branch develop updated (5bf7e81 -> ff6651f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 5bf7e81 fixes #880: Select running task in popup new ff6651f Prevent too long task name to increase popup size The 1 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 ff6651f04c76cf4a5d0f706953589e6b98245bdc Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Mar 29 15:41:38 2016 +0200 Prevent too long task name to increase popup size Summary of changes: src/main/java/org/chorem/jtimer/ui/NewTaskView.java | 4 +++- src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java | 3 ++- 2 files changed, 5 insertions(+), 2 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 https://gitlab.nuiton.org/chorem/jtimer.git commit ff6651f04c76cf4a5d0f706953589e6b98245bdc Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Mar 29 15:41:38 2016 +0200 Prevent too long task name to increase popup size --- src/main/java/org/chorem/jtimer/ui/NewTaskView.java | 4 +++- src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/NewTaskView.java b/src/main/java/org/chorem/jtimer/ui/NewTaskView.java index 9ef684e..915430c 100644 --- a/src/main/java/org/chorem/jtimer/ui/NewTaskView.java +++ b/src/main/java/org/chorem/jtimer/ui/NewTaskView.java @@ -40,6 +40,7 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.KeyStroke; +import org.apache.commons.lang3.StringUtils; import org.chorem.jtimer.JTimer; import org.chorem.jtimer.data.DataViolationException; import org.chorem.jtimer.data.TimerCore; @@ -90,7 +91,8 @@ public class NewTaskView extends DialogView { GridBagConstraints.NORTH, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); // task name - JLabel newTaskLabel = new JLabel(getResourceMap().getString("input.newTaskMessage", selectedTask.getName())); + String shortTaskName = StringUtils.abbreviate(selectedTask.getName(), 50); + JLabel newTaskLabel = new JLabel(getResourceMap().getString("input.newTaskMessage", shortTaskName)); panel.add(newTaskLabel, new GridBagConstraints(1, 0, 1, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0)); newTaskField = new JTextField(); diff --git a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java index 5d59a20..633a5fc 100644 --- a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java @@ -224,12 +224,13 @@ public class TimerTaskEditor extends DialogView { annotationChangeListener = new TextChangeListener(); // task title - titleText = new JTextField(); + titleText = new JTextField("", 20); // prevent too long task names titleText.getDocument().addDocumentListener(titleChangeListener); panel.add(titleText, BorderLayout.NORTH); panel.add(createJXMonthView(), BorderLayout.CENTER); panel.add(createEditionPanel(), BorderLayout.SOUTH); + return panel; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm