[Uml-devel] KDE/kdesdk/umbrello/umbrello/codeimpwizard

[Andi Fischer]

SVN commit 1290683 by fischer:

Resizing of code import wizard fixed and improved. Wizard is now usable also for small screens.

 M  +0 -7      codeimportingwizard.cpp  
 M  +0 -1      codeimportingwizard.h  
 M  +37 -24    codeimpstatuspage.ui  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimpwizard/codeimportingwizard.cpp #1290682:1290683
@@ -36,11 +36,6 @@
 #include <QtGui/QWizardPage>
 
 /**
- * Constant value for the fixed size of the wizard pages.
- */
-const QSize CodeImportingWizard::c_pageSize = QSize(520, 530);
-
-/**
  * Constructor. Sets up the wizard and loads the wizard pages.
  * Each wizard page has its own class.
  * @param classList   the list of classes, which have to be generated
@@ -72,7 +67,6 @@
 QWizardPage* CodeImportingWizard::createSelectionPage()
 {
     m_SelectionPage = new CodeImpSelectPage(this);
-    m_SelectionPage->setFixedSize(c_pageSize);
     return m_SelectionPage;
 }
 
@@ -84,7 +78,6 @@
 QWizardPage* CodeImportingWizard::createStatusPage()
 {
     m_StatusPage = new CodeImpStatusPage(this);
-    m_StatusPage->setFixedSize(c_pageSize);
     return m_StatusPage;
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimpwizard/codeimportingwizard.h #1290682:1290683
@@ -49,7 +49,6 @@
     CodeImpSelectPage  *m_SelectionPage;
     CodeImpStatusPage  *m_StatusPage;
 
-    static const QSize c_pageSize;
 };
 
 #endif
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimpwizard/codeimpstatuspage.ui #1290682:1290683
@@ -11,14 +11,20 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
     <widget class="QTabWidget" name="ui_tabWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
@@ -26,18 +32,17 @@
       <attribute name="title">
        <string>Import Status</string>
       </attribute>
-      <widget class="QWidget" name="verticalLayoutWidget">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>10</y>
-         <width>471</width>
-         <height>471</height>
-        </rect>
-       </property>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
          <widget class="QTableWidget" name="ui_tableWidgetStatus">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
           <property name="alternatingRowColors">
            <bool>true</bool>
           </property>
@@ -98,24 +103,31 @@
          </layout>
         </item>
        </layout>
+       </item>
+      </layout>
       </widget>
-     </widget>
      <widget class="QWidget" name="ui_tabLogger">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <attribute name="title">
        <string>Logger</string>
       </attribute>
-      <widget class="QWidget" name="verticalLayoutWidget_2">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>10</y>
-         <width>451</width>
-         <height>471</height>
-        </rect>
-       </property>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
-         <widget class="QTextEdit" name="ui_textEditLogger"/>
+          <widget class="QTextEdit" name="ui_textEditLogger">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
         </item>
         <item>
          <layout class="QGridLayout" name="gridLayout_4">
@@ -148,9 +160,10 @@
          </layout>
         </item>
        </layout>
+       </item>
+      </layout>
       </widget>
      </widget>
-    </widget>
    </item>
   </layout>
  </widget>