From kde-commits  Fri Oct 31 23:26:52 2008
From: =?utf-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <aurelien.gateau () free ! fr>
Date: Fri, 31 Oct 2008 23:26:52 +0000
To: kde-commits
Subject: extragear/graphics/kipi-plugins/htmlexport
Message-Id: <1225495612.832882.16614.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122549562408892

SVN commit 878345 by gateau:

Show a scrollbar if there is too many parameters.


 M  +54 -76    themeparameterspage.ui  
 M  +7 -10     wizard.cpp  


--- trunk/extragear/graphics/kipi-plugins/htmlexport/themeparameterspage.ui #878344:878345
@@ -1,80 +1,58 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>ThemeParametersPage</class>
-  <widget class="QWidget" name="ThemeParametersPage" >
-    <property name="geometry" >
-      <rect>
+<ui version="4.0" >
+ <class>ThemeParametersPage</class>
+ <widget class="QWidget" name="ThemeParametersPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <widget class="QLabel" name="textLabel1" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>In this page, you can change some theme parameters. Depending on the theme, different parameters are available.</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignVCenter</set>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QScrollArea" name="scrollArea" >
+     <property name="frameShape" >
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="widgetResizable" >
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="content" >
+      <property name="geometry" >
+       <rect>
         <x>0</x>
         <y>0</y>
-        <width>600</width>
-        <height>480</height>
-      </rect>
-    </property>
-    <layout class="QGridLayout" >
-      <property name="margin" >
-        <number>0</number>
+        <width>592</width>
+        <height>429</height>
+       </rect>
       </property>
-      <item rowspan="1" row="0" column="0" colspan="2" >
-        <widget class="QLabel" name="textLabel1" >
-          <property name="sizePolicy" >
-            <sizepolicy>
-              <hsizetype>5</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-            </sizepolicy>
-          </property>
-          <property name="text" >
-            <string>In this page, you can change some theme parameters. Depending on the theme, different parameters are available.</string>
-          </property>
-          <property name="alignment" >
-            <set>Qt::AlignVCenter</set>
-          </property>
-          <property name="wordWrap" >
-            <bool>true</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="2" column="0" >
-        <spacer name="spacer2_2_2_2" >
-          <property name="sizeHint" >
-            <size>
-              <width>16</width>
-              <height>20</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Horizontal</enum>
-          </property>
-        </spacer>
-      </item>
-      <item row="2" column="1" >
-        <widget class="QFrame" name="content" >
-        </widget>
-      </item>
-      <item row="1" column="1" >
-        <spacer name="spacer12" >
-          <property name="sizeHint" >
-            <size>
-              <width>20</width>
-              <height>16</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="0" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="0" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
 </ui>
--- trunk/extragear/graphics/kipi-plugins/htmlexport/wizard.cpp #878344:878345
@@ -138,21 +138,17 @@
 	}
 
 	void fillThemeParametersPage(Theme::Ptr theme) {
-		// Delete any previous widgets
-		QFrame* content = mThemeParametersPage->content;
-		if (content->layout()) {
-			Q_FOREACH(QObject* object, content->children()) {
-				if (object->isWidgetType()) {
-					delete object;
-				}
-			}
-			delete content->layout();
-		}
+		// Create a new content page
+		delete mThemeParametersPage->content;
+		QWidget* content = new QWidget;
+		mThemeParametersPage->content = content;
+		mThemeParametersPage->scrollArea->setWidget(mThemeParametersPage->content);
 		mThemeParameterWidgetFromName.clear();
 
 		// Create layout. We need to recreate it everytime, to get rid of
 		// spacers
 		QGridLayout* layout = new QGridLayout(content);
+		layout->setMargin(0);
 		layout->setSpacing(KDialog::spacingHint());
 
 		// Create widgets
@@ -173,6 +169,7 @@
 			name = i18nc("'%1' is a label for a theme parameter", "%1:", name);
 
 			QLabel* label = new QLabel(name, content);
+			label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 			QWidget* widget = themeParameter->createWidget(content, value);
 			label->setBuddy(widget);