[Isis-fish-commits] r4252 - in branches/isis-fish-4.4.0-ui-refactoring/src/main: java/fr/ifremer/isisfish/ui java/fr/ifremer/isisfish/ui/config java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/input/population java/fr/ifremer/isisfish/ui/models/rule java/fr/ifremer/isisfish/ui/script java/fr/ifremer/isisfish/ui/script/model java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/widget resources/icons resources/icons/common resources/icons/input

Author: echatellier Date: 2015-06-09 13:32:19 +0000 (Tue, 09 Jun 2015) New Revision: 4252 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4252 Log: Replace icons by Fugue icon theme Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/broom.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/camera.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/cross-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/information-small.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/minus-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/pencil-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plug-connect.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plus-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/table--plus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/tick-button.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/clipboard-paste.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/compile.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database--minus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database-import.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/disk-black.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/document-copy.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/edit-diff.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/folder-zipper.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/gear.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/scissors.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--minus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--plus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script-code.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/terminal.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag--plus.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/table-export.png Removed: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/accept.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/arrow_undo.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/camera.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cancel.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/connect.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cut.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_connect.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_edit.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_error.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_gear.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_go.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_key.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_lightning.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_link.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_refresh.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_save.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_table.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_copy.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_paste.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_white_compressed.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/paintbrush.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_next.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_previous.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_add.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code_red.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_delete.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_edit.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_error.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_gear.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_go.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_key.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_lightning.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_link.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_palette.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_save.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table_multiple.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/tick.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench.png branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench_orange.png Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -62,7 +62,7 @@ toolTipText="Stop the process" /> </cell> --> <cell> - <JLabel icon="camera.png" toolTipText="isisfish.status.screenshot" onMouseClicked="handler.screenshot()" /> + <JLabel icon="common/camera.png" toolTipText="isisfish.status.screenshot" onMouseClicked="handler.screenshot()" /> </cell> <cell fill="both"> <jaxx.runtime.swing.StatusMessagePanel /> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -185,16 +185,16 @@ <Table> <row fill='horizontal'> <cell fill='horizontal' weightx="1.0"> - <JButton id='testButton' text='isisfish.simulator.ssh.configuration.test' onActionPerformed="handler.testSSHConfiguration()" icon="connect.png" /> + <JButton id='testButton' text='isisfish.simulator.ssh.configuration.test' onActionPerformed="handler.testSSHConfiguration()" icon="common/plug-connect.png" /> </cell> <cell fill='horizontal' weightx="1.0"> - <JButton id='validButton' text='isisfish.common.valid' onActionPerformed="handler.saveSSHConfiguration()" icon="accept.png" enabled='{isConnected()}' /> + <JButton id='validButton' text='isisfish.common.valid' onActionPerformed="handler.saveSSHConfiguration()" icon="common/tick-button.png" enabled='{isConnected()}' /> </cell> <cell fill='horizontal' weightx="1.0"> - <JButton id='resetButton' text='isisfish.common.reset' onActionPerformed="handler.resetSSHConfiguration()" icon="arrow_undo.png" /> + <JButton id='resetButton' text='isisfish.common.reset' onActionPerformed="handler.resetSSHConfiguration()" icon="common/pencil-button.png" /> </cell> <cell fill='horizontal' weightx="1.0"> - <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed="handler.cancelSSHConfiguration()" icon="cancel.png" /> + <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed="handler.cancelSSHConfiguration()" icon="common/cross-button.png" /> </cell> </row> </Table> @@ -215,7 +215,7 @@ <JLabel id='statusFreeDatabaseLabel' enabled='{isConnected()}' /> </cell> <cell> - <JButton id='clearDatabaseButton' text='isisfish.common.clear' icon="paintbrush.png" + <JButton id='clearDatabaseButton' text='isisfish.common.clear' icon="common/broom.png" onActionPerformed="handler.clearDatabase()" enabled='{isConnected()}' /> </cell> </row> @@ -224,7 +224,7 @@ <JLabel id='statusFreeTempLabel' enabled='{isConnected()}' /> </cell> <cell> - <JButton id='clearTempButton' text='isisfish.common.clear' icon="paintbrush.png" + <JButton id='clearTempButton' text='isisfish.common.clear' icon="common/broom.png" onActionPerformed="handler.clearTempDirectory()" enabled='{isConnected()}' /> </cell> </row> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -42,8 +42,8 @@ <!-- Layer avec les icones permettant d'ajouter des facteurs --> <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' + blockIcon='{SwingUtil.createImageIcon("sensitivity/flag.png")}' + acceptIcon='{SwingUtil.createImageIcon("sensitivity/flag--plus.png")}' acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; @Override Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -79,7 +79,7 @@ onMatrixChanged="handler.populationRecruitmentDistributionMatrixChanged(event)" /> </cell> <cell> - <JButton icon="table.png" toolTipText="isisfish.common.newMatrix" + <JButton icon="common/table--plus.png" toolTipText="isisfish.common.newMatrix" onActionPerformed="handler.createRecruitmentDistribution(getBean())" enabled='{isActive()}' decorator='boxed' /> </cell> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -99,7 +99,7 @@ Class paramType = RuleStorage.getParameterType(rule, paramName); boolean canBeFactor = SensitivityUtils.canBeFactor(paramType); if (canBeFactor) { - JButton button = new JButton(Resource.getIcon("/icons/building_add.png")); + JButton button = new JButton(Resource.getIcon("/icons/sensitivity/flag--plus.png")); button.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -81,7 +81,7 @@ Class paramType = RuleStorage.getParameterType(rule, paramName); boolean canBeFactor = SensitivityUtils.canBeFactor(paramType); if (canBeFactor) { - comp = new JButton(Resource.getIcon("/icons/building_add.png")); + comp = new JButton(Resource.getIcon("/icons/sensitivity/flag--plus.png")); } } catch (IsisFishException ex) { if (log.isWarnEnabled()) { Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -44,59 +44,59 @@ <!-- Menu --> <JMenuBar id="scriptMenuBar" constraints='BorderLayout.NORTH'> <JMenu id="scriptTxtFile" text="isisfish.script.menu.file"> - <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script.png"> + <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script/script.png"> <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityScript)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityScript)' icon="script/script.png" /> <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulator)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulator)' icon="script/script.png" /> <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExport)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExport)' icon="script/script.png" /> <JMenuItem id="miNewExportStep" text="isisfish.script.menu.txtNewExportStep" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExportStep)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExportStep)' icon="script/script.png" /> <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityRule)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityRule)' icon="script/script.png" /> <JMenuItem id="miNewSImulationPlan" text="isisfish.script.menu.txtNewSimulationPlan" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulationPlan)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulationPlan)' icon="script/script.png" /> <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivity)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivity)' icon="script/script.png" /> <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivityExport)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySensitivityExport)' icon="script/script.png" /> <JMenuItem text="isisfish.script.menu.txtNewObjective" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityObjective)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityObjective)' icon="script/script.png" /> <JMenuItem text="isisfish.script.menu.txtNewOptimization" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityOptimization)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityOptimization)' icon="script/script.png" /> <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityFormule)' icon="script.png" /> + onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityFormule)' icon="script/script.png" /> </JMenu> <JMenuItem id="miSave" text="isisfish.script.menu.save" - onActionPerformed="handler.saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> + onActionPerformed="handler.saveScript()" icon="script/disk-black.png" enabled='{isSingleFileSelected()}' /> <JSeparator/> <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" - onActionPerformed='handler.deleteScript(false)' icon="script_delete.png" enabled='{isSingleFileSelected()}' /> + onActionPerformed='handler.deleteScript(false)' icon="script/script--minus.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtEdit" text="isisfish.script.menu.edit"> <JMenuItem id="miCut" text="isisfish.script.menu.cut" - onActionPerformed="handler.cut()" icon="cut.png" enabled='{isTextSelected()}' /> + onActionPerformed="handler.cut()" icon="script/scissors.png" enabled='{isTextSelected()}' /> <JMenuItem id="miCopy" text="isisfish.script.menu.copy" - onActionPerformed="handler.copy()" icon="page_copy.png" enabled='{isTextSelected()}' /> + onActionPerformed="handler.copy()" icon="script/document-copy.png" enabled='{isTextSelected()}' /> <JMenuItem id="miPaste" text="isisfish.script.menu.paste" - onActionPerformed="handler.paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' /> + onActionPerformed="handler.paste()" icon="script/clipboard-paste.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS"> - <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" + <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="script/database-import.png" onActionPerformed="handler.commitScript()" enabled='{isSingleFileSelected()}' /> - <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" + <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" icon="script/edit-diff.png" onActionPerformed="handler.diffScript()" enabled='{isSingleFileSelected()}' /> <JSeparator/> <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" - onActionPerformed='handler.deleteScript(true)' icon="database_delete.png"/> + onActionPerformed='handler.deleteScript(true)' icon="script/database--minus.png"/> </JMenu> <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> - <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" + <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script/compile.png" onActionPerformed="handler.checkScript()" enabled='{isJavaFileSelected()}' /> - <JMenuItem id="miCheckAllSyntax" text="isisfish.script.menu.checkAllSyntax" icon="script_code_red.png" + <JMenuItem id="miCheckAllSyntax" text="isisfish.script.menu.checkAllSyntax" icon="script/script-code.png" onActionPerformed="handler.checkAllScripts()" /> - <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script_gear.png" + <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script/terminal.png" onActionPerformed="handler.evaluateScript()" enabled='{isJavaFileSelected()}' /> <JSeparator/> <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate" @@ -110,23 +110,23 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JButton id="buttonScriptNew" text="isisfish.script.newplus" toolTipText='isisfish.script.new.tooltip' - onMousePressed='handler.newScript(event)' icon="script.png" /> + onMousePressed='handler.newScript(event)' icon="script/script.png" /> <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" - enabled='{isSingleFileSelected()}' onActionPerformed='handler.saveScript()' icon="script_save.png" /> + enabled='{isSingleFileSelected()}' onActionPerformed='handler.saveScript()' icon="script/disk-black.png" /> <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' - onActionPerformed='handler.exportScript()' icon="page_white_compressed.png" /> + onActionPerformed='handler.exportScript()' icon="script/folder-zipper.png" /> <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' - onActionPerformed='handler.commitScript()' icon="database_go.png" /> + onActionPerformed='handler.commitScript()' icon="script/database-import.png" /> <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' - onActionPerformed='handler.cut()' icon="cut.png" /> + onActionPerformed='handler.cut()' icon="script/scissors.png" /> <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' - onActionPerformed='handler.copy()' icon="page_copy.png" /> + onActionPerformed='handler.copy()' icon="script/document-copy.png" /> <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' - onActionPerformed='handler.paste()' icon="page_paste.png" /> + onActionPerformed='handler.paste()' icon="script/clipboard-paste.png" /> <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' - onActionPerformed='handler.checkScript()' icon="script_code_red.png" /> + onActionPerformed='handler.checkScript()' icon="script/compile.png" /> <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' - onActionPerformed='handler.evaluateScript()' icon="script_gear.png" /> + onActionPerformed='handler.evaluateScript()' icon="script/terminal.png" /> </JPanel> <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JScrollPane> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -64,7 +64,7 @@ /** Class logger. */ private static Log log = LogFactory.getLog(ScriptTreeCellRenderer.class); - protected static final Icon VCS_ICON = Resource.getIcon("/icons/database_key.png"); + protected static final Icon VCS_ICON = Resource.getIcon("/icons/script/database.png"); /* * @see javax.swing.tree.TreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean) Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -56,7 +56,7 @@ onActionPerformed="handler.addNewFactorGroup(true)"/> </cell> <cell anchor='west' weightx='1'> - <JButton icon="script_go.png" toolTipText="isisfish.sensitivity.mexico.exporttoxml.tip" + <JButton icon="sensitivity/table-export.png" toolTipText="isisfish.sensitivity.mexico.exporttoxml.tip" onActionPerformed="handler.exportFactorsToMexico()"/> </cell> </row> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -507,7 +507,7 @@ public Object getValue(String key) { Object result = null; if (key.equals(Action.SMALL_ICON)) { - result = SwingUtil.createImageIcon("building_add.png"); + result = SwingUtil.createImageIcon("sensitivity/flag--plus.png"); } return result; } Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-06-09 13:32:19 UTC (rev 4252) @@ -210,7 +210,7 @@ </cell> <cell anchor="north"> <JButton id="addRuleFactorButton" - icon='{SwingUtil.createImageIcon("building_add.png")}' + icon='{SwingUtil.createImageIcon("sensitivity/flag--plus.png")}' onActionPerformed="handler.addFactorWithComponent(ruleChooser)" visible="{isSensitivity()}" enabled="{getRegionStorage() != null}" /> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2015-06-09 13:32:19 UTC (rev 4252) @@ -200,7 +200,7 @@ * Build layout. */ private void buildLayout() { - dataBox = new JComboBox<T>(); + dataBox = new JComboBox<>(); dataBox.setName("filterBox"); dataBox.addActionListener(new ComboBoxActionListener()); filterField = new JXTextField(t("isisfish.common.filter")); @@ -208,7 +208,7 @@ filterField.getDocument().addDocumentListener(new FilterDocumentListener()); // fix size filterField.setPreferredSize(new Dimension(200, 0)); - resetButton = new JButton(Resource.getIcon("/icons/cancel.png")); + resetButton = new JButton(Resource.getIcon("/icons/common/cross-button.png")); resetButton.addActionListener(new FilterActionListener()); resetButton.setEnabled(false); resetButton.setName("filterReset"); Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt (rev 0) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/README.txt 2015-06-09 13:32:19 UTC (rev 4252) @@ -0,0 +1,80 @@ +Fugue Icons + +(C) 2013 Yusuke Kamiyamane. All rights reserved. + +These icons are licensed under a Creative Commons +Attribution 3.0 License. +<http://creativecommons.org/licenses/by/3.0/> + +If you can't or don't want to provide attribution, please +purchase a royalty-free license. +<http://p.yusukekamiyamane.com/> + +I'm unavailable for custom icon design work. But your +suggestions are always welcome! +<mailto:p@yusukekamiyamane.com> + +------------------------------------------------------------ + +All logos and trademarks in some icons are property of their +respective owners. + +------------------------------------------------------------ + +- geotag + + (C) Geotag Icon Project. All rights reserved. + <http://www.geotagicons.com/> + + Geotag icon is licensed under a Creative Commons + Attribution-Share Alike 3.0 License or LGPL. + <http://creativecommons.org/licenses/by-sa/3.0/> + <http://opensource.org/licenses/lgpl-license.php> + +- language + + (C) Language Icon Project. All rights reserved. + <http://www.languageicon.org/> + + Language icon is licensed under a Creative Commons + Attribution-Share Alike 3.0 License. + <http://creativecommons.org/licenses/by-sa/3.0/> + +- open-share + + (C) Open Share Icon Project. All rights reserved. + <http://www.openshareicons.com/> + + Open Share icon is licensed under a Creative Commons + Attribution-Share Alike 3.0 License. + <http://creativecommons.org/licenses/by-sa/3.0/> + +- opml + + (C) OPML Icon Project. All rights reserved. + <http://opmlicons.com/> + + OPML icon is licensed under a Creative Commons + Attribution-Share Alike 2.5 License. + <http://creativecommons.org/licenses/by-sa/2.5/> + +- share + + (C) Share Icon Project. All rights reserved. + <http://shareicons.com/> + + Share icon is licensed under a GPL or LGPL or BSD or + Creative Commons Attribution 2.5 License. + <http://opensource.org/licenses/gpl-license.php> + <http://opensource.org/licenses/lgpl-license.php> + <http://opensource.org/licenses/bsd-license.php> + <http://creativecommons.org/licenses/by/2.5/> + +- xfn + + (C) Wolfgang Bartelme. All rights reserved. + <http://www.bartelme.at/> + + XFN icon is licensed under a Creative Commons + Attribution-Share Alike 2.5 License. + <http://creativecommons.org/licenses/by-sa/2.5/> \ No newline at end of file Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/accept.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/add.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/arrow_undo.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building.png 2015-06-09 13:32:19 UTC (rev 4252) @@ -1,15 +0,0 @@ -�PNG - - -IHDR�� -
sRGB���bKGD������� pHYs
��tIME� :1�5���IDAT8�͔�O\U����}�����TB�4�1i�5�BYY�ݴ��.��ڤK��U�n����bB��Blb��e
TQk)�a����7������I���.�Y|�NιG�p�S144����eK)��ڦ�������!���dll\�������{�\fԶ�������-�7�������Ե�+�W�|����� -|�ۆR -) -�@��F���'�����瓓�}?3s� �Ν����s�d2���XV�i� @��r]�8N��l6�>��Q����&}}��T�T�"�"�� �5�Z��u�bq -}���}r��F��ZXV�@JI,f<)徙�4��B����S)$phP���>=�j.==lۢ��ƶc@�5B�a�i���x�rY��$��bq�ry�ioOR�Ԑ��4��g���4̓�Vs �à:;�c��r*����_;;::�d���/���A:�F,f��8N�� -׭�<|��-��Q*=? -l���aQ,�q�:�m���[[[loo��&�͒Nw`�6�z�j�%�ω��a1?��a�g30pl[��L�1�֚(��:$�cY1����)��tww�ܺu�y��q��t�����Ҡ�5N[[) -� Q�u66*XV���b�J��H$Doo���[�Pȱ�����h� C -DX��R{��Z���*�e��|�*�������)N�x#�V}</ #|?`}}�R��֚B!O6��4M���bp���ƍe��pw7���ˏ.]��2�H�b��.�FDH��>Bg���vwb�˟WW�M-K@�+m�[K -}�Z��VkA��{��O������=*g���o�߾}s��������,{��ٱw�c���Hon:JkMww�N$������{S��je� -x)��9`P)՗H�� !� ���σ�_޿0/�2���������JHfmIEND�B`� \ No newline at end of file Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png 2015-06-09 08:25:37 UTC (rev 4251) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/building_add.png 2015-06-09 13:32:19 UTC (rev 4252) @@ -1,14 +0,0 @@ -�PNG - - -IHDR�� -
sRGB���bKGD������� pHYs
��tIME� -2����IDAT8˵�MLcU��s��mo�����
�Ď,2����H��ְ���Y`\3ꚨvƍ��И �h!
�)VK[~�{{齧����L���&��;�˓s��ZZZb�d2 -BDZ��revvV�)"O6+++Z2�|3����)�(�,۶w���w�b񛉉 �����[�@��P(�*���a��`���e�?<<�˿wvv�J��P�&!��ח<�S�inZ�55::���=�\.7������ "�)�Js[[[�f����b�أ����c�1pΡi�u]! ���B����L&C�K@˲���
c��b����u�����8�V���j�����ڥ�SS��ǰm��C�u�|��b�]�;�A�|����`�=�J`>������B�4 -�<���^J�#�c��W��{�^�w�JSJ�8����`�RHy�cJ)�� }�ނa�X���?������q����x<�T*���Ct:ض -J)���J�f ׇP�����f���M&''����z��9�h6��������: -�Tq��A
G5��3�y�bENY2�$�R�r9^��.��zu?��È(����0��2��p=Լ{g0~�P��B��0J)����b}}�T -���h�P(�����^A"ꇏyИ�I��F&�)Ӱ����5-!��������y`�A)�V������w�
�ב��' �:. -J���gB�^�H,C8��Ͽ��f�UJ -(��9�m�h�6��f�D.��k���;{�a���gu��Mq�S�;.�N��j5�j������Lfefff�1v���$utt��4 -���N$)Պ���?7z��{��r4��O��k��uqVo���w��uw?���O$�T�ՊB�i����<==M��ɤA�@`�4�۔҇��G\�gT:��1�"�)������6��ʗ�u���|�����l�A9��IEND�B`� \ No newline at end of file Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/camera.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cancel.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/broom.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/broom.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/camera.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/camera.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/cross-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/cross-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/information-small.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/information-small.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/minus-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/minus-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/pencil-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/pencil-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plug-connect.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plug-connect.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plus-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/plus-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/table--plus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/table--plus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/tick-button.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/common/tick-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/connect.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/cut.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_add.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_connect.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_delete.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_edit.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_error.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_gear.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_go.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_key.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_lightning.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_link.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_refresh.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_save.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/database_table.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/delete.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_add.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_add.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_delete.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/input/map_delete.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_copy.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_paste.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/page_white_compressed.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/paintbrush.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_next.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/resultset_previous.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/clipboard-paste.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/clipboard-paste.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/compile.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/compile.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database--minus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database--minus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database-import.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database-import.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/database.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/disk-black.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/disk-black.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/document-copy.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/document-copy.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/edit-diff.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/edit-diff.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/folder-zipper.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/folder-zipper.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/gear.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/gear.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/scissors.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/scissors.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--minus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--minus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--plus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script--plus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script-code.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script-code.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/script.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/terminal.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script/terminal.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_add.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_code_red.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_delete.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_edit.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_error.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_gear.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_go.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_key.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_lightning.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_link.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_palette.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/script_save.png =================================================================== (Binary files differ) Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag--plus.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag--plus.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/flag.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/table-export.png =================================================================== (Binary files differ) Property changes on: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/sensitivity/table-export.png ___________________________________________________________________ Added: svn:mime-type + image/png Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/table_multiple.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/tick.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench.png =================================================================== (Binary files differ) Deleted: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/icons/wrench_orange.png =================================================================== (Binary files differ)