January 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r304 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 22:42:45 +0000 (Sun, 20 Jan 2008) New Revision: 304 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: changement mnemonic 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:12:19 UTC (rev 303) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-20 22:42:45 UTC (rev 304) @@ -27,7 +27,7 @@ <JMenuItem id="config" enabled='false'/> </JMenu>  - <JMenu text='{_("simexplorer.admin.menu")}' mnemonic="{'A'}"> + <JMenu text='{_("simexplorer.admin.menu")}' mnemonic="{'d'}"> <JMenuItem id="groups" enabled='false'/> <JMenuItem id="users" enabled='false'/> </JMenu>

1 0

r303 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action: admin tab
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 22:12:19 +0000 (Sun, 20 Jan 2008) New Revision: 303 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleTabAction.java Log: utilisation ActionConfig pour configurer les actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-20 22:11:21 UTC (rev 302) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -19,12 +19,24 @@ package fr.cemagref.simexplorer.is.ui.swing.action.admin; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour afficher la page de gestion des groupes d'utilisateurs * * @author chemit */ + at ActionConfig( + actionCommand = "groups", + container = SimExplorerUI.class, + name = "simexplorer.action.groups", + shortDescription = "simexplorer.action.groups.tooltip", + longDescription = "simexplorer.action.groups.help", + //smallIcon = "action/groups.png", + mnemonic = 'G', + hideActionText = false +) public class GroupsAction extends SimExplorerAbstractAction { private static final long serialVersionUID = 42756519520713299L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java 2008-01-20 22:11:21 UTC (rev 302) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -19,12 +19,24 @@ package fr.cemagref.simexplorer.is.ui.swing.action.admin; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour voir la gestion des utilisateurs * * @author chemit */ + at ActionConfig( + actionCommand = "users", + container = SimExplorerUI.class, + name = "simexplorer.action.users", + shortDescription = "simexplorer.action.users.tooltip", + longDescription = "simexplorer.action.users.help", + //smallIcon = "action/users.png", + mnemonic = 'U', + hideActionText = false +) public class UsersAction extends SimExplorerAbstractAction { private static final long serialVersionUID = -8183522709906575547L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-20 22:11:21 UTC (rev 302) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -19,13 +19,14 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; /** * Action pour fermer un tab * * @author chemit */ - at fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig( + at ActionConfig( actionCommand = "closeTab", container = fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader.class, name = "simexplorer.action.closeTab", Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -0,0 +1,46 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.action.tab; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; + +/** + * Action pour afficher le tab local + * + * @author chemit + */ + at ActionConfig( + actionCommand = "showtag_detail", + container = SimExplorerUI.class, + name = "simexplorer.action.show.detail", + shortDescription = "simexplorer.action.show.detail.tooltip", + longDescription = "simexplorer.action.show.detail.help", + smallIcon = "action/synch.png", + hideActionText = false +) +public class ShowDetailTabAction extends ShowTabAction { + + private static final long serialVersionUID = -5349479338237813002L; + + public ShowDetailTabAction(String name) { + super(name); + } + +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -0,0 +1,71 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.action.tab; + +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; + +/** + * Action pour afficher le tab local + * + * @author chemit + */ + at ActionConfig( + actionCommand = "showtag_local", + container = SimExplorerUI.class, + name = "simexplorer.action.show.local", + shortDescription = "simexplorer.action.show.local.tooltip", + longDescription = "simexplorer.action.show.local.help", + //smallIcon = "action/local.png", + mnemonic='A', + hideActionText = false +) +public class ShowLocalTabAction extends ShowTabAction { + + private static final long serialVersionUID = -5349479338237813002L; + + public ShowLocalTabAction(String name) { + super(name); + } + + @Override + protected void initAction() { + super.initAction(); + StorageService service; + + ListApplicationBean list; + if (getContext().getLocalApplications() == null) { + + service = SimExplorer.getStorageService(); + + // first local query, + list = new ListApplicationBean(); + try { + long size = service.findApplicationsCount(true); + + + } catch (Exception e) { + e.printStackTrace(); + } + } + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -0,0 +1,64 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.action.tab; + +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; + +/** + * Action pour afficher le tab local + * + * @author chemit + */ + at ActionConfig( + actionCommand = "showtag_remote", + container = SimExplorerUI.class, + name = "simexplorer.action.show.remote", + shortDescription = "simexplorer.action.show.remote.tooltip", + longDescription = "simexplorer.action.show.remote.help", + //smallIcon = "action/remote.png", + mnemonic='p', + hideActionText = false +) +public class ShowRemoteTabAction extends ShowTabAction { + + private static final long serialVersionUID = -5349479338237813002L; + + public ShowRemoteTabAction(String name) { + super(name); + } + + @Override + protected void initAction() { + super.initAction(); + StorageService service; + + ListApplicationBean list; + if (getContext().getRemoteApplications() == null) { + // first remote query, + service = SimExplorer.getRemoteStorageService(); + + list = new ListApplicationBean(); + + } + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -0,0 +1,47 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.action.tab; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; + +/** + * Action pour afficher le tab de synchronisation + * + * @author chemit + */ + at ActionConfig( + actionCommand = "showtag_synchronize", + container = SimExplorerUI.class, + name = "simexplorer.action.show.synchronize", + shortDescription = "simexplorer.action.show.synchronize.tooltip", + longDescription = "simexplorer.action.show.synchronize.help", + smallIcon = "action/reload.png", + mnemonic='S', + hideActionText = false +) +public class ShowSynchronizeTabAction extends ShowTabAction { + + private static final long serialVersionUID = -5349479338237813002L; + + public ShowSynchronizeTabAction(String name) { + super(name); + } + +} Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowTabAction.java 2008-01-20 22:11:21 UTC (rev 302) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowTabAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -18,10 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; -import fr.cemagref.simexplorer.is.ui.SimExplorer; -import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; import java.awt.event.ActionEvent; @@ -34,7 +31,7 @@ private static final long serialVersionUID = -4030583314708934811L; - public ShowTabAction(String name) { + protected ShowTabAction(String name) { super(name, "showTab"); } @@ -47,47 +44,14 @@ super.actionPerformed(e); // set model - + afterAction(); } - public void initAction() { + protected void afterAction() { - StorageService service; + } - ListApplicationBean list; - switch (tab) { + protected void initAction() { - case detail: - - break; - case local: - if (getContext().getLocalApplications() == null) { - - service = SimExplorer.getStorageService(); - - // first local query, - list = new ListApplicationBean(); - try { - long size = service.findApplicationsCount(true); - - - } catch (Exception e) { - e.printStackTrace(); - } - } - break; - case remote: - if (getContext().getRemoteApplications() == null) { - // first remote query, - service = SimExplorer.getRemoteStorageService(); - - list = new ListApplicationBean(); - - } - break; - case synchronize: - - break; - } } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleTabAction.java 2008-01-20 22:11:21 UTC (rev 302) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ToggleTabAction.java 2008-01-20 22:12:19 UTC (rev 303) @@ -19,6 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.toolbar.JSimExplorerToolbar; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import java.awt.event.ActionEvent; @@ -27,6 +29,11 @@ * * @author chemit */ + at ActionConfig( + actionCommand = "toggleTab", + container = JSimExplorerToolbar.class, + hideActionText = false +) public class ToggleTabAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -5457476021698351850L;

