Revision 8713

View differences:

org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/java/org/gvsig/vcsgis/app/addlayer/AbstractWizardVCSGisView.java
270 270
      jpanel1.setLayout(formlayout1);
271 271

  
272 272
      btnCheckout.setActionCommand("...");
273
      btnCheckout.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-checkout.png"));
273
      btnCheckout.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-common-checkout.png"));
274 274
      btnCheckout.setName("btnCheckout");
275 275
      btnCheckout.setToolTipText("_VCS_Checkout");
276 276
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
......
343 343
      jpanel1.add(btnAddWorkspace,cc.xy(5,1));
344 344

  
345 345
      btnInitWorkspace.setActionCommand("...");
346
      btnInitWorkspace.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-init-workspace.png"));
346
      btnInitWorkspace.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-common-init-workspace.png"));
347 347
      btnInitWorkspace.setName("btnInitWorkspace");
348 348
      btnInitWorkspace.setToolTipText("_If_you_cant_find_the_layer_click_here_to_initialize_a_new_workingcopy");
349 349
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
......
409 409
      jpanel1.add(lblReadOnlyNotification,cc.xywh(1,2,2,1));
410 410

  
411 411
      btnConnectToModel.setActionCommand("...");
412
      btnConnectToModel.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/tools-vcsgis-checkout-datamodel.png"));
412
      btnConnectToModel.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-common-checkout-datamodel.png"));
413 413
      btnConnectToModel.setName("btnConnectToModel");
414 414
      btnConnectToModel.setToolTipText("_VCS_Connect_to_datamodel");
415 415
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/java/org/gvsig/vcsgis/app/addlayer/AbstractWizardVCSGisView.xml
850 850
                      <at name="icon">
851 851
                       <object classname="com.jeta.forms.store.properties.IconProperty">
852 852
                        <at name="embedded">false</at>
853
                        <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-checkout.png</at>
854
                        <at name="description">vcsgis-checkout.png</at>
853
                        <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-common-checkout.png</at>
854
                        <at name="description">vcsgis-common-checkout.png</at>
855 855
                        <at name="width">16</at>
856 856
                        <at name="height">16</at>
857 857
                       </object>
......
1530 1530
                 <at name="icon">
1531 1531
                  <object classname="com.jeta.forms.store.properties.IconProperty">
1532 1532
                   <at name="embedded">false</at>
1533
                   <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-init-workspace.png</at>
1534
                   <at name="description">vcsgis-init-workspace.png</at>
1533
                   <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-common-init-workspace.png</at>
1534
                   <at name="description">vcsgis-common-init-workspace.png</at>
1535 1535
                   <at name="width">16</at>
1536 1536
                   <at name="height">16</at>
1537 1537
                  </object>
......
2618 2618
                 <at name="icon">
2619 2619
                  <object classname="com.jeta.forms.store.properties.IconProperty">
2620 2620
                   <at name="embedded">false</at>
2621
                   <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/tools-vcsgis-checkout-datamodel.png</at>
2622
                   <at name="description">tools-vcsgis-checkout-datamodel.png</at>
2621
                   <at name="path">vcsgis-common-checkout-datamodel.png</at>
2622
                   <at name="description">vcsgis-common-checkout-datamodel.png</at>
2623 2623
                   <at name="width">16</at>
2624 2624
                   <at name="height">16</at>
2625 2625
                  </object>
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/java/org/gvsig/vcsgis/app/VCSGisExtension.java
31 31
import java.util.Map;
32 32
import java.util.Objects;
33 33
import javax.swing.JOptionPane;
34
import org.gvsig.andami.IconThemeHelper;
35 34
import org.gvsig.andami.PluginsLocator;
36 35
import org.gvsig.andami.plugins.Extension;
37 36
import org.gvsig.andami.preferences.IPreference;
......
91 90

  
92 91
    @Override
