Author: tchemit Date: 2008-01-20 22:07:42 +0000 (Sun, 20 Jan 2008) New Revision: 298 Added: trunk/simexplorer-is-swing/src/resources/icons/action/ trunk/simexplorer-is-swing/src/resources/icons/action/about.png trunk/simexplorer-is-swing/src/resources/icons/action/closeTab.png trunk/simexplorer-is-swing/src/resources/icons/action/config.png trunk/simexplorer-is-swing/src/resources/icons/action/exit.png trunk/simexplorer-is-swing/src/resources/icons/action/help.png trunk/simexplorer-is-swing/src/resources/icons/action/quit.png trunk/simexplorer-is-swing/src/resources/icons/action/reload.png trunk/simexplorer-is-swing/src/resources/icons/action/site.png trunk/simexplorer-is-swing/src/resources/icons/action/synch.png trunk/simexplorer-is-swing/src/resources/icons/action/translate.png Removed: trunk/simexplorer-is-swing/src/resources/icons/closeTab.png trunk/simexplorer-is-swing/src/resources/icons/exit.png trunk/simexplorer-is-swing/src/resources/icons/help.png trunk/simexplorer-is-swing/src/resources/icons/info.png trunk/simexplorer-is-swing/src/resources/icons/preferences.png trunk/simexplorer-is-swing/src/resources/icons/quit.png trunk/simexplorer-is-swing/src/resources/icons/site.png trunk/simexplorer-is-swing/src/resources/icons/synch.png trunk/simexplorer-is-swing/src/resources/icons/translate.png Modified: trunk/simexplorer-is-swing/src/resources/actions.properties trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: utilisation d'actions concrete (m?\195?\170me si elles sont g?\195?\169n?\195?\169riques) afin de pouvoir positionner l'annotation de config sur toutes les actions de l'appli (sinon on doit mettre les clef dans jaxx + icones + mnemonic+...) creation rep action (dans icones pour les icones d?\195?\169j?\195?\160 utilis?\195?\169s) Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-20 22:05:51 UTC (rev 297) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-20 22:07:42 UTC (rev 298) @@ -1,20 +1,20 @@ -#action.connect=fr.cemagref.simexplorer.is.ui.swing.action.auth.ConnectAction -#action.unconnect=fr.cemagref.simexplorer.is.ui.swing.action.auth.UnconnectAction -#action.listApplications=fr.cemagref.simexplorer.is.ui.swing.action.application.ListApplicationsAction +action.connect=fr.cemagref.simexplorer.is.ui.swing.action.auth.ConnectAction +action.unconnect=fr.cemagref.simexplorer.is.ui.swing.action.auth.UnconnectAction + action.quit=fr.cemagref.simexplorer.is.ui.swing.action.common.QuitAction -action.i18n_fr_FR=fr.cemagref.simexplorer.is.ui.swing.action.common.ChangeI18nAction -action.i18n_en_GB=fr.cemagref.simexplorer.is.ui.swing.action.common.ChangeI18nAction +action.i18n_fr_FR=fr.cemagref.simexplorer.is.ui.swing.action.common.ChangeI18nFRAction +action.i18n_en_GB=fr.cemagref.simexplorer.is.ui.swing.action.common.ChangeI18nGBAction action.closeTab_local=fr.cemagref.simexplorer.is.ui.swing.action.tab.CloseTabAction action.closeTab_remote=fr.cemagref.simexplorer.is.ui.swing.action.tab.CloseTabAction action.closeTab_detail=fr.cemagref.simexplorer.is.ui.swing.action.tab.CloseTabAction action.closeTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.action.tab.CloseTabAction -action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowTabAction -action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowTabAction -action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowTabAction -action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowTabAction +action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowLocalTabAction +action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowRemoteTabAction +action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowDetailTabAction +action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.action.tab.ShowSynchronizeTabAction action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.action.tab.ToggleTabAction action.toggleTab_remote=fr.cemagref.simexplorer.is.ui.swing.action.tab.ToggleTabAction @@ -32,9 +32,9 @@ action.importApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ImportApplicationAction action.launchSynchronize=fr.cemagref.simexplorer.is.ui.swing.action.application.LaunchSynchronizeAction -#action.groups=fr.cemagref.simexplorer.is.ui.swing.action.admin.GroupsAction -#action.users=fr.cemagref.simexplorer.is.ui.swing.action.admin.UsersAction +action.groups=fr.cemagref.simexplorer.is.ui.swing.action.admin.GroupsAction +action.users=fr.cemagref.simexplorer.is.ui.swing.action.admin.UsersAction -#action.site=fr.cemagref.simexplorer.is.ui.swing.action.common.SiteAction -#action.help=fr.cemagref.simexplorer.is.ui.swing.action.common.HelpAction -#action.about=fr.cemagref.simexplorer.is.ui.swing.action.common.AboutAction \ No newline at end of file +action.site=fr.cemagref.simexplorer.is.ui.swing.action.common.SiteAction +action.help=fr.cemagref.simexplorer.is.ui.swing.action.common.HelpAction +action.about=fr.cemagref.simexplorer.is.ui.swing.action.common.AboutAction \ No newline at end of file Copied: trunk/simexplorer-is-swing/src/resources/icons/action/about.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/info.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/about.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/closeTab.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/closeTab.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/closeTab.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/config.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/preferences.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/config.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/exit.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/exit.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/exit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/help.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/help.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/help.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/quit.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/quit.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/quit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/reload.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/reload.png) =================================================================== (Binary files differ) Copied: trunk/simexplorer-is-swing/src/resources/icons/action/site.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/site.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/site.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/synch.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/synch.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/synch.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/translate.png (from rev 285, trunk/simexplorer-is-swing/src/resources/icons/translate.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/translate.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/simexplorer-is-swing/src/resources/icons/closeTab.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/exit.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/help.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/info.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/preferences.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/quit.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/site.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/synch.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/translate.png =================================================================== (Binary files differ) Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-20 22:05:51 UTC (rev 297) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-20 22:07:42 UTC (rev 298) @@ -2,77 +2,40 @@ defaultCloseOperation='DISPOSE_ON_CLOSE' width='800' height='600'> <script> import static org.codelutin.i18n.I18n._; + import static fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon; </script> <JMenuBar> <!-- menu principal --> - <JMenu text='{_("simexplorer.main.menu")}'> - <JMenuItem id="connect" enabled='false' - text='{_("simexplorer.main.menu.connect")}' - toolTipText='{_("simexplorer.main.menu.connect.tooltip")}' - /> - <JMenuItem id="unconnect" enabled='false' - text='{_("simexplorer.main.menu.unconnect")}' - toolTipText='{_("simexplorer.main.menu.unconnect.tooltip")}' - /> + <JMenu text='{_("simexplorer.main.menu")}' mnemonic="{'M'}"> + <JMenuItem id="connect" enabled='false'/> + <JMenuItem id="unconnect" enabled='false'/> <JSeparator/> - <JMenuItem id="showTab_local" enabled='false' - text='{_("simexplorer.main.menu.show.local")}' - toolTipText='{_("simexplorer.main.menu.show.local.tooltip")}' - /> - <JMenuItem id="showTab_remote" enabled='false' - text='{_("simexplorer.main.menu.show.remote")}' - toolTipText='{_("simexplorer.main.menu.show.remote.tooltip")}' - /> - <JMenuItem id="showTab_synchronize" enabled='false' - text='{_("simexplorer.main.menu.synchronize")}' - toolTipText='{_("simexplorer.main.menu.synchronize.tooltip")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("synch.png")}'/> + <JMenuItem id="showTab_local" enabled='false' mnemonic="{'l'}"/> + <JMenuItem id="showTab_remote" enabled='false'/> + <JMenuItem id="showTab_synchronize" enabled='false'/> <JSeparator/> - <JMenuItem id="quit" enabled='false' - text='{_("simexplorer.main.menu.quit")}' - toolTipText='{_("simexplorer.main.menu.quit.tooltip")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("quit.png")}'/> + <JMenuItem id="quit" enabled='false' /> </JMenu> <!-- menu config --> - <JMenu text='{_("simexplorer.config.menu")}'> - <JMenu text='{_("simexplorer.config.i18n.menu")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("translate.png")}'> - <JMenuItem id="i18n_fr_FR" enabled='false' - text='{_("simexplorer.config.i18n.menu.fr")}' - toolTipText='{_("simexplorer.config.i18n.menu.fr.tooltip")}'/> - <JMenuItem id="i18n_en_GB" enabled='false' - text='{_("simexplorer.config.i18n.menu.en")}' - toolTipText='{_("simexplorer.config.i18n.menu.en.tooltip")}'/> + <JMenu text='{_("simexplorer.config.menu")}' mnemonic="{'C'}"> + <JMenu text='{_("simexplorer.config.i18n.menu")}' mnemonic="{'L'}" + icon='{createImageIcon("action/translate.png")}'> + <JMenuItem id="i18n_fr_FR" enabled='false'/> + <JMenuItem id="i18n_en_GB" enabled='false'/> </JMenu> - <JMenuItem id="config" enabled='false' - text='{_("simexplorer.config.menu.config")}' - toolTipText='{_("simexplorer.config.menu.config.tooltip")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("preferences.png")}'/> + <JMenuItem id="config" enabled='false'/> </JMenu> <!-- menu admin --> - <JMenu text='{_("simexplorer.admin.menu")}'> - <JMenuItem id="groups" enabled='false' - text='{_("simexplorer.admin.menu.groups")}' - toolTipText='{_("simexplorer.admin.menu.groups.tooltip")}'/> - <JMenuItem id="users" enabled='false' - text='{_("simexplorer.admin.menu.users")}' - toolTipText='{_("simexplorer.admin.menu.users.tooltip")}'/> + <JMenu text='{_("simexplorer.admin.menu")}' mnemonic="{'A'}"> + <JMenuItem id="groups" enabled='false'/> + <JMenuItem id="users" enabled='false'/> </JMenu> <!-- menu aide --> - <JMenu text='{_("simexplorer.help.menu")}'> - <JMenuItem id="help" enabled='false' - text='{_("simexplorer.help.menu.help")}' - toolTipText='{_("simexplorer.help.menu.help.tooltip")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("help.png")}'/> - <JMenuItem id="site" enabled='false' - text='{_("simexplorer.help.menu.site")}' - toolTipText='{_("simexplorer.help.menu.site.tooltip")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("site.png")}'/> - <JMenuItem id="about" enabled='false' - text='{_("simexplorer.help.menu.about")}' - toolTipText='{_("simexplorer.help.menu.about.tooltip")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("info.png")}'/> + <JMenu text='{_("simexplorer.help.menu")}' mnemonic="{'e'}"> + <JMenuItem id="help" enabled='false'/> + <JMenuItem id="site" enabled='false'/> + <JMenuItem id="about" enabled='false'/> </JMenu> </JMenuBar>