Skip to content

Commit cee9ef4

Browse files
author
Martin Plieske
committed
removed KeepTime from Third party software & added link to license file above
1 parent 0ab6009 commit cee9ef4

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

src/main/java/de/doubleslash/keeptime/view/AboutController.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ public class AboutController {
5454
@FXML
5555
private Label versionNumberLabel;
5656

57+
@FXML
58+
private Hyperlink ourLicenseHyperLink;
59+
5760
@FXML
5861
private TableView<LicenceTableRow> licenseTableView;
5962

@@ -64,6 +67,9 @@ public void initialize() {
6467
LOG.debug("set version label");
6568
versionNumberLabel.setText(Main.VERSION);
6669

70+
ourLicenseHyperLink.setFocusTraversable(false);
71+
ourLicenseHyperLink.setOnAction(ae -> FileOpenHelper.openFile(Licenses.GPLV3.getPath()));
72+
6773
LOG.debug("set up table");
6874
// name column
6975
TableColumn<LicenceTableRow, String> nameColumn;
@@ -131,8 +137,6 @@ protected void updateItem(final String item, final boolean empty) {
131137

132138
public ObservableList<LicenceTableRow> loadRows() {
133139
final ObservableList<LicenceTableRow> rows = FXCollections.observableArrayList();
134-
135-
rows.add(new LicenceTableRow("KeepTime", Licenses.GPLV3));
136140
rows.add(new LicenceTableRow("jnativehook", Licenses.GPLV3));
137141
rows.add(new LicenceTableRow("jnativehook", Licenses.LGPLV3));
138142
rows.add(new LicenceTableRow("commons-lang3", Licenses.APACHEV2));

src/main/resources/layouts/about.fxml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<?import javafx.scene.shape.Line?>
2525
<?import javafx.scene.text.Font?>
2626

27-
<Pane fx:id="mainContainer" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="506.0" prefWidth="559.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.AboutController">
27+
<Pane fx:id="mainContainer" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="567.0" prefWidth="559.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.AboutController">
2828
<children>
2929
<Label fx:id="keepTimeLabel" layoutX="220.0" layoutY="50.0" text="KeepTime">
3030
<font>
@@ -42,32 +42,42 @@
4242
<Font name="Open Sans Regular" size="14.0" />
4343
</font>
4444
</Label>
45-
<Label fx:id="openSourceLabel" layoutX="62.0" layoutY="207.0" text="KeepTime is open source software, check out our github page">
45+
<Label fx:id="openSourceLabel" layoutX="62.0" layoutY="207.0" prefHeight="20.0" prefWidth="360.0" text="KeepTime is open source software, licensed under the">
4646
<font>
4747
<Font name="Open Sans Regular" size="14.0" />
4848
</font>
4949
</Label>
50-
<Hyperlink fx:id="gitHubHyperlink" focusTraversable="false" layoutX="57.0" layoutY="226.0" text="https://www.github.com/doubleSlashde/KeepTime">
50+
<Hyperlink fx:id="gitHubHyperlink" focusTraversable="false" layoutX="57.0" layoutY="262.0" text="https://www.github.com/doubleSlashde/KeepTime">
5151
<font>
5252
<Font name="Open Sans Regular" size="14.0" />
5353
</font>
5454
</Hyperlink>
55-
<Line fx:id="smallLine" endX="497.0" endY="273.0" startX="62.0" startY="273.0" strokeWidth="2.0" />
56-
<Label fx:id="thirdPartyLabel" layoutX="62.0" layoutY="293.0" text="third party software">
55+
<Line fx:id="smallLine" endX="497.0" endY="273.0" layoutY="36.0" startX="62.0" startY="273.0" strokeWidth="2.0" />
56+
<Label fx:id="thirdPartyLabel" layoutX="62.0" layoutY="329.0" text="third party software">
5757
<font>
5858
<Font name="Open Sans Regular" size="14.0" />
5959
</font>
6060
</Label>
61-
<Button fx:id="reportBugButton" focusTraversable="false" layoutX="378.0" layoutY="288.0" mnemonicParsing="false" prefWidth="110.0" text="report a bug">
61+
<Button fx:id="reportBugButton" focusTraversable="false" layoutX="378.0" layoutY="324.0" mnemonicParsing="false" prefWidth="110.0" text="report a bug">
6262
<font>
6363
<Font name="Open Sans Regular" size="14.0" />
6464
</font>
6565
</Button>
66-
<TableView fx:id="licenseTableView" focusTraversable="false" layoutX="62.0" layoutY="342.0" prefHeight="120.0" prefWidth="437.0" />
66+
<TableView fx:id="licenseTableView" focusTraversable="false" layoutX="62.0" layoutY="378.0" prefHeight="120.0" prefWidth="437.0" />
6767
<Label fx:id="versionNumberLabel" layoutX="120.0" layoutY="131.0" text="1.0.0">
6868
<font>
6969
<Font name="Open Sans Regular" size="14.0" />
7070
</font>
7171
</Label>
72+
<Hyperlink fx:id="ourLicenseHyperLink" layoutX="57.0" layoutY="221.0" text="GPL Version 3.0">
73+
<font>
74+
<Font name="Open Sans Regular" size="14.0" />
75+
</font>
76+
</Hyperlink>
77+
<Label layoutX="168.0" layoutY="225.0" text=", check out our Github page:">
78+
<font>
79+
<Font name="Open Sans Regular" size="14.0" />
80+
</font>
81+
</Label>
7282
</children>
7383
</Pane>

0 commit comments

Comments
 (0)