Revision 8715

View differences:

org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.app/org.gvsig.topology.app.mainplugin/src/main/java/org/gvsig/topology/app/mainplugin/TopologyExtension.java
86 86
        TopologySwingManager swingManager = TopologySwingLocator.getTopologySwingManager();
87 87
        swingManager.setDefaultServices(services);
88 88
  
89
        IconThemeHelper.registerIcon("document", "document-view-tree-icon", this);
90
        IconThemeHelper.registerIcon("topology", "topology-tree-folder", this);
91
        IconThemeHelper.registerIcon("topology", "topology-tree-project", this);
89
        IconThemeHelper.registerIcon("topology", "topology-plan", "document-view-tree-icon", this);
90
        IconThemeHelper.registerIcon("topology", "topology-plan", "topology-tree-folder", this);
91
        IconThemeHelper.registerIcon("topology", "topology-plan", "topology-tree-project", this);
92 92
        
93 93
        ConfigurableActionsMamager cfgActionsManager = ToolsUtilLocator.getConfigurableActionsMamager();
94 94
        cfgActionsManager.addConfigurableAction(JTopologyPlanProperties.CONFIGURABLE_PANEL_ID, new SaveTopologyPlan());
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/resources/org/gvsig/topology/swing/impl/images/.directory
1
[Dolphin]
2
PreviewsShown=true
3
Timestamp=2019,1,14,12,10,24
4
Version=4
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyReportView.xml
594 594
                                   <at name="icon">
595 595
                                    <object classname="com.jeta.forms.store.properties.IconProperty">
596 596
                                     <at name="embedded">false</at>
597
                                     <at name="path">org/gvsig/topology/swing/impl/images/topology-report-refresh.png</at>
598
                                     <at name="description">topology-report-refresh.png</at>
597
                                     <at name="path">common-refresh.png</at>
598
                                     <at name="description">common-refresh.png</at>
599 599
                                     <at name="width">16</at>
600 600
                                     <at name="height">16</at>
601 601
                                    </object>
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyReportView.java
211 211
      btnActions.setBorder(emptyborder3);
212 212
      jpanel1.add(btnActions,cc.xy(25,1));
213 213

  
214
      btnRefresh.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-refresh.png"));
214
      btnRefresh.setIcon(loadImage("common-refresh.png"));
215 215
      btnRefresh.setName("btnRefresh");
216 216
      btnRefresh.setRolloverEnabled(true);
217 217
      btnRefresh.setToolTipText("_Update");
......
275 275
      btnEraseErrorMarks.setBorder(emptyborder11);
276 276
      jpanel1.add(btnEraseErrorMarks,cc.xy(23,1));
277 277

  
278
      btnShowForm.setIcon(loadImage("datos/devel/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/table-show-form.png"));
278
      btnShowForm.setIcon(loadImage("common-showform.png"));
279 279
      btnShowForm.setName("btnShowForm");
280 280
      btnShowForm.setRolloverEnabled(true);
281 281
      btnShowForm.setToolTipText("_Show_feature_form");
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/RuleProperties.java
54 54
        private Icon multipointIcon;
