This is an automated email from the git hooks/post-receive script. New commit to branch master in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 05ebc177474a2a066ca9d2b42a1dcd52610cbd56 Merge: e8bb063 7b4b204 Author: Éric <chatellier@codelutin.com> Date: Mon Mar 2 17:07:49 2020 +0100 Merge branch 'release/1.5.3' .gitlab-ci.yml | 25 ++- README.md | 5 +- pom.xml | 82 ++++--- src/main/java/org/chorem/jtimer/JTimer.java | 108 +++++---- src/main/java/org/chorem/jtimer/JTimerConfig.java | 32 ++- src/main/java/org/chorem/jtimer/JTimerFactory.java | 51 +---- .../java/org/chorem/jtimer/data/TimerCore.java | 18 +- .../java/org/chorem/jtimer/entities/TimerSync.java | 151 ------------- .../java/org/chorem/jtimer/entities/TimerTask.java | 21 +- .../jtimer/plugin/timebundle/TimeBundleHelper.java | 136 ------------ .../jtimer/plugin/timebundle/TimeBundleSaver.java | 219 ------------------ .../plugin/timebundle/TimeBundleSynchronizer.java | 171 -------------- .../plugin/timebundle/TimeBundleVetoable.java | 56 ----- .../plugin/timebundle/TimerSyncCellRenderer.java | 46 ---- .../jtimer/plugin/timebundle/TimerSyncEditor.java | 245 --------------------- .../plugin/timebundle/TimerSyncTableModel.java | 203 ----------------- .../java/org/chorem/jtimer/system/SystemInfo.java | 5 - .../jtimer/system/macos/ApplicationServices.java | 2 +- .../jtimer/system/macos/MacOSSystemInfo.java | 7 +- .../chorem/jtimer/system/unix/UnixSystemInfo.java | 24 +- .../java/org/chorem/jtimer/system/unix/X11.java | 2 +- .../java/org/chorem/jtimer/system/unix/Xss.java | 2 +- .../org/chorem/jtimer/system/win32/Kernel32.java | 2 +- .../org/chorem/jtimer/system/win32/User32.java | 2 +- .../jtimer/system/win32/Win32SystemInfo.java | 7 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 36 ++- .../chorem/jtimer/ui/systray/SystrayManager.java | 8 +- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 75 ++++++- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 1 + .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 10 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 18 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 103 ++++++--- .../org/chorem/jtimer/ui/widget/DialogView.java | 8 +- src/main/resources/{log4j2.xml => logback.xml} | 32 ++- .../resources/TimerSyncEditor.properties | 46 ---- .../resources/TimerSyncEditor_fr.properties | 47 ---- .../plugin/timebundle/resources/dialog-close.png | Bin 1382 -> 0 bytes .../org/chorem/jtimer/resources/JTimer.properties | 28 +-- .../chorem/jtimer/resources/JTimer_fr.properties | 15 +- .../resources/org/chorem/jtimer/resources/bell.png | Bin 1887 -> 2110 bytes .../org/chorem/jtimer/resources/bookmark-new.png | Bin 1532 -> 0 bytes .../org/chorem/jtimer/resources/clock_play.png | Bin 0 -> 2609 bytes .../org/chorem/jtimer/resources/clock_stop.png | Bin 0 -> 2513 bytes .../org/chorem/jtimer/resources/date_task.png | Bin 0 -> 2358 bytes .../org/chorem/jtimer/resources/document-new.png | Bin 1008 -> 0 bytes .../org/chorem/jtimer/resources/go-next.png | Bin 1219 -> 0 bytes .../org/chorem/jtimer/resources/note_add.png | Bin 0 -> 1409 bytes .../org/chorem/jtimer/resources/notes.png | Bin 2234 -> 0 bytes .../org/chorem/jtimer/resources/process-stop.png | Bin 1927 -> 0 bytes .../org/chorem/jtimer/resources/report_add.png | Bin 0 -> 1871 bytes .../ui/alert/resources/AlertEditor.properties | 6 +- .../jtimer/ui/alert/resources/accept_button.png | Bin 0 -> 712 bytes .../org/chorem/jtimer/ui/alert/resources/add.png | Bin 0 -> 698 bytes .../org/chorem/jtimer/ui/alert/resources/cross.png | Bin 0 -> 473 bytes .../chorem/jtimer/ui/alert/resources/delete.png | Bin 0 -> 695 bytes .../ui/report/resources/ReportView.properties | 10 +- .../ui/report/resources/applications-system.png | Bin 1488 -> 0 bytes .../chorem/jtimer/ui/report/resources/cross.png | Bin 0 -> 1049 bytes .../org/chorem/jtimer/ui/report/resources/date.png | Bin 0 -> 775 bytes .../jtimer/ui/report/resources/date_current.png | Bin 667 -> 0 bytes .../jtimer/ui/report/resources/date_previous.png | Bin 720 -> 761 bytes .../jtimer/ui/report/resources/dialog-close.png | Bin 1382 -> 0 bytes .../ui/report/resources/document_prepare.png | Bin 0 -> 1675 bytes .../chorem/jtimer/ui/report/resources/email_go.png | Bin 0 -> 1364 bytes .../jtimer/ui/report/resources/mail-forward.png | Bin 893 -> 0 bytes .../jtimer/ui/resources/HelpFrame.properties | 2 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 2 +- .../jtimer/ui/resources/NewTaskView.properties | 4 +- .../org/chorem/jtimer/ui/resources/date_task.png | Bin 0 -> 2358 bytes .../chorem/jtimer/ui/resources/document-new.png | Bin 1008 -> 0 bytes .../ui/systray/resources/SystrayManager.properties | 1 + .../systray/resources/SystrayManager_fr.properties | 1 + .../ui/tasks/resources/IdleDialog.properties | 13 +- .../ui/tasks/resources/IdleDialog_fr.properties | 2 + .../ui/tasks/resources/RunTaskJob.properties | 4 +- .../jtimer/ui/tasks/resources/appointment-new.png | Bin 2399 -> 0 bytes .../jtimer/ui/tasks/resources/arrow_right.png | Bin 0 -> 577 bytes .../org/chorem/jtimer/ui/tasks/resources/bell.png | Bin 0 -> 2110 bytes .../chorem/jtimer/ui/tasks/resources/bell48.png | Bin 3725 -> 0 bytes .../jtimer/ui/tasks/resources/clock_edit.png | Bin 0 -> 2726 bytes .../jtimer/ui/tasks/resources/clock_pause.png | Bin 0 -> 2583 bytes .../ui/tasks/resources/document-revert-3.png | Bin 2043 -> 0 bytes .../chorem/jtimer/ui/tasks/resources/go-jump.png | Bin 1491 -> 0 bytes .../chorem/jtimer/ui/tasks/resources/go-next.png | Bin 1219 -> 0 bytes .../jtimer/ui/tasks/resources/process-stop.png | Bin 1927 -> 0 bytes .../org/chorem/jtimer/ui/tasks/resources/stop.png | Bin 0 -> 1173 bytes .../ui/tasks/resources/unmark_to_download.png | Bin 0 -> 8134 bytes src/site/rst/index.rst.vm | 18 +- src/site/rst/timebundle.rst | 30 --- src/site/site.xml | 10 +- .../java/org/chorem/jtimer/AbstractJTimerTest.java | 2 - .../plugin/timebundle/TimeBundleHelperTest.java | 87 -------- .../plugin/timebundle/TimeBundleSaverTest.java | 66 ------ .../jtimer/ui/report/ReportGeneratorTest.java | 11 +- 94 files changed, 415 insertions(+), 1903 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.