93 92
    public void initialize() {
94
        IconThemeHelper.registerIcon("action", "tools-vcsgis-init-server", this);
95
        IconThemeHelper.registerIcon("action", "tools-vcsgis-init-workspace", this);
96
        IconThemeHelper.registerIcon("action", "tools-vcsgis-add-to-workspace", this);
97
        IconThemeHelper.registerIcon("action", "tools-vcsgis-export", this);
98
        IconThemeHelper.registerIcon("action", "tools-vcsgis-checkout", this);
99
        IconThemeHelper.registerIcon("action", "tools-vcsgis-showchanges", this);
100
        IconThemeHelper.registerIcon("action", "tools-vcsgis-register-workspace", this);
101
        IconThemeHelper.registerIcon("action", "tools-vcsgis-show-revisions", this);
102
        IconThemeHelper.registerIcon("action", "tools-vcsgis-checkout-datamodel", this);
103
        IconThemeHelper.registerIcon("action", "tools-vcsgis-download-workingcopy", this);
93
        ToolsSwingUtils.registerIcons(
94
                this.getClass(), 
95
                "/images/action",
96
                "vcsgis",
97
                new String[] { "action", "tools-vcsgis-init-server","vcsgis" },
98
                new String[] { "action", "tools-vcsgis-init-workspace","vcsgis" },
99
                new String[] { "action", "tools-vcsgis-add-to-workspace","vcsgis" },
100
                new String[] { "action", "tools-vcsgis-export","vcsgis" },
101
                new String[] { "action", "tools-vcsgis-checkout","vcsgis" },
102
                new String[] { "action", "tools-vcsgis-showchanges","vcsgis" },
103
                new String[] { "action", "tools-vcsgis-register-workspace","vcsgis" },
104
                new String[] { "action", "tools-vcsgis-show-revisions","vcsgis" },
105
                new String[] { "action", "tools-vcsgis-checkout-datamodel","vcsgis" },
106
                new String[] { "action", "tools-vcsgis-download-workingcopy","vcsgis" }
107
        );        
108
        ToolsSwingUtils.registerSubgroupIconDescription("action", "vcsgis", "Acciones asociadas a VCSGis.\nSe encuentran en el menu 'Heramientas/VCSGis'");
104 109
        
110
        
105 111
        this.dialogsHelper = new VCSGisDialogsHelper();
106 112
//        ToolsLocator.getDisposableManager().setStackLimit(200);
107 113
    }
......
110 116
    public void postInitialize() {
111 117
        super.postInitialize();
112 118
        
113
        IconThemeHelper.registerIcon("preferences", "vcsgis-preferences", this);
119
        ToolsSwingUtils.registerIcons(
120
                this.getClass(), 
121
                "/images/preferences",
122
                "vcsgis",
123
                new String[] { "preferences", "vcsgis-preferences","vcsgis" }
124
        );        
114 125
        
115 126
        ApplicationManager application = ApplicationLocator.getApplicationManager();
116 127
        VCSGisManager manager = VCSGisLocator.getVCSGisManager();
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.server/src/main/java/org/gvsig/vcsgis/app/server/VCSGisServerExtension.java
27 27
import org.gvsig.tools.ToolsLocator;
28 28
import org.gvsig.tools.i18n.I18nManager;
29 29
import org.gvsig.tools.swing.api.ToolsSwingLocator;
30
import org.gvsig.tools.swing.api.ToolsSwingUtils;
30 31
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
31 32
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
32 33

  
......
40 41
    
41 42
    @Override
42 43
    public void initialize() {
43
        IconThemeHelper.registerIcon("action", "tools-vcsgis-show-server", this);
44
        IconThemeHelper.registerIcon("action", "tools-vcsgis-server-restart", this);
45
        IconThemeHelper.registerIcon("action", "tools-vcsgis-server-stop", this);
44
        ToolsSwingUtils.registerIcons(
45
                this.getClass(), 
46
                "/images/action",
47
                "vcsgis",
48
                new String[] { "action", "tools-vcsgis-show-server","vcsgis" }
49
        ); 
50
//        ToolsSwingUtils.registerIcons(
51
//                this.getClass(), 
52
//                "/images/vcsgis",
53
//                "vcsgis",
54
//                new String[] { "vcsgis", "tools-vcsgis-server-restart","vcsgis-server" },
55
//                new String[] { "vcsgis", "tools-vcsgis-server-stop","vcsgis-server" }
56
//        ); 
57
//        ToolsSwingUtils.registerSubgroupIconScreenshot(
58
//                this.getClass(), 
59
//                "vcsgis", 
60
//                "vcsgis-server", 
61
//                "/images/screenshots/vcsgis-server.png"
62
//        );  
46 63
    }
47 64

  
48 65
    @Override
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.server/src/main/java/org/gvsig/vcsgis/app/server/VCSGisServerPanelView.java
194 194
      jpanel1.setLayout(formlayout1);
195 195

  
196 196
      btnStop.setActionCommand("Stop");
197
      btnStop.setIcon(loadImage("datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.server/src/main/resources-plugin/images/action/tools-vcsgis-server-stop.png"));
197
      btnStop.setIcon(loadImage("common-stop.png"));
198 198
      btnStop.setName("btnStop");
199 199
      btnStop.setOpaque(false);
200 200
      btnStop.setText("_Stop");
......
202 202
      jpanel1.add(btnStop,cc.xy(6,1));
203 203

  
204 204
      btnRestart.setActionCommand("Restart");
205
      btnRestart.setIcon(loadImage("datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.server/src/main/resources-plugin/images/action/tools-vcsgis-server-restart.png"));
205
      btnRestart.setIcon(loadImage("common-start.png"));
206 206
      btnRestart.setName("btnRestart");
207 207
      btnRestart.setOpaque(false);
208 208
      btnRestart.setText("_Restart");
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/.directory
1
[Dolphin]
2
PreviewsShown=true
3
Timestamp=2020,10,25,19,27,22
4
Version=4
5
ViewMode=1
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/VCSGisSwingImplLibrary.java
27 27
import org.gvsig.vcsgis.swing.VCSGisSwingLocator;
28 28
import org.gvsig.tools.library.AbstractLibrary;
29 29
import org.gvsig.tools.library.LibraryException;
30
import org.gvsig.tools.swing.api.ToolsSwingUtils;
31
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_GROUP_NAME;
32
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_PROVIDER_NAME;
30 33
import org.gvsig.vcsgis.swing.impl.changes.VCSGisJChangesImpl;
31 34
import org.gvsig.vcsgis.swing.impl.checkout.VCSGisJCheckoutImpl;
32 35
import org.gvsig.vcsgis.swing.impl.checkoutDataModel.VCSGisJCheckoutDataModelImpl;
......
62 65
        
63 66
        ExportFeatureTypeForVCSGisRepository.selfRegister();
64 67
        
68
        ToolsSwingUtils.registerIcons(
69
                VCSGisSwingImplLibrary.class, 
70
                "/org/gvsig/vcsgis/swing/impl/images",
71
                ICON_PROVIDER_NAME,
72
                new String[]{ ICON_GROUP_NAME, "vcsgis-common-init-workspace", "vcsgis-common"},
73
                new String[]{ ICON_GROUP_NAME, "vcsgis-common-checkout", "vcsgis-common"},
74
                new String[]{ ICON_GROUP_NAME, "vcsgis-common-checkout-datamodel", "vcsgis-common"}
75
        );         
76
        ToolsSwingUtils.registerSubgroupIconScreenshot(
77
                this.getClass(), 
78
                "vcsgis", 
79
                "vcsgis-common", 
80
                "/org/gvsig/vcsgis/swing/impl/screenshots/vcsgis-addlayer.png"
81
        );
65 82
    }
66 83

  
67 84
}
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/registrationOfEditingStores/VCSGisJRegistrationOfEditingStoresImpl.java
29 29
import org.gvsig.vcsgis.swing.VCSGisPanel;
30 30
import org.gvsig.vcsgis.swing.VCSGisSwingLocator;
31 31
import org.gvsig.vcsgis.swing.VCSGisSwingServices;
32
import org.gvsig.vcsgis.swing.impl.VCSGisSwingImplLibrary;
32 33
import org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl;
33 34
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_GROUP_NAME;
34 35
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_PROVIDER_NAME;
......
263 264
    }
264 265
    
265 266
    public static void selfRegister() {
266
        String[][] iconsInfo = new String[][]{
267
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-workspace-plus"},
268
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-workspace-minus"},
269
        };
270
        registerIcons(iconsInfo);
271
        
267
//        ToolsSwingUtils.registerIcons(
268
//                VCSGisSwingImplLibrary.class, 
269
//                "/org/gvsig/vcsgis/swing/impl/images",
270
//                ICON_PROVIDER_NAME,
271
//                new String[]{ "preferences", "vcsgis-workspace-add", ICON_GROUP_NAME},
272
//                new String[]{ "preferences", "vcsgis-workspace-remove", ICON_GROUP_NAME}
273
//        );   
272 274
    }
273 275

  
274 276
    @Override
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/registerWorkspace/VCSGisJRegisterWorkspaceView.java
126 126
      jpanel1.add(jscrollpane1,cc.xywh(2,2,1,5));
