branch sync-timebundle updated (2f43914 -> 108f1ac)
This is an automated email from the git hooks/post-receive script. New change to branch sync-timebundle in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 2f43914 Change again to not ignore .gitignore file new d55c769 Add gradle build new 108f1ac Add timebundle in popup menu The 2 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 108f1ac23d7c2e0d1e87ba6a71c69c363d015661 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 8 18:14:51 2017 +0100 Add timebundle in popup menu commit d55c769952b523671eb10799507ae42179e47ddb Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 8 17:33:37 2017 +0100 Add gradle build Summary of changes: build.gradle | 38 ++++++++++++++++++++++ .../plugins/timebundle/TimeBundlePlugin.java | 18 ++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 build.gradle -- 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 sync-timebundle in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit d55c769952b523671eb10799507ae42179e47ddb Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 8 17:33:37 2017 +0100 Add gradle build --- build.gradle | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..60a34b4 --- /dev/null +++ b/build.gradle @@ -0,0 +1,38 @@ +apply plugin: 'java' +apply plugin: 'application' + +group = "org.chorem" +version = '1.5.2-SNAPSHOT' +sourceCompatibility = 1.8 + +mainClassName = "org.chorem.jtimer.JTimer" + +repositories { + mavenCentral() +} + +dependencies { + compile('org.nuiton:nuiton-config:3.2') { + exclude module: 'commons-primitives' + exclude module: 'commons-logging' + exclude module: 'nuiton-i18n' + exclude module: 'guava' + } + compile 'org.jdesktop.bsaf:bsaf:1.9.2' + compile 'org.swinglabs.swingx:swingx-core:1.6.5-1' + compile 'net.java.dev.jna:jna:4.3.0' + compile 'org.slf4j:jcl-over-slf4j:1.7.24' + compile 'ch.qos.logback:logback-classic:1.2.1' + compile 'org.freemarker:freemarker:2.3.25-incubating' + compile 'org.yaml:snakeyaml:1.18' + compile 'com.google.code.gson:gson:2.8.0' + compile 'org.json:json:20160810' + compile 'org.apache.commons:commons-lang3:3.5' + compile 'commons-io:commons-io:2.5' + testCompile 'org.testng:testng:6.11' +} + +test { + useTestNG() +} + -- 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 sync-timebundle in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 108f1ac23d7c2e0d1e87ba6a71c69c363d015661 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 8 18:14:51 2017 +0100 Add timebundle in popup menu --- .../jtimer/plugins/timebundle/TimeBundlePlugin.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/plugins/timebundle/TimeBundlePlugin.java b/src/main/java/org/chorem/jtimer/plugins/timebundle/TimeBundlePlugin.java index efe5be8..9f654cb 100644 --- a/src/main/java/org/chorem/jtimer/plugins/timebundle/TimeBundlePlugin.java +++ b/src/main/java/org/chorem/jtimer/plugins/timebundle/TimeBundlePlugin.java @@ -38,6 +38,7 @@ import javax.swing.Action; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -64,6 +65,8 @@ public class TimeBundlePlugin extends Plugin implements DataEventListener, Vetoa protected SyncIOSaver saver; + protected boolean selectedSingleProject; + @Override public void register(JTimerService service) { this.service = service; @@ -98,8 +101,8 @@ public class TimeBundlePlugin extends Plugin implements DataEventListener, Vetoa JMenuItem menuItem = new JMenuItem(timeBundleAction); JMenuBar jMenuBar = application.getMainFrame().getJMenuBar(); - JMenu menuProject = jMenuBar.getMenu(0); - menuProject.add(menuItem, 2); + JMenu menuProject = jMenuBar.getMenu(0); // project menu + menuProject.add(menuItem, 2); // after edit project if (log.isInfoEnabled()) { log.info("Time bundle UI registered"); @@ -109,9 +112,18 @@ public class TimeBundlePlugin extends Plugin implements DataEventListener, Vetoa } @Override + public void initTreePopupMenu(JPopupMenu menu) { + if (this.selectedSingleProject) { + JMenuItem menuItem = new JMenuItem(timeBundleAction); + menu.add(menuItem, 4); // after edit project + } + } + + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals("selectedSingleProject")) { - timeBundleAction.setEnabled((boolean)evt.getNewValue()); + this.selectedSingleProject = (boolean)evt.getNewValue(); + timeBundleAction.setEnabled(this.selectedSingleProject); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm