Skip to content

Commit d6f9b37

Browse files
ddamkeddamke
authored andcommitted
pullrequest changes
1 parent 03320f3 commit d6f9b37

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package de.doubleslash.keeptime.view;
1818

1919
import java.io.File;
20-
import java.io.IOException;
2120
import java.nio.file.Paths;
2221
import java.sql.SQLException;
2322
import java.util.Comparator;
@@ -123,9 +122,6 @@ public class SettingsController {
123122

124123
@FXML
125124
private AnchorPane settingsRoot;
126-
private static final String GITHUB_PAGE = "https://www.github.com/doubleSlashde/KeepTime";
127-
private static final String GITHUB_ISSUE_PAGE = GITHUB_PAGE + "/issues";
128-
private static final Color HYPERLINK_COLOR = Color.rgb(0, 115, 170);
129125

130126
@FXML
131127
private Hyperlink gitHubHyperlink;
@@ -157,11 +153,14 @@ public class SettingsController {
157153
@FXML
158154
private Region aboutIcon;
159155
@FXML
160-
private Region importexportIcon;
156+
private Region importExportIcon;
161157

162158
@FXML
163159
private Region licensesIcon;
164160

161+
private static final String GITHUB_PAGE = "https://www.github.com/doubleSlashde/KeepTime";
162+
private static final String GITHUB_ISSUE_PAGE = GITHUB_PAGE + "/issues";
163+
private static final Color HYPERLINK_COLOR = Color.rgb(0, 115, 170);
165164
private final ApplicationProperties applicationProperties;
166165

167166
private static final Logger LOG = LoggerFactory.getLogger(SettingsController.class);
@@ -206,7 +205,7 @@ private void initialize() {
206205
setRegionSvg(layoutIcon,requiredWidth, requiredHeight,RESOURCE.SVG_LAYOUT_ICON);
207206
setRegionSvg(generalIcon,requiredWidth,requiredHeight,RESOURCE.SVG_SETTINGS_ICON);
208207
setRegionSvg(aboutIcon,requiredWidth,requiredHeight,RESOURCE.SVG_ABOUT_ICON);
209-
setRegionSvg(importexportIcon,requiredWidth,requiredHeight,RESOURCE.SVG_IMPORT_EXPORT_ICON);
208+
setRegionSvg(importExportIcon,requiredWidth,requiredHeight,RESOURCE.SVG_IMPORT_EXPORT_ICON);
210209
setRegionSvg(licensesIcon,requiredWidth,requiredHeight,RESOURCE.SVG_LICENSES_ICON);
211210

212211
initExportButton();
@@ -292,7 +291,7 @@ private void initialize() {
292291
initializeAbout();
293292
}
294293

295-
private static void setRegionSvg(Region region, Double requiredWidth, Double requiredHeight, RESOURCE resource) {
294+
private static void setRegionSvg(Region region, double requiredWidth, double requiredHeight, RESOURCE resource) {
296295

297296
region.setShape(SvgNodeProvider.getSvgNodeWithScale(resource,1.0,1.0));
298297
region.setMinSize(requiredWidth, requiredHeight);

src/main/java/de/doubleslash/keeptime/viewpopup/GlobalScreenListener.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,11 @@ public class GlobalScreenListener implements NativeKeyListener, NativeMouseMotio
6666
private Point mouseLocation = new Point(0, 0);
6767

6868
public GlobalScreenListener() {
69-
if (!OS.isLinux()) {
69+
7070
disableJNativeHookLogger();
7171

7272
GlobalScreen.addNativeKeyListener(this);
7373
GlobalScreen.addNativeMouseMotionListener(this);
74-
}
7574
}
7675

7776
public void register(final boolean register) {

src/main/resources/layouts/settings.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@
439439
</AnchorPane>
440440
</content>
441441
<graphic>
442-
<Region fx:id="importexportIcon" prefHeight="15.0" prefWidth="15.0" rotate="-90.0" />
442+
<Region fx:id="importExportIcon" prefHeight="15.0" prefWidth="15.0" rotate="-90.0" />
443443
</graphic>
444444
</Tab>
445445
<Tab text="Licenses">

0 commit comments

Comments
 (0)