mirror of
https://gitlab.kit.edu/uskyk/typicalc.git
synced 2024-11-09 10:50:42 +00:00
New example button text
This commit is contained in:
parent
d8b547177a
commit
0e468b5611
@ -55,12 +55,13 @@ public class InputBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
protected InputBar(Consumer<Pair<String, Map<String, String>>> callback) {
|
protected InputBar(Consumer<Pair<String, Map<String, String>>> callback) {
|
||||||
this.callback = callback;
|
this.callback = callback;
|
||||||
|
|
||||||
|
setId(INPUT_BAR_ID);
|
||||||
|
|
||||||
infoIcon = new Button(new Icon(VaadinIcon.INFO_CIRCLE));
|
infoIcon = new Button(new Icon(VaadinIcon.INFO_CIRCLE));
|
||||||
infoIcon.addClickListener(event -> onInfoIconClick());
|
infoIcon.addClickListener(event -> onInfoIconClick());
|
||||||
|
|
||||||
inputField = new TextField();
|
inputField = new TextField();
|
||||||
inputField.getElement().setAttribute("autofocus", "");
|
inputField.getElement().setAttribute("autofocus", ""); // focus on page load
|
||||||
inputField.setPlaceholder(getTranslation("root.inputFieldPlaceholder"));
|
|
||||||
inputField.setId(INPUT_FIELD_ID);
|
inputField.setId(INPUT_FIELD_ID);
|
||||||
inputField.setClearButtonVisible(true);
|
inputField.setClearButtonVisible(true);
|
||||||
inputField.setMaxLength(MAX_INPUT_LENGTH);
|
inputField.setMaxLength(MAX_INPUT_LENGTH);
|
||||||
@ -72,10 +73,11 @@ public class InputBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
Button lambdaButton = new Button(getTranslation("root.lambda"));
|
Button lambdaButton = new Button(getTranslation("root.lambda"));
|
||||||
lambdaButton.setId(LAMBDA_BUTTON_ID);
|
lambdaButton.setId(LAMBDA_BUTTON_ID);
|
||||||
UI.getCurrent().getPage().executeJs("window.lambdaButtonListener($0, $1);", LAMBDA_BUTTON_ID, INPUT_FIELD_ID);
|
UI.getCurrent().getPage().executeJs("window.lambdaButtonListener($0, $1);", LAMBDA_BUTTON_ID, INPUT_FIELD_ID);
|
||||||
|
|
||||||
typeAssumptions = new Button("", event -> onTypeAssumptionsButton());
|
typeAssumptions = new Button("", event -> onTypeAssumptionsButton());
|
||||||
typeAssumptions.setId(ASS_BUTTON_ID);
|
typeAssumptions.setId(ASS_BUTTON_ID);
|
||||||
typeAssumptionsArea = new TypeAssumptionsArea();
|
typeAssumptionsArea = new TypeAssumptionsArea();
|
||||||
exampleButton = new Button(VaadinIcon.PAPERCLIP.create(), event -> onExampleButtonClick());
|
exampleButton = new Button(getTranslation("root.exampleButton"), event -> onExampleButtonClick());
|
||||||
exampleButton.setId(EXAMPLE_BUTTON_ID);
|
exampleButton.setId(EXAMPLE_BUTTON_ID);
|
||||||
inferTypeButton = new Button("", event -> onTypeInferButtonClick());
|
inferTypeButton = new Button("", event -> onTypeInferButtonClick());
|
||||||
inferTypeButton.addClickShortcut(Key.ENTER).listenOn(this);
|
inferTypeButton.addClickShortcut(Key.ENTER).listenOn(this);
|
||||||
@ -83,7 +85,6 @@ public class InputBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
inferTypeButton.setId(INFER_BUTTON_ID);
|
inferTypeButton.setId(INFER_BUTTON_ID);
|
||||||
|
|
||||||
add(infoIcon, typeAssumptions, lambdaButton, inputField, exampleButton, inferTypeButton);
|
add(infoIcon, typeAssumptions, lambdaButton, inputField, exampleButton, inferTypeButton);
|
||||||
setId(INPUT_BAR_ID);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -53,7 +53,6 @@ public class MainViewImpl extends AppLayout
|
|||||||
* Creates a new MainViewImpl.
|
* Creates a new MainViewImpl.
|
||||||
*/
|
*/
|
||||||
public MainViewImpl() {
|
public MainViewImpl() {
|
||||||
setDrawerOpened(false);
|
|
||||||
MainViewListener presenter = new Presenter(new ModelImpl(), this);
|
MainViewListener presenter = new Presenter(new ModelImpl(), this);
|
||||||
upperBar = new UpperBar(presenter, this::processInput);
|
upperBar = new UpperBar(presenter, this::processInput);
|
||||||
addToNavbar(upperBar);
|
addToNavbar(upperBar);
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package edu.kit.typicalc.view.main;
|
package edu.kit.typicalc.view.main;
|
||||||
|
|
||||||
import com.vaadin.flow.component.applayout.DrawerToggle;
|
|
||||||
import com.vaadin.flow.component.button.Button;
|
import com.vaadin.flow.component.button.Button;
|
||||||
import com.vaadin.flow.component.dependency.CssImport;
|
import com.vaadin.flow.component.dependency.CssImport;
|
||||||
import com.vaadin.flow.component.html.Anchor;
|
import com.vaadin.flow.component.html.Anchor;
|
||||||
@ -36,7 +35,6 @@ public class UpperBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
private static final String UPPER_BAR_ID = "header";
|
private static final String UPPER_BAR_ID = "header";
|
||||||
|
|
||||||
private final InputBar inputBar;
|
private final InputBar inputBar;
|
||||||
private final Button toggle;
|
|
||||||
private final Button helpButton;
|
private final Button helpButton;
|
||||||
|
|
||||||
private final transient MainViewListener presenter;
|
private final transient MainViewListener presenter;
|
||||||
@ -45,7 +43,7 @@ public class UpperBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
/**
|
/**
|
||||||
* Initializes a new UpperBar with the provided mainViewListener.
|
* Initializes a new UpperBar with the provided mainViewListener.
|
||||||
*
|
*
|
||||||
* @param presenter the listener used to communicate with the model
|
* @param presenter the listener used to communicate with the model
|
||||||
* @param inputConsumer function to handle user input
|
* @param inputConsumer function to handle user input
|
||||||
*/
|
*/
|
||||||
protected UpperBar(MainViewListener presenter, Consumer<Pair<String, Map<String, String>>> inputConsumer) {
|
protected UpperBar(MainViewListener presenter, Consumer<Pair<String, Map<String, String>>> inputConsumer) {
|
||||||
@ -53,7 +51,6 @@ public class UpperBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
this.presenter = presenter;
|
this.presenter = presenter;
|
||||||
this.inputConsumer = inputConsumer;
|
this.inputConsumer = inputConsumer;
|
||||||
|
|
||||||
toggle = new DrawerToggle();
|
|
||||||
H1 viewTitle = new H1(new Anchor("/", getTranslation("root.typicalc")));
|
H1 viewTitle = new H1(new Anchor("/", getTranslation("root.typicalc")));
|
||||||
viewTitle.setId(VIEW_TITLE_ID);
|
viewTitle.setId(VIEW_TITLE_ID);
|
||||||
this.inputBar = new InputBar(this::typeInfer);
|
this.inputBar = new InputBar(this::typeInfer);
|
||||||
@ -62,7 +59,7 @@ public class UpperBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
helpButton.addClickListener(event -> new HelpDialog().open());
|
helpButton.addClickListener(event -> new HelpDialog().open());
|
||||||
helpButton.setId(HELP_ICON_ID);
|
helpButton.setId(HELP_ICON_ID);
|
||||||
|
|
||||||
add(/*toggle, */viewTitle, inputBar, helpButton);
|
add(viewTitle, inputBar, helpButton);
|
||||||
setId(UPPER_BAR_ID);
|
setId(UPPER_BAR_ID);
|
||||||
getThemeList().set("dark", true);
|
getThemeList().set("dark", true);
|
||||||
setSpacing(false);
|
setSpacing(false);
|
||||||
@ -96,7 +93,6 @@ public class UpperBar extends HorizontalLayout implements LocaleChangeObserver {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void localeChange(LocaleChangeEvent event) {
|
public void localeChange(LocaleChangeEvent event) {
|
||||||
toggle.getElement().setAttribute("title", getTranslation("root.drawerToggleTooltip"));
|
|
||||||
helpButton.getElement().setAttribute("title", getTranslation("root.helpIconTooltip"));
|
helpButton.getElement().setAttribute("title", getTranslation("root.helpIconTooltip"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
root.close=Schließen
|
root.close=Schließen
|
||||||
root.save=Speichern
|
root.save=Speichern
|
||||||
root.copied=LaTeX-Code in Zwischenablage kopiert.
|
root.copied=LaTeX-Code in Zwischenablage kopiert.
|
||||||
|
root.exampleButton=📂 Beispiele
|
||||||
root.selectExample=Beispiel auswählen:
|
root.selectExample=Beispiel auswählen:
|
||||||
root.typeInfer=Typisieren
|
root.typeInfer=Typisieren
|
||||||
root.operatingHelp=Hilfe
|
root.operatingHelp=Hilfe
|
||||||
@ -144,7 +145,6 @@ verwendeten Pakete aufgelistet.
|
|||||||
root.correctAssumptions=Korrigiere oder lösche die ungültigen Typannahmen (rot hinterlegt) \
|
root.correctAssumptions=Korrigiere oder lösche die ungültigen Typannahmen (rot hinterlegt) \
|
||||||
vor dem Schließen des Dialogs.
|
vor dem Schließen des Dialogs.
|
||||||
root.copyLatexTooltip=Kopiere LaTeX-code
|
root.copyLatexTooltip=Kopiere LaTeX-code
|
||||||
root.drawerToggleTooltip=Ableitungsregeln
|
|
||||||
root.helpIconTooltip=Hilfe und Sprachwechsel
|
root.helpIconTooltip=Hilfe und Sprachwechsel
|
||||||
root.exampleTooltip=Beispielterme
|
root.exampleTooltip=Beispielterme
|
||||||
root.shareButtonTooltip=LaTeX-Code und Permalink
|
root.shareButtonTooltip=LaTeX-Code und Permalink
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
root.close=Close
|
root.close=Close
|
||||||
root.save=Save
|
root.save=Save
|
||||||
root.copied=LaTeX code copied to clipboard.
|
root.copied=LaTeX code copied to clipboard.
|
||||||
|
root.exampleButton=📂 Examples
|
||||||
root.selectExample=Select example:
|
root.selectExample=Select example:
|
||||||
root.typeInfer=Type
|
root.typeInfer=Type
|
||||||
root.operatingHelp=Help
|
root.operatingHelp=Help
|
||||||
@ -121,7 +122,6 @@ root.text8=The dialog contains a permalink to the current page, the LaTeX-code o
|
|||||||
to compile the code.
|
to compile the code.
|
||||||
root.correctAssumptions=Correct or delete the invalid type assumptions (red background) before closing the dialog.
|
root.correctAssumptions=Correct or delete the invalid type assumptions (red background) before closing the dialog.
|
||||||
root.copyLatexTooltip=Copy LaTeX code
|
root.copyLatexTooltip=Copy LaTeX code
|
||||||
root.drawerToggleTooltip=Type inference rules
|
|
||||||
root.helpIconTooltip=Help and language switch
|
root.helpIconTooltip=Help and language switch
|
||||||
root.exampleTooltip=Example terms
|
root.exampleTooltip=Example terms
|
||||||
root.shareButtonTooltip=LaTeX code and permalink
|
root.shareButtonTooltip=LaTeX code and permalink
|
||||||
|
Loading…
Reference in New Issue
Block a user