Revision 45839

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/java/org/gvsig/geodb/vectorialdb/visibility/VisibilityScaleSelectorView.xml
26 26
   </super>
27 27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/java/org/gvsig/geodb/vectorialdb/visibility/VisibilityScaleSelectorView.xml</at>
28 28
   <at name="path">datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/java/org/gvsig/geodb/vectorialdb/visibility/VisibilityScaleSelectorView.xml</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
30 30
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:MAX(100PX;DEFAULT):NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
31 31
   <at name="components">
32 32
    <object classname="java.util.LinkedList">
......
76 76
            </at>
77 77
            <at name="name">txtScaleBelowDenominator</at>
78 78
            <at name="width">96</at>
79
            <at name="height">19</at>
79
            <at name="height">22</at>
80 80
           </object>
81 81
          </at>
82 82
         </object>
......
129 129
             </object>
130 130
            </at>
131 131
            <at name="name">lblMinimumScale</at>
132
            <at name="width">614</at>
132
            <at name="width">1147</at>
133 133
            <at name="text">minimum_scale</at>
134 134
            <at name="fill">
135 135
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
136 136
              <at name="name">fill</at>
137 137
             </object>
138 138
            </at>
139
            <at name="height">15</at>
139
            <at name="height">16</at>
140 140
           </object>
141 141
          </at>
142 142
         </object>
......
189 189
             </object>
190 190
            </at>
191 191
            <at name="name">lblMaximumScale</at>
192
            <at name="width">614</at>
192
            <at name="width">1147</at>
193 193
            <at name="text">maximum_scale</at>
194 194
            <at name="fill">
195 195
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
196 196
              <at name="name">fill</at>
197 197
             </object>
198 198
            </at>
199
            <at name="height">15</at>
199
            <at name="height">16</at>
200 200
           </object>
201 201
          </at>
202 202
         </object>
......
250 250
            </at>
251 251
            <at name="name">txtScaleAboveDenominator</at>
252 252
            <at name="width">96</at>
253
            <at name="height">19</at>
253
            <at name="height">22</at>
254 254
           </object>
255 255
          </at>
256 256
         </object>
......
303 303
             </object>
304 304
            </at>
305 305
            <at name="name">lblBelow</at>
306
            <at name="width">119</at>
306
            <at name="width">90</at>
307 307
            <at name="text">is_below_1_colon</at>
308 308
            <at name="fill">
309 309
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
310 310
              <at name="name">fill</at>
311 311
             </object>
312 312
            </at>
313
            <at name="height">15</at>
313
            <at name="height">16</at>
314 314
           </object>
315 315
          </at>
316 316
         </object>
......
363 363
             </object>
364 364
            </at>
365 365
            <at name="name">lblAbove</at>
366
            <at name="width">119</at>
366
            <at name="width">90</at>
367 367
            <at name="text">is_above_1_colon</at>
368 368
            <at name="fill">
369 369
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
370 370
              <at name="name">fill</at>
371 371
             </object>
372 372
            </at>
373
            <at name="height">15</at>
373
            <at name="height">16</at>
374 374
           </object>
375 375
          </at>
376 376
         </object>
......
430 430
             </object>
431 431
            </at>
432 432
            <at name="name">rdb1_25000</at>
433
            <at name="width">871</at>
433
            <at name="width">1369</at>
434
            <at name="rolloverEnabled">true</at>
434 435
            <at name="text">1:25000</at>
435
            <at name="height">17</at>
436
            <at name="height">18</at>
436 437
           </object>
437 438
          </at>
438 439
         </object>
......
492 493
             </object>
493 494
            </at>
494 495
            <at name="name">rdbConditions</at>
495
            <at name="width">871</at>
496
            <at name="width">1369</at>
497
            <at name="rolloverEnabled">true</at>
496 498
            <at name="text">dont_show_layer_when_scale</at>
497
            <at name="height">17</at>
499
            <at name="height">18</at>
498 500
           </object>
499 501
          </at>
500 502
         </object>
......
547 549
             </object>
548 550
            </at>
549 551
            <at name="name">lbl_1_25000_description</at>
550
            <at name="width">855</at>
552
            <at name="width">1353</at>
551 553
            <at name="text">1_25000_description</at>
552 554
            <at name="fill">
553 555
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
554 556
              <at name="name">fill</at>
555 557
             </object>
556 558
            </at>
