Author: echatellier Date: 2012-07-17 18:25:55 +0200 (Tue, 17 Jul 2012) New Revision: 1019 Url: http://forge.codelutin.com/repositories/revision/coser/1019 Log: Misc improvements Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2012-07-17 15:28:11 UTC (rev 1018) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2012-07-17 16:25:55 UTC (rev 1019) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -48,9 +48,6 @@ <row> <cell fill="horizontal" insets="0" anchor="west" columns="2"> <JToolBar floatable="false"> - <JButton icon="disk.png" text="coser.ui.control.save" - onActionPerformed="getHandler().saveControl(this)" /> - <JToolBar.Separator /> <JLabel text="coser.ui.control.categorylabel" /> <fr.ifremer.coser.ui.control.ControlCategoryListModel id="categoryComboBoxModel" /> <JComboBox id="categoryComboBox" model="{categoryComboBoxModel}" @@ -67,11 +64,12 @@ <JToolBar.Separator /> <JButton icon="report.png" onActionPerformed="getHandler().displayLogReport(this)" text="coser.ui.control.controlreport" /> - <JToolBar.Separator /> + <Component initializer="javax.swing.Box.createHorizontalGlue()" /> + <JButton icon="disk.png" text="coser.ui.control.save" + onActionPerformed="getHandler().saveControl(this)" /> <JButton icon="accept.png" onActionPerformed="getHandler().validControl(this)" text="coser.ui.control.validcontrol" toolTipText="coser.ui.control.validcontroltip" enabled="{isCanValidControl()}"/> - </JToolBar> </cell> </row> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2012-07-17 15:28:11 UTC (rev 1018) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2012-07-17 16:25:55 UTC (rev 1019) @@ -33,6 +33,7 @@ import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JTextField; +import javax.swing.ListSelectionModel; import javax.swing.SwingWorker; import javax.swing.filechooser.FileFilter; @@ -309,7 +310,8 @@ */ public void loadProject(final ProjectOpenView projectView) { - final String projectName = (String)projectView.getProjectsComboBox().getSelectedItem(); + int selectedIndex = projectView.getProjectsList().getSelectedIndex(); + String projectName = (String)projectView.getProjectsList().getModel().getElementAt(selectedIndex); ProjectService projectService = projectView.getContextValue(ProjectService.class); CoserFrame parent = projectView.getContextValue(CoserFrame.class, JAXXUtil.PARENT); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx 2012-07-17 15:28:11 UTC (rev 1018) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx 2012-07-17 16:25:55 UTC (rev 1019) @@ -29,20 +29,23 @@ <cell weightx="1" fill="horizontal"> <Table border='{BorderFactory.createTitledBorder(_("coser.ui.project.openProjectTitle"))}'> <row> - <cell anchor="west"> + <cell anchor="north"> <JLabel text="coser.ui.project.project" /> </cell> - <cell> + <cell anchor="north"> <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + java.io.File.separator}' /> </cell> - <cell anchor="west" weightx="1"> - <JComboBox id="projectsComboBox" model="{new fr.ifremer.coser.ui.project.ProjectNamesListModel(this)}" /> + <cell fill="both" weightx="1"> + <JScrollPane> + <JList id="projectsList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" + model="{new fr.ifremer.coser.ui.project.ProjectNamesListModel(this)}" /> + </JScrollPane> </cell> </row> <row> <cell weightx="1" anchor="east" columns="3"> <JButton text="coser.ui.project.openProject" - enabled="{projectsComboBox.getSelectedItem() != null}" + enabled="{projectsList.getSelectedIndex() > 0}" onActionPerformed="getHandler().loadProject(this)" /> </cell> </row> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2012-07-17 15:28:11 UTC (rev 1018) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2012-07-17 16:25:55 UTC (rev 1019) @@ -63,15 +63,16 @@ </BeanValidator> <row> - <cell weightx="1" fill="horizontal"> + <cell weightx="1" insets="0" fill="horizontal" > <JToolBar floatable="false"> - <JButton id="saveSelectionButton" text="coser.ui.selection.details.saveSelection" - icon="disk.png" onActionPerformed="getHandler().saveSelection(this)" /> <JButton icon="report.png" onActionPerformed="getHandler().displayLogReport(this)" text="coser.ui.selection.selectionreport" /> <JToolBar.Separator /> <JButton icon="arrow_rotate_clockwise.png" onActionPerformed="getHandler().reloadControlData(this)" text="coser.ui.selection.reloadcontroldata" /> + <Component initializer="javax.swing.Box.createHorizontalGlue()" /> + <JButton id="saveSelectionButton" text="coser.ui.selection.details.saveSelection" + icon="disk.png" onActionPerformed="getHandler().saveSelection(this)" /> </JToolBar> </cell> </row> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-07-17 15:28:11 UTC (rev 1018) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-07-17 16:25:55 UTC (rev 1019) @@ -766,20 +766,6 @@ } /** - * Sauvegarde la sélection (partie listes de selection) - * et affiche un message utilisateur. - * - * @param view parent view - */ - public void saveSelection(SelectionListsView view) { - boolean saved = saveProjectSelection(view); - if (saved) { - JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionSaved"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); - } - } - - /** * Sauvegarde la sélection (partie listes de selection). * * @param view parent view Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-07-17 15:28:11 UTC (rev 1018) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-07-17 16:25:55 UTC (rev 1019) @@ -55,8 +55,7 @@ <row> <cell columns="8" weightx="1" fill="horizontal"> <JToolBar floatable="false"> - <JButton id="saveSelectionButton" text="coser.ui.selection.details.saveSelection" - icon="disk.png" onActionPerformed="getHandler().saveSelection(this)" /> + <Component initializer="javax.swing.Box.createHorizontalGlue()" /> <JButton id="validSelectionButton" text="coser.ui.selection.details.validSelection" icon="accept.png" onActionPerformed="getHandler().validSelection(this)" /> </JToolBar>