Revision 44603

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1398 1398
_Record_removed=Registro eliminado
1399 1399
error_removing_data_will_not_remove=Error al eliminar. Los datos no se eliminar\u00e1n.
1400 1400
_Creating_filter_for=Creando filtro para:
1401
_Form_refreshed=Formulario actualizado.
1401
_Form_refreshed=Formulario actualizado.
1402
_Simplified=Simplificada
1403
_Advanced=Avanzada
1404
_Clear=Limpiar
1405
_Search=Buscar
1406
_Insert_a_search_expression=Introduzca una expresi\u00f3n de b\u00fasqueda
1407
_elements=elementos
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1317 1317
error_saving_data_will_not_save=Error saving. Data will not save.
1318 1318
_Record_removed=Record removed
1319 1319
_Creating_filter_for=Creating filter for:
1320
_Form_refreshed=Form refreshed
1320
_Form_refreshed=Form refreshed
1321
_Simplified=Simplified
1322
_Advanced=Advanced
1323
_Clear=Clear
1324
_Search=Search
1325
_Insert_a_search_expression=Inseart a search expression
1326
_elements=elements
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/DefaultSearchPanelView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/DefaultSearchPanelView.xml</at>
27
   <at name="id">/home/osc/devel/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/DefaultSearchPanelView.xml</at>
28 28
   <at name="rowspecs">CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
29 29
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
30 30
   <at name="components">
......
89 89
                 <at name="value">
90 90
                  <object classname="com.jeta.forms.store.properties.TabProperty">
91 91
                   <at name="name">tab</at>
92
                   <at name="title">Simplificada</at>
92
                   <at name="title">_Simplified</at>
93 93
                   <at name="icon">
94 94
                    <object classname="com.jeta.forms.store.properties.IconProperty">
95 95
                     <at name="embedded">false</at>
......
113 113
                      </at>
114 114
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
115 115
                     </super>
116
                     <at name="id">embedded.2041925155</at>
116
                     <at name="id">embedded.607488925</at>
117 117
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
118 118
                     <at name="colspecs">FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
119 119
                     <at name="components">
......
166 166
                              <at name="editable">true</at>
167 167
                              <at name="requestFocusEnabled">false</at>
168 168
                              <at name="name">cboValue1</at>
169
                              <at name="width">161</at>
169
                              <at name="width">75</at>
170 170
                              <at name="items">
171 171
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
172 172
                                <at name="name">items</at>
......
228 228
                              <at name="editable">true</at>
229 229
                              <at name="requestFocusEnabled">false</at>
230 230
                              <at name="name">cboValue2</at>
231
                              <at name="width">161</at>
231
                              <at name="width">75</at>
232 232
                              <at name="items">
233 233
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
234 234
                                <at name="name">items</at>
......
290 290
                              <at name="editable">true</at>
291 291
                              <at name="requestFocusEnabled">false</at>
292 292
                              <at name="name">cboValue3</at>
293
                              <at name="width">161</at>
293
                              <at name="width">74</at>
294 294
                              <at name="items">
295 295
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
296 296
                                <at name="name">items</at>
......
352 352
                              <at name="editable">true</at>
353 353
                              <at name="requestFocusEnabled">false</at>
354 354
                              <at name="name">cboValue4</at>
355
                              <at name="width">154</at>
355
                              <at name="width">68</at>
356 356
                              <at name="items">
357 357
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
358 358
                                <at name="name">items</at>
......
412 412
                              </at>
413 413
                              <at name="horizontalAlignment">0</at>
414 414
                              <at name="name">lblRelationalOperator1</at>
415
                              <at name="width">134</at>
415
                              <at name="width">48</at>
416 416
                              <at name="text">Igual</at>
417 417
                              <at name="fill">
418 418
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
473 473
                              </at>
474 474
                              <at name="horizontalAlignment">0</at>
475 475
                              <at name="name">lblRelationalOperator2</at>
476
                              <at name="width">134</at>
476
                              <at name="width">48</at>
477 477
                              <at name="text">Igual</at>
478 478
                              <at name="fill">
479 479
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
534 534
                              </at>
535 535
                              <at name="horizontalAlignment">0</at>
536 536
                              <at name="name">lblRelationalOperator3</at>
537
                              <at name="width">134</at>