127 127

  
128 128
      btnAdd.setActionCommand("_add");
129
      btnAdd.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-workspace-plus.png"));
129
      btnAdd.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-workspace-add.png"));
130 130
      btnAdd.setName("btnAdd");
131 131
      btnAdd.setOpaque(false);
132 132
      btnAdd.setText("_Add");
133 133
      jpanel1.add(btnAdd,cc.xy(4,2));
134 134

  
135 135
      btnRemove.setActionCommand("_delete");
136
      btnRemove.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-workspace-minus.png"));
136
      btnRemove.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-workspace-remove.png"));
137 137
      btnRemove.setName("btnRemove");
138 138
      btnRemove.setOpaque(false);
139 139
      btnRemove.setText("_Remove");
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/registerWorkspace/VCSGisJRegisterWorkspaceImpl.java
37 37
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
38 38
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceDescriptor;
39 39
import org.gvsig.vcsgis.swing.VCSGisJRegisterWorkspace;
40
import org.gvsig.vcsgis.swing.impl.VCSGisSwingImplLibrary;
40 41
import org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl;
41 42
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_GROUP_NAME;
42 43
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_PROVIDER_NAME;
......
215 216
    }
216 217
    
217 218
    public static void selfRegister() {
218
        String[][] iconsInfo = new String[][]{
219
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-workspace-plus"},
220
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-workspace-minus"},
221
        };
222
        registerIcons(iconsInfo);
223
        
219
        ToolsSwingUtils.registerIcons(
220
                VCSGisSwingImplLibrary.class, 
221
                "/org/gvsig/vcsgis/swing/impl/images",
222
                ICON_PROVIDER_NAME,
223
                new String[]{ ICON_GROUP_NAME, "vcsgis-workspace-add", "preferences"},
224
                new String[]{ ICON_GROUP_NAME, "vcsgis-workspace-remove", "preferences"}
225
        );  
224 226
    }
225 227

  
226 228
    @Override
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/VCSGisSwingManagerImpl.java
100 100
    
101 101
    private static final Logger LOGGER = LoggerFactory.getLogger(VCSGisSwingManagerImpl.class);
102 102
    
103
    public static final String ICON_COMMON_GROUP_NAME = "Common";
104
    public static final String ICON_GROUP_NAME = "VCSGis";
103
    public static final String ICON_COMMON_GROUP_NAME = "common";
104
    public static final String ICON_GROUP_NAME = "vcsgis";
105 105
    public static final String ICON_PROVIDER_NAME = "VCSGis";
106 106
    
