[Gridarta-commit] SF.net SVN: gridarta:[5218] trunk

[<aki...@us...>]

Revision: 5218
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5218&view=rev
Author:   akirschbaum
Date:     2008-09-25 17:35:10 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
Make the tool selector more compact.

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/daimonin/ChangeLog
    trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java
    trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java
    trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
    trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2008-09-25 06:32:41 UTC (rev 5217)
+++ trunk/crossfire/ChangeLog	2008-09-25 17:35:10 UTC (rev 5218)
@@ -1,5 +1,7 @@
 2008-09-25  Andreas Kirschbaum
 
+	* Make the tool selector more compact.
+
 	* Use correct filename in updater.
 
 2008-09-24  Andreas Kirschbaum

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2008-09-25 06:32:41 UTC (rev 5217)
+++ trunk/daimonin/ChangeLog	2008-09-25 17:35:10 UTC (rev 5218)
@@ -1,5 +1,7 @@
 2008-09-25  Andreas Kirschbaum
 
+	* Make the tool selector more compact.
+
 	* Use correct filename in updater.
 
 2008-09-24  Andreas Kirschbaum

Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java	2008-09-25 06:32:41 UTC (rev 5217)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java	2008-09-25 17:35:10 UTC (rev 5218)
@@ -360,10 +360,6 @@
         gbcCheckBox.fill = GridBagConstraints.HORIZONTAL;
         gbcCheckBox.gridwidth = GridBagConstraints.REMAINDER;
 
-        final GridBagConstraints gbcFiller = new GridBagConstraints();
-        gbcFiller.fill = GridBagConstraints.BOTH;
-        gbcFiller.weighty = 1.0;
-
         panel.add(SwingUtils.createLabel("deletionTool.delete", deleteComboBox), gbcLabel);
         panel.add(deleteComboBox, gbcComboBox);
 
@@ -373,7 +369,6 @@
         panel.add(ignoreWallsAction.createCheckBox(), gbcCheckBox);
         panel.add(ignoreFloorsAction.createCheckBox(), gbcCheckBox);
         panel.add(ignoreMonstersAction.createCheckBox(), gbcCheckBox);
-        panel.add(new JPanel(), gbcFiller);
         return panel;
     }
 

Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java	2008-09-25 06:32:41 UTC (rev 5217)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java	2008-09-25 17:35:10 UTC (rev 5218)
@@ -208,13 +208,8 @@
         gbcCheckBox.fill = GridBagConstraints.HORIZONTAL;
         gbcCheckBox.gridwidth = GridBagConstraints.REMAINDER;
 
-        final GridBagConstraints gbcFiller = new GridBagConstraints();
-        gbcFiller.fill = GridBagConstraints.BOTH;
-        gbcFiller.weighty = 1.0;
-
         panel.add(SwingUtils.createLabel("insertionTool.mode", modeComboBox), gbcLabel);
         panel.add(modeComboBox, gbcComboBox);
-        panel.add(new JPanel(), gbcFiller);
         return panel;
     }
 

Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java	2008-09-25 06:32:41 UTC (rev 5217)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java	2008-09-25 17:35:10 UTC (rev 5218)
@@ -199,15 +199,9 @@
         gbcCheckBox.fill = GridBagConstraints.HORIZONTAL;
         gbcCheckBox.gridwidth = GridBagConstraints.REMAINDER;
 
-        final GridBagConstraints gbcFiller = new GridBagConstraints();
-        gbcFiller.fill = GridBagConstraints.BOTH;
-        gbcFiller.weighty = 1.0;
-
         panel.add(autoFillAction.createCheckBox(), gbcCheckBox);
         panel.add(SwingUtils.createLabel("selectionTool.mode", modeComboBox), gbcLabel);
         panel.add(modeComboBox, gbcComboBox);
-
-        panel.add(new JPanel(), gbcFiller);
         return panel;
     }
 

Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java	2008-09-25 06:32:41 UTC (rev 5217)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java	2008-09-25 17:35:10 UTC (rev 5218)
@@ -128,7 +128,9 @@
         @NotNull final Component optionsView = createOptionsView(tool);
         selectionButtonGroup.add(toggleButton);
         selectionPane.add(toggleButton);
-        optionsPane.add(optionsView, tool.getId());
+        final JPanel panel = new JPanel(new BorderLayout());
+        panel.add(optionsView, BorderLayout.NORTH);
+        optionsPane.add(panel, tool.getId());
         toggleButton.setSelected(selected);
         tools.put(tool.getId(), tool);
         if (selected) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.