537
                              <at name="width">47</at>
538 538
                              <at name="text">Igual</at>
539 539
                              <at name="fill">
540 540
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
595 595
                              </at>
596 596
                              <at name="horizontalAlignment">0</at>
597 597
                              <at name="name">lblRelationalOperator4</at>
598
                              <at name="width">134</at>
598
                              <at name="width">48</at>
599 599
                              <at name="text">Igual</at>
600 600
                              <at name="fill">
601 601
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
839 839
                              </at>
840 840
                              <at name="horizontalAlignment">0</at>
841 841
                              <at name="name">lblField1</at>
842
                              <at name="width">134</at>
842
                              <at name="width">48</at>
843 843
                              <at name="fill">
844 844
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
845 845
                                <at name="name">fill</at>
......
899 899
                              </at>
900 900
                              <at name="horizontalAlignment">0</at>
901 901
                              <at name="name">lblField2</at>
902
                              <at name="width">134</at>
902
                              <at name="width">48</at>
903 903
                              <at name="fill">
904 904
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
905 905
                                <at name="name">fill</at>
......
959 959
                              </at>
960 960
                              <at name="horizontalAlignment">0</at>
961 961
                              <at name="name">lblField3</at>
962
                              <at name="width">134</at>
962
                              <at name="width">47</at>
963 963
                              <at name="fill">
964 964
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
965 965
                                <at name="name">fill</at>
......
1019 1019
                              </at>
1020 1020
                              <at name="horizontalAlignment">0</at>
1021 1021
                              <at name="name">lblField4</at>
1022
                              <at name="width">134</at>
1022
                              <at name="width">48</at>
1023 1023
                              <at name="fill">
1024 1024
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1025 1025
                                <at name="name">fill</at>
......
1322 1322
                           </at>
1323 1323
                          </object>
1324 1324
                         </at>
1325
                         <at name="name"></at>
1325
                         <at name="name"/>
1326 1326
                         <at name="fill">
1327 1327
                          <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1328 1328
                           <at name="name">fill</at>
......
1411 1411
                 <at name="value">
1412 1412
                  <object classname="com.jeta.forms.store.properties.TabProperty">
1413 1413
                   <at name="name">tab</at>
1414
                   <at name="title">Avanzada</at>
1414
                   <at name="title">_Advanced</at>
1415 1415
                   <at name="icon">
1416 1416
                    <object classname="com.jeta.forms.store.properties.IconProperty">
1417 1417
                     <at name="embedded">false</at>
......
1435 1435
                      </at>
1436 1436
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1437 1437
                     </super>
1438
                     <at name="id">embedded.1846888562</at>
1438
                     <at name="id">embedded.1257561441</at>
1439 1439
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
1440 1440
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
1441 1441
                     <at name="components">
......
1485 1485
                               </object>
1486 1486
                              </at>
1487 1487
                              <at name="name">txtAdvancedExpression</at>
1488
                              <at name="width">769</at>
1488
                              <at name="width">424</at>
1489 1489
                              <at name="height">20</at>
1490 1490
                             </object>
1491 1491
                            </at>
......
1539 1539
                               </object>
1540 1540
                              </at>
1541 1541
                              <at name="name">lblExpressionDeBusqueda</at>
1542
                              <at name="width">769</at>
1543
                              <at name="text">Introduzca una expresion de busqueda</at>
1542
                              <at name="width">424</at>
1543
                              <at name="text">_Insert_a_search_expression</at>
1544 1544
                              <at name="fill">
1545 1545
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1546 1546
                                <at name="name">fill</at>
......
1748 1748
                           </at>
1749 1749
                          </object>
1750 1750
                         </at>
1751
                         <at name="name"/>
1751
                         <at name="name"></at>
1752 1752
                         <at name="fill">
1753 1753
                          <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1754 1754
                           <at name="name">fill</at>
......
1831 1831
              </at>
1832 1832
             </object>
1833 1833
            </at>
1834
            <at name="width">887</at>
1834
            <at name="width">542</at>
1835 1835
            <at name="tabCount">2</at>
1836 1836
            <at name="height">154</at>
1837 1837
           </object>
......
1886 1886
             </object>
1887 1887
            </at>
1888 1888
            <at name="name">tblResults</at>
1889
            <at name="width">885</at>
1889
            <at name="width">540</at>
1890 1890
            <at name="scollBars">
1891 1891
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1892 1892
              <at name="name">scollBars</at>
......
1939 1939
         </at>
1940 1940
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1941 1941
        </super>
1942
        <at name="id">embedded.1196826108</at>
1942
        <at name="id">embedded.730061379</at>
1943 1943
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1944 1944
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1945 1945
        <at name="components">
......
1990 1990
                 </at>
1991 1991
                 <at name="actionCommand">Buscar</at>
1992 1992
                 <at name="name">btnSearch</at>
1993
                 <at name="width">72</at>
1994
                 <at name="text">Buscar</at>
1993
                 <at name="width">78</at>
1994
                 <at name="text">_Search</at>
1995 1995
                 <at name="height">22</at>
1996 1996
                </object>
1997 1997
               </at>
......
2046 2046
                 </at>
2047 2047
                 <at name="actionCommand">Limpiar</at>
2048 2048
                 <at name="name">btnClear</at>
2049
                 <at name="width">74</at>
2050
                 <at name="text">Limpiar</at>
2049
                 <at name="width">68</at>
2050
                 <at name="text">_Clear</at>
2051 2051
                 <at name="height">22</at>
2052 2052
                </object>
2053 2053
               </at>
......
2155 2155
         </at>
2156 2156
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2157 2157
        </super>
2158
        <at name="id">embedded.267987326</at>
2158
        <at name="id">embedded.835443061</at>
2159 2159
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
2160 2160
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
2161 2161
        <at name="components">
......
2205 2205
                  </object>
2206 2206
                 </at>
2207 2207
                 <at name="name">lblMsg</at>
2208
                 <at name="width">859</at>
2208
                 <at name="width">514</at>
2209 2209
                 <at name="fill">
2210 2210
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
2211 2211
                   <at name="name">fill</at>
......
2352 2352
         </at>
2353 2353
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2354 2354
        </super>
2355
        <at name="id">embedded.I17092edeI16c41952af7OY7ff1</at>
2355
        <at name="id">embedded.15882479</at>
2356 2356
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
2357 2357
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
2358 2358
        <at name="components">
......
2409 2409
              </at>
2410 2410
             </object>
2411 2411
            </at>
2412
            <at name="name"></at>
2412
            <at name="name"/>
2413 2413
            <at name="fill">
2414 2414
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
2415 2415
              <at name="name">fill</at>
......
2420 2420
              <at name="name">scollBars</at>
2421 2421
              <at name="verticalpolicy">21</at>
2422 2422
              <at name="horizontalpolicy">31</at>
2423
              <at name="border">
2424
               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
2425
                <super classname="com.jeta.forms.store.properties.BorderProperty">
2426
                 <at name="name">border</at>
2427
                </super>
2428
                <at name="borders">
2429
                 <object classname="java.util.LinkedList">
2430
                  <item >
2431
                   <at name="value">
2432
                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
2433
                     <super classname="com.jeta.forms.store.properties.BorderProperty">
2434
                      <at name="name">border</at>
2435
                     </super>
2436
                    </object>
2437
                   </at>
2438
                  </item>
2439
                 </object>
2440
                </at>
2441
               </object>
2442
              </at>
2423 2443
             </object>
2424 2444
            </at>
2425 2445
           </object>
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/DefaultSearchPanelView.java
7 7
import java.awt.ComponentOrientation;
8 8
import java.awt.Container;
9 9
import java.awt.Dimension;
10
import java.awt.event.WindowAdapter;
11
import java.awt.event.WindowEvent;
10 12
import javax.swing.Box;
11 13
import javax.swing.ImageIcon;
12 14
import javax.swing.JButton;
......
64 66
   }
65 67

  
66 68
   /**
69
    * Main method for panel
70
    */
71
   public static void main(String[] args)
72
   {
73
      JFrame frame = new JFrame();
74
      frame.setSize(600, 400);
75
      frame.setLocation(100, 100);
76
      frame.getContentPane().add(new DefaultSearchPanelView());
77
      frame.setVisible(true);
78

  
79
      frame.addWindowListener( new WindowAdapter()
80
      {
81
         public void windowClosing( WindowEvent evt )
82
         {
83
            System.exit(0);
84
         }
85
      });
86
   }