55 55

  
56 56
        public DataSetListCellRenderer() {
57
            IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
58
            if( iconTheme.exists("layer-type-point") ) {
59
                this.pointIcon = iconTheme.get("layer-type-point");
57
            IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getActive();
58
            if( iconTheme.exists("store-geomtype-point") ) {
59
                this.pointIcon = iconTheme.get("store-geomtype-point");
60 60
            }
61
            if( iconTheme.exists("layer-type-line") ) {
62
                this.lineIcon = iconTheme.get("layer-type-line");
61
            if( iconTheme.exists("store-geomtype-line") ) {
62
                this.lineIcon = iconTheme.get("store-geomtype-line");
63 63
            }
64
            if( iconTheme.exists("layer-type-polygon") ) {
65
                this.polygonIcon = iconTheme.get("layer-type-polygon");
64
            if( iconTheme.exists("store-geomtype-polygon") ) {
65
                this.polygonIcon = iconTheme.get("store-geomtype-polygon");
66 66
            }
67
            if( iconTheme.exists("layer-type-multipoint") ) {
68
                this.multipointIcon = iconTheme.get("layer-type-multipoint");
67
            if( iconTheme.exists("store-geomtype-multipoint") ) {
68
                this.multipointIcon = iconTheme.get("store-geomtype-multipoint");
69 69
            }
70
            if( iconTheme.exists("layer-type-multiline") ) {
71
                this.multilineIcon = iconTheme.get("layer-type-multiline");
70
            if( iconTheme.exists("store-geomtype-multiline") ) {
71
                this.multilineIcon = iconTheme.get("store-geomtype-multiline");
72 72
            }
73
            if( iconTheme.exists("layer-type-multipolygon") ) {
74
                this.multipolygonIcon = iconTheme.get("layer-type-multipolygon");
73
            if( iconTheme.exists("store-geomtype-multipolygon") ) {
74
                this.multipolygonIcon = iconTheme.get("store-geomtype-multipolygon");
75 75
            }
76 76
        }
77 77
        
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/TopologySwingImplLibrary.java
29 29
import org.gvsig.tools.library.AbstractLibrary;
30 30
import org.gvsig.tools.library.LibraryException;
31 31
import org.gvsig.tools.swing.api.ToolsSwingLocator;
32
import org.gvsig.tools.swing.api.ToolsSwingUtils;
32 33
import org.gvsig.tools.swing.icontheme.IconTheme;
33 34
import org.gvsig.tools.util.ToolsUtilLocator;
34 35
import org.gvsig.topology.lib.api.TopologyLibrary;
......
62 63

  
63 64
    @Override
64 65
    protected void doPostInitialize() throws LibraryException {
65
        String[][] iconNames = new String[][] {
66
            new String[] { "layertypes", "layer-type-point" },
67
            new String[] { "layertypes", "layer-type-line" },
68
            new String[] { "layertypes", "layer-type-polygon" },
69
            new String[] { "layertypes", "layer-type-multipoint" },
70
            new String[] { "layertypes", "layer-type-multiline" },
71
            new String[] { "layertypes", "layer-type-multipolygon" }
72
        };
73
        IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent();
74
        for (String[] icon : iconNames) {
75
            URL url = this.getClass().getResource("images/layertypes/"+icon[1]+".png");
76
            theme.registerDefault("topology", icon[0], icon[1], null, url);
77
        }
66
//        String[][] iconNames = new String[][] {
67
//            new String[] { "layertypes", "layer-type-point" },
68
//            new String[] { "layertypes", "layer-type-line" },
69
//            new String[] { "layertypes", "layer-type-polygon" },
70
//            new String[] { "layertypes", "layer-type-multipoint" },
71
//            new String[] { "layertypes", "layer-type-multiline" },
72
//            new String[] { "layertypes", "layer-type-multipolygon" }
73
//        };
74
//        IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent();
75
//        for (String[] icon : iconNames) {
76
//            URL url = this.getClass().getResource("images/layertypes/"+icon[1]+".png");
77
//            theme.registerDefault("topology", icon[0], icon[1], null, url);
78
//        }
79
//        
80
//        iconNames = new String[][] {
81
//            new String[] { "action", "table-show-form" },
82
//            new String[] { "topology", "topology-plan-dataset-add" },
83
//            new String[] { "topology", "topology-plan-dataset-remove" },
84
//            new String[] { "topology", "topology-plan-rule-add" },
85
//            new String[] { "topology", "topology-plan-rule-edit" },
86
//            new String[] { "topology", "topology-plan-rule-remove" },
87
//            new String[] { "topology", "topology-report-actions" },
88
//            new String[] { "topology", "topology-report-center-error" },
89
//            new String[] { "topology", "topology-report-center-geometry" },
90
//            new String[] { "topology", "topology-report-erase-errors" },
91
//            new String[] { "topology", "topology-report-filter-errors" },
92
//            new String[] { "topology", "topology-report-filter-exceptions" },
93
//            new String[] { "topology", "topology-report-filter-visible-extent" },
94
//            new String[] { "topology", "topology-report-refresh" },
95
//            new String[] { "topology", "topology-report-show-form" },
96
//            new String[] { "topology", "topology-report-zoom-error" },
97
//            new String[] { "topology", "topology-report-zoom-geometry" }           
98
//        };
99
//        for (String[] icon : iconNames) {
100
//            URL url = this.getClass().getResource("images/"+icon[1]+".png");
101
//            theme.registerDefault("topology", icon[0], icon[1], null, url);
102
//        }
103
        ToolsSwingUtils.registerIcons(
104
                this.getClass(), 
105
                "/org/gvsig/topology/swing/impl/images",
106
                "Topology",
107
                new String[] { "topology", "topology-plan-dataset-add", "topology-plan" },
108
                new String[] { "topology", "topology-plan-dataset-remove", "topology-plan" },
109
                new String[] { "topology", "topology-plan-rule-add", "topology-plan" },
110
                new String[] { "topology", "topology-plan-rule-edit", "topology-plan" },
111
                new String[] { "topology", "topology-plan-rule-remove", "topology-plan" },
112
                
113
                new String[] { "topology", "topology-report-actions", "topology-report" },
114
                new String[] { "topology", "topology-report-center-error", "topology-report" },
115
                new String[] { "topology", "topology-report-center-geometry", "topology-report" },
116
                new String[] { "topology", "topology-report-erase-errors", "topology-report" },
117
                new String[] { "topology", "topology-report-filter-errors", "topology-report" },
118
                new String[] { "topology", "topology-report-filter-exceptions", "topology-report" },
119
                new String[] { "topology", "topology-report-filter-visible-extent", "topology-report" },
120
                new String[] { "topology", "topology-report-show-form", "topology-report" },
121
                new String[] { "topology", "topology-report-zoom-error", "topology-report" },
122
                new String[] { "topology", "topology-report-zoom-geometry", "topology-report" }           
123

  
124
        );           
125
        ToolsSwingUtils.registerSubgroupIconScreenshot(
126
                this.getClass(), 
127
                "topology",
128
                "topology-plan",
129
                "/org/gvsig/topology/swing/impl/screenshots/topology-plan1.png"
130
        );
131
        ToolsSwingUtils.registerSubgroupIconScreenshot(
132
                this.getClass(), 
133
                "topology",
134
                "topology-plan",
135
                "/org/gvsig/topology/swing/impl/screenshots/topology-plan2.png"
136
        );
137
        ToolsSwingUtils.registerSubgroupIconScreenshot(
138
                this.getClass(), 
139
                "topology",
140
                "topology-plan",
141
                "/org/gvsig/topology/swing/impl/screenshots/topology-plan3.png"
142
        );
143
        ToolsSwingUtils.registerSubgroupIconScreenshot(
144
                this.getClass(), 
145
                "topology",
146
                "topology-report",
147
                "/org/gvsig/topology/swing/impl/screenshots/topology-report1.png"
148
        );
78 149
        
79
        iconNames = new String[][] {
80
            new String[] { "action", "table-show-form" },
81
            new String[] { "topology", "topology-plan-dataset-add" },
82
            new String[] { "topology", "topology-plan-dataset-remove" },
83
            new String[] { "topology", "topology-plan-rule-add" },
84
            new String[] { "topology", "topology-plan-rule-edit" },
85
            new String[] { "topology", "topology-plan-rule-remove" },
86
            new String[] { "topology", "topology-report-actions" },
87
            new String[] { "topology", "topology-report-center-error" },
88
            new String[] { "topology", "topology-report-center-geometry" },
89
            new String[] { "topology", "topology-report-erase-errors" },
90
            new String[] { "topology", "topology-report-filter-errors" },
91
            new String[] { "topology", "topology-report-filter-exceptions" },
92
            new String[] { "topology", "topology-report-filter-visible-extent" },
93
            new String[] { "topology", "topology-report-refresh" },
94
            new String[] { "topology", "topology-report-show-form" },
95
            new String[] { "topology", "topology-report-zoom-error" },
96
            new String[] { "topology", "topology-report-zoom-geometry" }           
97
        };
98
        for (String[] icon : iconNames) {
99
            URL url = this.getClass().getResource("images/"+icon[1]+".png");
100
            theme.registerDefault("topology", icon[0], icon[1], null, url);
101
        }
102 150
        ConfigurableActionsMamager cfgActionsManager = ToolsUtilLocator.getConfigurableActionsMamager();
103 151
        cfgActionsManager.addConfigurableAction(CONFIGURABLE_PANEL_ID, new CopyTopologyPlanToClipboardAction());
104 152
    }
org.gvsig.topology/trunk/org.gvsig.topology/pom.xml
3 3
    <parent>
4 4
        <groupId>org.gvsig</groupId>
5 5
        <artifactId>org.gvsig.desktop</artifactId>
6
        <version>2.0.426</version>
6
        <version>2.0.427-SNAPSHOT</version>
7 7
    </parent>
8 8
    <artifactId>org.gvsig.topology</artifactId>
9 9
    <version>1.0.152-SNAPSHOT</version>

Also available in: Unified diff