557
            <at name="height">15</at>
559
            <at name="height">16</at>
558 560
           </object>
559 561
          </at>
560 562
         </object>
......
607 609
             </object>
608 610
            </at>
609 611
            <at name="name">lblDescription</at>
610
            <at name="width">871</at>
612
            <at name="width">1369</at>
611 613
            <at name="text">visibility_scale_selector_dialog_description</at>
612 614
            <at name="fill">
613 615
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
614 616
              <at name="name">fill</at>
615 617
             </object>
616 618
            </at>
617
            <at name="height">15</at>
619
            <at name="height">16</at>
618 620
           </object>
619 621
          </at>
620 622
         </object>
......
629 631
         <at name="cellconstraints">
630 632
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
631 633
           <at name="column">2</at>
632
           <at name="row">17</at>
634
           <at name="row">19</at>
633 635
           <at name="colspan">6</at>
634 636
           <at name="rowspan">1</at>
635 637
           <at name="halign">default</at>
......
668 670
            </at>
669 671
            <at name="actionCommand">remember_this_answer</at>
670 672
            <at name="name">chkRememberAnswer</at>
671
            <at name="width">871</at>
673
            <at name="width">1369</at>
674
            <at name="rolloverEnabled">true</at>
672 675
            <at name="text">remember_this_answer</at>
673
            <at name="height">17</at>
676
            <at name="height">18</at>
674 677
           </object>
675 678
          </at>
676 679
         </object>
......
730 733
             </object>
731 734
            </at>
732 735
            <at name="name">rdb1_1000</at>
733
            <at name="width">871</at>
736
            <at name="width">1369</at>
737
            <at name="rolloverEnabled">true</at>
734 738
            <at name="text">1:1000</at>
735
            <at name="height">17</at>
739
            <at name="height">18</at>
736 740
           </object>
737 741
          </at>
738 742
         </object>
......
785 789
             </object>
786 790
            </at>
787 791
            <at name="name">lbl_1_1000_description</at>
788
            <at name="width">855</at>
792
            <at name="width">1353</at>
789 793
            <at name="text">1_1000_description</at>
790 794
            <at name="fill">
791 795
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
792 796
              <at name="name">fill</at>
793 797
             </object>
794 798
            </at>
795
            <at name="height">15</at>
799
            <at name="height">16</at>
796 800
           </object>
797 801
          </at>
798 802
         </object>
......
852 856
             </object>
853 857
            </at>
854 858
            <at name="name">rdb1_5000</at>
855
            <at name="width">871</at>
859
            <at name="width">1369</at>
860
            <at name="rolloverEnabled">true</at>
856 861
            <at name="text">1:5000</at>
857
            <at name="height">17</at>
862
            <at name="height">18</at>
858 863
           </object>
859 864
          </at>
860 865
         </object>
......
907 912
             </object>
908 913
            </at>
909 914
            <at name="name">lbl_1_5000_description</at>
910
            <at name="width">855</at>
915
            <at name="width">1353</at>
911 916
            <at name="text">1_5000_description</at>
912 917
            <at name="fill">
913 918
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
914 919
              <at name="name">fill</at>
915 920
             </object>
916 921
            </at>
917
            <at name="height">15</at>
922
            <at name="height">16</at>
918 923
           </object>
919 924
          </at>
920 925
         </object>
......
922 927
       </object>
923 928
      </at>
924 929
     </item>
930
     <item >
931
      <at name="value">
932
       <object classname="com.jeta.forms.store.memento.BeanMemento">
933
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
934
         <at name="cellconstraints">
935
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
936
           <at name="column">2</at>
937
           <at name="row">17</at>
938
           <at name="colspan">6</at>
939
           <at name="rowspan">1</at>
940
           <at name="halign">default</at>
941
           <at name="valign">default</at>
942
           <at name="insets" object="insets">0,0,0,0</at>
943
          </object>
944
         </at>
945
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
946
        </super>
947
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
948
        <at name="beanclass">javax.swing.JRadioButton</at>
949
        <at name="beanproperties">
950
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
951
          <at name="classname">javax.swing.JRadioButton</at>
952
          <at name="properties">
953
           <object classname="com.jeta.forms.store.support.PropertyMap">
954
            <at name="border">
955
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
956
              <super classname="com.jeta.forms.store.properties.BorderProperty">
957
               <at name="name">border</at>
958
              </super>