1 0

r302 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action: application auth common
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 22:11:21 +0000 (Sun, 20 Jan 2008) New Revision: 302 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/AboutAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/HelpAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/SiteAction.java Log: utilisation ActionConfig pour configurer les actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -19,12 +19,23 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pouyr lancer la synchro * * @author tony */ + at ActionConfig( + actionCommand = "quit", + container = SimExplorerUI.class, + name = "simexplorer.action.synchronize", + shortDescription = "simexplorer.action.synchronize.tooltip", + longDescription = "simexplorer.action.synchronize.help", + smallIcon = "action/reload.png", + hideActionText = false +) public class LaunchSynchronizeAction extends SimExplorerAbstractAction { private static final long serialVersionUID = 8379937369551031306L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -18,13 +18,25 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.auth; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; /** * Action de connexion au serveur distant * * @author chemit */ + at ActionConfig( + actionCommand = "connect", + container = SimExplorerUI.class, + name = "simexplorer.action.connect", + shortDescription = "simexplorer.action.connect.tooltip", + longDescription = "simexplorer.action.connect.help", + //smallIcon = "action/connect.png", + mnemonic='C', + hideActionText = false +) public class ConnectAction extends SimExplorerAbstractAction { private static final long serialVersionUID = -6172528731543675359L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -19,12 +19,24 @@ package fr.cemagref.simexplorer.is.ui.swing.action.auth; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour se deconnecter du serveur distant * * @author chemit */ + at ActionConfig( + actionCommand = "unconnect", + container = SimExplorerUI.class, + name = "simexplorer.action.unconnect", + shortDescription = "simexplorer.action.unconnect.tooltip", + longDescription = "simexplorer.action.unconnect.help", + mnemonic='n', + //smallIcon = "action/unconnect.png", + hideActionText = false +) public class UnconnectAction extends SimExplorerAbstractAction { private static final long serialVersionUID = 2248642521834932196L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/AboutAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/AboutAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/AboutAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -19,12 +19,24 @@ package fr.cemagref.simexplorer.is.ui.swing.action.common; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour afficher la boit de dialogue About de l'application * * @author chemit */ + at ActionConfig( + actionCommand = "about", + container = SimExplorerUI.class, + name = "simexplorer.action.about", + shortDescription = "simexplorer.action.about.tooltip", + longDescription = "simexplorer.action.about.help", + smallIcon = "action/about.png", + mnemonic = 'A', + hideActionText = false +) public class AboutAction extends SimExplorerAbstractAction { private static final long serialVersionUID = 8275852970637350877L; Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -0,0 +1,41 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.action.common; + +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; + +/** @author chemit */ + at ActionConfig( + actionCommand = "i18n_fr_FR", + container = SimExplorerUI.class, + name = "simexplorer.action.i18n.fr", + shortDescription = "simexplorer.action.i18n.fr.tooltip", + longDescription = "simexplorer.action.i18n.fr.help", + mnemonic='F', + //smallIcon = "action/i18n.fr.png", + hideActionText = false +) +public class ChangeI18nFRAction extends ChangeI18nAction { + private static final long serialVersionUID = 7616779035801280791L; + + public ChangeI18nFRAction(String name) { + super(name); + } +} Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -0,0 +1,41 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.action.common; + +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; + +/** @author chemit */ + at ActionConfig( + actionCommand = "i18n_en_GB", + container = SimExplorerUI.class, + name = "simexplorer.action.i18n.en", + shortDescription = "simexplorer.action.i18n.en.tooltip", + longDescription = "simexplorer.action.i18n.en.help", + mnemonic='n', + //smallIcon = "action/i18n-en.png", + hideActionText = false +) +public class ChangeI18nGBAction extends ChangeI18nAction { + private static final long serialVersionUID = 7616779035801280791L; + + public ChangeI18nGBAction(String name) { + super(name); + } +} \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -19,6 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing.action.common; import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; import org.codelutin.option.ui.ConfigTableModel; @@ -27,6 +29,16 @@ * * @author chemit */ + at ActionConfig( + actionCommand = "config", + container = SimExplorerUI.class, + name = "simexplorer.action.config", + shortDescription = "simexplorer.action.config.tooltip", + longDescription = "simexplorer.action.config.help", + smallIcon = "action/config.png", + mnemonic = 'P', + hideActionText = false +) public class ConfigAction extends SimExplorerAbstractAction { private static final long serialVersionUID = 1449553547444065616L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/HelpAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/HelpAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/HelpAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -19,12 +19,24 @@ package fr.cemagref.simexplorer.is.ui.swing.action.common; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour afficher l'aide principale * * @author chemit */ + at ActionConfig( + actionCommand = "help", + container = SimExplorerUI.class, + name = "simexplorer.action.help", + shortDescription = "simexplorer.action.help.tooltip", + longDescription = "simexplorer.action.help.help", + smallIcon = "action/help.png", + mnemonic = 'e', + hideActionText = false +) public class HelpAction extends SimExplorerAbstractAction { private static final long serialVersionUID = 8250247303366300958L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -19,12 +19,24 @@ package fr.cemagref.simexplorer.is.ui.swing.action.common; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour quitter l'application * * @author chemit */ + at ActionConfig( + actionCommand = "quit", + container = SimExplorerUI.class, + name = "simexplorer.action.quit", + shortDescription = "simexplorer.action.quit.tooltip", + longDescription = "simexplorer.action.quit.help", + smallIcon = "action/quit.png", + mnemonic = 'Q', + hideActionText = false +) public class QuitAction extends SimExplorerAbstractAction { private static final long serialVersionUID = -2291089937320691627L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/SiteAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/SiteAction.java 2008-01-20 22:09:46 UTC (rev 301) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/SiteAction.java 2008-01-20 22:11:21 UTC (rev 302) @@ -19,12 +19,24 @@ package fr.cemagref.simexplorer.is.ui.swing.action.common; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour accéder au site de l'application * * @author chemit */ + at ActionConfig( + actionCommand = "site", + container = SimExplorerUI.class, + name = "simexplorer.action.site", + shortDescription = "simexplorer.action.site.tooltip", + longDescription = "simexplorer.action.site.help", + smallIcon = "action/site.png", + mnemonic = 'S', + hideActionText = false +) public class SiteAction extends SimExplorerAbstractAction { private static final long serialVersionUID = 7458557977976803799L;

1 0

r301 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 22:09:46 +0000 (Sun, 20 Jan 2008) New Revision: 301 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: extraction interface pour marquer les actions de type lookup Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java 2008-01-20 22:09:46 UTC (rev 301) @@ -0,0 +1,24 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.action; + +/** @author chemit */ +public interface ActionParameter { + String getParam(); +} Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-20 22:09:09 UTC (rev 300) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-20 22:09:46 UTC (rev 301) @@ -34,7 +34,7 @@ * * @author chemit */ -public class SimExplorerAbstractTabAction extends SimExplorerAbstractAction { +public class SimExplorerAbstractTabAction extends SimExplorerAbstractAction implements ActionParameter { protected SimExplorerTabManager.Tab tab; @@ -44,6 +44,7 @@ private static final long serialVersionUID = 5285229914266682509L; + protected String param; protected SimExplorerAbstractTabAction(String name, String prefixPatternName) { super(name); @@ -53,8 +54,9 @@ if (!matcher.matches()) { throw new IllegalArgumentException(I18n._("{0} should have a name like this {1}, but was {2}", getClass().getName(), patternName, name)); } + param = matcher.group(1); Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTabManager.Tab.class); - tab = (SimExplorerTabManager.Tab) convertorLanguage.convert(SimExplorerTabManager.Tab.class, matcher.group(1)); + tab = (SimExplorerTabManager.Tab) convertorLanguage.convert(SimExplorerTabManager.Tab.class, param); } @Override @@ -80,4 +82,7 @@ return method; } + public String getParam() { + return param; + } }

1 0

r300 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 22:09:09 +0000 (Sun, 20 Jan 2008) New Revision: 300 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java Log: am?\195?\169lioration init des actions (on peut soit utiliser les ActionConfig, soit les attributs du component parent) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-20 22:08:05 UTC (rev 299) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-20 22:09:09 UTC (rev 300) @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.i18n.I18n; import javax.swing.AbstractButton; import javax.swing.Action; @@ -38,7 +37,7 @@ * La classe responsable de l'enregistrement des actions disponibles * dans l'application ({@link #init()} . * <p/> - * C'est aussi une usine d'actions ({@link #newAction(String)} . + * C'est aussi une usine d'actions ({@link #newAction(String,javax.swing.AbstractButton)} . * <p/> * On peut de plus via la méthode {@link #loadActions(JAXXObject)} de charger * dans l'ui les actions connues. @@ -57,55 +56,6 @@ static Map<String, Class<? extends SimExplorerAbstractAction>> impls; - /** - * @param actionKey le nom de l'action tel que définie dans le fichier - * de mapping (sans le prefix action.) - * @return une nouvelle instance de l'action associée à sa clef. - */ - public static SimExplorerAbstractAction newAction(String actionKey) { - - // on vérifie que l'action existe bien - checkRegistredAction(actionKey); - - // on récupère la classe d'implantation de l'action - Class<? extends SimExplorerAbstractAction> klazz = impls.get(actionKey); - - - try { - SimExplorerAbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); - result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - - log.debug(actionKey + " : " + result); - // recherche de l'annotation de configuration - ActionConfig anno = klazz.getAnnotation(ActionConfig.class); - if (anno != null) { - // inject les données - if (!anno.name().isEmpty()) { - result.putValue(Action.NAME, I18n._(anno.name())); - } - //if (!anno.shortDescription().isEmpty()) { - result.putValue(Action.SHORT_DESCRIPTION, I18n._(anno.shortDescription())); - //} - if (!anno.smallIcon().isEmpty()) { - result.putValue(Action.SMALL_ICON, fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon(anno.smallIcon())); - } - if (anno.mnemonic() != '\0') { - result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); - } - result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); - result.putValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY, anno.displayedMnemonicIndex()); - - result.putValue("hideActionText", anno.hideActionText()); - result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(anno.enabled()); - - } - return result; - } catch (Exception e) { - throw new SimExplorerRuntimeException(e); - } - } - @SuppressWarnings({"unchecked"}) public static void init() { if (impls == null) { @@ -150,19 +100,84 @@ continue; } AbstractButton component = (AbstractButton) comp; - SimExplorerAbstractAction action = newAction(actionKey); - //String text = component.getText(); - //String tooltip = component.getToolTipText(); - //Icon icon = component.getIcon(); + + SimExplorerAbstractAction action = newAction(actionKey, component); + component.setAction(action); + Boolean value = (Boolean) action.getValue("hideActionText"); - if (value != null && value) { - component.setHideActionText(true); + + component.setHideActionText(value != null && value); + } + } + + /** + * @param actionKey le nom de l'action tel que définie dans le fichier + * de mapping (sans le prefix action.) + * @param component le button où rattacher l'action + * @return une nouvelle instance de l'action associée à sa clef. + */ + public static SimExplorerAbstractAction newAction(String actionKey, AbstractButton component) { + + // on vérifie que l'action existe bien + checkRegistredAction(actionKey); + + // on récupère la classe d'implantation de l'action + Class<? extends SimExplorerAbstractAction> klazz = impls.get(actionKey); + + + try { + SimExplorerAbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + //result.putValue(Action.ACTION_COMMAND_KEY, actionKey); + + log.debug(actionKey + " : " + result); + // recherche de l'annotation de configuration + ActionConfig anno = klazz.getAnnotation(ActionConfig.class); + if (anno != null) { + // inject les données + if (!anno.name().isEmpty()) { + System.out.println("found action with name : " + anno.name()); + result.putValue(Action.NAME, _(anno.name())); + } + //if (!anno.shortDescription().isEmpty()) { + result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); + //} + if (!anno.smallIcon().isEmpty()) { + result.putValue(Action.SMALL_ICON, fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon(anno.smallIcon())); + } + if (anno.mnemonic() != '\0') { + result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); + } else if (component!=null) { + result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); + } + //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); + + + result.putValue("hideActionText", anno.hideActionText()); + result.putValue(Action.SELECTED_KEY, anno.selected()); + result.setEnabled(anno.enabled()); + } else { + if (component != null) { + result.putValue(Action.SHORT_DESCRIPTION, component.getToolTipText()); + result.putValue(Action.SMALL_ICON, component.getIcon()); + result.putValue(Action.ACTION_COMMAND_KEY, component.getName()); + result.putValue(Action.NAME, component.getText()); + result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); + result.putValue("hideActionText", component.getHideActionText()); + } } - //component.setText(text); - //component.setToolTipText(tooltip); - //component.setIcon(icon); - //component.setEnabled(true); + String text = (String) result.getValue(Action.NAME); + Integer mnemo = (Integer) result.getValue(Action.MNEMONIC_KEY); + if (mnemo!=null && mnemo != '\0') { + int pos = text.indexOf((char)mnemo.intValue()); + if (pos==-1) { + pos = text.indexOf(Character.toLowerCase((char)mnemo.intValue())); + } + result.putValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY, pos); + } + return result; + } catch (Exception e) { + throw new SimExplorerRuntimeException(e); } }

1 0

r299 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 22:08:05 +0000 (Sun, 20 Jan 2008) New Revision: 299 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: i18n apr?\195?\168s utilisation ActionConfig Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 22:07:42 UTC (rev 298) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 22:08:05 UTC (rev 299) @@ -1,24 +1,48 @@ -#Sun Jan 20 18:41:29 GMT 2008 +#Sun Jan 20 22:02:45 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = +simexplorer.action.about=About +simexplorer.action.about.help= +simexplorer.action.about.tooltip=Show About dialog simexplorer.action.advancedSearch=Advanced search simexplorer.action.advancedSearch.tooltip=Show advanced search dialog simexplorer.action.closeTab=close simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=close the tab simexplorer.action.collapseAll.tooltip=Collapse all nodes +simexplorer.action.config=Preferences +simexplorer.action.config.help= +simexplorer.action.config.tooltip=Display the configuration modifier UI +simexplorer.action.connect=Connect +simexplorer.action.connect.help= +simexplorer.action.connect.tooltip=Connect to remote server simexplorer.action.expandAll.tooltip=Expand all nodes simexplorer.action.exportApplication=export simexplorer.action.exportApplication.tooltip=Export application +simexplorer.action.groups=Groups +simexplorer.action.groups.help= +simexplorer.action.groups.tooltip=Show Groups admin screen +simexplorer.action.help=Help +simexplorer.action.help.help= +simexplorer.action.help.tooltip=Show help dialog simexplorer.action.hideLocal=hide Local applications simexplorer.action.hideLocal.tooltip=Hide the list of local applications simexplorer.action.hideRemote=hide remote applications simexplorer.action.hideRemote.tooltip=Hide the list of remote applications simexplorer.action.hideSynchonize=hide Synchronize simexplorer.action.hideSynchonize.tooltip=Hide Synchronize screen +simexplorer.action.i18n.en=English +simexplorer.action.i18n.en.help= +simexplorer.action.i18n.en.tooltip=Change to english language +simexplorer.action.i18n.fr=French +simexplorer.action.i18n.fr.help= +simexplorer.action.i18n.fr.tooltip=Change to french language simexplorer.action.importApplication=import simexplorer.action.importApplication.tooltip=Import application +simexplorer.action.quit=Quit +simexplorer.action.quit.help= +simexplorer.action.quit.tooltip=Quit SimExplorer SI simexplorer.action.refresh=refresh simexplorer.action.refresh.tooltip=Refresh simexplorer.action.resetSearch=reset @@ -27,17 +51,37 @@ simexplorer.action.search.tooltip=Launch search simexplorer.action.searchText=Search simexplorer.action.searchText.tooltip=Text to search in applications +simexplorer.action.show.detail=Application detail +simexplorer.action.show.detail.help= +simexplorer.action.show.detail.tooltip=show Detail of Application +simexplorer.action.show.local=Applications (local) +simexplorer.action.show.local.help= +simexplorer.action.show.local.tooltip=Show the list of local applications +simexplorer.action.show.remote=Applications (remote) +simexplorer.action.show.remote.help= +simexplorer.action.show.remote.tooltip=Show the list of remote applications +simexplorer.action.show.synchronize=Synchronize +simexplorer.action.show.synchronize.help= +simexplorer.action.show.synchronize.tooltip=Show synchronize screen simexplorer.action.showLocal=show local Applications simexplorer.action.showLocal.tooltip=Show the list of local applications simexplorer.action.showRemote=show remote Applications simexplorer.action.showRemote.tooltip=Show the list of local applications simexplorer.action.showSynchonize=show Synchronize simexplorer.action.showSynchonize.tooltip=Show the synchronize screen +simexplorer.action.site=Site +simexplorer.action.site.help= +simexplorer.action.site.tooltip=Go to SimExplorer SI site +simexplorer.action.synchronize=Synchronize +simexplorer.action.synchronize.help= +simexplorer.action.synchronize.tooltip=Launch synchronization +simexplorer.action.unconnect=Unconnect +simexplorer.action.unconnect.help= +simexplorer.action.unconnect.tooltip=Disconnect from remote server +simexplorer.action.users=Users +simexplorer.action.users.help= +simexplorer.action.users.tooltip=Show Users admin screen simexplorer.admin.menu=Admin -simexplorer.admin.menu.groups=Groups -simexplorer.admin.menu.groups.tooltip=Show Groups admin screen -simexplorer.admin.menu.users=Users -simexplorer.admin.menu.users.tooltip=Show Users admin screen simexplorer.change.config.property= simexplorer.common.cancel=cancel simexplorer.common.create.date=creation date @@ -48,11 +92,7 @@ simexplorer.common.type=type simexplorer.common.uuid=uuid simexplorer.common.version=version -simexplorer.config.i18n.menu=I18n -simexplorer.config.i18n.menu.en=English -simexplorer.config.i18n.menu.en.tooltip=Change to english language -simexplorer.config.i18n.menu.fr=French -simexplorer.config.i18n.menu.fr.tooltip=Change to french language +simexplorer.config.i18n.menu=Language simexplorer.config.main.backupDirectory.description=Directory to put all SimExplorer backup files simexplorer.config.main.baseDirectory.description=Directory of the local databse of SimExplorer simexplorer.config.main.configFileName.description=The path of the configuration file @@ -70,30 +110,10 @@ simexplorer.config.main.userMail.description=User email adress simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration -simexplorer.config.menu.config=Preferences -simexplorer.config.menu.config.tooltip=Display the configuration modifier UI simexplorer.config.title=SimExplorer SI configuration modifier simexplorer.error.unfound.config.property= simexplorer.help.menu=Help -simexplorer.help.menu.about=About -simexplorer.help.menu.about.tooltip=Show About dialog -simexplorer.help.menu.help=Get help -simexplorer.help.menu.help.tooltip=Show help dialog -simexplorer.help.menu.site=Go to site -simexplorer.help.menu.site.tooltip=Go to SimExplorer SI site simexplorer.main.menu=Main -simexplorer.main.menu.connect=Connect -simexplorer.main.menu.connect.tooltip=Connect to remote server -simexplorer.main.menu.quit=Quit -simexplorer.main.menu.quit.tooltip=Quit SimExplorer SI -simexplorer.main.menu.show.local=show local Applications -simexplorer.main.menu.show.local.tooltip=Show the list of local applications -simexplorer.main.menu.show.remote=show remote Applications -simexplorer.main.menu.show.remote.tooltip=Show the list of remote applications -simexplorer.main.menu.synchronize=Synchronize -simexplorer.main.menu.synchronize.tooltip=Show synchronize screen -simexplorer.main.menu.unconnect=Disconnect -simexplorer.main.menu.unconnect.tooltip=Disconnect from remote server simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= simexplorer.option.description.config=change value of configuration property (with **key**) by value **value**. Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 22:07:42 UTC (rev 298) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 22:08:05 UTC (rev 299) @@ -1,24 +1,48 @@ -#Sun Jan 20 18:41:29 GMT 2008 +#Sun Jan 20 22:02:45 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = +simexplorer.action.about=A propos +simexplorer.action.about.help= +simexplorer.action.about.tooltip=Afficher les cr\u00E9dits simexplorer.action.advancedSearch=Recherche avanc\u00E9e simexplorer.action.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e simexplorer.action.closeTab=Fermer simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=Fermer l'onglet simexplorer.action.collapseAll.tooltip=R\u00E9duire tous les noeuds +simexplorer.action.config=Pr\u00E9f\u00E9rences +simexplorer.action.config.help= +simexplorer.action.config.tooltip=Afficher le dialogue de modification de configuration +simexplorer.action.connect=Connexion +simexplorer.action.connect.help= +simexplorer.action.connect.tooltip=Se connecter au serveur distant simexplorer.action.expandAll.tooltip=Expander tous les noeuds simexplorer.action.exportApplication=exporter simexplorer.action.exportApplication.tooltip=Exporter l'application +simexplorer.action.groups=Groupes +simexplorer.action.groups.help= +simexplorer.action.groups.tooltip=Afficher le gestionnaire des groupes +simexplorer.action.help=Aide +simexplorer.action.help.help= +simexplorer.action.help.tooltip=Acc\u00E9der \u00E0 l'aide simexplorer.action.hideLocal=cacher Applications locales simexplorer.action.hideLocal.tooltip=Cacher la liste des applications locales simexplorer.action.hideRemote=cacher Applications distantes simexplorer.action.hideRemote.tooltip=Cacher la liste des applications distantes simexplorer.action.hideSynchonize=cacher Synchronisation simexplorer.action.hideSynchonize.tooltip=Cacher l'\u00E9cran de synchronisation +simexplorer.action.i18n.en=Anglais +simexplorer.action.i18n.en.help= +simexplorer.action.i18n.en.tooltip=Traduire l'application en anglais +simexplorer.action.i18n.fr=Fran\u00E7ais +simexplorer.action.i18n.fr.help= +simexplorer.action.i18n.fr.tooltip=Traduire l'application en fran\u00E7ais simexplorer.action.importApplication=importer simexplorer.action.importApplication.tooltip=Importer l'application +simexplorer.action.quit=Quitter +simexplorer.action.quit.help= +simexplorer.action.quit.tooltip=Pour quitter l'application simexplorer.action.refresh=Synchroniser simexplorer.action.refresh.tooltip=Pour resynchroniser simexplorer.action.resetSearch=r\u00E9initialiser @@ -27,17 +51,37 @@ simexplorer.action.search.tooltip=Lancer la recherche simexplorer.action.searchText=recherche \: simexplorer.action.searchText.tooltip=Le texte de recherche +simexplorer.action.show.detail=D\u00E9tail +simexplorer.action.show.detail.help= +simexplorer.action.show.detail.tooltip=Affcihier les d\u00E9tail de l'application +simexplorer.action.show.local=Applications locales +simexplorer.action.show.local.help= +simexplorer.action.show.local.tooltip=Afficher la liste des applications locales +simexplorer.action.show.remote=Applications distantes +simexplorer.action.show.remote.help= +simexplorer.action.show.remote.tooltip=Afficher la liste des applications distantes +simexplorer.action.show.synchronize=Synchroniser +simexplorer.action.show.synchronize.help= +simexplorer.action.show.synchronize.tooltip=Afficher l'\u00E9cran de synchronisation des applications simexplorer.action.showLocal=voir Applications locales simexplorer.action.showLocal.tooltip=Afficher la liste des applications locales simexplorer.action.showRemote=voir Applications distantes simexplorer.action.showRemote.tooltip=Afficher la liste des applications distantes simexplorer.action.showSynchonize=voir Synchronisation simexplorer.action.showSynchonize.tooltip=Afficher l'\u00E9cran de synchronisation +simexplorer.action.site=Site +simexplorer.action.site.help= +simexplorer.action.site.tooltip=Acc\u00E9der \u00E0 l'aide +simexplorer.action.synchronize=Syncroniser +simexplorer.action.synchronize.help= +simexplorer.action.synchronize.tooltip=Lancer une nouvelle synchronisation +simexplorer.action.unconnect=D\u00E9connexion +simexplorer.action.unconnect.help= +simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant +simexplorer.action.users=Utilisateurs +simexplorer.action.users.help= +simexplorer.action.users.tooltip=Afficher le gestionnaire des utilisateurs simexplorer.admin.menu=Administration -simexplorer.admin.menu.groups=Groupes -simexplorer.admin.menu.groups.tooltip=Afficher le gestionnaire des groupes -simexplorer.admin.menu.users=Utilisateurs -simexplorer.admin.menu.users.tooltip=Afficher le gestionnaire des utilisateurs simexplorer.change.config.property= simexplorer.common.cancel=annuler simexplorer.common.create.date=date de cr\u00E9ation @@ -49,10 +93,6 @@ simexplorer.common.uuid=uuid simexplorer.common.version=version simexplorer.config.i18n.menu=Langue -simexplorer.config.i18n.menu.en=Anglais -simexplorer.config.i18n.menu.en.tooltip= -simexplorer.config.i18n.menu.fr=Fran\u00E7ais -simexplorer.config.i18n.menu.fr.tooltip=Traduire l'application en fran\u00E7ais simexplorer.config.main.backupDirectory.description=le r\u00E9pertoire des sauvegardes simexplorer.config.main.baseDirectory.description=le r\u00E9pertoire de la base locale simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration @@ -70,30 +110,10 @@ simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration -simexplorer.config.menu.config=Pr\u00E9f\u00E9rences -simexplorer.config.menu.config.tooltip= simexplorer.config.title=SimExplorer SI Pr\u00E9f\u00E9rences simexplorer.error.unfound.config.property= simexplorer.help.menu=Aide -simexplorer.help.menu.about=A propos -simexplorer.help.menu.about.tooltip=Afficher les cr\u00E9dits -simexplorer.help.menu.help=Obtenir de l'aide -simexplorer.help.menu.help.tooltip=Acc\u00E9der \u00E0 l'aide -simexplorer.help.menu.site=Le site -simexplorer.help.menu.site.tooltip=Acc\u00E9der au site simexplorer.main.menu=Menu principal -simexplorer.main.menu.connect=Connexion -simexplorer.main.menu.connect.tooltip=Se connecter au serveur distant -simexplorer.main.menu.quit=Quitter -simexplorer.main.menu.quit.tooltip=Pour quitter l'application -simexplorer.main.menu.show.local=Applications locales -simexplorer.main.menu.show.local.tooltip=Afficher la liste des applications locales -simexplorer.main.menu.show.remote=Applications distantes -simexplorer.main.menu.show.remote.tooltip=Afficher la liste des applications distantes -simexplorer.main.menu.synchronize=Synchronisation -simexplorer.main.menu.synchronize.tooltip=Afficher l'\u00E9cran de synchronisation des applications -simexplorer.main.menu.unconnect=D\u00E9connexion -simexplorer.main.menu.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**.

1 0

r298 - in trunk/simexplorer-is-swing/src: resources resources/icons resources/icons/action uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

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>  - <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>  - <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>  - <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>  - <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>

1 0

r297 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 22:05:51 +0000 (Sun, 20 Jan 2008) New Revision: 297 Modified: trunk/simexplorer-is-swing/pom.xml Log: erreur sur l'include d'i18n Modified: trunk/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is-swing/pom.xml 2008-01-20 18:42:40 UTC (rev 296) +++ trunk/simexplorer-is-swing/pom.xml 2008-01-20 22:05:51 UTC (rev 297) @@ -141,7 +141,7 @@ <entry> <basedir>${basedir}/src/java/fr/cemagref/simexplorer/is/ui/swing/action</basedir> <includes> - <param>**\/CloseTabAction.java</param> + <param>**\/*Action.java</param> </includes> <excludes> <param>**\/*Abstract*Action.java</param>

1 0

r296 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 18:42:40 +0000 (Sun, 20 Jan 2008) New Revision: 296 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java Log: utilisation ActionConfig pour configurer les actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-20 18:42:28 UTC (rev 295) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-20 18:42:40 UTC (rev 296) @@ -30,7 +30,7 @@ container = fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader.class, name = "simexplorer.action.closeTab", shortDescription = "simexplorer.action.closeTab.tooltip", - longDescription = "simexplorer.action.closeTab.tooltip", + longDescription = "simexplorer.action.closeTab.help", smallIcon = "window-close.png", hideActionText = true )

1 0

r295 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org Jan. 20, 2008

Jan. 20, 2008

Author: tchemit Date: 2008-01-20 18:42:28 +0000 (Sun, 20 Jan 2008) New Revision: 295 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: utilisation ActionConfig pour configurer les actions Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 18:41:02 UTC (rev 294) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 18:42:28 UTC (rev 295) @@ -1,10 +1,11 @@ -#Sun Jan 20 18:22:38 GMT 2008 +#Sun Jan 20 18:41:29 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Advanced search simexplorer.action.advancedSearch.tooltip=Show advanced search dialog simexplorer.action.closeTab=close +simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=close the tab simexplorer.action.collapseAll.tooltip=Collapse all nodes simexplorer.action.expandAll.tooltip=Expand all nodes Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 18:41:02 UTC (rev 294) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 18:42:28 UTC (rev 295) @@ -1,10 +1,11 @@ -#Sun Jan 20 18:22:38 GMT 2008 +#Sun Jan 20 18:41:29 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Recherche avanc\u00E9e simexplorer.action.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e simexplorer.action.closeTab=Fermer +simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=Fermer l'onglet simexplorer.action.collapseAll.tooltip=R\u00E9duire tous les noeuds simexplorer.action.expandAll.tooltip=Expander tous les noeuds

1 0