Skip to content

Commit 66cb60e

Browse files
ddamkeddamke
ddamke
authored and
ddamke
committed
extra tab for Licenses
1 parent c74344e commit 66cb60e

File tree

1 file changed

+92
-70
lines changed

1 file changed

+92
-70
lines changed

‎src/main/resources/layouts/settings.fxml‎

Lines changed: 92 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<?import javafx.scene.control.ColorPicker?>
2525
<?import javafx.scene.control.Hyperlink?>
2626
<?import javafx.scene.control.Label?>
27-
<?import javafx.scene.control.ScrollPane?>
2827
<?import javafx.scene.control.Tab?>
2928
<?import javafx.scene.control.TabPane?>
3029
<?import javafx.scene.control.TableView?>
@@ -38,9 +37,9 @@
3837
<?import javafx.scene.text.Font?>
3938
<?import javafx.scene.text.Text?>
4039

41-
<AnchorPane fx:id="settingsRoot" focusTraversable="true" prefHeight="448.0" prefWidth="606.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.SettingsController">
40+
<AnchorPane fx:id="settingsRoot" focusTraversable="true" prefHeight="467.0" prefWidth="606.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.SettingsController">
4241
<children>
43-
<TabPane layoutY="6.0" prefHeight="393.0" prefWidth="606.0" side="LEFT" stylesheets="@../css/settingsv2.css" tabClosingPolicy="UNAVAILABLE" tabMinHeight="100.0" tabMinWidth="40.0">
42+
<TabPane layoutY="6.0" prefHeight="459.0" prefWidth="606.0" side="LEFT" stylesheets="@../css/settingsv2.css" tabClosingPolicy="UNAVAILABLE" tabMinHeight="100.0" tabMinWidth="40.0">
4443
<tabs>
4544
<Tab closable="false">
4645
<content>
@@ -389,11 +388,14 @@
389388
<children>
390389
<Group>
391390
<children>
392-
<VBox alignment="BOTTOM_RIGHT" layoutX="30.0" layoutY="81.0" prefHeight="148.0" prefWidth="460.0" styleClass="settingsBorder" stylesheets="@../css/settingsv2.css">
391+
<VBox alignment="BOTTOM_RIGHT" layoutX="30.0" layoutY="81.0" prefHeight="148.0" prefWidth="479.0" styleClass="settingsBorder" stylesheets="@../css/settingsv2.css">
393392
<children>
394393
<HBox prefHeight="132.0" prefWidth="457.0">
395394
<children>
396-
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Import your prevously exportet Sql script " />
395+
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Import">
396+
<font>
397+
<Font name="System Bold" size="12.0" />
398+
</font></Text>
397399
</children>
398400
</HBox>
399401
<HBox alignment="BOTTOM_RIGHT" prefHeight="38.0" prefWidth="432.0">
@@ -411,11 +413,14 @@
411413
</Group>
412414
<Group layoutX="10.0" layoutY="10.0" styleClass="settingsBorder" stylesheets="@../css/settingsv2.css">
413415
<children>
414-
<VBox alignment="BOTTOM_RIGHT" prefHeight="144.0" prefWidth="460.0" styleClass="settingsBorder" stylesheets="@../css/settingsv2.css">
416+
<VBox alignment="BOTTOM_RIGHT" prefHeight="144.0" prefWidth="478.0" styleClass="settingsBorder" stylesheets="@../css/settingsv2.css">
415417
<children>
416-
<HBox prefHeight="119.0" prefWidth="456.0">
418+
<HBox prefHeight="105.0" prefWidth="474.0">
417419
<children>
418-
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Export your data to a Sql scrippt" />
420+
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Export">
421+
<font>
422+
<Font name="System Bold" size="12.0" />
423+
</font></Text>
419424
</children>
420425
</HBox>
421426
<HBox alignment="BOTTOM_RIGHT" prefHeight="30.0" prefWidth="475.0">
@@ -447,73 +452,63 @@
447452
</Tab>
448453
<Tab>
449454
<content>
450-
<ScrollPane fitToWidth="true" styleClass="ScrollPane" stylesheets="@../css/settingsv2.css">
451-
<content>
452-
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="446.0" prefWidth="501.0" styleClass="anchorPane" stylesheets="@../css/settingsv2.css">
455+
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="446.0" prefWidth="501.0" styleClass="anchorPane" stylesheets="@../css/settingsv2.css">
456+
<children>
457+
<Pane fx:id="mainContainer" layoutX="-20.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="492.0" prefWidth="478.0" styleClass="tab-pane" stylesheets="@../css/settingsv2.css">
453458
<children>
454-
<Pane fx:id="mainContainer" layoutX="-20.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="492.0" prefWidth="478.0" styleClass="tab-pane" stylesheets="@../css/settingsv2.css">
459+
<Label fx:id="keepTimeLabel" layoutX="197.0" layoutY="11.0" text="KeepTime">
460+
<font>
461+
<Font name="Open Sans Regular" size="26.0" />
462+
</font>
463+
</Label>
464+
<Line fx:id="bigLine" endX="497.0" endY="111.0" fill="BLACK" layoutX="-23.0" layoutY="-39.0" smooth="false" startX="62.0" startY="111.0" strokeWidth="2.0" />
465+
<Label fx:id="versionLabel" layoutX="39.0" layoutY="92.0" text="Version:">
466+
<font>
467+
<Font name="Open Sans Regular" size="14.0" />
468+
</font>
469+
</Label>
470+
<Label fx:id="copyrightLabel" layoutX="39.0" layoutY="130.0" text="Copyright (c) doubleSlash Net-Business GmbH">
471+
<font>
472+
<Font name="Open Sans Regular" size="14.0" />
473+
</font>
474+
</Label>
475+
<Label fx:id="openSourceLabel" layoutX="39.0" layoutY="168.0" prefHeight="20.0" prefWidth="360.0" text="KeepTime is open source software, licensed under the">
476+
<font>
477+
<Font name="Open Sans Regular" size="14.0" />
478+
</font>
479+
</Label>
480+
<Hyperlink fx:id="gitHubHyperlink" focusTraversable="false" layoutX="34.0" layoutY="206.0" text="https://www.github.com/doubleSlashde/KeepTime" underline="true">
481+
<font>
482+
<Font name="Open Sans Regular" size="14.0" />
483+
</font>
484+
</Hyperlink>
485+
<Line fx:id="smallLine" endX="497.0" endY="273.0" layoutX="-23.0" layoutY="1.0" startX="62.0" startY="273.0" strokeWidth="2.0" />
486+
<Button fx:id="reportBugButton" focusTraversable="false" layoutX="396.0" layoutY="237.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="80" text="Report" />
487+
<Pane layoutX="280" layoutY="227" maxHeight="50.0" maxWidth="135.0" minHeight="50.0" minWidth="50.0" prefHeight="50.0" prefWidth="135.0">
455488
<children>
456-
<Label fx:id="keepTimeLabel" layoutX="197.0" layoutY="11.0" text="KeepTime">
457-
<font>
458-
<Font name="Open Sans Regular" size="26.0" />
459-
</font>
460-
</Label>
461-
<Line fx:id="bigLine" endX="497.0" endY="111.0" fill="BLACK" layoutX="-23.0" layoutY="-39.0" smooth="false" startX="62.0" startY="111.0" strokeWidth="2.0" />
462-
<Label fx:id="versionLabel" layoutX="39.0" layoutY="92.0" text="Version:">
463-
<font>
464-
<Font name="Open Sans Regular" size="14.0" />
465-
</font>
466-
</Label>
467-
<Label fx:id="copyrightLabel" layoutX="39.0" layoutY="130.0" text="Copyright (c) doubleSlash Net-Business GmbH">
468-
<font>
469-
<Font name="Open Sans Regular" size="14.0" />
470-
</font>
471-
</Label>
472-
<Label fx:id="openSourceLabel" layoutX="39.0" layoutY="168.0" prefHeight="20.0" prefWidth="360.0" text="KeepTime is open source software, licensed under the">
473-
<font>
474-
<Font name="Open Sans Regular" size="14.0" />
475-
</font>
476-
</Label>
477-
<Hyperlink fx:id="gitHubHyperlink" focusTraversable="false" layoutX="34.0" layoutY="206.0" text="https://www.github.com/doubleSlashde/KeepTime" underline="true">
478-
<font>
479-
<Font name="Open Sans Regular" size="14.0" />
480-
</font>
481-
</Hyperlink>
482-
<Line fx:id="smallLine" endX="497.0" endY="273.0" layoutX="-23.0" layoutY="1.0" startX="62.0" startY="273.0" strokeWidth="2.0" />
483-
<Label fx:id="thirdPartyLabel" layoutX="39.0" layoutY="281.0" text="third party software">
484-
<font>
485-
<Font name="Open Sans Regular" size="14.0" />
486-
</font>
487-
</Label>
488-
<Button fx:id="reportBugButton" focusTraversable="false" layoutX="396.0" layoutY="237.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="80" text="Report" />
489-
<Pane layoutX="280" layoutY="227" maxHeight="50.0" maxWidth="135.0" minHeight="50.0" minWidth="50.0" prefHeight="50.0" prefWidth="135.0">
490-
<children>
491-
<Label contentDisplay="CENTER" layoutY="-5.0" maxHeight="60.0" maxWidth="1.7976931348623157E308" minHeight="50.0" minWidth="50.0" prefHeight="60.0" prefWidth="107.0" text="Found a Bug ?" />
492-
<SVGPath fx:id="bugIcon" layoutX="-160.0" layoutY="-231.0" scaleX="0.04" scaleY="0.04" />
493-
</children>
494-
</Pane>
495-
<TableView fx:id="licenseTableView" focusTraversable="false" layoutX="39.0" layoutY="302.0" prefHeight="182.0" prefWidth="417.0" />
496-
<Label fx:id="versionNumberLabel" layoutX="97.0" layoutY="92.0" text="1.0.0">
497-
<font>
498-
<Font name="Open Sans Regular" size="14.0" />
499-
</font>
500-
</Label>
501-
<Hyperlink fx:id="ourLicenseHyperLink" layoutX="34.0" layoutY="182.0" text="GPL Version 3.0">
502-
<font>
503-
<Font name="Open Sans Regular" size="14.0" />
504-
</font>
505-
</Hyperlink>
506-
<Label layoutX="143.0" layoutY="186.0" text=". Check out our GitHub page:">
507-
<font>
508-
<Font name="Open Sans Regular" size="14.0" />
509-
</font>
510-
</Label>
489+
<Label contentDisplay="CENTER" layoutY="-5.0" maxHeight="60.0" maxWidth="1.7976931348623157E308" minHeight="50.0" minWidth="50.0" prefHeight="60.0" prefWidth="107.0" text="Found a Bug ?" />
490+
<SVGPath fx:id="bugIcon" layoutX="-160.0" layoutY="-231.0" scaleX="0.04" scaleY="0.04" />
511491
</children>
512492
</Pane>
493+
<Label fx:id="versionNumberLabel" layoutX="97.0" layoutY="92.0" text="1.0.0">
494+
<font>
495+
<Font name="Open Sans Regular" size="14.0" />
496+
</font>
497+
</Label>
498+
<Hyperlink fx:id="ourLicenseHyperLink" layoutX="34.0" layoutY="182.0" text="GPL Version 3.0">
499+
<font>
500+
<Font name="Open Sans Regular" size="14.0" />
501+
</font>
502+
</Hyperlink>
503+
<Label layoutX="143.0" layoutY="186.0" text=". Check out our GitHub page:">
504+
<font>
505+
<Font name="Open Sans Regular" size="14.0" />
506+
</font>
507+
</Label>
513508
</children>
514-
</AnchorPane>
515-
</content>
516-
</ScrollPane>
509+
</Pane>
510+
</children>
511+
</AnchorPane>
517512
</content>
518513
<graphic>
519514
<HBox styleClass="HBox" stylesheets="@../css/settingsv2.css">
@@ -524,6 +519,33 @@
524519
</HBox>
525520
</graphic>
526521
</Tab>
522+
<Tab>
523+
<content>
524+
<AnchorPane layoutX="20.0" layoutY="20.0" minHeight="0.0" minWidth="0.0" prefHeight="438.0" prefWidth="489.0">
525+
<children>
526+
<VBox layoutX="20.0" layoutY="20.0" prefHeight="387.0" prefWidth="411.0">
527+
<children>
528+
<Group />
529+
<VBox prefHeight="305.0" prefWidth="391.0" spacing="5.0" stylesheets="@../css/settingsv2.css">
530+
<children>
531+
<Label fx:id="thirdPartyLabel" text="Third party software" />
532+
<TableView fx:id="licenseTableView" focusTraversable="false" prefHeight="283.0" prefWidth="391.0" />
533+
</children>
534+
</VBox>
535+
</children>
536+
</VBox>
537+
</children>
538+
</AnchorPane>
539+
</content>
540+
<graphic>
541+
<HBox>
542+
<children>
543+
<Region prefHeight="25.0" prefWidth="25.0" />
544+
<Label prefWidth="75.0" text="Licenses" />
545+
</children>
546+
</HBox>
547+
</graphic>
548+
</Tab>
527549
</tabs>
528550
<styleClass>
529551
<String fx:value="tab-header-area" />

0 commit comments

Comments
 (0)