Skip to content

Commit c29ce3d

Browse files
BenHerbstBenHerbst
committed
We now use split pane, not border pane anymore
1 parent 3dfe75f commit c29ce3d

File tree

2 files changed

+129
-99
lines changed

2 files changed

+129
-99
lines changed

‎.idea/workspace.xml‎

Lines changed: 11 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/resources/fxml/MainView.fxml‎

Lines changed: 118 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,35 @@
55
<?import javafx.scene.control.Menu?>
66
<?import javafx.scene.control.MenuBar?>
77
<?import javafx.scene.control.MenuItem?>
8+
<?import javafx.scene.control.SplitPane?>
89
<?import javafx.scene.control.Tab?>
910
<?import javafx.scene.control.TabPane?>
1011
<?import javafx.scene.control.ToolBar?>
1112
<?import javafx.scene.control.TreeView?>
1213
<?import javafx.scene.layout.AnchorPane?>
13-
<?import javafx.scene.layout.BorderPane?>
14+
<?import javafx.scene.layout.VBox?>
1415
<?import javafx.scene.text.Font?>
1516
<?import org.kordamp.ikonli.javafx.FontIcon?>
1617

17-
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="737.0" prefWidth="1113.0" stylesheets="@../styles/main.css" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.idaesbasic.controllers.MainController">
18-
<left>
19-
<TreeView fx:id="fileExplorer" prefHeight="689.0" prefWidth="264.0" BorderPane.alignment="CENTER" />
20-
</left>
21-
<bottom>
22-
<ToolBar prefHeight="22.0" prefWidth="600.0" stylesheets="@../styles/airbar/button.css" BorderPane.alignment="CENTER">
23-
<items>
24-
<Button fx:id="dateButton" layoutX="272.0" layoutY="10.0" mnemonicParsing="false" text="17/10/2021" />
25-
<Button fx:id="timeButton" layoutX="310.0" layoutY="10.0" mnemonicParsing="false" text="12:30" />
26-
</items>
27-
</ToolBar>
28-
</bottom>
29-
<center>
30-
<TabPane fx:id="tabPane" prefHeight="33.0" prefWidth="600.0" tabClosingPolicy="ALL_TABS" BorderPane.alignment="CENTER">
31-
<tabs>
32-
<Tab text="New tab">
33-
<content>
34-
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
35-
</content>
36-
</Tab>
37-
<Tab text="New tab">
38-
<content>
39-
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="648.0" prefWidth="384.0" />
40-
</content>
41-
</Tab>
42-
<Tab fx:id="plusTab" closable="false" text="Add tab">
43-
<graphic>
44-
<FontIcon iconColor="WHITE" iconLiteral="fa-plus" />
45-
</graphic>
46-
</Tab>
47-
</tabs>
48-
</TabPane>
49-
</center>
50-
<top>
51-
<MenuBar BorderPane.alignment="CENTER">
18+
19+
<VBox prefHeight="742.0" prefWidth="1323.0" stylesheets="@../styles/main.css" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.idaesbasic.controllers.MainController">
20+
<children>
21+
<MenuBar>
5222
<menus>
5323
<Menu mnemonicParsing="false" text="File">
5424
<items>
5525
<MenuItem disable="true" mnemonicParsing="false" text="Open">
5626
<graphic>
5727
<FontIcon iconColor="WHITE" iconLiteral="fa-file" iconSize="16" />
58-
</graphic></MenuItem>
28+
</graphic>
29+
</MenuItem>
5930
<Menu mnemonicParsing="false" text="New">
6031
<items>
6132
<MenuItem fx:id="menuItemNewTodolist" mnemonicParsing="false" onAction="#newTodolist" text="New Todolist">
6233
<graphic>
6334
<FontIcon iconColor="WHITE" iconLiteral="fa-check-circle" iconSize="16" />
64-
</graphic></MenuItem>
35+
</graphic>
36+
</MenuItem>
6537
<MenuItem mnemonicParsing="false" onAction="#newKanban" text="New Kanban" />
6638
<MenuItem fx:id="menuItemNewCalendar" mnemonicParsing="false" onAction="#newCalendar" text="New Calendar" />
6739
<MenuItem disable="true" mnemonicParsing="false" text="New Whiteboard" />
@@ -73,15 +45,18 @@
7345
<MenuItem fx:id="menuItemSaveAs" mnemonicParsing="false" onAction="#saveFileAs" text="Save as">
7446
<graphic>
7547
<FontIcon iconColor="WHITE" iconLiteral="fa-share-square" iconSize="16" />
76-
</graphic></MenuItem>
48+
</graphic>
49+
</MenuItem>
7750
<MenuItem fx:id="menuItemSaveCurrentFile" mnemonicParsing="false" onAction="#saveCurrentFile" text="Save">
7851
<graphic>
7952
<FontIcon iconColor="WHITE" iconLiteral="fa-save" iconSize="16" />
80-
</graphic></MenuItem>
53+
</graphic>
54+
</MenuItem>
8155
<MenuItem fx:id="menuItemCloseFile" mnemonicParsing="false" onAction="#closeFile" text="Close">
8256
<graphic>
8357
<FontIcon iconColor="WHITE" iconLiteral="fa-close" iconSize="16" />
84-
</graphic></MenuItem>
58+
</graphic>
59+
</MenuItem>
8560
</items>
8661
</Menu>
8762
<Menu disable="true" mnemonicParsing="false" text="Edit">
@@ -97,128 +72,175 @@
9772
<MenuItem fx:id="menuItemCloseAllTabs" mnemonicParsing="false" onAction="#closeAllTabs" text="Close all tabs">
9873
<graphic>
9974
<FontIcon iconColor="WHITE" iconLiteral="fa-window-close" iconSize="16" selectionEnd="0" />
100-
</graphic></MenuItem>
75+
</graphic>
76+
</MenuItem>
10177
<MenuItem fx:id="menuItemNewTab" mnemonicParsing="false" onAction="#addTabAction" text="New tab">
10278
<graphic>
10379
<FontIcon iconColor="WHITE" iconLiteral="fa-plus-square" iconSize="16" selectionEnd="0" />
104-
</graphic></MenuItem>
80+
</graphic>
81+
</MenuItem>
10582
<MenuItem fx:id="menuItemCloseTab" mnemonicParsing="false" onAction="#closeCurrentTab" text="Close tab">
10683
<graphic>
10784
<FontIcon iconColor="WHITE" iconLiteral="fa-close" iconSize="16" selectionEnd="0" />
108-
</graphic></MenuItem>
85+
</graphic>
86+
</MenuItem>
10987
</items>
11088
</Menu>
11189
<Menu mnemonicParsing="false" text="Projects">
11290
<items>
11391
<MenuItem disable="true" mnemonicParsing="false" text="Start new project">
11492
<graphic>
11593
<FontIcon iconColor="WHITE" iconLiteral="fa-plus-square" iconSize="16" />
116-
</graphic></MenuItem>
94+
</graphic>
95+
</MenuItem>
11796
<MenuItem fx:id="menuItemAddProject" mnemonicParsing="false" onAction="#addProject" text="Open and add project">
11897
<graphic>
11998
<FontIcon iconColor="WHITE" iconLiteral="fa-folder-open" iconSize="16" />
120-
</graphic></MenuItem>
99+
</graphic>
100+
</MenuItem>
121101
<MenuItem fx:id="menuItemCloseProject" mnemonicParsing="false" onAction="#closeCurrentProject" text="Close current project">
122102
<graphic>
123103
<FontIcon iconColor="WHITE" iconLiteral="fa-folder" iconSize="16" selectionEnd="0" />
124-
</graphic></MenuItem>
104+
</graphic>
105+
</MenuItem>
125106
<Menu fx:id="RegisteredProjectsListMenu" mnemonicParsing="false" text="Project list">
126107
<graphic>
127108
<FontIcon iconColor="WHITE" iconLiteral="fa-folder" iconSize="16" selectionEnd="0" />
128-
</graphic></Menu>
109+
</graphic>
110+
</Menu>
129111
<MenuItem fx:id="menuItemDeleteProject" mnemonicParsing="false" onAction="#deleteCurrentProject" text="Delete project">
130112
<graphic>
131113
<FontIcon iconColor="WHITE" iconLiteral="fa-trash" iconSize="16" selectionEnd="0" />
132-
</graphic></MenuItem>
114+
</graphic>
115+
</MenuItem>
133116
</items>
134117
</Menu>
135118
<Menu mnemonicParsing="false" text="Window">
136119
<items>
137120
<MenuItem fx:id="menuItemNewWIndow" mnemonicParsing="false" onAction="#openNewWindow" text="New window">
138121
<graphic>
139122
<FontIcon iconColor="WHITE" iconLiteral="fa-plus-square" iconSize="16" />
140-
</graphic></MenuItem>
123+
</graphic>
124+
</MenuItem>
141125
<MenuItem fx:id="menuItemCloseCurrentWindow" mnemonicParsing="false" onAction="#closeCurrentWindow" text="Close current window">
142126
<graphic>
143127
<FontIcon iconColor="WHITE" iconLiteral="fa-close" iconSize="16" />
144-
</graphic></MenuItem>
128+
</graphic>
129+
</MenuItem>
145130
<MenuItem fx:id="menuItemOpenFileExplorer" mnemonicParsing="false" onAction="#openFileExplorer" text="Open file explorer">
146131
<graphic>
147132
<FontIcon iconColor="WHITE" iconLiteral="fa-folder" iconSize="16" />
148-
</graphic></MenuItem>
133+
</graphic>
134+
</MenuItem>
149135
<MenuItem fx:id="menuItemOpenBrowser" mnemonicParsing="false" onAction="#openDefaultBrowser" text="Open browser">
150136
<graphic>
151137
<FontIcon iconColor="WHITE" iconLiteral="fa-internet-explorer" iconSize="16" />
152-
</graphic></MenuItem>
138+
</graphic>
139+
</MenuItem>
153140
<MenuItem fx:id="menuItemOpenMail" mnemonicParsing="false" onAction="#openDefaultMail" text="Open mail">
154141
<graphic>
155142
<FontIcon iconColor="WHITE" iconLiteral="fa-envelope" iconSize="16" />
156-
</graphic></MenuItem>
143+
</graphic>
144+
</MenuItem>
157145
<MenuItem disable="true" mnemonicParsing="false" text="Open in standard app">
158146
<graphic>
159147
<FontIcon iconColor="WHITE" iconLiteral="fa-external-link-square" iconSize="16" />
160-
</graphic></MenuItem>
148+
</graphic>
149+
</MenuItem>
161150
</items>
162151
</Menu>
163152
<Menu mnemonicParsing="false" text="Help">
164153
<items>
165154
<MenuItem disable="true" mnemonicParsing="false" text="About">
166155
<graphic>
167156
<FontIcon iconColor="WHITE" iconLiteral="fa-question-circle" iconSize="16" />
168-
</graphic></MenuItem>
157+
</graphic>
158+
</MenuItem>
169159
<MenuItem fx:id="menuItemUsedLibarys" mnemonicParsing="false" onAction="#showUsedLibarys" text="Used libarys">
170160
<graphic>
171161
<FontIcon iconColor="WHITE" iconLiteral="fa-book" iconSize="16" />
172-
</graphic></MenuItem>
162+
</graphic>
163+
</MenuItem>
173164
<MenuItem fx:id="menuItemGithub" mnemonicParsing="false" onAction="#showGithubSite" text="Github">
174165
<graphic>
175166
<FontIcon iconColor="WHITE" iconLiteral="fa-github" iconSize="16" />
176-
</graphic></MenuItem>
167+
</graphic>
168+
</MenuItem>
177169
<MenuItem disable="true" mnemonicParsing="false" text="Settings">
178170
<graphic>
179171
<FontIcon iconColor="WHITE" iconLiteral="fa-cog" iconSize="16" />
180-
</graphic></MenuItem>
172+
</graphic>
173+
</MenuItem>
181174
<MenuItem fx:id="menuItemCloseApp" mnemonicParsing="false" onAction="#closeApp" text="Close">
182175
<graphic>
183176
<FontIcon iconColor="WHITE" iconLiteral="fa-close" iconSize="16" />
184-
</graphic></MenuItem>
177+
</graphic>
178+
</MenuItem>
185179
</items>
186180
</Menu>
187181
</menus>
188182
</MenuBar>
189-
</top>
190-
<right>
191-
<TabPane prefHeight="689.0" prefWidth="409.0" side="RIGHT" stylesheets="@../styles/sidepanel/sidepanel.css" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
192-
<tabs>
193-
<Tab disable="true" text="Messenges">
194-
<content>
195-
<AnchorPane prefHeight="200.0" prefWidth="200.0">
196-
<children>
197-
<Label alignment="CENTER" text="This panel will be added in version 1.0.0 Stable" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
198-
<font>
199-
<Font size="16.0" />
200-
</font>
201-
</Label>
202-
</children>
203-
</AnchorPane>
204-
</content>
205-
</Tab>
206-
<Tab disable="true" text="News">
207-
<content>
208-
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
209-
</content>
210-
</Tab>
211-
<Tab disable="true" text="Properties">
212-
<content>
213-
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
214-
</content>
215-
</Tab>
216-
<Tab disable="true" text="Pomodoro timer">
217-
<content>
218-
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
219-
</content>
220-
</Tab>
221-
</tabs>
222-
</TabPane>
223-
</right>
224-
</BorderPane>
183+
<SplitPane dividerPositions="0.2, 0.7" VBox.vgrow="ALWAYS">
184+
<items>
185+
<TreeView fx:id="fileExplorer" prefHeight="689.0" prefWidth="484.0" />
186+
<TabPane fx:id="tabPane" prefHeight="689.0" prefWidth="0.0" tabClosingPolicy="ALL_TABS">
187+
<tabs>
188+
<Tab text="New tab">
189+
<content>
190+
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
191+
</content>
192+
</Tab>
193+
<Tab text="New tab">
194+
<content>
195+
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="648.0" prefWidth="384.0" />
196+
</content>
197+
</Tab>
198+
<Tab fx:id="plusTab" closable="false" text="Add tab">
199+
<graphic>
200+
<FontIcon iconColor="WHITE" iconLiteral="fa-plus" />
201+
</graphic>
202+
</Tab>
203+
</tabs>
204+
</TabPane>
205+
<TabPane prefHeight="689.0" prefWidth="409.0" side="RIGHT" stylesheets="@../styles/sidepanel/sidepanel.css" tabClosingPolicy="UNAVAILABLE">
206+
<tabs>
207+
<Tab disable="true" text="Messenges">
208+
<content>
209+
<AnchorPane prefHeight="200.0" prefWidth="200.0">
210+
<children>
211+
<Label alignment="CENTER" text="This panel will be added in version 1.0.0 Stable" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
212+
<font>
213+
<Font size="16.0" />
214+
</font>
215+
</Label>
216+
</children>
217+
</AnchorPane>
218+
</content>
219+
</Tab>
220+
<Tab disable="true" text="News">
221+
<content>
222+
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
223+
</content>
224+
</Tab>
225+
<Tab disable="true" text="Properties">
226+
<content>
227+
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
228+
</content>
229+
</Tab>
230+
<Tab disable="true" text="Pomodoro timer">
231+
<content>
232+
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
233+
</content>
234+
</Tab>
235+
</tabs>
236+
</TabPane>
237+
</items>
238+
</SplitPane>
239+
<ToolBar prefHeight="22.0" prefWidth="600.0" stylesheets="@../styles/airbar/button.css">
240+
<items>
241+
<Button fx:id="dateButton" layoutX="272.0" layoutY="10.0" mnemonicParsing="false" text="17/10/2021" />
242+
<Button fx:id="timeButton" layoutX="310.0" layoutY="10.0" mnemonicParsing="false" text="12:30" />
243+
</items>
244+
</ToolBar>
245+
</children>
246+
</VBox>

0 commit comments

Comments
 (0)