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>.