Author: tchemit Date: 2008-04-11 05:22:01 +0000 (Fri, 11 Apr 2008) New Revision: 450 Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-all.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-local.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-remote.png Removed: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/local_vs_local.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_local.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_remote.png Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUI.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIHandler.java trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx Log: ui improvement Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-11 05:22:01 UTC (rev 450) @@ -98,7 +98,6 @@ getUi().getUpdate().setEnabled(hasActions && acts.contains("update")); getUi().getCommit().setEnabled(hasActions && acts.contains("commit")); getUi().getRevert().setEnabled(hasActions && acts.contains("revert")); - getUi().getDelete().setEnabled(hasActions && acts.contains("delete")); getUi().getRefresh().setEnabled(hasActions); } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-11 05:22:01 UTC (rev 450) @@ -42,6 +42,7 @@ getUi().getUpdateAll().setEnabled(hasActions && acts.contains("update")); getUi().getCommitAll().setEnabled(hasActions && acts.contains("commit")); getUi().getRevertAll().setEnabled(hasActions && acts.contains("revert")); + getUi().getAddAll().setEnabled(hasActions && acts.contains("add")); getUi().getDeleteAll().setEnabled(hasActions && acts.contains("delete")); getUi().getRefreshAll().setEnabled(hasActions); } @@ -144,8 +145,9 @@ getUi().getDiff().setEnabled(hasActions && acts.contains("diff")); getUi().getUpdate().setEnabled(hasActions && acts.contains("update")); getUi().getCommit().setEnabled(hasActions && acts.contains("commit")); + getUi().getAdd().setEnabled(hasActions && acts.contains("add")); + getUi().getDelete().setEnabled(hasActions && acts.contains("delete")); getUi().getRevert().setEnabled(hasActions && acts.contains("revert")); - getUi().getDelete().setEnabled(hasActions && acts.contains("delete")); getUi().getRefresh().setEnabled(hasActions); getUi().getPopup().pack(); // display popup Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUI.java 2008-04-11 05:22:01 UTC (rev 450) @@ -22,6 +22,7 @@ import javax.swing.JTable; import javax.swing.JToggleButton; import javax.swing.ButtonGroup; +import javax.swing.ImageIcon; import java.awt.CardLayout; /** @author chemit */ @@ -57,7 +58,7 @@ public abstract AbstractButton getRevert(); - public abstract AbstractButton getDelete(); + public abstract AbstractButton getHelp(); public abstract CardLayout getCardLayout(); @@ -92,4 +93,9 @@ protected void setLocation(VCSEntryLocation location) { getHandler().getModel().setLocation(location); } + + public ImageIcon createLocationIcon(VCSEntryLocation action) { + return jaxx.runtime.UIHelper.createImageIcon("location-" + action.name().toLowerCase() + ".png"); + } + } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractTabUIHandler.java 2008-04-11 05:22:01 UTC (rev 450) @@ -31,6 +31,7 @@ @Override public void init() { super.init(); + getUi().getHelp().setEnabled(true); initTab(VCSEntryLocation.ALL); initTab(VCSEntryLocation.LOCAL); initTab(VCSEntryLocation.REMOTE); Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUI.java 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUI.java 2008-04-11 05:22:01 UTC (rev 450) @@ -14,6 +14,8 @@ */ package org.codelutin.vcs.ui.util; +import javax.swing.ImageIcon; + /** @author chemit */ public class AbstractUI<H extends AbstractUIHandler> extends javax.swing.JDialog { @@ -31,4 +33,12 @@ this.handler = handler; } + protected void doHelp() { + handler.doHelp(); + } + + public ImageIcon createActionIcon(org.codelutin.vcs.type.VCSAction action) { + return jaxx.runtime.UIHelper.createImageIcon(action.name().toLowerCase() + ".png"); + } + } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIHandler.java 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIHandler.java 2008-04-11 05:22:01 UTC (rev 450) @@ -62,4 +62,7 @@ } + public void doHelp() { + log.info("TODO " + this); + } } Deleted: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/local_vs_local.png =================================================================== (Binary files differ) Copied: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-all.png (from rev 440, trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_local.png) =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-all.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-local.png (from rev 440, trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/local_vs_local.png) =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-local.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-remote.png (from rev 440, trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_remote.png) =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/location-remote.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_local.png =================================================================== (Binary files differ) Deleted: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_remote.png =================================================================== (Binary files differ) Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx 2008-04-11 05:22:01 UTC (rev 450) @@ -1,5 +1,9 @@ <DiffUI title='lutinvcs.diff.title' modal="true" defaultCloseOperation='DISPOSE_ON_CLOSE' height='600' width='500'> <style source="common.css"/> + <script> + import static org.codelutin.vcs.type.VCSAction.*; + import static org.codelutin.vcs.type.VCSEntryLocation.*; + </script> <java.awt.CardLayout id='cardLayout'/> <Table> @@ -8,44 +12,41 @@ <JToolBar> <JToggleButton id='allTab' selected='false' buttonGroup='tabs' mnemonic="A" toolTipText="lutinvcs.tabs.diff.tooltip.all" - icon='{createImageIcon("remote_vs_local.png")}' - onActionPerformed='setLocation(org.codelutin.vcs.type.VCSEntryLocation.ALL)'/> + icon='{createLocationIcon(ALL)}' onActionPerformed='setLocation(ALL)'/> <JToggleButton id='localTab' selected='false' buttonGroup='tabs' mnemonic="L" toolTipText="lutinvcs.tabs.diff.tooltip.local" - icon='{createImageIcon("local_vs_local.png")}' - onActionPerformed='setLocation(org.codelutin.vcs.type.VCSEntryLocation.LOCAL)'/> + icon='{createLocationIcon(LOCAL)}' onActionPerformed='setLocation(LOCAL)'/> <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' mnemonic="R" - icon='{createImageIcon("remote_vs_remote.png")}' toolTipText="lutinvcs.tabs.diff.tooltip.remote" - onActionPerformed='setLocation(org.codelutin.vcs.type.VCSEntryLocation.REMOTE)'/> + icon='{createLocationIcon(REMOTE)}' onActionPerformed='setLocation(REMOTE)'/> + <JSeparator orientation="vertical"/> + <JButton id='refresh' toolTipText="lutinvcs.action.tooltip.refresh" + icon='{createActionIcon(REFRESH)}' onActionPerformed='doAction(REFRESH)'/> + <JSeparator orientation="vertical"/> + <JButton id='nextDiff' toolTipText="lutinvcs.action.tooltip.nextDiff" icon='{createImageIcon("diff-next.png")}' onActionPerformed='gotoNextDiff()'/> <JButton id='previousDiff' toolTipText="lutinvcs.action.tooltip.previousDiff" icon='{createImageIcon("diff-prev.png")}' onActionPerformed='gotoPreviousDiff()'/> + <JSeparator orientation="vertical"/> - <JButton id='refresh' toolTipText="lutinvcs.action.tooltip.refresh" - icon='{createImageIcon("autoRefresh.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.REFRESH)'/> <JButton id='update' toolTipText="lutinvcs.action.tooltip.update" - icon='{createImageIcon("update.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.UPDATE)'/> + icon='{createActionIcon(UPDATE)}' onActionPerformed='doAction(UPDATE)'/> + <JButton id='revert' toolTipText="lutinvcs.action.tooltip.revert" + icon='{createActionIcon(REVERT)}' onActionPerformed='doAction(REVERT)'/> + <!--JSeparator orientation="vertical"/--> <JButton id='commit' toolTipText="lutinvcs.action.tooltip.commit" - icon='{createImageIcon("commit.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.COMMIT)'/> + icon='{createActionIcon(COMMIT)}' onActionPerformed='doAction(COMMIT)'/> + <JSeparator orientation="vertical"/> - <JButton id='revert' toolTipText="lutinvcs.action.tooltip.revert" - icon='{createImageIcon("rollback.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.REVERT)'/> - - <JButton id='delete' toolTipText="lutinvcs.action.tooltip.delete" - icon='{createImageIcon("remove.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.DELETE)'/> + <JButton id='help' toolTipText="lutinvcs.action.tooltip.help" + icon='{createImageIcon("help.png")}' onActionPerformed='doHelp()'/> </JToolBar> </cell> </row> Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx 2008-04-11 05:00:17 UTC (rev 449) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx 2008-04-11 05:22:01 UTC (rev 450) @@ -1,6 +1,9 @@ <SynchUI title='lutinvcs.synch.title' defaultCloseOperation='DISPOSE_ON_CLOSE'> <style source="common.css"/> - + <script> + import static org.codelutin.vcs.type.VCSAction.*; + import static org.codelutin.vcs.type.VCSEntryLocation.*; + </script> <java.awt.CardLayout id='cardLayout'/> <!--JPopupMenu/--> <!--org.codelutin.vcs.ui.impl.JPopup id="allPopup"/> @@ -14,39 +17,43 @@ <JToolBar> <JToggleButton id='allTab' buttonGroup='tabs' text='lutinvcs.tabs.all' mnemonic="A" toolTipText="lutinvcs.tabs.tooltip.all" - onActionPerformed='setLocation(org.codelutin.vcs.type.VCSEntryLocation.ALL)'/> + icon='{createLocationIcon(ALL)}' onActionPerformed='setLocation(ALL)'/> <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' mnemonic="L" toolTipText="lutinvcs.tabs.tooltip.local" - onActionPerformed='setLocation(org.codelutin.vcs.type.VCSEntryLocation.LOCAL)'/> + icon='{createLocationIcon(LOCAL)}' onActionPerformed='setLocation(LOCAL)'/> <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' mnemonic="R" toolTipText="lutinvcs.tabs.tooltip.remote" - onActionPerformed='setLocation(org.codelutin.vcs.type.VCSEntryLocation.REMOTE)'/> + icon='{createLocationIcon(REMOTE)}' onActionPerformed='setLocation(REMOTE)'/> + <JSeparator orientation="vertical"/> <JButton id='refreshAll' toolTipText="lutinvcs.action.tooltip.refreshAll" - icon='{createImageIcon("autoRefresh.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.REFRESH,false)'/> + icon='{createActionIcon(REFRESH)}' onActionPerformed='doAction(REFRESH,false)'/> <JButton id='diffAll' toolTipText="lutinvcs.action.tooltip.diffAll" - icon='{createImageIcon("diff.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.DIFF,false)'/> + icon='{createActionIcon(DIFF)}' onActionPerformed='doAction(DIFF,false)'/> + <JSeparator orientation="vertical"/> <JButton id='updateAll' toolTipText="lutinvcs.action.tooltip.updateAll" - icon='{createImageIcon("update.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.UPDATE,false)'/> + icon='{createActionIcon(UPDATE)}' onActionPerformed='doAction(UPDATE,false)'/> + <JButton id='revertAll' toolTipText="lutinvcs.action.tooltip.revertAll" + icon='{createActionIcon(REVERT)}' onActionPerformed='doAction(REVERT,false)'/> + <JSeparator orientation="vertical"/> + <JButton id='commitAll' toolTipText="lutinvcs.action.tooltip.commitAll" - icon='{createImageIcon("commit.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.COMMIT,false)'/> + icon='{createActionIcon(COMMIT)}' onActionPerformed='doAction(COMMIT,false)'/> - <JButton id='revertAll' toolTipText="lutinvcs.action.tooltip.revertAll" - icon='{createImageIcon("rollback.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.REVERT,false)'/> + <JButton id='addAll' toolTipText="lutinvcs.action.tooltip.addAll" + icon='{createActionIcon(ADD)}' onActionPerformed='doAction(ADD,false)'/> <JButton id='deleteAll' toolTipText="lutinvcs.action.tooltip.deleteAll" - icon='{createImageIcon("remove.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.DELETE,false)'/> + icon='{createActionIcon(DELETE)}' onActionPerformed='doAction(DELETE,false)'/> + <JSeparator orientation="vertical"/> + + <JButton id='help' toolTipText="lutinvcs.action.tooltip.help" icon='{createImageIcon("help.png")}' + onActionPerformed='doHelp()'/> </JToolBar> </cell> </row> @@ -69,28 +76,26 @@ <cell> <JPopupMenu id="popup"> <JMenuItem id='refresh' text='lutinvcs.action.refresh' toolTipText='lutinvcs.action.tooltip.refresh' - icon='{createImageIcon("autoRefresh.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.REFRESH,true)'/> + icon='{createActionIcon(REFRESH)}' onActionPerformed='doAction(REFRESH,true)'/> <JMenuItem id='diff' text='lutinvcs.action.diff' toolTipText='lutinvcs.action.tooltip.diff' - icon='{createImageIcon("diff.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.DIFF,true)'/> - + icon='{createActionIcon(DIFF)}' onActionPerformed='doAction(DIFF,true)'/> + <JSeparator/> <JMenuItem id='update' text='lutinvcs.action.update' toolTipText='lutinvcs.action.tooltip.update' - icon='{createImageIcon("update.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.UPDATE,true)'/> + icon='{createActionIcon(UPDATE)}' onActionPerformed='doAction(UPDATE,true)'/> + <JMenuItem id='revert' text='lutinvcs.action.revert' toolTipText='lutinvcs.action.tooltip.revert' + icon='{createActionIcon(REVERT)}' onActionPerformed='doAction(REVERT,true)'/> + <JSeparator/> <JMenuItem id='commit' text='lutinvcs.action.commit' toolTipText='lutinvcs.action.tooltip.commit' - icon='{createImageIcon("commit.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.COMMIT,true)'/> + icon='{createActionIcon(COMMIT)}' onActionPerformed='doAction(COMMIT,true)'/> - <JMenuItem id='revert' text='lutinvcs.action.revert' toolTipText='lutinvcs.action.tooltip.revert' - icon='{createImageIcon("rollback.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.REVERT,true)'/> + <JMenuItem id='add' text='lutinvcs.action.add' toolTipText='lutinvcs.action.tooltip.add' + icon='{createActionIcon(ADD)}' onActionPerformed='doAction(ADD,true)'/> <JMenuItem id='delete' text='lutinvcs.action.delete' toolTipText='lutinvcs.action.tooltip.delete' - icon='{createImageIcon("remove.png")}' - onActionPerformed='doAction(org.codelutin.vcs.type.VCSAction.DELETE,true)'/> + icon='{createActionIcon(DELETE)}' onActionPerformed='doAction(DELETE,true)'/> + </JPopupMenu> </cell> </row>