87

  
88
   /**
67 89
    * Adds fill components to empty cells in the first row and first column of the grid.
68 90
    * This ensures that the grid spacing will be the same as shown in the designer.
69 91
    * @param cols an array of column indices in the first row where fill components should be added.
......
153 175
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
154 176
      tabSearchMode.setBorder(emptyborder1);
155 177
      tabSearchMode.setTabPlacement(JTabbedPane.BOTTOM);
156
      tabSearchMode.addTab("Simplificada",null,createPanel1());
157
      tabSearchMode.addTab("Avanzada",null,createPanel2());
178
      tabSearchMode.addTab("_Simplified",null,createPanel1());
179
      tabSearchMode.addTab("_Advanced",null,createPanel2());
158 180
      jpanel1.add(tabSearchMode,cc.xy(2,3));
159 181

  
160 182
      tblResults.setName("tblResults");
......
280 302
      jpanel1.add(txtAdvancedExpression,cc.xy(2,4));
281 303

  
282 304
      lblExpressionDeBusqueda.setName("lblExpressionDeBusqueda");
283
      lblExpressionDeBusqueda.setText("Introduzca una expresion de busqueda");
305
      lblExpressionDeBusqueda.setText("_Insert_a_search_expression");
284 306
      jpanel1.add(lblExpressionDeBusqueda,cc.xy(2,2));
285 307

  
286 308
      btnAdvancedExpression.setActionCommand("...");
......
314 336

  
315 337
      btnSearch.setActionCommand("Buscar");
316 338
      btnSearch.setName("btnSearch");
317
      btnSearch.setText("Buscar");
339
      btnSearch.setText("_Search");
318 340
      jpanel1.add(btnSearch,cc.xy(4,1));
319 341

  
320 342
      btnClear.setActionCommand("Limpiar");
321 343
      btnClear.setName("btnClear");
322
      btnClear.setText("Limpiar");
344
      btnClear.setText("_Clear");
323 345
      jpanel1.add(btnClear,cc.xy(2,1));
324 346

  
325 347
      addFillComponents(jpanel1,new int[]{ 1,3 },new int[]{ 1 });
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/DefaultSearchPanel.java
58 58
import org.gvsig.tools.i18n.I18nManager;
59 59
import org.gvsig.tools.swing.api.ActionListenerSupport;
60 60
import org.gvsig.tools.swing.api.ToolsSwingLocator;
61
import org.gvsig.tools.swing.api.ToolsSwingManager;
61 62
import org.gvsig.tools.swing.icontheme.IconTheme;
62 63
import org.gvsig.tools.util.ToolsUtilLocator;
63 64
import org.slf4j.Logger;
......
207 208
    private final Map<String, ActionButtons> actions;
208 209
    private boolean showActions = true;
209 210
    private int maxSearhFields = 4;
211
    private final I18nManager i18n = ToolsLocator.getI18nManager();
210 212

  
211 213
    public DefaultSearchPanel(FeatureStore store) {
212 214
        this.store = store;
......
277 279
    }
278 280

  
279 281
    private void initComponents() {
282
        ToolsSwingManager swingManager = ToolsSwingLocator.getToolsSwingManager();
283
        swingManager.translate(this.tabSearchMode);
284
        swingManager.translate(this.btnSearch);
285
        swingManager.translate(this.btnClear);
286
        swingManager.translate(this.lblExpressionDeBusqueda);
287
                
280 288
        ConfigurableActionsMamager cfgActionsManager = ToolsUtilLocator.getConfigurableActionsMamager();
281 289
        JComponent c = cfgActionsManager.getConfigurableActionsComponent(CONFIGURABLE_PANEL_ID, this);
282 290
        this.pnlCfgActions.setLayout(new BorderLayout(0,0));
......
486 494
                        public void run() {
487 495
                            TableModel m = (TableModel) model.getValue();
488 496
                            tblResults.setModel(m);
489
                            lblMsg.setText(String.format("%d elementos", m.getRowCount()));
497
                            lblMsg.setText(String.format("%d "+i18n.getTranslation("_elements"), m.getRowCount()));
490 498
                            setEnabled(true);
491 499
                        }
492 500
                    });

Also available in: Unified diff