Revision 3366 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

View differences:

VCSGisJChangesView.java
29 29
   JComboBox cboWorkspace = new JComboBox();
30 30
   JTabbedPane tabLocalAndRemote = new JTabbedPane();
31 31
   JTable tblLocalChanges = new JTable();
32
   JList lstLocalTables = new JList();
33 32
   JButton btnLocalCheckAll = new JButton();
34 33
   JButton btnLocalUnCheckAll = new JButton();
35 34
   JButton btnLocalShowForm = new JButton();
......
45 44
   JButton btnLocalEffectiveDate = new JButton();
46 45
   JLabel lblLocalComment = new JLabel();
47 46
   JLabel lblLocalChangesCount = new JLabel();
47
   JButton btnLocalCheckAllEntities = new JButton();
48
   JButton btnLocalUnCheckAll1 = new JButton();
49
   JList lstLocalTables = new JList();
48 50
   JTextField txtLocalTablesFilter = new JTextField();
49 51
   JButton btnLocalTable = new JButton();
50 52
   JTable tblRemoteChanges = new JTable();
......
171 173

  
172 174
      tabLocalAndRemote.setName("tabLocalAndRemote");
173 175
      tabLocalAndRemote.addTab("_Working_copy",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-show-local-changes.png"),createPanel1());
174
      tabLocalAndRemote.addTab("_Repository",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-show-remote-changes.png"),createPanel5());
176
      tabLocalAndRemote.addTab("_Repository",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-show-remote-changes.png"),createPanel6());
175 177
      jpanel1.add(tabLocalAndRemote,cc.xywh(2,4,5,1));
176 178

  
177 179
      btnWorkspace.setActionCommand("...");
......
182 184
      btnWorkspace.setBorder(emptyborder1);
183 185
      jpanel1.add(btnWorkspace,cc.xy(6,2));
184 186

  
185
      jpanel1.add(createPanel8(),cc.xywh(2,6,5,1));
187
      jpanel1.add(createPanel9(),cc.xywh(2,6,5,1));
186 188
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7 });
187 189
      return jpanel1;
188 190
   }
......
201 203
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
202 204
      jpanel1.add(jscrollpane1,cc.xy(4,5));
203 205

  
204
      lstLocalTables.setName("lstLocalTables");
205
      JScrollPane jscrollpane2 = new JScrollPane();
206
      jscrollpane2.setViewportView(lstLocalTables);
207
      jscrollpane2.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
208
      jscrollpane2.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
209
      jpanel1.add(jscrollpane2,cc.xy(2,5));
210

  
211 206
      jpanel1.add(createPanel2(),cc.xy(4,3));
212 207
      jpanel1.add(createPanel3(),cc.xywh(2,8,3,1));
213 208
      lblLocalChangesCount.setName("lblLocalChangesCount");
......
216 211
      jpanel1.add(lblLocalChangesCount,cc.xywh(2,6,3,1));
217 212

  
218 213
      jpanel1.add(createPanel4(),cc.xy(2,3));
214
      jpanel1.add(createPanel5(),cc.xy(2,5));
219 215
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9 });
220 216
      return jpanel1;
221 217
   }
......
358 354
   public JPanel createPanel4()
359 355
   {
360 356
      JPanel jpanel1 = new JPanel();
361
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
357
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)","CENTER:DEFAULT:NONE");
362 358
      CellConstraints cc = new CellConstraints();
363 359
      jpanel1.setLayout(formlayout1);
364 360

  
361
      btnLocalCheckAllEntities.setActionCommand("...");
362
      btnLocalCheckAllEntities.setEnabled(false);
363
      btnLocalCheckAllEntities.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/common-check-on.png"));
364
      btnLocalCheckAllEntities.setName("btnLocalCheckAllEntities");
365
      btnLocalCheckAllEntities.setOpaque(false);
366
      btnLocalCheckAllEntities.setToolTipText("_Select_all");
367
      EmptyBorder emptyborder1 = new EmptyBorder(1,1,1,1);
368
      btnLocalCheckAllEntities.setBorder(emptyborder1);
369
      jpanel1.add(btnLocalCheckAllEntities,cc.xy(1,1));
370

  
371
      btnLocalUnCheckAll1.setActionCommand("...");
372
      btnLocalUnCheckAll1.setEnabled(false);
373
      btnLocalUnCheckAll1.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/common-check-off.png"));
374
      btnLocalUnCheckAll1.setName("btnLocalUnCheckAll");
375
      btnLocalUnCheckAll1.setOpaque(false);
376
      btnLocalUnCheckAll1.setToolTipText("_Unselect_all");
377
      EmptyBorder emptyborder2 = new EmptyBorder(1,1,1,1);
378
      btnLocalUnCheckAll1.setBorder(emptyborder2);
379
      jpanel1.add(btnLocalUnCheckAll1,cc.xy(2,1));
380

  
381
      addFillComponents(jpanel1,new int[]{ 3 },new int[0]);
382
      return jpanel1;
383
   }
384

  
385
   public JPanel createPanel5()
386
   {
387
      JPanel jpanel1 = new JPanel();
388
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)");
389
      CellConstraints cc = new CellConstraints();
390
      jpanel1.setLayout(formlayout1);
391

  
392
      lstLocalTables.setName("lstLocalTables");
393
      JScrollPane jscrollpane1 = new JScrollPane();
394
      jscrollpane1.setViewportView(lstLocalTables);
395
      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
396
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
397
      jpanel1.add(jscrollpane1,cc.xywh(1,3,3,1));
398

  
365 399
      txtLocalTablesFilter.setName("txtLocalTablesFilter");
366 400
      jpanel1.add(txtLocalTablesFilter,cc.xy(1,1));
367 401

  
......
373 407
      btnLocalTable.setBorder(emptyborder1);
374 408
      jpanel1.add(btnLocalTable,cc.xy(3,1));
375 409

  
376
      addFillComponents(jpanel1,new int[]{ 2 },new int[0]);
410
      addFillComponents(jpanel1,new int[]{ 2 },new int[]{ 2 });
377 411
      return jpanel1;
378 412
   }
379 413

  
380
   public JPanel createPanel5()
414
   public JPanel createPanel6()
381 415
   {
382 416
      JPanel jpanel1 = new JPanel();
383 417
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.2),FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.8),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
......
403 437
      lblRemoteChangesCount.setHorizontalAlignment(JLabel.RIGHT);
404 438
      jpanel1.add(lblRemoteChangesCount,cc.xy(4,5));
405 439

  
406
      jpanel1.add(createPanel6(),cc.xy(4,2));
407
      jpanel1.add(createPanel7(),cc.xy(2,2));
440
      jpanel1.add(createPanel7(),cc.xy(4,2));
441
      jpanel1.add(createPanel8(),cc.xy(2,2));
408 442
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6 });
409 443
      return jpanel1;
410 444
   }
411 445

  
412
   public JPanel createPanel6()
446
   public JPanel createPanel7()
413 447
   {
414 448
      JPanel jpanel1 = new JPanel();
415 449
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
......
515 549
      return jpanel1;
516 550
   }
517 551

  
518
   public JPanel createPanel7()
552
   public JPanel createPanel8()
519 553
   {
520 554
      JPanel jpanel1 = new JPanel();
521 555
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
......
553 587
      return jpanel1;
554 588
   }
555 589

  
556
   public JPanel createPanel8()
590
   public JPanel createPanel9()
557 591
   {
558 592
      JPanel jpanel1 = new JPanel();
559 593
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE","CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE");

Also available in: Unified diff