107 107
    private VCSGisSwingServices services;
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/checkout/VCSGisJCheckoutImpl.java
825 825

  
826 826
    public static void selfRegister() {
827 827
        String[][] iconsInfo = new String[][]{
828
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-checkout"},};
828
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-common-checkout"},};
829 829
        registerIcons(iconsInfo);
830 830
    }
831 831

  
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.xml
2126 2126
                                             <at name="icon">
2127 2127
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
2128 2128
                                               <at name="embedded">false</at>
2129
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-refresh-status.png</at>
2130
                                               <at name="description">vcsgis-refresh-status.png</at>
2129
                                               <at name="path">common-refresh.png</at>
2130
                                               <at name="description">common-refresh.png</at>
2131 2131
                                               <at name="width">16</at>
2132 2132
                                               <at name="height">16</at>
2133 2133
                                              </object>
......
2556 2556
                                             <at name="icon">
2557 2557
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
2558 2558
                                               <at name="embedded">false</at>
2559
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-highlight-context.png</at>
2559
                                               <at name="path">vcsgis-highlight-context.png</at>
2560 2560
                                               <at name="description">vcsgis-highlight-context.png</at>
2561 2561
                                               <at name="width">16</at>
2562 2562
                                               <at name="height">16</at>
......
3138 3138
                                             <at name="icon">
3139 3139
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
3140 3140
                                               <at name="embedded">false</at>
3141
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-refresh-status.png</at>
3142
                                               <at name="description">vcsgis-refresh-status.png</at>
3141
                                               <at name="path">common-refresh.png</at>
3142
                                               <at name="description">common-refresh.png</at>
3143 3143
                                               <at name="width">16</at>
3144 3144
                                               <at name="height">16</at>
3145 3145
                                              </object>
......
3209 3209
                                             <at name="icon">
3210 3210
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
3211 3211
                                               <at name="embedded">false</at>
3212
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-remotechanges-download.png</at>
3212
                                               <at name="path">vcsgis-remotechanges-download.png</at>
3213 3213
                                               <at name="description">vcsgis-remotechanges-download.png</at>
3214 3214
                                               <at name="width">16</at>
3215 3215
                                               <at name="height">16</at>
......
3280 3280
                                             <at name="icon">
3281 3281
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
3282 3282
                                               <at name="embedded">false</at>
3283
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-checkout.png</at>
3284
                                               <at name="description">vcsgis-checkout.png</at>
3283
                                               <at name="path">vcsgis-common-checkout.png</at>
3284
                                               <at name="description">vcsgis-common-checkout.png</at>
3285 3285
                                               <at name="width">16</at>
3286 3286
                                               <at name="height">16</at>
3287 3287
                                              </object>
......
3351 3351
                                             <at name="icon">
3352 3352
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
3353 3353
                                               <at name="embedded">false</at>
3354
                                               <at name="path">datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-checkout-overwrite.png</at>
3354
                                               <at name="path">vcsgis-checkout-overwrite.png</at>
3355 3355
                                               <at name="description">vcsgis-checkout-overwrite.png</at>
3356 3356
                                               <at name="width">16</at>
3357 3357
                                               <at name="height">16</at>
......
4525 4525
                                             <at name="icon">
4526 4526
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
4527 4527
                                               <at name="embedded">false</at>
4528
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-remotechanges-clear.png</at>
4528
                                               <at name="path">vcsgis-remotechanges-clear.png</at>
4529 4529
                                               <at name="description">vcsgis-remotechanges-clear.png</at>
4530 4530
                                               <at name="width">16</at>
4531 4531
                                               <at name="height">16</at>
......
4596 4596
                                             <at name="icon">
4597 4597
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
4598 4598
                                               <at name="embedded">false</at>
4599
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-remotechanges-reload.png</at>
4599
                                               <at name="path">vcsgis-remotechanges-reload.png</at>
4600 4600
                                               <at name="description">vcsgis-remotechanges-reload.png</at>
4601 4601
                                               <at name="width">16</at>
4602 4602
                                               <at name="height">16</at>
......
5025 5025
                                             <at name="icon">
5026 5026
                                              <object classname="com.jeta.forms.store.properties.IconProperty">
5027 5027
                                               <at name="embedded">false</at>
5028
                                               <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-highlight-context.png</at>
5028
                                               <at name="path">vcsgis-highlight-context.png</at>
5029 5029
                                               <at name="description">vcsgis-highlight-context.png</at>
5030 5030
                                               <at name="width">16</at>
5031 5031
                                               <at name="height">16</at>
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.java
456 456
      jpanel1.add(jlabel1,cc.xy(3,1));
457 457

  
458 458
      btnLocalRefresh.setActionCommand("...");
459
      btnLocalRefresh.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-refresh-status.png"));
459
      btnLocalRefresh.setIcon(loadImage("common-refresh.png"));
460 460
      btnLocalRefresh.setName("btnLocalRefresh");
461 461
      btnLocalRefresh.setOpaque(false);
462 462
      btnLocalRefresh.setRolloverEnabled(true);
......
521 521

  
522 522
      btnLocalHighlight.setActionCommand("...");
523 523
      btnLocalHighlight.setEnabled(false);
524
      btnLocalHighlight.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-highlight-context.png"));
524
      btnLocalHighlight.setIcon(loadImage("vcsgis-highlight-context.png"));
525 525
      btnLocalHighlight.setName("btnLocalHighlight");
526 526
      btnLocalHighlight.setOpaque(false);
527 527
      btnLocalHighlight.setRolloverEnabled(true);
......
585 585
      jpanel1.setLayout(formlayout1);
586 586

  
587 587
      btnRemoteTablesReload.setActionCommand("...");
588
      btnRemoteTablesReload.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-refresh-status.png"));
588
      btnRemoteTablesReload.setIcon(loadImage("common-refresh.png"));
589 589
      btnRemoteTablesReload.setName("btnRemoteTablesReload");
590 590
      btnRemoteTablesReload.setOpaque(false);
591 591
      btnRemoteTablesReload.setRolloverEnabled(true);
......
595 595
      jpanel1.add(btnRemoteTablesReload,cc.xy(6,1));
596 596

  
597 597
      btnRemoteDownloadChanges.setActionCommand("...");
598
      btnRemoteDownloadChanges.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-remotechanges-download.png"));
598
      btnRemoteDownloadChanges.setIcon(loadImage("vcsgis-remotechanges-download.png"));
599 599
      btnRemoteDownloadChanges.setName("btnRemoteDownloadChanges");
600 600
      btnRemoteDownloadChanges.setOpaque(false);
601 601
      btnRemoteDownloadChanges.setRolloverEnabled(true);
......
605 605
      jpanel1.add(btnRemoteDownloadChanges,cc.xy(12,1));
606 606

  
607 607
      btnRemoteCheckout.setActionCommand("...");
608
      btnRemoteCheckout.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-checkout.png"));
608
      btnRemoteCheckout.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-common-checkout.png"));
609 609
      btnRemoteCheckout.setName("btnRemoteCheckout");
610 610
      btnRemoteCheckout.setOpaque(false);
611 611
      btnRemoteCheckout.setRolloverEnabled(true);
......
615 615
      jpanel1.add(btnRemoteCheckout,cc.xy(10,1));
616 616

  
617 617
      btnRemoteCheckoutOverwrite.setActionCommand("...");
618
      btnRemoteCheckoutOverwrite.setIcon(loadImage("datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-checkout-overwrite.png"));
618
      btnRemoteCheckoutOverwrite.setIcon(loadImage("vcsgis-checkout-overwrite.png"));
619 619
      btnRemoteCheckoutOverwrite.setName("btnRemoteCheckoutOverwrite");
620 620
      btnRemoteCheckoutOverwrite.setOpaque(false);
621 621
      btnRemoteCheckoutOverwrite.setRolloverEnabled(true);
......
759 759
      jpanel1.add(btnRemoteUncheckAll,cc.xy(2,1));
760 760

  
761 761
      btnRemoteCleanChanges.setActionCommand("...");
762
      btnRemoteCleanChanges.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-remotechanges-clear.png"));
762
      btnRemoteCleanChanges.setIcon(loadImage("vcsgis-remotechanges-clear.png"));
763 763
      btnRemoteCleanChanges.setName("btnRemoteCleanChanges");
764 764
      btnRemoteCleanChanges.setOpaque(false);
765 765
      btnRemoteCleanChanges.setRolloverEnabled(true);
......
769 769
      jpanel1.add(btnRemoteCleanChanges,cc.xy(9,1));
770 770

  
771 771
      btnRemoteReloadChanges.setActionCommand("...");
772
      btnRemoteReloadChanges.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-remotechanges-reload.png"));
772
      btnRemoteReloadChanges.setIcon(loadImage("vcsgis-remotechanges-reload.png"));
773 773
      btnRemoteReloadChanges.setName("btnRemoteReloadChanges");
774 774
      btnRemoteReloadChanges.setOpaque(false);
775 775
      btnRemoteReloadChanges.setRolloverEnabled(true);
......
833 833

  
834 834
      btnRemoteHighlight.setActionCommand("...");
835 835
      btnRemoteHighlight.setEnabled(false);
836
      btnRemoteHighlight.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-highlight-context.png"));
836
      btnRemoteHighlight.setIcon(loadImage("vcsgis-highlight-context.png"));
837 837
      btnRemoteHighlight.setName("btnRemoteHighlight");
838 838
      btnRemoteHighlight.setOpaque(false);
839 839
      btnRemoteHighlight.setRolloverEnabled(true);
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesImpl.java
62 62
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingCommons.notInSwingThreadInvokeLater;
63 63
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingCommons.showAuthenticationErrors;
64 64
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingCommons.showAuthenticationRequiredMessage;
65
import org.gvsig.vcsgis.swing.impl.VCSGisSwingImplLibrary;
65 66
import org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl;
66 67
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_COMMON_GROUP_NAME;
67 68
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_GROUP_NAME;
......
403 404
    }