959
              <at name="borders">
960
               <object classname="java.util.LinkedList">
961
                <item >
962
                 <at name="value">
963
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
964
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
965
                    <at name="name">border</at>
966
                   </super>
967
                  </object>
968
                 </at>
969
                </item>
970
               </object>
971
              </at>
972
             </object>
973
            </at>
974
            <at name="actionCommand">1:1000</at>
975
            <at name="buttonGroup">
976
             <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
977
              <at name="name">buttonGroup</at>
978
              <at name="groupname">1</at>
979
             </object>
980
            </at>
981
            <at name="name">rdbDontAssignScale</at>
982
            <at name="width">1369</at>
983
            <at name="rolloverEnabled">true</at>
984
            <at name="text">_Do_not_assign_a_display_scale</at>
985
            <at name="height">18</at>
986
           </object>
987
          </at>
988
         </object>
989
        </at>
990
       </object>
991
      </at>
992
     </item>
925 993
    </object>
926 994
   </at>
927 995
   <at name="properties">
......
939 1007
         </at>
940 1008
        </object>
941 1009
       </at>
942
       <at name="name"/>
1010
       <at name="name"></at>
943 1011
       <at name="fill">
944 1012
        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
945 1013
         <at name="name">fill</at>
......
979 1047
   <at name="cellpainters">
980 1048
    <object classname="com.jeta.forms.store.support.Matrix">
981 1049
     <at name="rows">
982
      <object classname="[Ljava.lang.Object;" size="18">
1050
      <object classname="[Ljava.lang.Object;" size="20">
983 1051
       <at name="item" index="0">
984 1052
        <object classname="[Ljava.lang.Object;" size="8"/>
985 1053
       </at>
......
1034 1102
       <at name="item" index="17">
1035 1103
        <object classname="[Ljava.lang.Object;" size="8"/>
1036 1104
       </at>
1105
       <at name="item" index="18">
1106
        <object classname="[Ljava.lang.Object;" size="8"/>
1107
       </at>
1108
       <at name="item" index="19">
1109
        <object classname="[Ljava.lang.Object;" size="8"/>
1110
       </at>
1037 1111
      </object>
1038 1112
     </at>
1039 1113
    </object>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/java/org/gvsig/geodb/vectorialdb/visibility/VisibilityScaleSelectorView.java
36 36
   JLabel lbl_1_1000_description = new JLabel();
37 37
   JRadioButton rdb1_5000 = new JRadioButton();
38 38
   JLabel lbl_1_5000_description = new JLabel();
39
   JRadioButton rdbDontAssignScale = new JRadioButton();
