[Buix-commits] r453 - in trunk/lutinvcs/lutinvcs-ui-jaxx/src/main: resources/i18n uimodel/org/codelutin/vcs/ui

Author: tchemit Date: 2008-04-11 06:42:06 +0000 (Fri, 11 Apr 2008) New Revision: 453 Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx 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 trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css Log: use css Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties 2008-04-11 05:23:40 UTC (rev 452) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties 2008-04-11 06:42:06 UTC (rev 453) @@ -30,9 +30,6 @@ lutinvcs.diff.title=Diff UI lutinvcs.synch.title=Synch lutinvcs.tabs.all=all -lutinvcs.tabs.diff.tooltip.all=both local and remote modifed files -lutinvcs.tabs.diff.tooltip.local=only local modified files -lutinvcs.tabs.diff.tooltip.remote=only remote modified files lutinvcs.tabs.local=local lutinvcs.tabs.remote=remote lutinvcs.tabs.tooltip.all=Show all files (local and remote) Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties 2008-04-11 05:23:40 UTC (rev 452) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties 2008-04-11 06:42:06 UTC (rev 453) @@ -30,9 +30,6 @@ lutinvcs.diff.title=Diff UI lutinvcs.synch.title=Synchronisation lutinvcs.tabs.all=all -lutinvcs.tabs.diff.tooltip.all=voir tous les fichiers modifi\u00E9s -lutinvcs.tabs.diff.tooltip.local=voir les fichiers locaux modifi\u00E9es -lutinvcs.tabs.diff.tooltip.remote=voir les fichiers distants modifi\u00E9s lutinvcs.tabs.local=local lutinvcs.tabs.remote=remote lutinvcs.tabs.tooltip.all=voir tous les fichiers modifi\u00E9s localement ou \u00E0 distance Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx 2008-04-11 05:23:40 UTC (rev 452) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx 2008-04-11 06:42:06 UTC (rev 453) @@ -19,9 +19,9 @@ <cell fill='both'/> </row> </Table> - <JButton id='lastMessages' toolTipText="lutinvcs.action.tooltip.lastMessages" - icon='{createImageIcon("recent_msgs.png")}' - onActionPerformed='showLastMessages()'/> + <JButton id='lastMessages' onActionPerformed='showLastMessages()'/> + <JSeparator orientation="vertical"/> + <JButton id='help' onActionPerformed='doHelp()'/> </JToolBar> </cell> </row> @@ -45,7 +45,8 @@ </row> <row> <cell fill='both'> - <JButton id='accept' text='lutinvcs.accept' onActionPerformed='doAccept()'/> + <JButton id='accept' onActionPerformed='doAccept()'/> + <!--JButton id='accept' text='lutinvcs.accept' onActionPerformed='doAccept()'/--> </cell> </row> </Table> 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:23:40 UTC (rev 452) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx 2008-04-11 06:42:06 UTC (rev 453) @@ -10,43 +10,24 @@ <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <JToggleButton id='allTab' selected='false' buttonGroup='tabs' mnemonic="A" - toolTipText="lutinvcs.tabs.diff.tooltip.all" - icon='{createLocationIcon(ALL)}' onActionPerformed='setLocation(ALL)'/> - - <JToggleButton id='localTab' selected='false' buttonGroup='tabs' mnemonic="L" - toolTipText="lutinvcs.tabs.diff.tooltip.local" - icon='{createLocationIcon(LOCAL)}' onActionPerformed='setLocation(LOCAL)'/> - - <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' mnemonic="R" - toolTipText="lutinvcs.tabs.diff.tooltip.remote" - icon='{createLocationIcon(REMOTE)}' onActionPerformed='setLocation(REMOTE)'/> + <JToggleButton id='allTab' onActionPerformed='setLocation(ALL)'/> + <JToggleButton id='localTab' onActionPerformed='setLocation(LOCAL)'/> + <JToggleButton id='remoteTab' onActionPerformed='setLocation(REMOTE)'/> <JSeparator orientation="vertical"/> - <JButton id='refresh' toolTipText="lutinvcs.action.tooltip.refresh" - icon='{createActionIcon(REFRESH)}' onActionPerformed='doAction(REFRESH)'/> + <JButton id='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()'/> + <JButton id='nextDiff' onActionPerformed='gotoNextDiff()'/> + <JButton id='previousDiff' onActionPerformed='gotoPreviousDiff()'/> <JSeparator orientation="vertical"/> - - <JButton id='update' toolTipText="lutinvcs.action.tooltip.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='{createActionIcon(COMMIT)}' onActionPerformed='doAction(COMMIT)'/> + <JButton id='update' onActionPerformed='doAction(UPDATE)'/> + <JButton id='commit' onActionPerformed='doAction(COMMIT)'/> + <JButton id='revert' onActionPerformed='doAction(REVERT)'/> <JSeparator orientation="vertical"/> - <JButton id='help' toolTipText="lutinvcs.action.tooltip.help" - icon='{createImageIcon("help.png")}' onActionPerformed='doHelp()'/> + <JButton id='help' 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:23:40 UTC (rev 452) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx 2008-04-11 06:42:06 UTC (rev 453) @@ -5,55 +5,43 @@ import static org.codelutin.vcs.type.VCSEntryLocation.*; </script> <java.awt.CardLayout id='cardLayout'/> - <!--JPopupMenu/--> - <!--org.codelutin.vcs.ui.impl.JPopup id="allPopup"/> - <org.codelutin.vcs.ui.impl.JPopup id="localPopup"/> - <org.codelutin.vcs.ui.impl.JPopup id="remotePopup"/--> + <JPopupMenu id="popup"> + <JMenuItem id='refresh' text='lutinvcs.action.refresh' onActionPerformed='doAction(REFRESH,true)'/> + <JMenuItem id='diff' text='lutinvcs.action.diff' onActionPerformed='doAction(DIFF,true)'/> + <JSeparator/> + <JMenuItem id='update' text='lutinvcs.action.update' onActionPerformed='doAction(UPDATE,true)'/> + <JMenuItem id='revert' text='lutinvcs.action.revert' onActionPerformed='doAction(REVERT,true)'/> + <JSeparator/> + <JMenuItem id='commit' text='lutinvcs.action.commit' onActionPerformed='doAction(COMMIT,true)'/> + <JMenuItem id='add' text='lutinvcs.action.add' onActionPerformed='doAction(ADD,true)'/> + <JMenuItem id='delete' text='lutinvcs.action.delete' onActionPerformed='doAction(DELETE,true)'/> + </JPopupMenu> <Table id='table'> <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <JToggleButton id='allTab' buttonGroup='tabs' text='lutinvcs.tabs.all' mnemonic="A" - toolTipText="lutinvcs.tabs.tooltip.all" - icon='{createLocationIcon(ALL)}' onActionPerformed='setLocation(ALL)'/> + <JToggleButton id='allTab' onActionPerformed='setLocation(ALL)'/> + <JToggleButton id='localTab' onActionPerformed='setLocation(LOCAL)'/> + <JToggleButton id='remoteTab' onActionPerformed='setLocation(REMOTE)'/> - <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' - mnemonic="L" toolTipText="lutinvcs.tabs.tooltip.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" - icon='{createLocationIcon(REMOTE)}' onActionPerformed='setLocation(REMOTE)'/> <JSeparator orientation="vertical"/> - <JButton id='refreshAll' toolTipText="lutinvcs.action.tooltip.refreshAll" - icon='{createActionIcon(REFRESH)}' onActionPerformed='doAction(REFRESH,false)'/> - - <JButton id='diffAll' toolTipText="lutinvcs.action.tooltip.diffAll" - icon='{createActionIcon(DIFF)}' onActionPerformed='doAction(DIFF,false)'/> + <JButton id='refreshAll' onActionPerformed='doAction(REFRESH,false)'/> + <JButton id='diffAll' onActionPerformed='doAction(DIFF,false)'/> <JSeparator orientation="vertical"/> - <JButton id='updateAll' toolTipText="lutinvcs.action.tooltip.updateAll" - icon='{createActionIcon(UPDATE)}' onActionPerformed='doAction(UPDATE,false)'/> - - <JButton id='revertAll' toolTipText="lutinvcs.action.tooltip.revertAll" - icon='{createActionIcon(REVERT)}' onActionPerformed='doAction(REVERT,false)'/> + <JButton id='updateAll' onActionPerformed='doAction(UPDATE,false)'/> + <JButton id='revertAll' onActionPerformed='doAction(REVERT,false)'/> <JSeparator orientation="vertical"/> - <JButton id='commitAll' toolTipText="lutinvcs.action.tooltip.commitAll" - icon='{createActionIcon(COMMIT)}' onActionPerformed='doAction(COMMIT,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='{createActionIcon(DELETE)}' onActionPerformed='doAction(DELETE,false)'/> + <JButton id='commitAll' onActionPerformed='doAction(COMMIT,false)'/> + <JButton id='addAll' onActionPerformed='doAction(ADD,false)'/> + <JButton id='deleteAll' onActionPerformed='doAction(DELETE,false)'/> <JSeparator orientation="vertical"/> - <JButton id='help' toolTipText="lutinvcs.action.tooltip.help" icon='{createImageIcon("help.png")}' - onActionPerformed='doHelp()'/> + <JButton id='help' onActionPerformed='doHelp()'/> </JToolBar> </cell> </row> @@ -72,32 +60,5 @@ </JPanel> </cell> </row> - <row> - <cell> - <JPopupMenu id="popup"> - <JMenuItem id='refresh' text='lutinvcs.action.refresh' toolTipText='lutinvcs.action.tooltip.refresh' - icon='{createActionIcon(REFRESH)}' onActionPerformed='doAction(REFRESH,true)'/> - - <JMenuItem id='diff' text='lutinvcs.action.diff' toolTipText='lutinvcs.action.tooltip.diff' - icon='{createActionIcon(DIFF)}' onActionPerformed='doAction(DIFF,true)'/> - <JSeparator/> - <JMenuItem id='update' text='lutinvcs.action.update' toolTipText='lutinvcs.action.tooltip.update' - 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='{createActionIcon(COMMIT)}' onActionPerformed='doAction(COMMIT,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='{createActionIcon(DELETE)}' onActionPerformed='doAction(DELETE,true)'/> - - </JPopupMenu> - </cell> - </row> </Table> </SynchUI> \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-04-11 05:23:40 UTC (rev 452) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-04-11 06:42:06 UTC (rev 453) @@ -63,4 +63,194 @@ cellSelectionEnabled: false; rowMargin: 0; selectionMode: 0; +} + +#allTab { + buttonGroup: tabs; + mnemonic: A; + selected: false; + icon: { createLocationIcon( ALL ) +} + +; +text: + +"lutinvcs.tabs.all" +; +toolTipText: + +"lutinvcs.tabs.tooltip.all" +; +} + +#localTab { + buttonGroup: tabs; + mnemonic: L; + selected: false; + icon: { createLocationIcon( LOCAL ) +} + +; +text: + +"lutinvcs.tabs.local" +; +toolTipText: + +"lutinvcs.tabs.tooltip.local" +; +} + +#remoteTab { + buttonGroup: tabs; + mnemonic: R; + selected: false; + icon: { createLocationIcon( REMOTE ) +} + +; +text: + +"lutinvcs.tabs.remote" +; +toolTipText: + +"lutinvcs.tabs.tooltip.remote" +; +} + +#refresh, #refreshAll { + icon: { createActionIcon( REFRESH ) +} + +; +} + +#diff, #diffAll { + icon: { createActionIcon( DIFF ) +} + +; +} + +#update, #updateAll { + icon: { createActionIcon( UPDATE ) +} + +; +} + +#revert, #revertAll { + icon: { createActionIcon( REVERT ) +} + +; +} + +#commit, #commitAll { + icon: { createActionIcon( COMMIT ) +} + +; +} + +#add, #addAll { + icon: { createActionIcon( ADD ) +} + +; +} + +#delete, #deleteAll { + icon: { createActionIcon( DELETE ) +} + +; +} + +#refresh { + toolTipText: "lutinvcs.action.tooltip.refresh"; +} + +#refreshAll { + toolTipText: "lutinvcs.action.tooltip.refreshAll"; +} + +#diff { + toolTipText: "lutinvcs.action.tooltip.diff"; +} + +#diffAll { + toolTipText: "lutinvcs.action.tooltip.diffAll"; +} + +#update { + toolTipText: "lutinvcs.action.tooltip.update"; +} + +#updateAll { + toolTipText: "lutinvcs.action.tooltip.updateAll"; +} + +#revert { + toolTipText: "lutinvcs.action.tooltip.revert"; +} + +#revertAll { + toolTipText: "lutinvcs.action.tooltip.revertAll"; +} + +#commit { + toolTipText: "lutinvcs.action.tooltip.commit"; +} + +#commitAll { + toolTipText: "lutinvcs.action.tooltip.commitAll"; +} + +#add { + toolTipText: "lutinvcs.action.tooltip.add"; +} + +#addAll { + toolTipText: "lutinvcs.action.tooltip.addAll"; +} + +#delete { + toolTipText: "lutinvcs.action.tooltip.delete"; +} + +#deleteAll { + toolTipText: "lutinvcs.action.tooltip.deleteAll"; +} + +#help { + toolTipText: "lutinvcs.action.tooltip.help"; + enabled: true; + icon: { createImageIcon( "help.png" ) +} + +; +} + +#nextDiff { + toolTipText: "lutinvcs.action.tooltip.nextDiff"; + icon: { createImageIcon( "diff-next.png" ) +} + +; +} + +#previousDiff { + toolTipText: "lutinvcs.action.tooltip.previousDiff"; + icon: { createImageIcon( "diff-prev.png" ) +} + +; +} + +#lastMessages { + toolTipText: "lutinvcs.action.tooltip.lastMessages"; + icon: { createImageIcon( "recent_msgs.png" ) +}; } \ No newline at end of file