Skip to content

Commit

Permalink
Merge pull request #36 from CodeDead/feature/tab-icons
Browse files Browse the repository at this point in the history
* Added icons to tabs
  • Loading branch information
CodeDead authored May 28, 2022
2 parents 836f549 + 6b8329d commit a68f815
Showing 1 changed file with 111 additions and 90 deletions.
201 changes: 111 additions & 90 deletions src/main/resources/windows/SettingsWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<?import javafx.collections.FXCollections?>
<?import java.lang.String?>
<?import com.codedead.opal.domain.NumberTextField?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.image.Image?>
<GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="com.codedead.opal.controller.SettingsWindowController"
Expand All @@ -27,105 +29,124 @@

<TabPane GridPane.rowIndex="0" tabClosingPolicy="UNAVAILABLE">
<Tab text="%General">
<GridPane alignment="CENTER">
<rowConstraints>
<RowConstraints/>
<RowConstraints/>
<RowConstraints/>
</rowConstraints>
<graphic>
<ImageView>
<image>
<Image url="@../images/settings.png"/>
</image>
</ImageView>
</graphic>
<content>
<GridPane alignment="CENTER">
<rowConstraints>
<RowConstraints/>
<RowConstraints/>
<RowConstraints/>
</rowConstraints>

<columnConstraints>
<ColumnConstraints/>
<ColumnConstraints/>
</columnConstraints>
<columnConstraints>
<ColumnConstraints/>
<ColumnConstraints/>
</columnConstraints>

<CheckBox fx:id="chbAutoUpdate" GridPane.columnSpan="2" GridPane.rowIndex="0"
GridPane.columnIndex="0" text="%AutoUpdate">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</CheckBox>
<Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="%Language">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</Label>
<ComboBox fx:id="cboLanguage" GridPane.rowIndex="1" GridPane.columnIndex="1" maxWidth="Infinity">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
<items>
<FXCollections fx:factory="observableArrayList">
<String fx:value="English"/>
<String fx:value="Deutsch"/>
<String fx:value="Español"/>
<String fx:value="Français"/>
<String fx:value="Nederlands"/>
<String fx:value="русский" />
</FXCollections>
</items>
</ComboBox>
<CheckBox fx:id="chbAutoUpdate" GridPane.columnSpan="2" GridPane.rowIndex="0"
GridPane.columnIndex="0" text="%AutoUpdate">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</CheckBox>
<Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="%Language">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</Label>
<ComboBox fx:id="cboLanguage" GridPane.rowIndex="1" GridPane.columnIndex="1" maxWidth="Infinity">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
<items>
<FXCollections fx:factory="observableArrayList">
<String fx:value="English"/>
<String fx:value="Deutsch"/>
<String fx:value="Español"/>
<String fx:value="Français"/>
<String fx:value="Nederlands"/>
<String fx:value="русский"/>
</FXCollections>
</items>
</ComboBox>

<Label GridPane.rowIndex="2" GridPane.columnIndex="0" text="%LogLevel">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</Label>
<ComboBox fx:id="cboLogLevel" GridPane.rowIndex="2" GridPane.columnIndex="1" maxWidth="Infinity">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
<items>
<FXCollections fx:factory="observableArrayList">
<String fx:value="OFF"/>
<String fx:value="FATAL"/>
<String fx:value="ERROR"/>
<String fx:value="WARN"/>
<String fx:value="INFO"/>
<String fx:value="DEBUG"/>
<String fx:value="TRACE"/>
<String fx:value="ALL"/>
</FXCollections>
</items>
</ComboBox>
</GridPane>
<Label GridPane.rowIndex="2" GridPane.columnIndex="0" text="%LogLevel">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</Label>
<ComboBox fx:id="cboLogLevel" GridPane.rowIndex="2" GridPane.columnIndex="1" maxWidth="Infinity">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
<items>
<FXCollections fx:factory="observableArrayList">
<String fx:value="OFF"/>
<String fx:value="FATAL"/>
<String fx:value="ERROR"/>
<String fx:value="WARN"/>
<String fx:value="INFO"/>
<String fx:value="DEBUG"/>
<String fx:value="TRACE"/>
<String fx:value="ALL"/>
</FXCollections>
</items>
</ComboBox>
</GridPane>
</content>
</Tab>
<Tab text="%Timer">
<GridPane alignment="CENTER">
<rowConstraints>
<RowConstraints/>
<RowConstraints/>
</rowConstraints>
<columnConstraints>
<ColumnConstraints/>
<ColumnConstraints/>
<ColumnConstraints/>
</columnConstraints>
<graphic>
<ImageView>
<image>
<Image url="@../images/timer.png"/>
</image>
</ImageView>
</graphic>
<content>
<GridPane alignment="CENTER">
<rowConstraints>
<RowConstraints/>
<RowConstraints/>
</rowConstraints>
<columnConstraints>
<ColumnConstraints/>
<ColumnConstraints/>
<ColumnConstraints/>
</columnConstraints>

<Label GridPane.rowIndex="0" GridPane.columnIndex="0" text="%Delay">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</Label>
<Label GridPane.rowIndex="0" GridPane.columnIndex="0" text="%Delay">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</Label>

<NumberTextField GridPane.columnIndex="1" GridPane.rowIndex="0" fx:id="numDelay">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</NumberTextField>
<NumberTextField GridPane.columnIndex="1" GridPane.rowIndex="0" fx:id="numDelay">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</NumberTextField>

<ComboBox fx:id="cboDelayType" GridPane.rowIndex="0" GridPane.columnIndex="2" maxWidth="Infinity">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</ComboBox>
<ComboBox fx:id="cboDelayType" GridPane.rowIndex="0" GridPane.columnIndex="2" maxWidth="Infinity">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</ComboBox>

<CheckBox fx:id="chbTimerApplicationShutdown" GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.columnSpan="3" text="%TimerApplicationShutdown">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</CheckBox>
</GridPane>
<CheckBox fx:id="chbTimerApplicationShutdown" GridPane.rowIndex="1" GridPane.columnIndex="0"
GridPane.columnSpan="3" text="%TimerApplicationShutdown">
<GridPane.margin>
<Insets bottom="3" left="3" right="3" top="3"/>
</GridPane.margin>
</CheckBox>
</GridPane>
</content>
</Tab>
</TabPane>

Expand Down

0 comments on commit a68f815

Please sign in to comment.