404 405

  
405 406
    public static void selfRegister() {
406
        String[][] iconsInfo = new String[][]{
407
//            new String[]{ICON_PROVIDER_NAME, ICON_COMMON_GROUP_NAME, "common-check-off"},
408
//            new String[]{ICON_PROVIDER_NAME, ICON_COMMON_GROUP_NAME, "common-check-on"},
409
//            new String[]{ICON_PROVIDER_NAME, ICON_COMMON_GROUP_NAME, "common-check-onsmart"},
410
//            new String[]{ICON_PROVIDER_NAME, ICON_COMMON_GROUP_NAME, "common-showform"},
411
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-commit-all"},
412
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-refresh-status"},
413
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-revert"},
414
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-update-all"},
415
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-merge"},
416
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-show-local-changes"},
417
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-show-remote-changes"},
418
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-show-local-and-remote-changes"},
419
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-center-context"},
420
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-zoom-context"},
421
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-clean-highlighted"},
422
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-topology-plan"},
423
        };
424
        registerIcons(iconsInfo);
425 407
        
408
        ToolsSwingUtils.registerIcons(
409
                VCSGisSwingImplLibrary.class, 
410
                "/org/gvsig/vcsgis/swing/impl/images",
411
                ICON_PROVIDER_NAME,
412
                new String[]{ ICON_GROUP_NAME, "vcsgis-commit-all", "vcsgis-changes"},
413
                new String[]{ ICON_GROUP_NAME, "vcsgis-revert", "vcsgis-changes"},
414
                new String[]{ ICON_GROUP_NAME, "vcsgis-topology-plan", "vcsgis-changes"},
415
                new String[]{ ICON_GROUP_NAME, "vcsgis-show-local-changes", "vcsgis-changes"},
416
                new String[]{ ICON_GROUP_NAME, "vcsgis-checkout-overwrite", "vcsgis-changes"},
417
                
418
                new String[]{ ICON_GROUP_NAME, "vcsgis-remotechanges-clear", "vcsgis-changes"},
419
                new String[]{ ICON_GROUP_NAME, "vcsgis-remotechanges-download", "vcsgis-changes"},
420
                new String[]{ ICON_GROUP_NAME, "vcsgis-remotechanges-reload", "vcsgis-changes"},
421
                new String[]{ ICON_GROUP_NAME, "vcsgis-highlight-context", "vcsgis-changes"},
422
                
423
                new String[]{ ICON_GROUP_NAME, "vcsgis-update-all", "vcsgis-changes"},
424
                new String[]{ ICON_GROUP_NAME, "vcsgis-merge", "vcsgis-changes"},
425
                new String[]{ ICON_GROUP_NAME, "vcsgis-show-remote-changes", "vcsgis-changes"},
426
                new String[]{ ICON_GROUP_NAME, "vcsgis-center-context", "vcsgis-changes"},
427
                new String[]{ ICON_GROUP_NAME, "vcsgis-zoom-context", "vcsgis-changes"},
428
                new String[]{ ICON_GROUP_NAME, "vcsgis-clean-highlighted", "vcsgis-changes"}
429
                
430
//                new String[]{ ICON_GROUP_NAME, "vcsgis-show-local-and-remote-changes"},
431
        );         
432
        ToolsSwingUtils.registerSubgroupIconScreenshot(
433
                VCSGisSwingImplLibrary.class, 
434
                "vcsgis", 
435
                "vcsgis-changes", 
436
                "/org/gvsig/vcsgis/swing/impl/screenshots/vcsgis-changes-local.png"
437
        );
438
        ToolsSwingUtils.registerSubgroupIconScreenshot(
439
                VCSGisSwingImplLibrary.class, 
440
                "vcsgis", 
441
                "vcsgis-changes", 
442
                "/org/gvsig/vcsgis/swing/impl/screenshots/vcsgis-changes-remote.png"
443
        );
444
        
426 445
    }
