Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 54 button sizes #65

Merged
merged 5 commits into from
Apr 4, 2024
Merged

Issue 54 button sizes #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68bd165
Renamed Histogram/Plot button to Hist button in GUI
JonasSchaub Apr 3, 2024
e2f3c04
Adjusted pref and max widths of text fields and combo boxes in settin…
JonasSchaub Apr 3, 2024
73bb5d0
Renamed Fragment button in pipeline settings view Run and adjusted bu…
JonasSchaub Apr 3, 2024
0ffee78
Made + and - symbols on pipeline settings view bold;
JonasSchaub Apr 4, 2024
c55a2e1
adjusted widths of combo boxes and text fields in histogram view;
JonasSchaub Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/main/java/de/unijena/cheminf/mortar/controller/PipelineSettingsViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ private void addNewChoiceRow(String aFragmenterName) {
tmpFragmenterSettingsButton.setMinHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpFragmenterSettingsButton.setPrefHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpFragmenterSettingsButton.setMaxHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpFragmenterSettingsButton.setMinWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpFragmenterSettingsButton.setPrefWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpFragmenterSettingsButton.setMaxWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
BooleanBinding tmpBooleanBinding = Bindings.isNull(tmpComboBox.getSelectionModel().selectedItemProperty());
tmpFragmenterSettingsButton.disableProperty().bind(tmpBooleanBinding);
tmpFragmenterSettingsButton.setOnAction(anActionEvent -> {
Expand Down Expand Up @@ -292,12 +295,13 @@ private void addAddRowButton(int aRowNumber) {
Button tmpAddButton = new Button();
tmpAddButton.setTooltip(GuiUtil.createTooltip(Message.get("PipelineSettingsView.addNewRowButton.toolTip")));
tmpAddButton.setText("+");
tmpAddButton.setStyle("-fx-font-weight: bold");
tmpAddButton.setMinHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpAddButton.setPrefHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpAddButton.setMaxHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpAddButton.setMinWidth(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpAddButton.setPrefWidth(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpAddButton.setMaxWidth(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpAddButton.setMinWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpAddButton.setPrefWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpAddButton.setMaxWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpAddButton.setOnAction(anActionEvent -> this.addNewChoiceRow(null));
this.pipelineSettingsView.addAddRowButton(tmpAddButton, aRowNumber);
}
Expand All @@ -311,12 +315,13 @@ private void addRemoveRowButton(int aRowNumber) {
Button tmpRemoveButton = new Button();
tmpRemoveButton.setTooltip(GuiUtil.createTooltip(Message.get("PipelineSettingsView.removeRowButton.toolTip")));
tmpRemoveButton.setText("-");
tmpRemoveButton.setStyle("-fx-font-weight: bold");
tmpRemoveButton.setMinHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpRemoveButton.setPrefHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpRemoveButton.setMaxHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpRemoveButton.setMinWidth(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpRemoveButton.setPrefWidth(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpRemoveButton.setMaxWidth(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
tmpRemoveButton.setMinWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpRemoveButton.setPrefWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpRemoveButton.setMaxWidth(GuiDefinitions.GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE);
tmpRemoveButton.setOnAction(anActionEvent -> {
int tmpRowIndex = GridPane.getRowIndex(tmpRemoveButton);
//remove addButton
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/de/unijena/cheminf/mortar/gui/util/GuiDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ private GuiDefinitions() {
* Value for the height of a button.
*/
public static final double GUI_BUTTON_HEIGHT_VALUE = 25.0;
/**
* Value for the width of buttons in the pipeline settings view.
*/
public static final double GUI_PIPELINE_SETTINGS_VIEW_BUTTON_WIDTH_VALUE = 50.0;
/**
* Value for the distance between the buttons.
*/
Expand All @@ -87,15 +91,15 @@ private GuiDefinitions() {
/**
* Value for the preference width of a text field.
*/
public static final double GUI_TEXT_FIELD_PREF_WIDTH_VALUE = 50.0;
public static final double GUI_TEXT_FIELD_PREF_WIDTH_VALUE = 60.0;
/**
* Value for the maximum width of a text field.
*/
public static final double GUI_SETTINGS_TEXT_FIELD_MAX_WIDTH_VALUE = 70.0;
public static final double GUI_SETTINGS_TEXT_FIELD_MAX_WIDTH_VALUE = 120.0;
/**
* Value for the preferred width of a combo box in the settings view.
*/
public static final double GUI_SETTING_COMBO_BOX_PREF_WIDTH_VALUE = 210.0;
public static final double GUI_SETTING_COMBO_BOX_PREF_WIDTH_VALUE = 180.0;
/**
* Value for the maximum width of a combo box in the settings view.
*/
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/de/unijena/cheminf/mortar/gui/views/HistogramView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,21 @@ public HistogramView(int aMaxFragmentNumber) {
this.displayedFragmentsNumberTextField = new TextField();
this.displayedFragmentsNumberTextField.setPrefWidth(GuiDefinitions.GUI_TEXT_FIELD_WIDTH);
this.displayedFragmentsNumberTextField.setTooltip(GuiUtil.createTooltip(Message.get("HistogramView.textField.toolTip") + " " + aMaxFragmentNumber));
this.displayedFragmentsNumberTextField.setMinWidth(GuiDefinitions.GUI_BUTTON_WIDTH_VALUE);
this.displayedFragmentsNumberTextField.setMaxWidth(GuiDefinitions.GUI_BUTTON_WIDTH_VALUE);
this.displayedFragmentsNumberTextField.setPrefWidth(GuiDefinitions.GUI_BUTTON_WIDTH_VALUE);
this.displayedFragmentsNumberTextField.setPrefHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
this.displayedFragmentsNumberTextField.setAlignment(Pos.CENTER_RIGHT);
this.applyButton = GuiUtil.getButtonOfStandardSize(Message.get("HistogramView.refreshButton.text"));
this.applyButton.setTooltip(GuiUtil.createTooltip(Message.get("HistogramView.refreshButton.toolTip")));
this.maximumSMILESLengthTextField = new TextField();
this.maximumSMILESLengthTextField.setPrefWidth(GuiDefinitions.GUI_TEXT_FIELD_WIDTH);
this.maximumSMILESLengthTextField.setTooltip(GuiUtil.createTooltip(Message.get("HistogramView.smilesField.toolTip")));
this.maximumSMILESLengthTextField.setMinWidth(GuiDefinitions.GUI_BUTTON_WIDTH_VALUE);
this.maximumSMILESLengthTextField.setMaxWidth(GuiDefinitions.GUI_BUTTON_WIDTH_VALUE);
this.maximumSMILESLengthTextField.setPrefWidth(GuiDefinitions.GUI_BUTTON_WIDTH_VALUE);
this.maximumSMILESLengthTextField.setPrefHeight(GuiDefinitions.GUI_BUTTON_HEIGHT_VALUE);
this.maximumSMILESLengthTextField.setAlignment(Pos.CENTER_RIGHT);
this.maximumSMILESLengthLabel = new Label(Message.get("HistogramView.smilesLabel.text"));
this.maximumSMILESLengthLabel.setTooltip(GuiUtil.createTooltip(Message.get("HistogramView.smilesField.toolTip")));
this.displayedFragmentsNumberLabel = new Label(Message.get("HistogramView.displayedFragmentsTextFieldLabel.text"));
Expand All @@ -195,6 +205,8 @@ public HistogramView(int aMaxFragmentNumber) {
this.barWidthsComboBox.getItems().add(tmpBarWidthOptionConstant.getDisplayName());
}
this.barWidthsComboBox.setTooltip(GuiUtil.createTooltip(Message.get("HistogramView.comboBox.toolTip")));
this.barWidthsComboBox.setPrefWidth(GuiDefinitions.GUI_SETTING_COMBO_BOX_PREF_WIDTH_VALUE);
this.barWidthsComboBox.setMaxWidth(GuiDefinitions.GUI_SETTING_COMBO_BOX_MAX_WIDTH_VALUE);
this.barWidthsLabel = new Label(Message.get("HistogramView.gapSettingLabel.text"));
this.barWidthsLabel.setTooltip(GuiUtil.createTooltip(Message.get("HistogramView.comboBox.toolTip")));
this.frequencyLabel = new Label(Message.get("HistogramView.chooseDataComboBox.text"));
Expand All @@ -204,6 +216,8 @@ public HistogramView(int aMaxFragmentNumber) {
this.frequencyComboBox.getItems().add(tmpFrequencyOptionConstant.getDisplayName());
}
this.frequencyComboBox.setTooltip(GuiUtil.createTooltip(Message.get("HistogramView.chooseDataComboBox.toolTip")));
this.frequencyComboBox.setPrefWidth(GuiDefinitions.GUI_SETTING_COMBO_BOX_PREF_WIDTH_VALUE);
this.frequencyComboBox.setMaxWidth(GuiDefinitions.GUI_SETTING_COMBO_BOX_MAX_WIDTH_VALUE);
tmpLeftSideGrid.setVgap(GuiDefinitions.GUI_INSETS_VALUE);
tmpLeftSideGrid.setHgap(GuiDefinitions.GUI_INSETS_VALUE);
tmpLeftSideGrid.setPadding(new Insets(GuiDefinitions.GUI_INSETS_VALUE));
Expand Down
31 changes: 16 additions & 15 deletions src/main/java/de/unijena/cheminf/mortar/gui/views/PipelineSettingsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ public PipelineSettingsView(){
*/
public void addGrid(Stage aStage) {
ScrollPane tmpScrollPane = new ScrollPane();
HBox.setHgrow(tmpScrollPane,Priority.ALWAYS);
VBox.setVgrow(tmpScrollPane,Priority.ALWAYS);
HBox.setHgrow(tmpScrollPane, Priority.ALWAYS);
VBox.setVgrow(tmpScrollPane, Priority.ALWAYS);
this.borderPane.setCenter(tmpScrollPane);
this.createGridPane(aStage);
tmpScrollPane.setContent(this.gridPane);
Expand Down Expand Up @@ -193,33 +193,34 @@ private void createGridPane(Stage aStage) {
this.gridPane.setPadding(new Insets(GuiDefinitions.GUI_INSETS_VALUE));
this.gridPane.setVgap(GuiDefinitions.GUI_INSETS_VALUE);
this.gridPane.setHgap(GuiDefinitions.GUI_INSETS_VALUE);
final double tmpColumnWidth = 60;
//0th column (numbering)
ColumnConstraints tmpColCon0 = new ColumnConstraints();
tmpColCon0.setHalignment(HPos.CENTER);
tmpColCon0.setHgrow(Priority.ALWAYS);
// tmpColCon0.prefWidthProperty().bind(
// aStage.widthProperty().multiply(0.05)
// );
tmpColCon0.setPrefWidth(40);
tmpColCon0.setMinWidth(40);
tmpColCon0.setMaxWidth(40);
tmpColCon0.setPrefWidth(tmpColumnWidth);
tmpColCon0.setMinWidth(tmpColumnWidth);
tmpColCon0.setMaxWidth(tmpColumnWidth);
this.gridPane.getColumnConstraints().add(tmpColCon0);
//1st column (choicebox for algorithm)
ColumnConstraints tmpColCon1 = new ColumnConstraints();
tmpColCon1.setHalignment(HPos.LEFT);
tmpColCon1.setHgrow(Priority.ALWAYS);
tmpColCon1.prefWidthProperty().bind(
// aStage.widthProperty().multiply(0.8)
aStage.widthProperty().subtract(200) //magic number
aStage.widthProperty().subtract(260) //magic number
);
this.gridPane.getColumnConstraints().add(tmpColCon1);
//2nd column (settings button or add new algorithm button)
ColumnConstraints tmpColCon2 = new ColumnConstraints();
tmpColCon2.setHalignment(HPos.CENTER);
tmpColCon2.setHgrow(Priority.ALWAYS);
tmpColCon2.setPrefWidth(40);
tmpColCon2.setMinWidth(40);
tmpColCon2.setMaxWidth(40);
tmpColCon2.setPrefWidth(tmpColumnWidth);
tmpColCon2.setMinWidth(tmpColumnWidth);
tmpColCon2.setMaxWidth(tmpColumnWidth);
// tmpColCon2.prefWidthProperty().bind(
// aStage.widthProperty().multiply(0.175)
// );
Expand All @@ -228,9 +229,9 @@ private void createGridPane(Stage aStage) {
ColumnConstraints tmpColCon3 = new ColumnConstraints();
tmpColCon3.setHalignment(HPos.CENTER);
tmpColCon3.setHgrow(Priority.ALWAYS);
tmpColCon3.setPrefWidth(40);
tmpColCon3.setMinWidth(40);
tmpColCon3.setMaxWidth(40);
tmpColCon3.setPrefWidth(tmpColumnWidth - 10.0);
tmpColCon3.setMinWidth(tmpColumnWidth - 10.0);
tmpColCon3.setMaxWidth(tmpColumnWidth - 10.0);
// tmpColCon3.prefWidthProperty().bind(
// aStage.widthProperty().multiply(0.175)
// );
Expand All @@ -240,9 +241,9 @@ private void createGridPane(Stage aStage) {
tmpRowCon1.setValignment(VPos.CENTER);
tmpRowCon1.setVgrow(Priority.ALWAYS);
this.gridPane.getRowConstraints().add(tmpRowCon1);
tmpRowCon1.setPrefHeight(50);
tmpRowCon1.setMaxHeight(50);
tmpRowCon1.setMinHeight(50);
tmpRowCon1.setPrefHeight(tmpColumnWidth);
tmpRowCon1.setMaxHeight(tmpColumnWidth);
tmpRowCon1.setMinHeight(tmpColumnWidth);
//name textfield
this.textField = new TextField();
this.textField.setMaxWidth(250);
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/de/unijena/cheminf/mortar/message/Message_en_GB.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ MainView.menuBar.pipelineMenu.pipelineSettingsMenuItem.text = Create Pipeline
MainView.menuBar.viewsMenu.text = Views
MainView.menuBar.viewsMenu.HistogramMenuItem.text = Histogram
MainView.menuBar.viewsMenu.overviewViewMenuItem.text = Overview
MainView.showHistogramViewButton.text = Plot
MainView.showHistogramViewButton.text = Hist
MainView.showHistogramViewButton.tooltip = Opens the histogram view
MainView.showOverviewViewButton.text = Overview
MainView.showOverviewViewButton.tooltip = Opens the overview view
Expand Down Expand Up @@ -219,7 +219,7 @@ FragmentationSettingsView.title.text = Fragmentation Settings
PipelineSettingsView.title.text = Pipeline
PipelineSettingsView.cancelButton.text = Cancel
PipelineSettingsView.cancelButton.toolTip = Discards changes and closes window
PipelineSettingsView.fragmentButton.text = Fragment
PipelineSettingsView.fragmentButton.text = Run
PipelineSettingsView.fragmentButton.toolTip = Closes window and starts pipeline fragmentation
PipelineSettingsView.defaultButton.text = Default
PipelineSettingsView.defaultButton.tooltip = Reset pipeline
Expand Down
Loading