39 40

  
40 41
   /**
41 42
    * Default constructor
......
127 128
   public JPanel createPanel()
128 129
   {
129 130
      JPanel jpanel1 = new JPanel();
130
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:MAX(100PX;DEFAULT):NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
131
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:MAX(100PX;DEFAULT):NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
131 132
      CellConstraints cc = new CellConstraints();
132 133
      jpanel1.setLayout(formlayout1);
133 134

  
......
155 156

  
156 157
      rdb1_25000.setActionCommand("1:25000");
157 158
      rdb1_25000.setName("rdb1_25000");
159
      rdb1_25000.setRolloverEnabled(true);
158 160
      rdb1_25000.setText("1:25000");
159 161
      buttongroup1.add(rdb1_25000);
160 162
      jpanel1.add(rdb1_25000,cc.xywh(2,4,6,1));
161 163

  
162 164
      rdbConditions.setActionCommand("dont_show_layer_when");
163 165
      rdbConditions.setName("rdbConditions");
166
      rdbConditions.setRolloverEnabled(true);
164 167
      rdbConditions.setText("dont_show_layer_when_scale");
165 168
      buttongroup1.add(rdbConditions);
166 169
      jpanel1.add(rdbConditions,cc.xywh(2,13,6,1));
......
175 178

  
176 179
      chkRememberAnswer.setActionCommand("remember_this_answer");
177 180
      chkRememberAnswer.setName("chkRememberAnswer");
181
      chkRememberAnswer.setRolloverEnabled(true);
178 182
      chkRememberAnswer.setText("remember_this_answer");
179
      jpanel1.add(chkRememberAnswer,new CellConstraints(2,17,6,1,CellConstraints.DEFAULT,CellConstraints.TOP));
183
      jpanel1.add(chkRememberAnswer,new CellConstraints(2,19,6,1,CellConstraints.DEFAULT,CellConstraints.TOP));
180 184

  
181 185
      rdb1_1000.setActionCommand("1:1000");
182 186
      rdb1_1000.setName("rdb1_1000");
187
      rdb1_1000.setRolloverEnabled(true);
183 188
      rdb1_1000.setText("1:1000");
184 189
      buttongroup1.add(rdb1_1000);
185 190
      jpanel1.add(rdb1_1000,cc.xywh(2,10,6,1));
......
190 195

  
191 196
      rdb1_5000.setActionCommand("1:5000");
192 197
      rdb1_5000.setName("rdb1_5000");
198
      rdb1_5000.setRolloverEnabled(true);
193 199
      rdb1_5000.setText("1:5000");
194 200
      buttongroup1.add(rdb1_5000);
195 201
      jpanel1.add(rdb1_5000,cc.xywh(2,7,6,1));
......
198 204
      lbl_1_5000_description.setText("1_5000_description");
199 205
      jpanel1.add(lbl_1_5000_description,cc.xywh(3,8,5,1));
200 206

  
201
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18 });
207
      rdbDontAssignScale.setActionCommand("1:1000");
208
      rdbDontAssignScale.setName("rdbDontAssignScale");
209
      rdbDontAssignScale.setRolloverEnabled(true);
210
      rdbDontAssignScale.setText("_Do_not_assign_a_display_scale");
211
      buttongroup1.add(rdbDontAssignScale);
212
      jpanel1.add(rdbDontAssignScale,cc.xywh(2,17,6,1));
213

  
214
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20 });
202 215
      return jpanel1;
203 216
   }
204 217

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/java/org/gvsig/geodb/vectorialdb/visibility/VisibilityScaleSelector.java
84 84
            txtScaleAboveDenominator.setValue(SCALE_ABOVE_DENOMINATOR_1_25000);
85 85
            txtScaleBelowDenominator.setValue(SCALE_BELOW_DENOMINATOR_1_25000);
86 86
        });
87

  
87
        rdbDontAssignScale.addActionListener((ActionEvent e) -> {
88
            txtScaleAboveDenominator.setValue(-1);
89
            txtScaleBelowDenominator.setValue(-1);
90
        });
91
        rdbDontAssignScale.setSelected(true);
92
        
88 93
        this.setPreferredSize(new Dimension(400,400));
89 94
    }
90 95

  
......
99 104
        i18nc.translate(lbl_1_5000_description, true);
100 105
        i18nc.translate(lbl_1_1000_description, true);
101 106
        i18nc.translate(rdbConditions, true);
107
        i18nc.translate(rdbDontAssignScale);
102 108
        i18nc.translate(lblBelow, true);
103 109
        i18nc.translate(lblAbove, true);
104 110
        i18nc.translate(lblMaximumScale, true);
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/java/org/gvsig/geodb/WizardDBVectorial.java
221 221
        VisibilityScaleSelector visibilityScaleSelector = new VisibilityScaleSelector();
222 222
        Dialog dialog = winManager.createDialog(
223 223
                visibilityScaleSelector.asJComponent(), 
224
                i18n.getTranslation("select_visibility_scale"), 
224
                i18n.getTranslation("select_visibility_scale") + " - " + layer.getName(), 
225 225
                null, 
226 226
                WindowManager_v2.BUTTONS_OK_CANCEL
227 227
        );
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/resources-plugin/i18n/text.properties
59 59
_Projection_required=Es necesario especificar la proyecci\u00f3n
60 60
_Projection_recommended=Es recomendable especificar la proyecci\u00f3n
61 61
_PrimaryKey_field_required=Es necesario especificar la clave primaria
62
_PrimaryKey_field_recommended=Es recomendable especificar la clave primaria
62
_PrimaryKey_field_recommended=Es recomendable especificar la clave primaria
63
_Do_not_assign_a_display_scale=No asignarle una escala de visualizaci\u00f3n
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
59 59
_Projection_required=Projection required
60 60
_Projection_recommended=Projection recommended
61 61
_PrimaryKey_field_required=PrimaryKey field required
62
_PrimaryKey_field_recommended=PrimaryKey field recommended
62
_PrimaryKey_field_recommended=PrimaryKey field recommended
63
_Do_not_assign_a_display_scale=Do not assign a display scale

Also available in: Unified diff