mirror of
https://github.com/robertvokac/time-calc.git
synced 2025-03-25 07:27:49 +01:00
Added several improvements
This commit is contained in:
parent
e7c765f47e
commit
e553ecb6a6
@ -44,8 +44,6 @@ If file overtime.txt does not exist, then the default overtime is 0:00.
|
|||||||
### .tc/test.txt
|
### .tc/test.txt
|
||||||
If file test.txt exists, then user is not asked for start time and overtime. Instead, the values in files starttime.txt and overtime.txt are used.
|
If file test.txt exists, then user is not asked for start time and overtime. Instead, the values in files starttime.txt and overtime.txt are used.
|
||||||
|
|
||||||
This file can be also used to define custom current time - for testing purposes.
|
|
||||||
|
|
||||||
### ./tc/timecalc.conf
|
### ./tc/timecalc.conf
|
||||||
|
|
||||||
Configuration is stored here.
|
Configuration is stored here.
|
||||||
|
@ -195,7 +195,9 @@ public class MainWindow extends TWindow {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
hideShowCheckBox.addItemListener(e ->
|
hideShowCheckBox.addItemListener(e ->
|
||||||
|
|
||||||
{
|
{
|
||||||
|
this.requestFocus();
|
||||||
});
|
});
|
||||||
exitButton.addActionListener(e
|
exitButton.addActionListener(e
|
||||||
-> {
|
-> {
|
||||||
@ -253,7 +255,7 @@ public class MainWindow extends TWindow {
|
|||||||
analogClock.secondProperty.bindTo( time.secondProperty);
|
analogClock.secondProperty.bindTo( time.secondProperty);
|
||||||
analogClock.millisecondProperty.bindTo(time.millisecondProperty);
|
analogClock.millisecondProperty.bindTo(time.millisecondProperty);
|
||||||
|
|
||||||
analogClock.dayOfWeekProperty.bindTo(time.dayOfWeek);
|
analogClock.dayOfWeekProperty.bindTo(time.dayOfWeekProperty);
|
||||||
|
|
||||||
analogClock.millisecondEnabledProperty
|
analogClock.millisecondEnabledProperty
|
||||||
.bindTo(timeCalcConfiguration.clockHandsMillisecondVisibleProperty);
|
.bindTo(timeCalcConfiguration.clockHandsMillisecondVisibleProperty);
|
||||||
|
@ -127,6 +127,17 @@ public class AnalogClock extends Widget {
|
|||||||
= new AnalogClock(new TimeHM("6:30"), new TimeHM("19:00"));
|
= new AnalogClock(new TimeHM("6:30"), new TimeHM("19:00"));
|
||||||
window.add(clock);
|
window.add(clock);
|
||||||
window.pack();
|
window.pack();
|
||||||
|
Time time = new Time();
|
||||||
|
time.allowCustomValuesProperty.setValue(true);
|
||||||
|
clock.dayProperty.bindTo(time.dayProperty);
|
||||||
|
clock.monthProperty.bindTo(time.monthProperty);
|
||||||
|
clock.yearProperty.bindTo(time.yearProperty);
|
||||||
|
clock.hourProperty.bindTo(time.hourProperty);
|
||||||
|
clock.minuteProperty.bindTo(time.minuteProperty);
|
||||||
|
clock.secondProperty.bindTo( time.secondProperty);
|
||||||
|
clock.millisecondProperty.bindTo(time.millisecondProperty);
|
||||||
|
clock.dayOfWeekProperty.bindTo(time.dayOfWeekProperty);
|
||||||
|
clock.visibilityProperty.setValue(Visibility.GRAY.name());
|
||||||
window.setVisible(true);
|
window.setVisible(true);
|
||||||
// window.addKeyListener(new KeyAdapter() {
|
// window.addKeyListener(new KeyAdapter() {
|
||||||
// // Key Pressed method
|
// // Key Pressed method
|
||||||
|
@ -38,7 +38,7 @@ public class Time extends Thread {
|
|||||||
= secondReadWriteProperty.asReadOnlyProperty();
|
= secondReadWriteProperty.asReadOnlyProperty();
|
||||||
public ReadOnlyProperty<Integer> millisecondProperty
|
public ReadOnlyProperty<Integer> millisecondProperty
|
||||||
= millisecondReadWriteProperty.asReadOnlyProperty();
|
= millisecondReadWriteProperty.asReadOnlyProperty();
|
||||||
public ReadOnlyProperty<Integer> dayOfWeek
|
public ReadOnlyProperty<Integer> dayOfWeekProperty
|
||||||
= dayOfWeekReadWriteProperty.asReadOnlyProperty();
|
= dayOfWeekReadWriteProperty.asReadOnlyProperty();
|
||||||
public final IntegerProperty yearCustomProperty
|
public final IntegerProperty yearCustomProperty
|
||||||
= new IntegerProperty("yearCustomProperty", Integer.MAX_VALUE);
|
= new IntegerProperty("yearCustomProperty", Integer.MAX_VALUE);
|
||||||
@ -111,7 +111,7 @@ public class Time extends Thread {
|
|||||||
+ minuteProperty.getValue() + " "
|
+ minuteProperty.getValue() + " "
|
||||||
+ secondProperty.getValue() + " "
|
+ secondProperty.getValue() + " "
|
||||||
+ millisecondProperty.getValue() + " "
|
+ millisecondProperty.getValue() + " "
|
||||||
+ dayOfWeek.getValue() + " "
|
+ dayOfWeekProperty.getValue() + " "
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
private int returnCustomValueIfNeeded(Calendar cal, int timeUnit,
|
private int returnCustomValueIfNeeded(Calendar cal, int timeUnit,
|
||||||
|
@ -13,13 +13,13 @@ _Time Calc is written in Java programming language and uses the Swing framework.
|
|||||||
### Start of application
|
### Start of application
|
||||||
|
|
||||||
When "Time Calc" is started", user is asked for:
|
When "Time Calc" is started", user is asked for:
|
||||||
- start time ... like 7:30
|
- start time ... like 7:30
|
||||||
- overtime ... like 0:45 ... overtime is optional and the default value is 0:00
|
- overtime ... like 0:45 ... overtime is optional and the default value is 0:00
|
||||||
|
|
||||||
### Restart of application
|
### Restart of application
|
||||||
|
|
||||||
You can restart the app, if you press the **"Restart"** button.
|
You can restart the app, if you press the **"Restart"** button.
|
||||||
- Then you are asked again for start time and overtime.
|
- Then you are asked again for start time and overtime.
|
||||||
|
|
||||||
### End of application
|
### End of application
|
||||||
|
|
||||||
@ -33,7 +33,7 @@ If these files are present, something special happens.
|
|||||||
|
|
||||||
### .tc/starttime.txt
|
### .tc/starttime.txt
|
||||||
|
|
||||||
This file contains the default start time - used during the previous run of the app.
|
This file contains the default start time - used during the previous run of the app.
|
||||||
If file starttime.txt does not exist, then the default start time is 7:00.
|
If file starttime.txt does not exist, then the default start time is 7:00.
|
||||||
|
|
||||||
### .tc/overtime.txt
|
### .tc/overtime.txt
|
||||||
@ -44,8 +44,6 @@ If file overtime.txt does not exist, then the default overtime is 0:00.
|
|||||||
### .tc/test.txt
|
### .tc/test.txt
|
||||||
If file test.txt exists, then user is not asked for start time and overtime. Instead, the values in files starttime.txt and overtime.txt are used.
|
If file test.txt exists, then user is not asked for start time and overtime. Instead, the values in files starttime.txt and overtime.txt are used.
|
||||||
|
|
||||||
This file can be also used to define custom current time - for testing purposes.
|
|
||||||
|
|
||||||
### ./tc/timecalc.conf
|
### ./tc/timecalc.conf
|
||||||
|
|
||||||
Configuration is stored here.
|
Configuration is stored here.
|
||||||
@ -66,29 +64,29 @@ Optional assignments of profiles to numbers is stored here.
|
|||||||
|
|
||||||
### 3 Visibility modes
|
### 3 Visibility modes
|
||||||
|
|
||||||
* STRONGLY_COLORED - many colors
|
* STRONGLY_COLORED - many colors
|
||||||
* WEAKLY_COLORED - darkened colors
|
* WEAKLY_COLORED - darkened colors
|
||||||
* GRAY - gray colors
|
* GRAY - gray colors
|
||||||
* NONE - widgets are hidden
|
* NONE - widgets are hidden
|
||||||
|
|
||||||
### Widgets
|
### Widgets
|
||||||
|
|
||||||
#### Analog Clock
|
#### Analog Clock
|
||||||
|
|
||||||
* hour hand
|
* hour hand
|
||||||
* minute hand (can be disabled in configuration)
|
* minute hand (can be disabled in configuration)
|
||||||
* second hand (can be disabled in configuration)
|
* second hand (can be disabled in configuration)
|
||||||
* millisecond hand (can be disabled in configuration)
|
* millisecond hand (can be disabled in configuration)
|
||||||
* shows current year, month, day of month and day of week, if analog clock is hovered by mouse cursor and Visibility is STRONGLY_COLORED
|
* shows current year, month, day of month and day of week, if analog clock is hovered by mouse cursor and Visibility is STRONGLY_COLORED
|
||||||
* shows yellow highlighted remaining time until end of today working hours, if analog clock is hovered by mouse cursor and Visibility is STRONGLY_COLORED
|
* shows yellow highlighted remaining time until end of today working hours, if analog clock is hovered by mouse cursor and Visibility is STRONGLY_COLORED
|
||||||
* hands can be long or shorter (can be set in configuration)
|
* hands can be long or shorter (can be set in configuration)
|
||||||
|
|
||||||
#### Progress Square
|
#### Progress Square
|
||||||
* Show graphically day progress
|
* Show graphically day progress
|
||||||
|
|
||||||
#### Progress Circle
|
#### Progress Circle
|
||||||
|
|
||||||
* Show graphically day progress
|
* Show graphically day progress
|
||||||
|
|
||||||
#### Hour Battery
|
#### Hour Battery
|
||||||
|
|
||||||
@ -176,12 +174,12 @@ Smileys can be colored or white-black (can be set in configuration)
|
|||||||
|
|
||||||
## Todos
|
## Todos
|
||||||
|
|
||||||
* Split to Maven modules
|
* Split to Maven modules
|
||||||
* Junit, Mockito, etc.
|
* Junit, Mockito, etc.
|
||||||
* Checkstyle
|
* Checkstyle
|
||||||
* Sonarlint
|
* Sonarlint
|
||||||
* Sonarqube
|
* Sonarqube
|
||||||
* Add SQLite support and store times of arrivals and departures and time of activities
|
* Add SQLite support and store times of arrivals and departures and time of activities
|
||||||
|
|
||||||
## For Developers
|
## For Developers
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user