Skip to content

Commit 614ed6f

Browse files
introfogintrofog
committed
Use cross platform SansSerif font
1 parent b64ba77 commit 614ed6f

File tree

8 files changed

+72
-86
lines changed

8 files changed

+72
-86
lines changed

‎src/main/resources/com/github/introfog/gitwave/view/about.fxml

Lines changed: 45 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,60 @@
77
<?import javafx.scene.image.Image?>
88
<?import javafx.scene.image.ImageView?>
99
<?import javafx.scene.layout.AnchorPane?>
10+
<?import javafx.scene.layout.HBox?>
11+
<?import javafx.scene.layout.VBox?>
1012
<?import javafx.scene.text.Font?>
11-
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="315.0" prefWidth="400.0" style="-fx-font-size: 12; -fx-font-family: verdana;" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.AboutController">
13+
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="325.0" prefWidth="400.0" style="-fx-font-size: 13; -fx-font-family: sansserif;" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.AboutController">
1214
<children>
1315
<ImageView fitHeight="80.0" fitWidth="80.0" layoutX="32.0" layoutY="40.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
1416
<image>
1517
<Image url="@../../../../../logo256.png" />
1618
</image></ImageView>
17-
<Button layoutX="294.0" layoutY="292.0" mnemonicParsing="false" onAction="#close" text="Close" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" />
18-
<Label fx:id="version" layoutX="134.0" layoutY="40.0" text="VERSION" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="20.0">
19-
<graphic>
20-
<Label text="GitWave">
19+
<VBox prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="100.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
20+
<children>
21+
<Label fx:id="version" text="VERSION">
22+
<graphic>
23+
<Label text="GitWave">
24+
<font>
25+
<Font name="SansSerif Bold" size="14.0" />
26+
</font>
27+
</Label>
28+
</graphic>
2129
<font>
22-
<Font name="Verdana Bold" size="14.0" />
30+
<Font name="SansSerif Bold" size="14.0" />
2331
</font>
32+
<VBox.margin>
33+
<Insets top="20.0" />
34+
</VBox.margin>
2435
</Label>
25-
</graphic>
26-
<font>
27-
<Font name="Verdana Bold" size="14.0" />
28-
</font></Label>
29-
<Label layoutX="134.0" layoutY="72.0" text="GitWave is the ultimate tool for developers who work with multiple repositories. The app is designed to streamline your workflow by allowing you to run any bash commands across several repositories simultaneously. It’s a powerful companion for any developer looking to save time and effort when managing their Git projects." wrapText="true" AnchorPane.leftAnchor="100.0" AnchorPane.rightAnchor="0.0" />
30-
<Label layoutX="140.0" layoutY="210.0" text="GitWave is a open source project:" wrapText="true" AnchorPane.leftAnchor="100.0" />
31-
<Hyperlink layoutX="140.0" layoutY="207.0" onAction="#openGitHub" text="GitHub" AnchorPane.rightAnchor="0.0" />
32-
<Label layoutX="133.0" layoutY="240.0" text="Copyright 2023-2024 Dmitry Chubrick" AnchorPane.leftAnchor="100.0" />
36+
<Label text="GitWave is the ultimate tool for developers who work with multiple repositories. The app is designed to streamline your workflow by allowing you to run any bash commands across several repositories simultaneously. It’s a powerful companion for any developer looking to save time and effort when managing their Git projects." wrapText="true">
37+
<VBox.margin>
38+
<Insets top="10.0" />
39+
</VBox.margin>
40+
</Label>
41+
<HBox>
42+
<children>
43+
<Label text="GitWave is a open source project:" wrapText="true">
44+
<HBox.margin>
45+
<Insets />
46+
</HBox.margin>
47+
</Label>
48+
<Hyperlink onAction="#openGitHub" text="GitHub">
49+
<HBox.margin>
50+
<Insets top="-3.0" />
51+
</HBox.margin></Hyperlink>
52+
</children>
53+
<VBox.margin>
54+
<Insets top="10.0" />
55+
</VBox.margin>
56+
</HBox>
57+
<Label text="Copyright 2023-2024 Dmitry Chubrick">
58+
<VBox.margin>
59+
<Insets top="10.0" />
60+
</VBox.margin></Label>
61+
</children>
62+
</VBox>
63+
<Button mnemonicParsing="false" onAction="#close" text="Close" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="147.0" />
3364
</children>
3465
<padding>
3566
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />

‎src/main/resources/com/github/introfog/gitwave/view/edit.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<?import javafx.scene.layout.ColumnConstraints?>
99
<?import javafx.scene.layout.GridPane?>
1010
<?import javafx.scene.layout.RowConstraints?>
11-
<AnchorPane maxHeight="180.0" maxWidth="-Infinity" minHeight="180.0" minWidth="-Infinity" prefHeight="180.0" prefWidth="500.0" style="-fx-font-family: verdana; -fx-font-size: 12;" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.EditController">
11+
<AnchorPane maxHeight="180.0" maxWidth="-Infinity" minHeight="180.0" minWidth="-Infinity" prefHeight="180.0" prefWidth="500.0" style="-fx-font-family: sansserif; -fx-font-size: 13;" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.EditController">
1212
<children>
1313
<GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
1414
<columnConstraints>

‎src/main/resources/com/github/introfog/gitwave/view/execution.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<?import javafx.scene.layout.AnchorPane?>
55
<?import org.fxmisc.flowless.VirtualizedScrollPane?>
66
<?import org.fxmisc.richtext.InlineCssTextArea?>
7-
<AnchorPane prefHeight="400.0" prefWidth="600.0" style="-fx-font-family: verdana; -fx-font-size: 14;" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.main.ExecutionController">
7+
<AnchorPane prefHeight="400.0" prefWidth="600.0" style="-fx-font-family: sansserif; -fx-font-size: 15;" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17.0.12" fx:controller="com.github.introfog.gitwave.controller.main.ExecutionController">
88
<children>
99
<VirtualizedScrollPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
1010
<content>

‎src/main/resources/com/github/introfog/gitwave/view/explorer.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<?import javafx.scene.control.TableColumn?>
44
<?import javafx.scene.control.TableView?>
55
<?import javafx.scene.layout.AnchorPane?>
6-
<AnchorPane fx:id="anchor" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="275.0" prefWidth="800.0" style="-fx-font-family: verdana; -fx-font-size: 12;" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.ExploreController">
6+
<AnchorPane fx:id="anchor" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="275.0" prefWidth="800.0" style="-fx-font-family: sansserif; -fx-font-size: 13;" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.ExploreController">
77
<children>
88
<TableView fx:id="commandsTable" onMouseClicked="#mouseClick" prefHeight="223.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
99
<columns>

‎src/main/resources/com/github/introfog/gitwave/view/main.fxml