427 446

  
428 447
    @Override
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/VCSWorkspacePickerControllerImpl.java
70 70
                VCSWorkspacePickerControllerImpl.class, 
71 71
                "/org/gvsig/vcsgis/swing/impl/images",
72 72
                "VCSGis", 
73
                new String[] { "picker", "picker-vcsgis-workingcopy" }
73
                new String[] { "picker", "picker-vcsgis-workingcopy", "picker-vcsgis" }
74 74
        );
75 75
    }
76 76
        
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/checkoutDataModel/VCSGisJCheckoutDataModelView.xml
1054 1054
            <at name="icon">
1055 1055
             <object classname="com.jeta.forms.store.properties.IconProperty">
1056 1056
              <at name="embedded">false</at>
1057
              <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-refresh-status.png</at>
1058
              <at name="description">vcsgis-refresh-status.png</at>
1057
              <at name="path">common-refresh.png</at>
1058
              <at name="description">common-refresh.png</at>
1059 1059
              <at name="width">16</at>
1060 1060
              <at name="height">16</at>
1061 1061
             </object>
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/checkoutDataModel/VCSGisJCheckoutDataModelView.java
185 185
      jpanel1.add(createPanel1(),cc.xywh(2,10,5,1));
186 186
      btnReloadEntities.setActionCommand("...");
