[Buix-commits] r307 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui

3 Apr 2008

Author: tchemit
Date: 2008-04-03 17:02:06 +0000 (Thu, 03 Apr 2008)
New Revision: 307

Added:
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffPanelUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx
Modified:
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css
Log:
uis

Copied: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx (from rev 298, trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx)
===================================================================

--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx	                        (rev 0)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx	2008-04-03 17:02:06 UTC (rev 307)
@@ -0,0 +1,93 @@
+<JDialog title='lutinvcs.confirm.title' id='ui' defaultCloseOperation='DISPOSE_ON_CLOSE' modal='true'>
+    <style source="common.css"/>
+    <script>
+
+        import org.codelutin.vcs.VCSAction;
+        import org.codelutin.vcs.ui.action.AbstractConfirmUIHandler;
+
+        protected AbstractConfirmUIHandler handler;
+
+        public JConfirmUI(AbstractConfirmUIHandler handler) {
+        this.handler =handler;
+        JRootPane rootPane = ui.getRootPane();
+        //rootPane.setDefaultButton(accept);
+
+        Action quitAction = new AbstractAction("cancel") {
+        private static final long serialVersionUID = -869095664995763057L;
+        public void actionPerformed(ActionEvent e) {
+        ui.dispose();
+        }
+        };
+
+        Action acceptAction= new AbstractAction("accept") {
+        private static final long serialVersionUID = -869095664995763055L;
+        public void actionPerformed(ActionEvent e) {
+        model.doAction(commitMessage.getText());
+        }
+        };
+        rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"quit");
+        rootPane.getActionMap().put("quit", quitAction);
+        accept.setAction((acceptAction));
+        }
+
+        protected AbstractConfirmUIHandler getHandler() {
+        return handler;
+        }
+
+        protected void showLastMessages() {
+
+        }
+    </script>
+
+    <org.codelutin.vcs.ui.model.ConfirmUIModel id="model"/>
+
+
+    <Table>
+        <row fill='both'>
+            <cell fill='both'>
+                <JLabel id="actionLabel" text="lutinvcs.confirm.message"/>
+            </cell>
+        </row>
+
+        <row fill='both'>
+            <cell fill='both' weightx='1'>
+                <Table id="toolbar" fill='both'>
+                    <row>
+                        <cell fill='both'>
+                            <JLabel id="actionCommitLabel" text="lutinvcs.commit.message"/>
+                        </cell>
+                        <cell fill='both'>
+                            <JLabel/>
+                        </cell>
+                        <cell fill='horizontal' anchor='east'>
+                            <JButton id='lastMessages' toolTipText="lutinvcs.action.tooltip.lastMessages"
+                                     icon='{createImageIcon("recent_messages.png")}'
+                                     onActionPerformed='showLastMessages()'/>
+                        </cell>
+                    </row>
+                    <row fill='both'>
+                        <cell fill='both' columns='3' weightx='1' weighty='1'>
+                            <JScrollPane id="commitScroll" height='60' verticalScrollBarPolicy="20">
+                                <!--JScrollPane id="commitScroll" verticalScrollBarPolicy="20" columnHeaderView="{toolbar}"-->
+                                <JTextArea id="commitMessage" constructorParams="4,50"/>
+                            </JScrollPane>
+                        </cell>
+                    </row>
+                </Table>
+            </cell>
+        </row>
+
+        <row>
+            <cell fill='both' weightx='1' weighty='1'>
+                <JScrollPane id='content' styleClass='confirmScroll'>
+                    <JTable id="contentTable" styleClass='confirmTable' model="{model.getModel()}"/>
+                </JScrollPane>
+            </cell>
+        </row>
+        <row>
+            <cell fill='both'>
+                <JButton id='accept' text='lutinvcs.accept'/>
+            </cell>
+        </row>
+    </Table>
+</JDialog>

Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffPanelUI.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffPanelUI.jaxx	                        (rev 0)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffPanelUI.jaxx	2008-04-03 17:02:06 UTC (rev 307)
@@ -0,0 +1,15 @@
+<!--Table>
+    <style source="common.css"/>
+    <row fill='both'>
+        <cell fill='both' weightx='1'-->
+<JSplitPane id='splitPane2' orientation='horizontal' oneTouchExpandable='true'>
+    <JScrollPane id='remoteScroll' styleClass='updateScroll'>
+        <JTextArea id="remoteContent"/>
+    </JScrollPane>
+    <JScrollPane id='localScroll' styleClass='updateScroll'>
+        <JTextArea id="localContent"/>
+    </JScrollPane>
+</JSplitPane>
+        <!--/cell>
+    </row>
+</Table-->       
\ No newline at end of file

Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx	                        (rev 0)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx	2008-04-03 17:02:06 UTC (rev 307)
@@ -0,0 +1,156 @@
+<JDialog title='lutinvcs.diff.title' id='diffui' defaultCloseOperation='DISPOSE_ON_CLOSE'>
+    <style source="common.css"/>
+    <script>
+
+        import org.codelutin.vcs.VCSAction;
+        import org.codelutin.vcs.ui.action.AbstractDiffUIHandler;
+        import org.codelutin.vcs.ui.VCSUIConstants;
+
+        protected AbstractDiffUIHandler handler;
+
+        public JTable getTable(String modelName) {
+        return (JTable) get$objectMap().get(modelName+"Table");
+        }
+
+        @Override
+        public void setVisible(boolean b) {
+        if (getHandler().getModel().getTabModel() == null) {
+        // first launch, no tab model selected,choose one
+        selectTab(VCSUIConstants.DIFF_ALL_MODEL_PROPERTY);
+        }
+        super.setVisible(b);
+        }
+
+        public JDiffUI(AbstractDiffUIHandler handler) {
+        this.handler =handler;
+        }
+
+        protected AbstractDiffUIHandler getHandler() {
+        return handler;
+        }
+
+        protected void setHandler(AbstractDiffUIHandler handler) {
+        this.handler = handler;
+        }
+
+        protected void selectTab(String tabname) {
+        model.setTabModel(model.getModel(tabname));
+        }
+
+        protected void selectFile(JTable table) {
+        model.setFileModel(model.getTabModel().getData(table.getSelectionModel())[0]);
+        }
+
+        protected void doAction(VCSAction action) {
+        model.doAction(action);
+        }
+
+        protected void gotoNextDiff() {
+        handler.gotoNextDiff();
+        }
+
+        protected void gotoPreviousDiff() {
+        handler.gotoPreviousDiff();
+        }
+
+        Action quitAction;
+        JRootPane rootPane = diffui.getRootPane();
+        //rootPane.setDefaultButton(quit);
+        quitAction = new AbstractAction("quit") {
+        private static final long serialVersionUID = -869095664995763057L;
+        public void actionPerformed(ActionEvent e) {
+        diffui.dispose();
+        }
+        };
+        rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"quit");
+        rootPane.getActionMap().put("quit", quitAction);
+    </script>
+
+    <org.codelutin.vcs.ui.model.DiffUIModel id="model"/>
+
+    <java.awt.CardLayout id='cardLayout'/>
+
+    <Table>
+        <row fill='both'>
+            <cell fill='both' weightx='1'>
+                <JToolBar>
+                    <JToggleButton id='allTab' selected='true' buttonGroup='tabs' mnemonic="A"
+                                   toolTipText="lutinvcs.tabs.diff.tooltip.all"
+                                   icon='{createImageIcon("remote_vs_local.png")}'
+                                   onActionPerformed='selectTab("modelSynchAll")'/>
+                    <JToggleButton id='localTab' selected='false' buttonGroup='tabs' mnemonic="L"
+                                   toolTipText="lutinvcs.tabs.diff.tooltip.local"
+                                   icon='{createImageIcon("local_vs_local.png")}'
+                                   onActionPerformed='selectTab("modelSynchLocal")'/>
+                    <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' mnemonic="R"
+                                   icon='{createImageIcon("remote_vs_remote.png")}'
+                                   toolTipText="lutinvcs.tabs.diff.tooltip.remote"
+                                   onActionPerformed='selectTab("modelSynchRemote")'/>
+
+
+                    <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-previous.png")}' onActionPerformed='gotoPreviousDiff()'/>
+
+                    <JButton id='refresh' toolTipText="lutinvcs.action.tooltip.refresh"
+                             icon='{createImageIcon("autoRefresh.png")}'
+                             onActionPerformed='doAction(VCSAction.REFRESH)'/>
+
+                    <JButton id='update' toolTipText="lutinvcs.action.tooltip.update"
+                             icon='{createImageIcon("update.png")}'
+                             onActionPerformed='doAction(VCSAction.UPDATE)'/>
+
+                    <JButton id='commit' toolTipText="lutinvcs.action.tooltip.commit"
+                             icon='{createImageIcon("commit.png")}'
+                             onActionPerformed='doAction(VCSAction.COMMIT)'/>
+
+                    <JButton id='revert' toolTipText="lutinvcs.action.tooltip.revert"
+                             icon='{createImageIcon("rollback.png")}'
+                             onActionPerformed='doAction(VCSAction.REVERT)'/>
+
+                    <JButton id='delete' toolTipText="lutinvcs.action.tooltip.delete"
+                             icon='{createImageIcon("remove.png")}'
+                             onActionPerformed='doAction(VCSAction.DELETE)'/>
+                </JToolBar>
+            </cell>
+        </row>
+        <row fill='both'>
+            <cell fill='both' weighty='1' weightx='2'>
+                <JPanel id='preview' layout='{cardLayout}'>
+                    <JScrollPane id='allContent' styleClass='diffScroll' constraints='"modelSynchAll"'>
+                        <JTable id="modelDiffAllTable" styleClass='diffTable'
+                                onMouseClicked="selectFile(modelDiffAllTable)"/>
+                    </JScrollPane>
+                    <JScrollPane id='localContent' styleClass='diffScroll' constraints='"modelSynchLocal"'>
+                        <JTable id="modelDiffLocalTable" styleClass='diffTable'
+                                onMouseClicked="selectFile(modelDiffLocalTable)"/>
+                    </JScrollPane>
+                    <JScrollPane id='remoteContent' styleClass='diffScroll' constraints='"modelSynchRemote"'
+                                 onMouseClicked="selectFile(modelDiffRemoteTable)">
+                        <JTable id="modelDiffRemoteTable" styleClass='diffTable'/>
+                    </JScrollPane>
+                </JPanel>
+            </cell>
+        </row>
+        <!--row>
+            <cell fill='both'>
+                <JToolBar>
+                    <Table insets='0,0,0,0'>
+                        <row fill='both' anchor='west'>
+                            <cell fill='both' weightx='2'>
+                                <JLabel id="label"/>
+                            </cell>
+                        </row>
+                        <row fill='both' anchor='east'>
+                            <cell fill='both'>
+                                <JProgressBar id="progress"/>
+                            </cell>
+                        </row>
+                    </Table>
+                </JToolBar>
+            </cell>
+        </row-->
+    </Table>
+</JDialog>

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx	2008-04-03 17:01:51 UTC (rev 306)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx	2008-04-03 17:02:06 UTC (rev 307)
@@ -18,9 +18,8 @@
         @Override
         public void setVisible(boolean b) {
         if (getHandler().getModel().getTabModel() == null) {
-        getHandler().init();
         // first launch, no tab model selected,choose one
-        selectTab(VCSUIConstants.ALL_MODEL_PROPERTY);
+        selectTab(VCSUIConstants.SYNCH_ALL_MODEL_PROPERTY);
         }
         super.setVisible(b);
         }
