[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Peter Kümmel]

SVN commit 1190785 by kuemmel:

undo using scroll bars, we have to patch rge .ui files

 M  +1 -4      dialog.cpp  
 M  +2 -4      dialog.h  
 M  +5 -23     dialog.ui  


--- branches/work/kst/portto4/kst/src/libkstapp/dialog.cpp #1190784:1190785
@@ -16,7 +16,6 @@
 
 #include <QHash>
 #include <QPushButton>
-#include <QStackedWidget>
 
 namespace Kst {
 
@@ -24,9 +23,7 @@
   : QDialog(parent), _allowApply(false) {
 
   setupUi(this);
-  _stackedWidget = new QStackedWidget;
-  _scrollArea->setWidget(_stackedWidget);
-  _scrollArea->setWidgetResizable(true);
+
   _saveAsDefault->hide();
 
   extensionWidget()->hide();
--- branches/work/kst/portto4/kst/src/libkstapp/dialog.h #1190784:1190785
@@ -19,10 +19,9 @@
 
 #include "ui_dialog.h"
 
-template<class Key, class Value> class QHash;
-class QStackedWidget;
+template<class Key, class Value>
+class QHash;
 
-
 namespace Kst {
 
 class DialogPage;
@@ -66,7 +65,6 @@
 
     QHash<QListWidgetItem*, DialogPage*> _itemHash;
     bool _allowApply;
-    QStackedWidget* _stackedWidget;
 };
 
 }
--- branches/work/kst/portto4/kst/src/libkstapp/dialog.ui #1190784:1190785
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>400</height>
+    <width>421</width>
+    <height>299</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,12 +19,6 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>800</width>
-    <height>400</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
@@ -121,28 +115,16 @@
          <bool>true</bool>
         </property>
        </widget>
-       <widget class="QScrollArea" name="_scrollArea">
+       <widget class="QStackedWidget" name="_stackedWidget">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-          <horstretch>2</horstretch>
+          <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="lineWidth">
-         <number>0</number>
-        </property>
-        <property name="midLineWidth">
+        <property name="currentIndex">
          <number>-1</number>
         </property>
-        <property name="widgetResizable">
-         <bool>true</bool>
-        </property>
        </widget>
       </widget>
      </item>