Skip to content

Commit 4e584cb

Browse files
authored
Merge pull request #105 from DavidDamke/feature/update_settings_dialog_design
Feature/update settings dialog design
2 parents cbe8e31 + b7d075f commit 4e584cb

File tree

15 files changed

+735
-586
lines changed

15 files changed

+735
-586
lines changed

README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Create projects and choose if they are counted as 'work time'. Select the projec
1212
+ You can move the window by dragging it around
1313
+ Open the context menu (with a right-click) for a project to edit/delete or change the project and transfer n minutes of the current running one
1414
+ In the taskbar you will also see the current time + the color of the active project
15-
+ The current Project will be saved eyery minute to mitigate loss on system crash or shutdown without closing window manually first.
15+
+ The current Project will be saved every minute to mitigate loss on system crash or shutdown without closing window manually first.
1616
+ After a day you can open the Reports, which will summarize the work done for the different projects during the day
1717

18-
**You need to close the application manualy before you shutdown your PC. Otherwise the last running project is not saved completely to database. (will be last state saved by auto-save)**
18+
**You need to close the application manually before you shut down your PC. Otherwise, the last running project is not saved completely to database. (will be last state saved by auto-save)**
1919

2020
### Settings:
21-
![Settings Screen](readme/images/settings.png?raw=true "Settings")
21+
![Settings Screen](readme/images/settingsColor.PNG?raw=true "Settings")
2222

2323
+ Colors: you can define various colors to use in the UI to customize the application. The Reset resets the color to the default color.
2424
+ Display projects on the right: Will show the list of projects on the right side, instead of the left
@@ -39,7 +39,7 @@ Create projects and choose if they are counted as 'work time'. Select the projec
3939
* Extract the downloaded .zip
4040
* Copy the downloaded keeptime.bat file next to the *.jar*. Adapt the path inside the *keeptime.bat* to the name of the *.jar* file (if needed). Try starting the application by executing the *keeptime.bat* file. The start may take up to one minute.
4141

42-
It is recommended to run the application at computer start so you do not forget to track your time. For autostart also execute the following steps (for windows)
42+
It is recommended to run the application at computer start, so you do not forget to track your time. For autostart also execute the following steps (for windows)
4343
* Open the autostart folder: Press *Windows+R*, execute *shell:startup*
4444
* Create a shortcut to the *.bat* in the autostart folder
4545

@@ -67,7 +67,4 @@ You should put the .jar in an extra folder as a *logs* and a *db* folder will be
6767

6868
* Windows 7, 10
6969
* Linux (tested on Ubuntu 18.04)
70-
* Java 11
71-
72-
73-
70+
* Java 11

readme/images/settings.png

-19.3 KB
Binary file not shown.

readme/images/settingsColor.PNG

12.7 KB
Loading

src/main/java/de/doubleslash/keeptime/common/Resources.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ public enum RESOURCE {
5757

5858
SVG_BUG_ICON("/svgs/bug.svg"),
5959

60+
SVG_LAYOUT_ICON("/svgs/border-all.svg"),
61+
62+
SVG_ABOUT_ICON("/svgs/info.svg"),
63+
64+
SVG_COLOR_ICON("/svgs/palette.svg"),
65+
66+
SVG_IMPORT_EXPORT_ICON("/svgs/sort.svg"),
67+
68+
SVG_LICENSES_ICON("/svgs/closed-captioning.svg")
69+
6070
;
6171

6272
String resourceLocation;

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

Lines changed: 0 additions & 176 deletions
This file was deleted.

0 commit comments

Comments
 (0)