This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 8b56d2c79c0e41f4ccb24769507cba3453107823 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 2 16:44:59 2020 +0100 fixes #152: Use fatcow icons --- README.md | 5 +--- pom.xml | 28 ++++++++------------- src/main/java/org/chorem/jtimer/JTimer.java | 12 ++++----- src/main/java/org/chorem/jtimer/JTimerFactory.java | 15 ++++++----- .../java/org/chorem/jtimer/ui/NewTaskView.java | 4 +-- .../plugin/timebundle/resources/dialog-close.png | Bin 1382 -> 0 bytes .../org/chorem/jtimer/resources/JTimer.properties | 16 ++++++------ .../chorem/jtimer/resources/JTimer_fr.properties | 8 +----- .../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/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/tasks/resources/IdleDialog.properties | 12 ++++----- .../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 51 files changed, 53 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index a573d0e..98e27b8 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,4 @@ or executable script: Credits ------- -Images "src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png" -and "src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png" -are licensed under Creative Commons Attribution (by) and available at: -http://www.famfamfam.com/ +Images licensed under Creative Commons Attribution 3.0 License and available at: http://www.fatcow.com/free-icons diff --git a/pom.xml b/pom.xml index ab18a09..167579d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2019 CodeLutin + Copyright (C) 2007 - 2020 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -26,13 +26,13 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>chorempom</artifactId> - <version>10.5</version> + <artifactId>pom</artifactId> + <version>11.4</version> </parent> <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.3-SNAPSHOT</version> <name>jTimer</name> <description> @@ -98,21 +98,13 @@ </scm> <properties> - - <projectId>jtimer</projectId> - - <!--Main class in JAR --> - <maven.jar.main.class>org.chorem.jtimer.JTimer</maven.jar.main.class> + <gitlabGroupName>chorem</gitlabGroupName> + <gitlabProjectName>jtimer</gitlabProjectName> + <animal.sniffer.skip>true</animal.sniffer.skip> + <javaVersion>1.8</javaVersion> <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName> - <redmine.releaseFiles>target/${project.artifactId}-${project.version}.zip</redmine.releaseFiles> - <skipPostRelease>false</skipPostRelease> - <jnlpFileName>jTimer.jnlp</jnlpFileName> - <ciViewId>JTimer</ciViewId> - <javaVersion>1.8</javaVersion> - <signatureArtifactId>java18</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> </properties> <dependencies> @@ -296,7 +288,7 @@ <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>${maven.jar.main.class}</mainClass> + <mainClass>org.chorem.jtimer.JTimer</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> </archive> @@ -309,7 +301,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <version>2.3</version> </dependency> </dependencies> </plugin> diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index 5385a44..ef9eac4 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2019 CodeLutin + * Copyright (C) 2007 - 2020 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -30,7 +30,6 @@ import org.chorem.jtimer.data.DataViolationException; import org.chorem.jtimer.data.TimerCore; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; -import org.chorem.jtimer.system.SystemInfo; import org.chorem.jtimer.system.SystemInfoFactory; import org.chorem.jtimer.ui.HelpFrame; import org.chorem.jtimer.ui.NewTaskView; @@ -84,7 +83,6 @@ import java.io.IOException; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.Optional; import java.util.Timer; /** @@ -157,8 +155,7 @@ public class JTimer extends SingleFrameApplication implements public static void main(String[] args) { if (log.isInfoEnabled()) { - log.info("Starting " + JTimer.class.getSimpleName() + " at " - + new Date()); + log.info("Starting " + JTimer.class.getSimpleName() + " at " + new Date()); } // load configuration and run actions @@ -326,8 +323,9 @@ public class JTimer extends SingleFrameApplication implements * @return tool bar builded */ protected JComponent createToolBar() { - String[] toolbarActionNames = {"startTask", "stopTask", "newProject", - "newTask", "---", "addAnnotation", "editAlert"}; + String[] toolbarActionNames = {"newProject", "newTask", "---", + "startTask", "stopTask", "---", + "addAnnotation", "editAlert"}; JToolBar toolBar = new JToolBar(); toolBar.setFloatable(false); for (String actionName : toolbarActionNames) { diff --git a/src/main/java/org/chorem/jtimer/JTimerFactory.java b/src/main/java/org/chorem/jtimer/JTimerFactory.java index e66396a..63f7c8a 100644 --- a/src/main/java/org/chorem/jtimer/JTimerFactory.java +++ b/src/main/java/org/chorem/jtimer/JTimerFactory.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2018 CodeLutin + * Copyright (C) 2007 - 2020 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,6 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.io.Saver; +import java.lang.reflect.InvocationTargetException; + /** * JTimer config class. * @@ -70,18 +72,15 @@ public class JTimerFactory { try { // get instance - saver = (Saver) saverClass.newInstance(); + Class<?>[] empty = {}; + saver = (Saver) saverClass.getConstructor(empty).newInstance(); // set delay to saver saver.setAutoSaveDelay(JTimer.config.getIOSaverAutoSaveDelay() * 1000); - } catch (InstantiationException e) { - if (log.isErrorEnabled()) { - log.error("Can't instantiate class : " + saverClass, e); - } - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { if (log.isErrorEnabled()) { - log.error("Can't access class : " + saverClass, e); + log.error("Can't instantiate saver : " + saverClass, e); } } } diff --git a/src/main/java/org/chorem/jtimer/ui/NewTaskView.java b/src/main/java/org/chorem/jtimer/ui/NewTaskView.java index e34aa9b..dcb5c9c 100644 --- a/src/main/java/org/chorem/jtimer/ui/NewTaskView.java +++ b/src/main/java/org/chorem/jtimer/ui/NewTaskView.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2016 - 2018 CodeLutin + * Copyright (C) 2016 - 2020 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -92,7 +92,7 @@ public class NewTaskView extends DialogView { JPanel panel = new JPanel(new GridBagLayout()); // icon - JLabel newTaskIcon = new JLabel(new ImageIcon(getClass().getResource("resources/document-new.png"))); + JLabel newTaskIcon = new JLabel(new ImageIcon(getClass().getResource("resources/date_task.png"))); panel.add(newTaskIcon, new GridBagConstraints(0, 0, 1, 4, 0, 0, GridBagConstraints.NORTH, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); diff --git a/src/main/resources/org/chorem/jtimer/plugin/timebundle/resources/dialog-close.png b/src/main/resources/org/chorem/jtimer/plugin/timebundle/resources/dialog-close.png deleted file mode 100644 index 48ef771..0000000 Binary files a/src/main/resources/org/chorem/jtimer/plugin/timebundle/resources/dialog-close.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties index 5ccb538..fb02d6a 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2016 CodeLutin +# Copyright (C) 2007 - 2020 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -33,10 +33,11 @@ Application.vendorId = codelutin Application.homepage = http://www.codelutin.com Application.description = jTimer Application.lookAndFeel = system +Application.icon = jtimer-40-orange.png # Resources for @Actions defined in jTimer newProject.Action.text = &New Project -newProject.Action.icon = bookmark-new.png +newProject.Action.icon = report_add.png newProject.Action.accelerator = shift control N newProject.Action.shortDescription = Create new project @@ -45,7 +46,6 @@ editProject.Action.accelerator = shift F2 editProject.Action.shortDescription = Edit project deleteProject.Action.text = &Delete Project -deleteProject.Action.icon = process-stop.png deleteProject.Action.accelerator = shift control DELETE deleteProject.Action.shortDescription = Delete project @@ -54,7 +54,7 @@ closeProject.Action.accelerator = shift control O closeProject.Action.shortDescription = Open or close project newTask.Action.text = &New Task -newTask.Action.icon = document-new.png +newTask.Action.icon = date_task.png newTask.Action.accelerator = control N newTask.Action.shortDescription = Create new task @@ -67,22 +67,21 @@ closeTask.Action.accelerator = control O closeTask.Action.shortDescription = Open or close task deleteTask.Action.text = &Delete Task -deleteTask.Action.icon = process-stop.png deleteTask.Action.accelerator = DELETE deleteTask.Action.shortDescription = Delete task startTask.Action.text = &Start -startTask.Action.icon = go-next.png +startTask.Action.icon = clock_play.png startTask.Action.accelerator = alt S startTask.Action.shortDescription = Start selected task stopTask.Action.text = St&op -stopTask.Action.icon = process-stop.png +stopTask.Action.icon = clock_stop.png stopTask.Action.accelerator = alt shift S stopTask.Action.shortDescription = Stop selected task addAnnotation.Action.text = Add &annotation -addAnnotation.Action.icon = notes.png +addAnnotation.Action.icon = note_add.png addAnnotation.Action.accelerator = control A addAnnotation.Action.shortDescription = Add an annotation @@ -148,7 +147,6 @@ quit.Action.text = &Quit # mainframe mainFrame.title = ${Application.title} -mainFrame.iconImage = jtimer-40-orange.png # menu projectMenu.text = &Project diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties index 1c222ca..04de40b 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2016 CodeLutin +# Copyright (C) 2007 - 2020 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -21,21 +21,18 @@ ### # Resources for @Actions defined in jTimer newProject.Action.text = &Nouveau projet -newProject.Action.icon = bookmark-new.png newProject.Action.shortDescription = Cr\u00E9ation d'un nouveau projet editProject.Action.text = \u00C9dition du proj&et editProject.Action.shortDescription = \u00C9dition du projet deleteProject.Action.text = &Suppression du projet -deleteProject.Action.icon = process-stop.png deleteProject.Action.shortDescription = Suppression du projet closeProject.Action.text = &Ouvrir/Fermer le projet closeProject.Action.shortDescription = Ouvrir ou fermer le projet newTask.Action.text = &Nouvelle t\u00E2che -newTask.Action.icon = document-new.png newTask.Action.shortDescription = Cr\u00E9ation d'une nouvelle t\u00E2che editTask.Action.text = \u00C9dition de la t\u00E2ch&e @@ -45,15 +42,12 @@ closeTask.Action.text = &Ouvrir/Fermer la t\u00E2che closeTask.Action.shortDescription = Ouvrir ou fermer la t\u00E2che deleteTask.Action.text = &Suppression de la t\u00E2che -deleteTask.Action.icon = process-stop.png deleteTask.Action.shortDescription = Suppression de la t\u00E2che startTask.Action.text = &D\u00E9marrer -startTask.Action.icon = go-next.png startTask.Action.shortDescription = D\u00E9marre la t\u00E2che s\u00E9lectionn\u00E9e stopTask.Action.text = Arr\u00EAter -stopTask.Action.icon = process-stop.png stopTask.Action.shortDescription = Arr\u00EAte la t\u00E2che s\u00E9lectionn\u00E9e addAnnotation.Action.text = Ajouter une &annotation diff --git a/src/main/resources/org/chorem/jtimer/resources/bell.png b/src/main/resources/org/chorem/jtimer/resources/bell.png old mode 100755 new mode 100644 index a2f5097..663e246 Binary files a/src/main/resources/org/chorem/jtimer/resources/bell.png and b/src/main/resources/org/chorem/jtimer/resources/bell.png differ diff --git a/src/main/resources/org/chorem/jtimer/resources/bookmark-new.png b/src/main/resources/org/chorem/jtimer/resources/bookmark-new.png deleted file mode 100644 index 621312a..0000000 Binary files a/src/main/resources/org/chorem/jtimer/resources/bookmark-new.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/resources/clock_play.png b/src/main/resources/org/chorem/jtimer/resources/clock_play.png new file mode 100644 index 0000000..6fc1c40 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/resources/clock_play.png differ diff --git a/src/main/resources/org/chorem/jtimer/resources/clock_stop.png b/src/main/resources/org/chorem/jtimer/resources/clock_stop.png new file mode 100644 index 0000000..2c9d7f6 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/resources/clock_stop.png differ diff --git a/src/main/resources/org/chorem/jtimer/resources/date_task.png b/src/main/resources/org/chorem/jtimer/resources/date_task.png new file mode 100644 index 0000000..b6d403d Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/resources/date_task.png differ diff --git a/src/main/resources/org/chorem/jtimer/resources/document-new.png b/src/main/resources/org/chorem/jtimer/resources/document-new.png deleted file mode 100644 index e6d64bb..0000000 Binary files a/src/main/resources/org/chorem/jtimer/resources/document-new.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/resources/go-next.png b/src/main/resources/org/chorem/jtimer/resources/go-next.png deleted file mode 100644 index a68e2db..0000000 Binary files a/src/main/resources/org/chorem/jtimer/resources/go-next.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/resources/note_add.png b/src/main/resources/org/chorem/jtimer/resources/note_add.png new file mode 100644 index 0000000..616a35e Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/resources/note_add.png differ diff --git a/src/main/resources/org/chorem/jtimer/resources/notes.png b/src/main/resources/org/chorem/jtimer/resources/notes.png deleted file mode 100755 index 6b0ce05..0000000 Binary files a/src/main/resources/org/chorem/jtimer/resources/notes.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/resources/process-stop.png b/src/main/resources/org/chorem/jtimer/resources/process-stop.png deleted file mode 100644 index e7a8d17..0000000 Binary files a/src/main/resources/org/chorem/jtimer/resources/process-stop.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/resources/report_add.png b/src/main/resources/org/chorem/jtimer/resources/report_add.png new file mode 100644 index 0000000..6395444 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/resources/report_add.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties b/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties index 436fd18..8d71a85 100644 --- a/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties +++ b/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2011 CodeLutin +# Copyright (C) 2007 - 2020 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -26,13 +26,17 @@ alert.duration = Duration # buttons addAlert.Action.text = &Add +addAlert.Action.icon = add.png addAlert.Action.shortDescription = Add removeAlert.Action.text = &Remove +removeAlert.Action.icon = delete.png removeAlert.shortDescription = Remove save.Action.text = &Save +save.Action.icon = accept_button.png save.Action.shortDescription = Save cancel.Action.text = &Cancel +cancel.Action.icon = cross.png cancel.Action.shortDescription = Cancel diff --git a/src/main/resources/org/chorem/jtimer/ui/alert/resources/accept_button.png b/src/main/resources/org/chorem/jtimer/ui/alert/resources/accept_button.png new file mode 100644 index 0000000..719e391 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/alert/resources/accept_button.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/alert/resources/add.png b/src/main/resources/org/chorem/jtimer/ui/alert/resources/add.png new file mode 100644 index 0000000..0ea124a Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/alert/resources/add.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/alert/resources/cross.png b/src/main/resources/org/chorem/jtimer/ui/alert/resources/cross.png new file mode 100644 index 0000000..33a3837 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/alert/resources/cross.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/alert/resources/delete.png b/src/main/resources/org/chorem/jtimer/ui/alert/resources/delete.png new file mode 100644 index 0000000..ace289e Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/alert/resources/delete.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties index 74ef97d..90b86d3 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2016 CodeLutin +# Copyright (C) 2007 - 2020 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -37,7 +37,7 @@ reportIntermediateTotalTime=Include intermediate total times reportProjects=Projects reportProjectsList=Projects list -currentWeek.Action.icon = date_current.png +currentWeek.Action.icon = date.png currentWeek.Action.shortDescription = Current week previousWeek.Action.icon = date_previous.png @@ -49,13 +49,13 @@ showHiddenProjects.Action.text = Show hidden projects showHiddenProjects.Action.shortDescription = Show hidden projects generateReport.Action.text = &Generate -generateReport.Action.icon = applications-system.png +generateReport.Action.icon = document_prepare.png generateReport.Action.shortDescription = Generate report sendMail.Action.text = &Send by mail -sendMail.Action.icon = mail-forward.png +sendMail.Action.icon = email_go.png sendMail.Action.shortDescription = Send report by mail closeView.Action.text = &Close -closeView.Action.icon = dialog-close.png +closeView.Action.icon = cross.png closeView.Action.shortDescription = Close diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/applications-system.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/applications-system.png deleted file mode 100644 index 4decc89..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/report/resources/applications-system.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/cross.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/cross.png new file mode 100644 index 0000000..4ee1253 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/report/resources/cross.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/date.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/date.png new file mode 100644 index 0000000..945af71 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/report/resources/date.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png deleted file mode 100644 index 9ccd4f8..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png index e117a83..ac24c3a 100644 Binary files a/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png and b/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/dialog-close.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/dialog-close.png deleted file mode 100644 index 48ef771..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/report/resources/dialog-close.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/document_prepare.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/document_prepare.png new file mode 100644 index 0000000..cd4bb02 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/report/resources/document_prepare.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/email_go.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/email_go.png new file mode 100644 index 0000000..f71e37a Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/report/resources/email_go.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/mail-forward.png b/src/main/resources/org/chorem/jtimer/ui/report/resources/mail-forward.png deleted file mode 100644 index 51aa0b4..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/report/resources/mail-forward.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/resources/NewTaskView.properties b/src/main/resources/org/chorem/jtimer/ui/resources/NewTaskView.properties index 66ce69e..348acf2 100644 --- a/src/main/resources/org/chorem/jtimer/ui/resources/NewTaskView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/resources/NewTaskView.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2016 CodeLutin +# Copyright (C) 2016 - 2020 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -20,7 +20,7 @@ # #L% ### newTaskTitle=New task -newTaskIcon.icon = document-new.png +newTaskIcon.icon = date_task.png input.newTaskMessage=Task name to create for "%s" : input.newTaskTemplate=Task template to use : diff --git a/src/main/resources/org/chorem/jtimer/ui/resources/date_task.png b/src/main/resources/org/chorem/jtimer/ui/resources/date_task.png new file mode 100644 index 0000000..b6d403d Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/resources/date_task.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/resources/document-new.png b/src/main/resources/org/chorem/jtimer/ui/resources/document-new.png deleted file mode 100644 index e6d64bb..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/resources/document-new.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties index 493e86c..2e76b58 100644 --- a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties +++ b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2016 CodeLutin +# Copyright (C) 2007 - 2020 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -21,7 +21,7 @@ ### # idle i18n idleTitle = Idle detect -idleIcon = appointment-new.png +idleIcon = clock_pause.png idleMessage = You have been idle for %d minutes. idleRestart = Choose restart option : currentTask = Task : %s @@ -30,19 +30,19 @@ assignIdleTimeTo = Assign idle time to task: chooseRevertOption.Action.text=&Stop chooseRevertOption.Action.shortDescription=Stop task without counting elapsed time -chooseRevertOption.Action.icon=process-stop.png +chooseRevertOption.Action.icon=stop.png chooseContinueOption.Action.text=&Continue chooseContinueOption.Action.shortDescription=Continue task counting elapsed time -chooseContinueOption.Action.icon=go-next.png +chooseContinueOption.Action.icon=arrow_right.png chooseResumeOption.Action.text=&Resume chooseResumeOption.Action.shortDescription=Resume task without counting elapsed time -chooseResumeOption.Action.icon=go-jump.png +chooseResumeOption.Action.icon=unmark_to_download.png chooseAssignOption.Action.text=&Assign\u2026 chooseAssignOption.Action.shortDescription=Assign idle time to another task -chooseAssignOption.Action.icon=document-revert-3.png +chooseAssignOption.Action.icon=clock_edit.png newTaskOption.Action.text=New task... validAssignOption.Action.text=Assign and resume current task diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties index f27cf39..c142f39 100644 --- a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties +++ b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2016 CodeLutin +# Copyright (C) 2007 - 2020 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -alert.alertIcon=bell48.png +alert.alertIcon=bell.png # messages alert.title = ${Application.title} - Alert diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/appointment-new.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/appointment-new.png deleted file mode 100644 index 85daef3..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/appointment-new.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/arrow_right.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/arrow_right.png new file mode 100644 index 0000000..036b9e2 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/arrow_right.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell.png new file mode 100644 index 0000000..663e246 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell48.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell48.png deleted file mode 100755 index 88c61cf..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell48.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_edit.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_edit.png new file mode 100644 index 0000000..b3a6138 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_edit.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_pause.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_pause.png new file mode 100644 index 0000000..762682b Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_pause.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/document-revert-3.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/document-revert-3.png deleted file mode 100644 index 09cd5a5..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/document-revert-3.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-jump.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-jump.png deleted file mode 100644 index 34dc4c0..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-jump.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-next.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-next.png deleted file mode 100644 index a68e2db..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-next.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/process-stop.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/process-stop.png deleted file mode 100644 index e7a8d17..0000000 Binary files a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/process-stop.png and /dev/null differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/stop.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/stop.png new file mode 100644 index 0000000..807117f Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/stop.png differ diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/unmark_to_download.png b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/unmark_to_download.png new file mode 100644 index 0000000..0ab8175 Binary files /dev/null and b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/unmark_to_download.png differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.