Lines changed: 15 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<?import javafx.scene.layout.ColumnConstraints?>
1818
<?import javafx.scene.layout.GridPane?>
1919
<?import javafx.scene.layout.RowConstraints?>
20-
<?import javafx.scene.text.Font?>
21-
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="450.0" style="-fx-font-family: verdana; -fx-font-size: 12;" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.main.MainController">
20+
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="450.0" style="-fx-font-family: sanserif; -fx-font-size: 13;" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.main.MainController">
2221
<children>
2322
<GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
2423
<columnConstraints>
@@ -49,18 +48,9 @@
4948
<content>
5049
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
5150
<children>
52-
<Label layoutX="21.0" layoutY="20.0" prefHeight="18.0" prefWidth="282.0" text="Choose directory where command will be run" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="20.0">
53-
<font>
54-
<Font name="Verdana" size="12.0" />
55-
</font></Label>
56-
<TextField fx:id="directory" layoutY="40.0" prefHeight="25.0" prefWidth="378.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="40.0">
57-
<font>
58-
<Font name="Verdana" size="12.0" />
59-
</font></TextField>
60-
<Button layoutX="20.0" layoutY="84.0" mnemonicParsing="false" onAction="#browseDirectory" text="Browse" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="80.0">
61-
<font>
62-
<Font name="Verdana" size="12.0" />
63-
</font></Button>
51+
<Label layoutX="21.0" layoutY="20.0" prefHeight="18.0" prefWidth="282.0" text="Choose directory where command will be run" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="20.0" />
52+
<TextField fx:id="directory" layoutY="40.0" prefWidth="378.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="40.0" />
53+
<Button layoutX="20.0" layoutY="84.0" mnemonicParsing="false" onAction="#browseDirectory" text="Browse" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="80.0" />
6454
</children>
6555
</AnchorPane>
6656
</content>
@@ -69,34 +59,13 @@
6959
<content>
7060
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
7161
<children>
72-
<Label text="Command*" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="20.0">
73-
<font>
74-
<Font name="Verdana" size="12.0" />
75-
</font></Label>
76-
<TextField fx:id="command" layoutY="37.0" prefHeight="25.0" prefWidth="378.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="40.0">
77-
<font>
78-
<Font name="Verdana" size="12.0" />
79-
</font></TextField>
80-
<Label layoutX="8.0" layoutY="71.0" text="Description" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="80.0">
81-
<font>
82-
<Font name="Verdana" size="12.0" />
83-
</font></Label>
84-
<TextField fx:id="description" layoutY="88.0" prefHeight="25.0" prefWidth="378.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="100.0">
85-
<font>
86-
<Font name="Verdana" size="12.0" />
87-
</font></TextField>
88-
<Button fx:id="save" disable="true" layoutX="48.0" layoutY="138.0" mnemonicParsing="false" onAction="#saveOrEditCommand" text="Save" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="140.0">
89-
<font>
90-
<Font name="Verdana" size="12.0" />
91-
</font></Button>
92-
<Button layoutX="130.0" layoutY="138.0" mnemonicParsing="false" onAction="#chooseFromSaved" text="Choose from saved" AnchorPane.rightAnchor="80.0" AnchorPane.topAnchor="140.0">
93-
<font>
94-
<Font name="Verdana" size="12.0" />
95-
</font></Button>
96-
<Button layoutX="287.0" layoutY="138.0" mnemonicParsing="false" onAction="#reset" text="Reset" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="140.0">
97-
<font>
98-
<Font name="Verdana" size="12.0" />
99-
</font></Button>
62+
<Label text="Command*" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="20.0" />
63+
<TextField fx:id="command" layoutY="37.0" prefHeight="25.0" prefWidth="378.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="40.0" />
64+
<Label layoutX="8.0" layoutY="71.0" text="Description" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="80.0" />
65+
<TextField fx:id="description" layoutY="88.0" prefHeight="25.0" prefWidth="378.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="100.0" />
66+
<Button fx:id="save" disable="true" layoutX="48.0" layoutY="138.0" mnemonicParsing="false" onAction="#saveOrEditCommand" text="Save" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="140.0" />
67+
<Button layoutX="130.0" layoutY="138.0" mnemonicParsing="false" onAction="#chooseFromSaved" text="Choose from saved" AnchorPane.rightAnchor="80.0" AnchorPane.topAnchor="140.0" />
68+
<Button layoutX="287.0" layoutY="138.0" mnemonicParsing="false" onAction="#reset" text="Reset" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="140.0" />
10069
</children>
10170
</AnchorPane>
10271
</content>
@@ -105,7 +74,7 @@
10574
<content>
10675
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
10776
<children>
108-
<TableView fx:id="parametersTable" disable="true" editable="true" layoutX="91.0" layoutY="-18.0" prefHeight="200.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
77+
<TableView fx:id="parametersTable" disable="true" editable="true" fixedCellSize="32.0" layoutX="91.0" layoutY="-18.0" prefHeight="200.0" prefWidth="200.0" style="-fx-alignment: center-left;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
10978
<columns>
11079
<TableColumn editable="false" minWidth="100.0" prefWidth="75.0" text="Name" />
11180
<TableColumn minWidth="100.0" prefWidth="75.0" text="Value" />
@@ -114,22 +83,16 @@
11483
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
11584
</columnResizePolicy>
11685
</TableView>
117-
<Label fx:id="parametersText" layoutX="28.0" layoutY="14.0" prefHeight="50.0" prefWidth="418.0" text="Current command doesn't define any parameters. Enter your parameter in the format {parameterName}. Ensure that parameterName is not empty and doesn't contain spaces." wrapText="true" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="20.0" />
86+
<Label fx:id="parametersText" layoutX="28.0" layoutY="14.0" prefWidth="418.0" text="Current command doesn't define any parameters. Enter your parameter in the format {parameterName}. Ensure that parameterName is not empty and doesn't contain spaces." wrapText="true" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="20.0" />
11887
</children></AnchorPane>
11988
</content>
12089
</Tab>
12190
</tabs>
12291
</TabPane>
12392
<AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2" GridPane.vgrow="NEVER">
12493
<children>
125-
<Button layoutX="386.0" layoutY="36.0" mnemonicParsing="false" onAction="#runCommand" text="4. Run" AnchorPane.bottomAnchor="20.0" AnchorPane.rightAnchor="20.0">
126-
<font>
127-
<Font name="Verdana" size="12.0" />
128-
</font></Button>
129-
<Hyperlink focusTraversable="false" layoutY="25.0" onAction="#foundIssue" text="Found an issue?" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0">
130-
<font>
131-
<Font name="Verdana" size="12.0" />
132-
</font></Hyperlink>
94+
<Button layoutX="386.0" layoutY="36.0" mnemonicParsing="false" onAction="#runCommand" text="4. Run" AnchorPane.bottomAnchor="20.0" AnchorPane.rightAnchor="20.0" />
95+
<Hyperlink focusTraversable="false" layoutY="25.0" onAction="#foundIssue" text="Found an issue?" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" />
13396
<Separator layoutY="17.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
13497
</children>
13598
</AnchorPane>

0 commit comments

Comments
 (0)