187 187
      btnReloadEntities.setEnabled(false);
188
      btnReloadEntities.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-refresh-status.png"));
188
      btnReloadEntities.setIcon(loadImage("common-refresh.png"));
189 189
      btnReloadEntities.setName("btnReloadEntities");
190 190
      btnReloadEntities.setToolTipText("_Refresh");
191 191
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/checkoutDataModel/VCSGisJCheckoutDataModelImpl.java
513 513

  
514 514
    public static void selfRegister() {
515 515
        String[][] iconsInfo = new String[][]{
516
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-checkout"},
516
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-common-checkout"},
517 517
//            new String[]{ICON_PROVIDER_NAME, ICON_COMMON_GROUP_NAME, "common-check-off"},
518 518
//            new String[]{ICON_PROVIDER_NAME, ICON_COMMON_GROUP_NAME, "common-check-on"},
519 519
        };
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/revisions/VCSGisJRevisionsController.java
40 40
import org.gvsig.tools.swing.api.ChangeListenerHelper;
41 41
import org.gvsig.tools.swing.api.ChangeListenerSupport;
42 42
import org.gvsig.tools.swing.api.ToolsSwingLocator;
43
import org.gvsig.tools.swing.api.ToolsSwingUtils;
43 44
import org.gvsig.tools.swing.api.windowmanager.Dialog;
44 45
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
45 46
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
......
48 49
import org.gvsig.vcsgis.lib.VCSGisRevision;
49 50
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
50 51
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingCommons.notInSwingThreadInvokeLater;
52
import org.gvsig.vcsgis.swing.impl.VCSGisSwingImplLibrary;
51 53
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_GROUP_NAME;
52 54
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_PROVIDER_NAME;
53 55
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.loadImage;
......
309 311
    }
310 312

  
311 313
    public static void selfRegister() {
312
        String[][] iconsInfo = new String[][]{
313
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-revisions"},
314
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-revisions-filter"},
315
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-revisions-more"},
316
        };
317
        registerIcons(iconsInfo);
314
        ToolsSwingUtils.registerIcons(
315
                VCSGisSwingImplLibrary.class, 
316
                "/org/gvsig/vcsgis/swing/impl/images",
317
                ICON_PROVIDER_NAME,
318
//                new String[]{ ICON_GROUP_NAME, "vcsgis-revisions", "vcsgis-revisions"},
319
                new String[]{ ICON_GROUP_NAME, "vcsgis-revisions-filter", "vcsgis-revisions"},
320
                new String[]{ ICON_GROUP_NAME, "vcsgis-revisions-more", "vcsgis-revisions"}
321
        );         
322
        ToolsSwingUtils.registerSubgroupIconScreenshot(
323
                VCSGisSwingImplLibrary.class, 
324
                "vcsgis", 
325
                "vcsgis-revisions", 
326
                "/org/gvsig/vcsgis/swing/impl/screenshots/vcsgis-revisions.png"
327
        );        
318 328
    }
319 329

  
320 330
    void setEnabled(boolean enabled) {
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/initworkspace/VCSGisJInitWorkspaceImpl.java
67 67
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceDescriptor;
68 68
import org.gvsig.vcsgis.swing.VCSGisJInitWorkspace;
69 69
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingCommons.BOOKMARKSANDHISTORY_REPOSITORY_URL;
70
import org.gvsig.vcsgis.swing.impl.VCSGisSwingImplLibrary;
70 71
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_GROUP_NAME;
71 72
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.ICON_PROVIDER_NAME;
72 73
import static org.gvsig.vcsgis.swing.impl.VCSGisSwingManagerImpl.registerIcons;
......
493 494
    }
494 495

  
495 496
    public static void selfRegister() {
496
        String[][] iconsInfo = new String[][]{
497
            new String[]{ICON_PROVIDER_NAME, ICON_GROUP_NAME, "vcsgis-init-workspace"},};
498
        registerIcons(iconsInfo);
497

  
499 498
    }
500 499

  
501 500
    @Override

Also available in: Unified diff