@@ -47,8 +46,7 @@
 
         Action quitAction;
         JRootPane rootPane = ui.getRootPane();
-        rootPane.setDefaultButton(quit);
-        quitAction = new AbstractAction(quit.getText()) {
+        quitAction = new AbstractAction("quit") {
         private static final long serialVersionUID = -869095664995763057L;
         public void actionPerformed(ActionEvent e) {
         ui.dispose();
@@ -121,11 +119,11 @@
                 </JPanel>
             </cell>
         </row>
-        <row>
+        <!--row>
             <cell fill='both'>
                 <JButton id='quit' text='lutinvcs.quit' action='{quitAction}'/>
             </cell>
-        </row>
+        </row-->
         <!--row>
             <cell fill='both'>
                 <JToolBar>

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx
===================================================================
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx	2008-04-03 17:01:51 UTC (rev 306)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx	2008-04-03 17:02:06 UTC (rev 307)
@@ -1,4 +1,4 @@
-<JPopupMenu enabled='false'>
+<JPopupMenu>
     <script>
         import org.codelutin.vcs.VCSAction;
         import org.codelutin.vcs.ui.action.VCSAbsractAction;
@@ -14,17 +14,23 @@
         ActionEvent e = new ActionEvent( item,1,action.name());
         dispatchAction.actionPerformed(e);
         }
+        add(refresh);
+        add(diff);
+        add(update);
+        add(commit);
+        add(revert);
+        add(delete);
     </script>
-    <JMenuItem id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh"
+    <JMenuItem id='refresh' text='{_("lutinvcs.action.refresh")}' toolTipText='{_("lutinvcs.action.tooltip.refresh")}'
                icon='{createImageIcon("autoRefresh.png")}' onActionPerformed='doAction(VCSAction.REFRESH,refresh)'/>
-    <JMenuItem id='diff' text="lutinvcs.action.diff" toolTipText="lutinvcs.action.tooltip.diff"
+    <JMenuItem id='diff' text='{_("lutinvcs.action.diff")}' toolTipText='{_("lutinvcs.action.tooltip.diff")}'
                icon='{createImageIcon("diff.png")}' onActionPerformed='doAction(VCSAction.DIFF,diff)'/>
-    <JMenuItem id='update' text="lutinvcs.action.update" toolTipText="lutinvcs.action.tooltip.update"
+    <JMenuItem id='update' text='{_("lutinvcs.action.update")}' toolTipText='{_("lutinvcs.action.tooltip.update")}'
                icon='{createImageIcon("update.png")}' onActionPerformed='doAction(VCSAction.UPDATE,update)'/>
-    <JMenuItem id='commit' text="lutinvcs.action.commit" toolTipText="lutinvcs.action.tooltip.commit"
+    <JMenuItem id='commit' text='{_("lutinvcs.action.commit")}' toolTipText='{_("lutinvcs.action.tooltip.commit")}'
                icon='{createImageIcon("commit.png")}' onActionPerformed='doAction(VCSAction.COMMIT,commit)'/>
-    <JMenuItem id='revert' text="lutinvcs.action.revert" toolTipText="lutinvcs.action.tooltip.revert"
+    <JMenuItem id='revert' text='{_("lutinvcs.action.revert")}' toolTipText='{_("lutinvcs.action.tooltip.revert")}'
                icon='{createImageIcon("rollback.png")}' onActionPerformed='doAction(VCSAction.REVERT,revert)'/>
-    <JMenuItem id='delete' text="lutinvcs.action.delete" toolTipText="lutinvcs.action.tooltip.delete"
+    <JMenuItem id='delete' text='{_("lutinvcs.action.delete")}' toolTipText='{_("lutinvcs.action.tooltip.delete")}'
                icon='{createImageIcon("remove.png")}' onActionPerformed='doAction(VCSAction.DELETE,delete)'/>
-</JPopupMenu>
+</JPopupMenu>
\ 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-03 17:01:51 UTC (rev 306)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css	2008-04-03 17:02:06 UTC (rev 307)
@@ -42,7 +42,6 @@
 }
 
 ;
-
 }
 
 .updateScroll {

    

[Buix-commits] r307 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui

tchemit＠users.labs.libre-entreprise.org