branch develop updated (8ad5674 -> 348b57b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git from 8ad5674 Fix annoying trace log on non linux system new d1055db Fix label for next action step new 558593b Fix gray background bug in report view new 7a504e1 set minimum size for jsplitpane new 2e4c406 fixes #1333: Always display lines new 348b57b Remove unused sync project The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 348b57b83c4f841756efa27ae349647f1a18d094 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:55:01 2016 +0100 Remove unused sync project commit 2e4c406935c6b87c9d027f3f293404defbbc0b51 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:48:46 2016 +0100 fixes #1333: Always display lines commit 7a504e109078ebbe8e5bd7440ce6542eb07f2683 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:40:02 2016 +0100 set minimum size for jsplitpane commit 558593b89a9ffe8fd7169314eede387ebba082a8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:35:40 2016 +0100 Fix gray background bug in report view commit d1055dbbe4086309320a0b248ff8e33d3d324507 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:16:32 2016 +0100 Fix label for next action step Summary of changes: src/main/java/org/chorem/jtimer/JTimer.java | 31 +--------------------- src/main/java/org/chorem/jtimer/JTimerConfig.java | 20 -------------- .../org/chorem/jtimer/entities/TimerProject.java | 21 +-------------- .../chorem/jtimer/entities/TimerTaskHelper.java | 10 +------ .../org/chorem/jtimer/ui/report/ReportView.java | 3 +++ .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 2 -- .../jtimer/ui/tree/CheckBoxTreeCellComponent.java | 14 ++-------- .../jtimer/ui/tree/CheckBoxTreeCellRenderer.java | 7 ++++- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 21 +-------------- .../org/chorem/jtimer/resources/JTimer.properties | 3 --- .../chorem/jtimer/resources/JTimer_fr.properties | 3 --- .../ui/tasks/resources/IdleDialog.properties | 2 +- .../ui/tasks/resources/IdleDialog_fr.properties | 2 +- .../chorem/jtimer/entities/TimerProjectTest.java | 14 ---------- 14 files changed, 17 insertions(+), 136 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit d1055dbbe4086309320a0b248ff8e33d3d324507 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:16:32 2016 +0100 Fix label for next action step --- .../org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties | 2 +- .../org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 efbb6f8..f33fec6 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 @@ -40,7 +40,7 @@ chooseResumeOption.Action.text=Resume chooseResumeOption.Action.shortDescription=Resume task without counting elapsed time chooseResumeOption.Action.icon=go-jump.png -chooseAssignOption.Action.text=Assign +chooseAssignOption.Action.text=Assign\u2026 chooseAssignOption.Action.shortDescription=Assign idle time to another task chooseAssignOption.Action.icon=document-revert-3.png diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties index 9f9eb6d..6dfe211 100644 --- a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties @@ -36,7 +36,7 @@ chooseContinueOption.Action.shortDescription=Continuer la t\u00E2che en comptant chooseResumeOption.Action.text=Reprendre chooseResumeOption.Action.shortDescription=Reprendre la t\u00E2che en ne comptant pas le temps \u00E9coul\u00E9 -chooseAssignOption.Action.text=Assigner +chooseAssignOption.Action.text=Assigner\u2026 chooseAssignOption.Action.shortDescription=Assigner le temps d'inactivit\u00E9 \u00E0 une autre t\u00E2che validAssignOption.Action.text=Assigner et reprendre la t\u00E2che en cours -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 558593b89a9ffe8fd7169314eede387ebba082a8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:35:40 2016 +0100 Fix gray background bug in report view --- .../java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellRenderer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellRenderer.java b/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellRenderer.java index a6aaf18..cec3f89 100644 --- a/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellRenderer.java @@ -62,6 +62,11 @@ public class CheckBoxTreeCellRenderer extends CheckBoxTreeCellComponent public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - return getCheckBoxComponent(tree, value, selected, expanded, leaf, row); + Component c = getCheckBoxComponent(tree, value, selected, expanded, leaf, row); + + // fix a strange bug where checkbox does have a "gray" background + c.setBackground(tree.getBackground()); + + return c; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 7a504e109078ebbe8e5bd7440ce6542eb07f2683 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:40:02 2016 +0100 set minimum size for jsplitpane --- src/main/java/org/chorem/jtimer/ui/report/ReportView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java index a9637da..ae5079d 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java @@ -24,6 +24,7 @@ package org.chorem.jtimer.ui.report; import java.awt.Color; import java.awt.Desktop; +import java.awt.Dimension; import java.awt.Font; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -304,6 +305,8 @@ public class ReportView extends FrameView implements DocumentListener { // color fix on linux ? configComponent.setBackground(panelReports.getBackground()); + // set minimum size to prevent "packed size" (too big) + configComponent.setMinimumSize(new Dimension(200, 0)); JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, configComponent, panelReports); splitPane.setOneTouchExpandable(true); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 2e4c406935c6b87c9d027f3f293404defbbc0b51 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:48:46 2016 +0100 fixes #1333: Always display lines --- src/main/java/org/chorem/jtimer/JTimer.java | 31 +--------------------- src/main/java/org/chorem/jtimer/JTimerConfig.java | 20 -------------- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 2 -- .../org/chorem/jtimer/resources/JTimer.properties | 3 --- .../chorem/jtimer/resources/JTimer_fr.properties | 3 --- 5 files changed, 1 insertion(+), 58 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index bcd914d..a48f2b2 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -319,7 +319,7 @@ public class JTimer extends SingleFrameApplication implements } // default lines are non visible - changeTreeShowLineOption(); + projectsAndTasksTable.putClientProperty("JTree.lineStyle", "Angled"); return projectsAndTasksTable; } @@ -402,13 +402,6 @@ public class JTimer extends SingleFrameApplication implements showClosedItem.setIcon(null); menu.add(showClosedItem); - // showTreeLines - JMenuItem showTreeLinesItem = new JCheckBoxMenuItem(); - showTreeLinesItem.setAction(getAction("isShowTreeLines")); - showTreeLinesItem.setSelected(config.isShowTreeLines()); - showTreeLinesItem.setIcon(null); - menu.add(showTreeLinesItem); - // close to systray JMenuItem closeToSysItem = new JCheckBoxMenuItem(); closeToSysItem.setAction(getAction("isCloseToSystray")); @@ -882,28 +875,6 @@ public class JTimer extends SingleFrameApplication implements projectsAndTasksTable.setShowClosed(showClosed); config.setShowClosed(showClosed); } - - /** - * Change show tree lines option. - * - * @param event action event - */ - @Action - public void isShowTreeLines(ActionEvent event) { - JCheckBoxMenuItem source = (JCheckBoxMenuItem) event.getSource(); - boolean showTreeLines = source.isSelected(); - config.setShowTreeLines(showTreeLines); - changeTreeShowLineOption(); - projectsAndTasksTable.repaint(); - } - - /** - * Change property "JTree.lineStyle" of the tree. - */ - protected void changeTreeShowLineOption() { - projectsAndTasksTable.putClientProperty("JTree.lineStyle", - config.isShowTreeLines() ? "Angled" : "None"); - } /** * Change close to systray option. diff --git a/src/main/java/org/chorem/jtimer/JTimerConfig.java b/src/main/java/org/chorem/jtimer/JTimerConfig.java index e87aa68..ac98d49 100644 --- a/src/main/java/org/chorem/jtimer/JTimerConfig.java +++ b/src/main/java/org/chorem/jtimer/JTimerConfig.java @@ -154,25 +154,6 @@ public class JTimerConfig { } /** - * Show angles lines on main ui tree. - * - * @return show closed project - */ - public boolean isShowTreeLines() { - return appConfig.getOptionAsBoolean(JTimerOption.UI_SHOW_TREELINES.key); - } - - /** - * Set show closed option. - * - * @param showTreeLines showTreeLines - */ - public void setShowTreeLines(boolean showTreeLines) { - appConfig.setOption(JTimerOption.UI_SHOW_TREELINES.key, String.valueOf(showTreeLines)); - appConfig.saveForUser(); - } - - /** * Get task template from configuration. * * @return task template as map @@ -245,7 +226,6 @@ public class JTimerConfig { UI_TEMPLATE_DIRECTORY("jtimer.ui.template.directory", "${jtimer.io.saver.directory}/templates"), UI_IDLE_TIME("jtimer.ui.idletime", "300"), UI_SHOW_CLOSED("jtimer.ui.showclosed", "false"), - UI_SHOW_TREELINES("jtimer.ui.showtreelines", "false"), UI_CLOSE_TO_SYSTRAY("jtimer.ui.closetosystray", "true"), UI_REPORT_FIRSTDAYOFWEEK("jtimer.ui.report.firstdayofweek", "0"); diff --git a/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java b/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java index 8888cf9..d863592 100644 --- a/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java +++ b/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java @@ -379,8 +379,6 @@ public class IdleDialog extends JDialog { * Reset some part of the UI. */ protected void reset() { - projectsTree.putClientProperty("JTree.lineStyle", - JTimer.config.isShowTreeLines() ? "Angled" : "None"); assignButton.setSelected(false); assignPanel.setVisible(assignButton.isSelected()); this.pack(); diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties index 4d9de8e..ea8bf2e 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties @@ -124,9 +124,6 @@ makeReport.Action.shortDescription = Create report isShowClosed.Action.text = Show closed isShowClosed.Action.shortDescription = Show closed task and project -isShowTreeLines.Action.text = Show tree lines -isShowTreeLines.Action.shortDescription = Show tree lines - isCloseToSystray.Action.text = Close to systray isCloseToSystray.Action.shortDescription = Reduce application to system tray instead of closing 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 8bf41f8..ea42975 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties @@ -92,9 +92,6 @@ makeReport.Action.shortDescription = Cr\u00E9er un rapport isShowClosed.Action.text = Afficher les cach\u00E9s isShowClosed.Action.shortDescription = Affiche les projets et t\u00E2ches ferm\u00E9s -isShowTreeLines.Action.text = Afficher les lignes de l'arbre -isShowTreeLines.Action.shortDescription = Afficher les lignes de l'arbre - isCloseToSystray.Action.text = Fermer vers le systray isCloseToSystray.Action.shortDescription = R\u00E9duit l'application dans le systray au lieu de la fermer -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 348b57b83c4f841756efa27ae349647f1a18d094 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:55:01 2016 +0100 Remove unused sync project --- .../org/chorem/jtimer/entities/TimerProject.java | 21 +-------------------- .../org/chorem/jtimer/entities/TimerTaskHelper.java | 10 +--------- .../jtimer/ui/tree/CheckBoxTreeCellComponent.java | 14 ++------------ .../ui/treetable/ProjectsAndTasksCellRenderer.java | 21 +-------------------- .../chorem/jtimer/entities/TimerProjectTest.java | 14 -------------- 5 files changed, 5 insertions(+), 75 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerProject.java b/src/main/java/org/chorem/jtimer/entities/TimerProject.java index f1db1db..ad64ff6 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerProject.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerProject.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -36,9 +36,6 @@ public class TimerProject extends TimerTask { /** serialVersionUID. */ private static final long serialVersionUID = -8953488997256237790L; - /** Synchronized project name prefix. */ - public static final String SYNCHRONIZED_PROJECT_NAME_PREFIX = "#"; - /** * Constructor. */ @@ -55,22 +52,6 @@ public class TimerProject extends TimerTask { } /** - * Is synchronized. - * - * @return the synchronize - */ - public boolean isSynchronized() { - - boolean sync = false; - - if (name != null && name.startsWith(SYNCHRONIZED_PROJECT_NAME_PREFIX)) { - sync = true; - } - - return sync; - } - - /** * Clone project. * * @return project copy diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 830dfaa..ec03a86 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -205,15 +205,7 @@ public class TimerTaskHelper { result.addAll(getTaskPath(task.getParent())); result.add(task.getName()); } else { - if (((TimerProject) task).isSynchronized()) { - - // FIXME substring should not be here - result.add(task.getName().substring( - TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - .length())); - } else { - result.add(task.getName()); - } + result.add(task.getName()); } return result; } diff --git a/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java b/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java index 532fe53..38629cc 100644 --- a/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java +++ b/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 2016 CodeLutin, Chatellier Eric * %% * 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 javax.swing.JCheckBox; import javax.swing.JTree; import org.chorem.jtimer.data.TimerCore; -import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; /** @@ -88,17 +87,8 @@ public abstract class CheckBoxTreeCellComponent extends JCheckBox { if (value instanceof TimerTask) { TimerTask task = (TimerTask) value; - // add style in project in sync - String taskName = task.getName(); - if (task instanceof TimerProject - && ((TimerProject) task).isSynchronized()) { - taskName = taskName - .substring(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - .length()); - } - // task name should not be "null" - this.setText(taskName); + this.setText(task.getName()); // add color if task is closed if (task.isClosed()) { diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java index 1971f5a..33718fd 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java @@ -24,12 +24,10 @@ package org.chorem.jtimer.ui.treetable; import java.awt.Color; import java.awt.Component; -import java.awt.Font; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; /** @@ -60,17 +58,8 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer { if (value instanceof TimerTask) { TimerTask task = (TimerTask) value; - // add style in project in sync - String taskName = task.getName(); - if (task instanceof TimerProject - && ((TimerProject) task).isSynchronized()) { - taskName = taskName - .substring(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - .length()); - } - // task name should not be "null" - localValue = taskName; + localValue = task.getName(); } // le fait en 2 temps car sinon, on voit de temps en temps @@ -84,14 +73,6 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer { if (value instanceof TimerTask) { TimerTask task = (TimerTask) value; - // add style in project in sync - if (task instanceof TimerProject - && ((TimerProject) task).isSynchronized()) { - setFont(getFont().deriveFont(Font.ITALIC)); - } else { - setFont(getFont().deriveFont(Font.PLAIN)); - } - // add color if task is closed if (task.isClosed()) { // fix selection color diff --git a/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java b/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java index 0dc0d0a..1c0ffb3 100644 --- a/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java +++ b/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java @@ -47,20 +47,6 @@ public class TimerProjectTest extends AbstractJTimerTest { project.setName("test"); Assert.assertEquals("test", project.getName()); - Assert.assertFalse(project.isSynchronized()); - } - - /** - * Test project sync. - */ - @Test - public void testProjectSynchronized() { - - TimerProject project = new TimerProject(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX + "test"); - - Assert.assertEquals(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - + "test", project.getName()); - Assert.assertTrue(project.isSynchronized()); } /** -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm