SVN commit 515149 by langkamp:

fixed some option widget layout problems

 M  +3 -0      plugins/tools/selectiontools/kis_tool_select_brush.cc  
 M  +2 -1      plugins/tools/selectiontools/kis_tool_select_contiguous.cc  
 M  +4 -0      plugins/tools/selectiontools/kis_tool_select_elliptical.cc  
 M  +4 -0      plugins/tools/selectiontools/kis_tool_select_eraser.cc  
 M  +4 -0      plugins/tools/selectiontools/kis_tool_select_outline.cc  
 M  +4 -0      plugins/tools/selectiontools/kis_tool_select_polygonal.cc  
 M  +4 -0      plugins/tools/selectiontools/kis_tool_select_rectangular.cc  
 M  +3 -1      plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc  
 M  +0 -2      todo-1.5  
 M  +9 -20     ui/wdgselectionoptions.ui  


--- trunk/koffice/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc #515148:515149
@@ -147,6 +147,9 @@
     Q_CHECK_PTR(m_optWidget);
     m_optWidget -> setCaption(i18n("Selection Brush"));
 
+    QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout());
+    l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
     return m_optWidget;
 }
 
--- trunk/koffice/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc #515148:515149
@@ -189,7 +189,8 @@
     m_optWidget -> setCaption(i18n("Contiguous Area Selection"));
 
     QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout());
-    
+    l -> setSpacing( 6 );
+
     connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int)));
 
     QHBoxLayout * hbox = new QHBoxLayout(l);
--- trunk/koffice/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc #515148:515149
@@ -21,6 +21,7 @@
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qpen.h>
+#include <qlayout.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -302,6 +303,9 @@
 
     connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int)));
 
+    QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout());
+    l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
     return m_optWidget;
 }
 
--- trunk/koffice/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc #515148:515149
@@ -129,6 +129,10 @@
     m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget -> setCaption(i18n("Selection Eraser"));
+
+    QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout());
+    l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
     return m_optWidget;
 }
 
--- trunk/koffice/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc #515148:515149
@@ -23,6 +23,7 @@
 #include <qpainter.h>
 #include <qregion.h>
 #include <qwidget.h>
+#include <qlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
@@ -271,6 +272,9 @@
 
     connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int)));
 
+    QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout());
+    l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
     return m_optWidget;
 }
 
--- trunk/koffice/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc #515148:515149
@@ -23,6 +23,7 @@
 #include <qpainter.h>
 #include <qregion.h>
 #include <qwidget.h>
+#include <qlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
@@ -282,6 +283,9 @@
 
     connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int)));
 
+    QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout());
+    l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
     return m_optWidget;
 }
 
--- trunk/koffice/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc #515148:515149
@@ -24,6 +24,7 @@
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qpen.h>
+#include <qlayout.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -297,6 +298,9 @@
 
     connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int)));
 
+    QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout());
+    l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
     return m_optWidget;
 }
 
--- trunk/koffice/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc #515148:515149
@@ -235,7 +235,7 @@
 
     m_optWidget -> setCaption(i18n("Similar Selection"));
 
-    QVBoxLayout * l = new QVBoxLayout(m_optWidget);
+    QVBoxLayout * l = new QVBoxLayout(m_optWidget, 0, 6);
     Q_CHECK_PTR(l);
 
     m_selectionOptionsWidget = new KisSelectionOptions(m_optWidget, m_subject);
@@ -260,6 +260,8 @@
     hbox -> addWidget(input);
     connect(input, SIGNAL(valueChanged(int)), this, SLOT(slotSetFuzziness(int)));
 
+    l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
     return m_optWidget;
 }
 
--- trunk/koffice/krita/todo-1.5 #515148:515149
@@ -54,8 +54,6 @@
 * star tool: Ratio should be drop down spinbox
 * color picker: top combo should be as wide as the whole widget; the widget is a bit too big,
   we should try to make the listview a lot smaller. Maybe just use labels here?
-* contiguous area: options are near bottom of widget
-* select similar: options are near bottom of widget
 * brush, gradient, pattern buttons: should always be _square_
 * Add Palette dialog should have Cancel button (the layout also looks wierd, don't know why)
 * The edit palette dialog two-step should be changed into a single dialog
--- trunk/koffice/krita/ui/wdgselectionoptions.ui #515148:515149
@@ -9,18 +9,21 @@
             <x>0</x>
             <y>0</y>
             <width>180</width>
-            <height>31</height>
+            <height>34</height>
         </rect>
     </property>
+    <property name="caption">
+        <string>WdgSelectionOptions</string>
+    </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>2</number>
+            <number>0</number>
         </property>
         <property name="spacing">
-            <number>2</number>
+            <number>0</number>
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
@@ -30,6 +33,9 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
+                <property name="spacing">
+                    <number>6</number>
+                </property>
                 <widget class="QLabel">
                     <property name="name">
                         <cstring>lblAction</cstring>
@@ -55,23 +61,6 @@
                 </widget>
             </hbox>
         </widget>
-        <spacer>
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>0</height>
-                </size>
-            </property>
-        </spacer>
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>