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

[Andi Fischer]

SVN commit 831326 by fischer:

Small ui improvements and fixes.

 M  +4 -5      codegenerationwizard.cpp  
 M  +3 -0      codegenoptionspage.cpp  
 M  +3 -0      codegenselectpage.cpp  
 M  +0 -11     codegenselectpage.ui  
 M  +3 -0      codegenstatuspage.cpp  
 M  +20 -45    codegenstatuspage.ui  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenwizard/codegenerationwizard.cpp #831325:831326
@@ -27,6 +27,7 @@
 #include "codegenstatuspage.h"
 #include "classifier.h"
 #include "uml.h"
+#include "icon_utils.h"
 
 
 const QSize CodeGenerationWizard::c_pageSize = QSize(520, 530);
@@ -39,9 +40,10 @@
 CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList)
   : QWizard((QWidget*)UMLApp::app())
   {
-    setWizardStyle(QWizard::ModernStyle);  //:TODO: does not work for MAC
+    setWizardStyle(QWizard::ModernStyle);
+    setPixmap(QWizard::LogoPixmap, Icon_Utils::UserIcon(Icon_Utils::it_Code_Gen_Wizard));
     setWindowTitle(i18n("Code Generation Wizard"));
-    setPixmap(QWizard::LogoPixmap, QPixmap("../hi48-app-umbrello.png"));  //:TODO: does not work ?
+    setOption(QWizard::NoBackButtonOnStartPage, true);
 
     setPage(SelectionPage, createSelectionPage(classList));
     setPage(OptionsPage, createOptionsPage());
@@ -64,7 +66,6 @@
 {
     m_CodeGenSelectPage = new CodeGenSelectPage(this);
     m_CodeGenSelectPage->setClassifierList(classList);
-    m_CodeGenSelectPage->setTitle(i18n("Select Classes"));
     m_CodeGenSelectPage->setFixedSize(c_pageSize);
     return m_CodeGenSelectPage;
 }
@@ -77,7 +78,6 @@
 QWizardPage* CodeGenerationWizard::createOptionsPage()
 {
     m_CodeGenOptionsPage = new CodeGenOptionsPage(this);
-    m_CodeGenOptionsPage->setTitle(i18n("Code Generation Options"));
     m_CodeGenOptionsPage->setFixedSize(c_pageSize);
     return m_CodeGenOptionsPage;
 }
@@ -90,7 +90,6 @@
 QWizardPage* CodeGenerationWizard::createStatusPage()
 {
     m_CodeGenStatusPage = new CodeGenStatusPage(this);
-    m_CodeGenStatusPage->setTitle(i18n("Status of Code Generation Progress"));
     m_CodeGenStatusPage->setFixedSize(c_pageSize);
     return m_CodeGenStatusPage;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenwizard/codegenoptionspage.cpp #831325:831326
@@ -39,6 +39,9 @@
 CodeGenOptionsPage::CodeGenOptionsPage(QWidget *parent)
     : QWizardPage(parent)
 {
+    setTitle(i18n("Code Generation Options"));
+    setSubTitle(i18n("Adjust code generation options."));
+
     setupUi(this);
 
     m_pCodePolicyPage = 0;
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenwizard/codegenselectpage.cpp #831325:831326
@@ -33,6 +33,9 @@
 CodeGenSelectPage::CodeGenSelectPage(QWidget *parent)
     : QWizardPage(parent)
 {
+    setTitle(i18n("Select Classes"));
+    setSubTitle(i18n("Place all the classes you want to generate code\nfor in the right hand side list."));
+
     setupUi(this);
 
     connect(ui_addButton, SIGNAL(clicked()), this, SLOT(selectClass()));
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenwizard/codegenselectpage.ui #831325:831326
@@ -20,17 +20,6 @@
   </property>
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QLabel" name="ui_labelTitle" >
-     <property name="text" >
-      <string>Place all the classes you want to generate code
-for in the right hand side list</string>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
     <layout class="QHBoxLayout" >
      <item>
       <layout class="QVBoxLayout" >
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenwizard/codegenstatuspage.cpp #831325:831326
@@ -41,6 +41,9 @@
 CodeGenStatusPage::CodeGenStatusPage(QWidget *parent)
     : QWizardPage(parent), m_generationDone(false)
 {
+    setTitle(i18n("Status of Code Generation Progress"));
+    setSubTitle(i18n("Press the button Generate to start the code generation.\nCheck the success state for every class."));
+
     setupUi(this);
 
     ui_tableWidgetStatus->setColumnCount(3);
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenwizard/codegenstatuspage.ui #831325:831326
@@ -20,56 +20,31 @@
   </property>
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QLabel" name="ui_labelUsage" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QTableWidget" name="ui_tableWidgetStatus" >
+     <property name="alternatingRowColors" >
+      <bool>true</bool>
      </property>
-     <property name="text" >
-      <string>Press the button Generate to start the code generation</string>
+     <property name="columnCount" >
+      <number>3</number>
      </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
+     <column>
+      <property name="text" >
+       <string>Class</string>
+      </property>
+     </column>
+     <column>
+      <property name="text" >
+       <string>Status</string>
+      </property>
+     </column>
+     <column>
+      <property name="text" >
+       <string/>
+      </property>
+     </column>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="ui_groupBox" >
-     <property name="title" >
-      <string>Generation Status</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="QTableWidget" name="ui_tableWidgetStatus" >
-        <property name="alternatingRowColors" >
-         <bool>true</bool>
-        </property>
-        <property name="columnCount" >
-         <number>3</number>
-        </property>
-        <column>
-         <property name="text" >
-          <string>Class</string>
-         </property>
-        </column>
-        <column>
-         <property name="text" >
-          <string>Status</string>
-         </property>
-        </column>
-        <column>
-         <property name="text" >
-          <string/>
-         </property>
-        </column>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <layout class="QHBoxLayout" >
      <item>
       <widget class="QPushButton" name="ui_pushButtonGenerate" >