Skip to content

Commit 47367d9

Browse files
introfogintrofog
committed
Update design for execute window
1 parent 76ccca0 commit 47367d9

File tree

3 files changed

+62
-19
lines changed

3 files changed

+62
-19
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Explore, contribute, and customize the application according to your preferences
3737
## Ideas For Further Releases
3838
- Allow working with app by using only keyboard (with correct Tabs, Esc and so on work).
3939
- Exclude sub-directories from command running.
40+
- Allow export and import config.
4041
- Implement dynamic fields in commands, e.g. command `git checkout -f {branch}` and you can quickly specify which branch checkout in each command run.
4142

4243
## License

‎src/main/java/com/github/introfog/gitwave/model/StageFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public static FxmlStageHolder createModalStage(String fxmlPath, String title) {
5252

5353
public static FxmlStageHolder createPrimaryStage(String fxmlPath, String title, Stage stage) {
5454
final FxmlStageHolder holder = creteStage(fxmlPath, title, stage);
55+
holder.getStage().setMinWidth(400);
56+
holder.getStage().setMinHeight(340);
5557
holder.getStage().setResizable(true);
5658
return holder;
5759
}

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

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<?import javafx.scene.layout.ColumnConstraints?>
1515
<?import javafx.scene.layout.GridPane?>
1616
<?import javafx.scene.layout.RowConstraints?>
17-
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="450.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.ExecuteController">
17+
<?import javafx.scene.text.Font?>
18+
<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="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.ExecuteController">
1819
<children>
1920
<GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
2021
<columnConstraints>
@@ -37,21 +38,24 @@
3738
</Menu>
3839
</menus>
3940
</MenuBar>
40-
<AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2" GridPane.vgrow="NEVER">
41-
<children>
42-
<Hyperlink layoutY="25.0" onAction="#foundIssue" text="Found an issue?" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" />
43-
<Button fx:id="run" layoutX="386.0" layoutY="36.0" mnemonicParsing="false" onAction="#runCommand" text="4. Run" AnchorPane.bottomAnchor="20.0" AnchorPane.rightAnchor="20.0" />
44-
</children>
45-
</AnchorPane>
46-
<TabPane prefHeight="204.0" prefWidth="450.0" style="-fx-border-color: black;" tabClosingPolicy="UNAVAILABLE" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" GridPane.vgrow="ALWAYS">
41+
<TabPane prefHeight="204.0" prefWidth="450.0" style="-fx-border-color: black; -fx-border-style: solid none; -fx-border-width: 2;" tabClosingPolicy="UNAVAILABLE" tabMinWidth="100.0" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" GridPane.vgrow="ALWAYS">
4742
<tabs>
4843
<Tab text="1. Directory">
4944
<content>
5045
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
5146
<children>
52-
<Label prefWidth="270.0" text="Choose directory where git command will be run" />
53-
<TextField fx:id="directory" layoutY="40.0" prefHeight="25.0" prefWidth="378.0" />
54-
<Button layoutY="88.0" mnemonicParsing="false" onAction="#browseDirectory" text="Browse" />
47+
<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">
48+
<font>
49+
<Font name="Verdana" size="12.0" />
50+
</font></Label>
51+
<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">
52+
<font>
53+
<Font name="Verdana" size="12.0" />
54+
</font></TextField>
55+
<Button layoutX="20.0" layoutY="84.0" mnemonicParsing="false" onAction="#browseDirectory" text="Browse" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="80.0">
56+
<font>
57+
<Font name="Verdana" size="12.0" />
58+
</font></Button>
5559
</children>
5660
</AnchorPane>
5761
</content>
@@ -60,14 +64,38 @@
6064
<content>
6165
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
6266
<children>
63-
<Label text="Command" />
64-
<TextField fx:id="command" layoutY="37.0" prefHeight="25.0" prefWidth="378.0" />
65-
<Label layoutX="8.0" layoutY="71.0" text="Description" />
66-
<TextField fx:id="description" layoutY="88.0" prefHeight="25.0" prefWidth="378.0" />
67-
<Button fx:id="save" layoutX="48.0" layoutY="138.0" mnemonicParsing="false" onAction="#saveCommand" text="Save" />
68-
<Button layoutX="130.0" layoutY="138.0" mnemonicParsing="false" onAction="#chooseFromSaved" text="Choose from saved" />
69-
<Button fx:id="update" disable="true" layoutX="351.0" layoutY="138.0" mnemonicParsing="false" onAction="#updateSavedCommand" text="Update" />
70-
<Button fx:id="clean" disable="true" layoutX="287.0" layoutY="138.0" mnemonicParsing="false" onAction="#cleanSavedCommand" text="Clean" />
67+
<Label text="Command" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="20.0">
68+
<font>
69+
<Font name="Verdana" size="12.0" />
70+
</font></Label>
71+
<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">
72+
<font>
73+
<Font name="Verdana" size="12.0" />
74+
</font></TextField>
75+
<Label layoutX="8.0" layoutY="71.0" text="Description" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="80.0">
76+
<font>
77+
<Font name="Verdana" size="12.0" />
78+
</font></Label>
79+
<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">
80+
<font>
81+
<Font name="Verdana" size="12.0" />
82+
</font></TextField>
83+
<Button fx:id="save" layoutX="48.0" layoutY="138.0" mnemonicParsing="false" onAction="#saveCommand" text="Save" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="140.0">
84+
<font>
85+
<Font name="Verdana" size="12.0" />
86+
</font></Button>
87+
<Button layoutX="130.0" layoutY="138.0" mnemonicParsing="false" onAction="#chooseFromSaved" text="Choose from saved" AnchorPane.rightAnchor="80.0" AnchorPane.topAnchor="140.0">
88+
<font>
89+
<Font name="Verdana" size="12.0" />
90+
</font></Button>
91+
<Button fx:id="update" disable="true" layoutX="351.0" layoutY="138.0" mnemonicParsing="false" onAction="#updateSavedCommand" text="Update" AnchorPane.leftAnchor="80.0" AnchorPane.topAnchor="140.0">
92+
<font>
93+
<Font name="Verdana" size="12.0" />
94+
</font></Button>
95+
<Button fx:id="clean" disable="true" layoutX="287.0" layoutY="138.0" mnemonicParsing="false" onAction="#cleanSavedCommand" text="Clean" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="140.0">
96+
<font>
97+
<Font name="Verdana" size="12.0" />
98+
</font></Button>
7199
</children>
72100
</AnchorPane>
73101
</content>
@@ -79,6 +107,18 @@
79107
</Tab>
80108
</tabs>
81109
</TabPane>
110+
<AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2" GridPane.vgrow="NEVER">
111+
<children>
112+
<Hyperlink layoutY="25.0" onAction="#foundIssue" text="Found an issue?" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
113+
<font>
114+
<Font name="Verdana" size="12.0" />
115+
</font></Hyperlink>
116+
<Button fx:id="run" layoutX="386.0" layoutY="36.0" mnemonicParsing="false" onAction="#runCommand" text="4. Run" AnchorPane.bottomAnchor="20.0" AnchorPane.rightAnchor="20.0">
117+
<font>
118+
<Font name="Verdana" size="12.0" />
119+
</font></Button>
120+
</children>
121+
</AnchorPane>
82122
</children>
83123
</GridPane>
84124
</children>

0 commit comments

Comments
 (0)