Author: chatellier Date: 2009-10-26 15:02:11 +0000 (Mon, 26 Oct 2009) New Revision: 2691 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Use jaxx based nuiton-util configuration model UI. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-10-26 14:56:42 UTC (rev 2690) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-10-26 15:02:11 UTC (rev 2691) @@ -34,12 +34,14 @@ import fr.ifremer.isisfish.ui.script.ScriptUI; import fr.ifremer.isisfish.ui.simulator.SimulUI; import fr.ifremer.isisfish.ui.queue.QueueUI; - import fr.ifremer.isisfish.ui.config.ConfigUI; import fr.ifremer.isisfish.ui.config.SSHLauncherConfigUI; import fr.ifremer.isisfish.ui.vcs.VCSConfigUI; import org.nuiton.widget.AboutFrame; import jaxx.runtime.DefaultJAXXContext; import jaxx.runtime.JAXXInitialContext; + import jaxx.runtime.swing.editor.config.ConfigUI; + import jaxx.runtime.swing.editor.config.ConfigUIBuilder; + import jaxx.runtime.swing.editor.config.model.ConfigUIModel; Map<JFrame, WelcomePanelUI> allFrameOpened; WelcomeSaveVerifier verifier = new WelcomeSaveVerifier(); @@ -91,12 +93,25 @@ // FIXME a reimplanter // thread:Welcome.updateVCS() } + + /** + * Show congig frame (Jaxx based). + */ protected void config() { - ConfigUI configUI = new ConfigUI(); - configUI.pack(); - org.nuiton.widget.SwingUtil.center(configUI); - configUI.setVisible(true); + ConfigUIModel model = new ConfigUIModel(IsisFish.config); + + // categorie main + model.addCategory( + _("isisfish.config.category.main"), + _("isisfish.config.category.main.description"), + IsisConfig.Option.CONFIG_FILE, + IsisConfig.Option.LOCALE + ); + + ConfigUI configUI = ConfigUIBuilder.newConfigUI(new DefaultJAXXContext(this), model, _("isisfish.config.category.main")); + ConfigUIBuilder.showConfigUI(configUI, this, false); } + protected void configVCS() { VCSConfigUI vcsConfig = new VCSConfigUI(); vcsConfig.pack(); @@ -148,8 +163,8 @@ <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> </JMenu> <JMenu text="isisfish.welcome.menu.configuration"> - <JMenuItem text="isisfish.welcome.menu.configuration" enabled='false' onActionPerformed='config()'/> - <JMenuItem text="isisfish.welcome.menu.configuration.vcs" enabled='false' onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='config()'/> + <JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='configVCS()'/> <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='configurationSSHLauncher()'/> </JMenu> <JMenu text="isisfish.welcome.menu.help">