[PC-BSD Commits] r4256 - pbibuild/pbi-source/PBIsource

svn at pcbsd.org svn at pcbsd.org
Tue Jul 21 10:11:31 PDT 2009


Author: kris
Date: 2009-07-21 10:11:31 -0700 (Tue, 21 Jul 2009)
New Revision: 4256

Modified:
   pbibuild/pbi-source/PBIsource/pbi.cpp
   pbibuild/pbi-source/PBIsource/pbi.h
   pbibuild/pbi-source/PBIsource/pbi.ui
Log:

Added new categories to PBI installer for kmenu, and fixes bugs relating to
icon placement. Still needs a bit of UI refinement, but PBI installer is
functional for 8.0 now



Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp	2009-07-21 17:10:21 UTC (rev 4255)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp	2009-07-21 17:11:31 UTC (rev 4256)
@@ -27,6 +27,7 @@
 #include "ui_pbi.h"
 using namespace std;
 
+
 void PBI::ProgramInit( QString ProgDir )
 {
     
@@ -35,18 +36,19 @@
     // Lets the app know if the file-extraction has begun
     ExtractStarted = 0;
     
+   // Set the fixed size
+   setFixedSize(510,310);
+   setMaximumWidth(490);
+   setContentsMargins(0,0,0,0);
    gridLayout->setMargin(0);
    gridLayout->setSpacing(0);
    gridLayout_2->setMargin(0);
-   gridLayout_2->setSpacing(2);
+   gridLayout_2->setSpacing(0);
    gridLayout_3->setMargin(0);
-   gridLayout_4->setSpacing(2);
-   gridLayout_4->setMargin(0);
-   gridLayout_4->setSpacing(2);
    gridLayout_5->setMargin(0);
-   gridLayout_5->setSpacing(2);
+   gridLayout_5->setSpacing(0);
    gridLayout_6->setMargin(0);
-   gridLayout_6->setSpacing(2);
+   gridLayout_6->setSpacing(0);
    
   
     ProgramDir = ProgDir;
@@ -57,9 +59,6 @@
     connect(CheckRoot, SIGNAL( readyReadStandardOutput() ), this, SLOT(CheckRootSlot() ) );	   
     CheckRoot->start(program);
 
-    // Set the fixed size
-    setFixedSize(490,310);
-    setMaximumWidth(490);
      
      // Connect the page changed slot to proper signal
      connect( this, SIGNAL(currentIdChanged(int)), this, SLOT(PageChanged(int)) );
@@ -201,6 +200,7 @@
     if ( PageName == tr("Install Finished") )
     {
 	button(QWizard::BackButton)->setEnabled(FALSE);
+	button(QWizard::BackButton)->setHidden(TRUE);
 	button(QWizard::FinishButton)->setEnabled(TRUE);
 	button(QWizard::CancelButton)->setHidden(TRUE);
     }
@@ -210,8 +210,6 @@
 
 void PBI::readSettingsSlot()
 {
-    int NoMenuCheck = 1;
-    int NoTaskbarCheck = 1;
     
     // Open our config file, and read in the data
     QFile file( "PkgConfig" );
@@ -268,10 +266,6 @@
 	    if ( line.indexOf("ExeNoMenu:") == 0)
 	    {
 		NoMenu[i] = line.replace("ExeNoMenu: ", "");
-		if (NoMenu[i] == "0")
-		{
-		    NoMenuCheck = 0;
-		}
 	    }
 	    if ( line.indexOf("ExeNoDesktop:") == 0)
 	    {
@@ -304,11 +298,6 @@
 	    if ( line.indexOf("ExeTaskbar:") == 0)
 	    {
 		ExeTaskbar[i] = line.replace("ExeTaskbar: ", "");
-		
-		if ( ExeTaskbar[i] == "1")
-		{
-		    NoTaskbarCheck = 0;
-		}
 	    }
 	    if ( line.indexOf("ExeOwndir:") == 0)
 	    {
@@ -380,17 +369,6 @@
         //ProgDirName = ProgramName.replace(" ", "") + ProgramVer.replace(" ", "");
     }
     
-    // If we have a package with no desktop icons, remove the page
-    if (NoMenuCheck == 1)
-    {
-       removePage(3); 	
-    }
-    
-    if ( NoTaskbarCheck == 1)
-    {
-          TaskbarCheckBox->setHidden(TRUE);	
-    }
-    
     // Get the LICENSE file loaded
     QFile LicFile( "LICENSE" );
     if ( ! LicFile.exists() )
@@ -587,7 +565,7 @@
 
         // Do a check to save the menu location for this app, so we can
         // do a passive popup letting the user know
-        if (LaunchCheckBox->isChecked() && NoMenu[i] == "0" && addedIcons == 0)
+        if ( NoMenu[i] == "0" && addedIcons == 0)
         {
             // Set the flag that we have created menu entries
             addedIcons = 1;
@@ -1086,69 +1064,62 @@
       IconScript << " " << "xdg-desktop-menu install " + MenuDir + "/PBI-" + ProgDirName + "-" + Binary + ".desktop";
       IconUnScript << " " << "xdg-desktop-menu uninstall " + MenuDir + "/PBI-" + ProgDirName + "-" + Binary + ".desktop";
 
-      if ( ExeKdeCat[exenum] == "Development") {
+      if ( ExeKdeCat[exenum] == "Development")
        stream << "Categories=Qt;KDE;Development;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Editors") {
+      if ( ExeKdeCat[exenum] == "Editors")
        stream << "Categories=Qt;KDE;Editors;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Edutainment") {
+      if ( ExeKdeCat[exenum] == "Edutainment")
        stream << "Categories=Qt;KDE;Education;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Edutainment/Languages") {
+      if ( ExeKdeCat[exenum] == "Edutainment/Languages")
        stream << "Categories=Qt;KDE;Education;Languages;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Edutainment/Math") {
+      if ( ExeKdeCat[exenum] == "Edutainment/Math")
        stream << "Categories=Qt;KDE;Education;Math;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Edutainment/Misc") {
+      if ( ExeKdeCat[exenum] == "Edutainment/Misc")
        stream << "Categories=Qt;KDE;Education;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Edutainment/Science") {
+      if ( ExeKdeCat[exenum] == "Edutainment/Science")
        stream << "Categories=Qt;KDE;Education;Science;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Edutainment/Teaching") {
+      if ( ExeKdeCat[exenum] == "Edutainment/Teaching")
        stream << "Categories=Qt;KDE;Education;Teaching;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Games") {
+      if ( ExeKdeCat[exenum] == "Games")
        stream << "Categories=Qt;KDE;Game;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Games/Arcade") {
+      if ( ExeKdeCat[exenum] == "Games/Arcade")
        stream << "Categories=Qt;KDE;Game;ArcadeGame;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Games/Board") {
+      if ( ExeKdeCat[exenum] == "Games/Board")
        stream << "Categories=Qt;KDE;Game;BoardGame;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Games/Card") {
+      if ( ExeKdeCat[exenum] == "Games/Card")
        stream << "Categories=Qt;KDE;Game;CardGame;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Games/Kidsgames") {
+      if ( ExeKdeCat[exenum] == "Games/Kidsgames")
        stream << "Categories=Qt;KDE;Game;X-KDE-KidsGame;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Games/TacticStrategy") {
+      if ( ExeKdeCat[exenum] == "Games/TacticStrategy")
        stream << "Categories=Qt;KDE;Game;StrategyGame;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Graphics") {
+      if ( ExeKdeCat[exenum] == "Graphics")
        stream << "Categories=Qt;KDE;Graphics;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Internet") {
+      if ( ExeKdeCat[exenum] == "Internet")
        stream << "Categories=Qt;KDE;Network;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Multimedia") {
+      if ( ExeKdeCat[exenum] == "Multimedia")
        stream << "Categories=Qt;KDE;AudioVideo;Audio;Player;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Office") {
+      if ( ExeKdeCat[exenum] == "Network")
+       stream << "Categories=Qt;KDE;Network;\n";
+      if ( ExeKdeCat[exenum] == "Network/Email")
+       stream << "Categories=Qt;KDE;Network;Email;\n";
+      if ( ExeKdeCat[exenum] == "Network/FileTransfer")
+       stream << "Categories=Qt;KDE;Network;FileTransfer;\n";
+      if ( ExeKdeCat[exenum] == "Network/InstantMessaging")
+       stream << "Categories=Qt;KDE;Network;InstantMessaging;\n";
+      if ( ExeKdeCat[exenum] == "Network/News")
+       stream << "Categories=Qt;KDE;Network;News;\n";
+      if ( ExeKdeCat[exenum] == "Network/RemoteAccess")
+       stream << "Categories=Qt;KDE;Network;RemoteAccess;\n";
+      if ( ExeKdeCat[exenum] == "Network/WebBrowser")
+       stream << "Categories=Qt;KDE;Network;WebBrowser;\n";
+      if ( ExeKdeCat[exenum] == "Office")
        stream << "Categories=Qt;KDE;Office;\n";
-      }
-      if ( ExeKdeCat[exenum] == "System") {
+      if ( ExeKdeCat[exenum] == "System")
        stream << "Categories=Qt;KDE;System;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Toys") {
+      if ( ExeKdeCat[exenum] == "Toys")
        stream << "Categories=Qt;KDE;Toys;\n";
-      }
-      if ( ExeKdeCat[exenum] == "Utilities") {
+      if ( ExeKdeCat[exenum] == "Utilities")
        stream << "Categories=Qt;KDE;Utility;\n";
-      }
 				 
     }
 	     
@@ -1159,7 +1130,7 @@
 
     // Make the desktop files now if we need them
     ///////////////////////////////////////////////////////////////	
-    if ( NoDesktop[exenum] == "0" && ExeWebLink[exenum] != "1" && DesktopCheckBox->isChecked() )
+    if ( NoDesktop[exenum] == "0" && ExeWebLink[exenum] != "1" )
     {
 	
 	QFile file2( "/home/" + RealUserName + "/Desktop/" + Binary + ".desktop");
@@ -1707,7 +1678,6 @@
 	 QPixmap pixmap1;
 	 pixmap1.load("leftside.png");
 	 leftBarPixmap->setPixmap(pixmap1);
-
      }
     
          // Check if a custom leftside.png exists and load it
@@ -1715,7 +1685,6 @@
 	 QPixmap pixmap2;
 	 pixmap2.load("header.png");
 	 headerPixmap->setPixmap(pixmap2);
-	 headerPixmap2->setPixmap(pixmap2);
 	 headerPixmap3->setPixmap(pixmap2);
 	 headerPixmap4->setPixmap(pixmap2);
 	 headerPixmap5->setPixmap(pixmap2);

Modified: pbibuild/pbi-source/PBIsource/pbi.h
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.h	2009-07-21 17:10:21 UTC (rev 4255)
+++ pbibuild/pbi-source/PBIsource/pbi.h	2009-07-21 17:11:31 UTC (rev 4256)
@@ -25,7 +25,6 @@
     void extractOnly();
     QString getLineFromCommandOutput(QString command);
 
-
 public slots:
     void ProgramInit( QString ProgDir );
     void PageChanged( int pageId );

Modified: pbibuild/pbi-source/PBIsource/pbi.ui
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.ui	2009-07-21 17:10:21 UTC (rev 4255)
+++ pbibuild/pbi-source/PBIsource/pbi.ui	2009-07-21 17:11:31 UTC (rev 4256)
@@ -6,13 +6,26 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>575</width>
-    <height>365</height>
+    <width>500</width>
+    <height>355</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>PBI Installer</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="PBI.qrc">
+    <normaloff>:/application.png</normaloff>:/application.png</iconset>
+  </property>
+  <property name="wizardStyle">
+   <enum>QWizard::ClassicStyle</enum>
+  </property>
   <property name="options">
    <set>QWizard::IgnoreSubTitles</set>
   </property>
@@ -24,29 +37,35 @@
     <string>Welcome Screen</string>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0" rowspan="5">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <item row="0" column="0">
      <widget class="QLabel" name="leftBarPixmap">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="pixmap">
-       <pixmap resource="PBI.qrc">:/leftside.png</pixmap>
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>300</height>
+       </size>
       </property>
-      <property name="scaledContents">
-       <bool>true</bool>
+      <property name="text">
+       <string/>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      <property name="textFormat">
+       <enum>Qt::LogText</enum>
       </property>
-      <property name="wordWrap">
-       <bool>false</bool>
+      <property name="pixmap">
+       <pixmap resource="PBI.qrc">:/leftside.png</pixmap>
       </property>
      </widget>
     </item>
-    <item row="0" column="1" rowspan="5">
+    <item row="0" column="1">
      <spacer name="spacer26">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -63,252 +82,234 @@
      </spacer>
     </item>
     <item row="0" column="2">
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <spacer name="spacer23">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Maximum</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>140</width>
-          <height>21</height>
-         </size>
-        </property>
-       </spacer>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>13</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="ProgramLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <property name="text">
+           <string>&lt;h1&gt;Program Name&lt;/h1&gt;</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
       <item>
-       <spacer name="spacer22">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <spacer name="spacer25">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>300</width>
+            <height>13</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="WelcomeLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>32767</width>
+            <height>40</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Preparing to install PROGNAME</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="spacer77">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>31</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
       <item>
-       <spacer name="spacer24">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>141</width>
-          <height>31</height>
-         </size>
-        </property>
-       </spacer>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="textLabel2_2_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Vendor:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="AuthorLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>&lt;Author&gt;</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-     </layout>
-    </item>
-    <item row="1" column="2">
-     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QLabel" name="ProgramLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="text">
-         <string>&lt;h1&gt;Program Name&lt;/h1&gt;</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="textLabel2_2_3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <property name="text">
+           <string>URL:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="WebsiteLabel">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>&lt;Web&gt;</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
-       <spacer name="spacer25">
+       <spacer name="spacer27">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
+         <enum>QSizePolicy::Preferred</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>328</width>
-          <height>13</height>
+          <width>308</width>
+          <height>38</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QLabel" name="WelcomeLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>32767</width>
-          <height>40</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Preparing to install PROGNAME</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="spacer77">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>31</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </item>
-    <item row="2" column="2">
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QLabel" name="textLabel2_2_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Vendor:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="AuthorLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>&lt;Author&gt;</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item row="3" column="2">
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <item>
-       <widget class="QLabel" name="textLabel2_2_3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="text">
-         <string>URL:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="WebsiteLabel">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>&lt;Web&gt;</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item row="4" column="2">
-     <spacer name="spacer27">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>308</width>
-        <height>38</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="wizardPage">
@@ -316,8 +317,20 @@
     <string>License Agreement</string>
    </property>
    <layout class="QGridLayout" name="gridLayout_2">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <item row="0" column="0">
      <widget class="QLabel" name="headerPixmap">
+      <property name="maximumSize">
+       <size>
+        <width>490</width>
+        <height>50</height>
+       </size>
+      </property>
       <property name="pixmap">
        <pixmap resource="PBI.qrc">:/header.png</pixmap>
       </property>
@@ -368,6 +381,12 @@
       </item>
       <item>
        <widget class="QTextEdit" name="LicenseTextEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
@@ -399,7 +418,7 @@
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
+         <enum>QSizePolicy::Preferred</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -428,7 +447,7 @@
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
+         <enum>QSizePolicy::Preferred</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -447,8 +466,20 @@
     <string>Install Directory</string>
    </property>
    <layout class="QGridLayout" name="gridLayout_3">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <item row="0" column="0">
      <widget class="QLabel" name="headerPixmap5">
+      <property name="maximumSize">
+       <size>
+        <width>490</width>
+        <height>50</height>
+       </size>
+      </property>
       <property name="pixmap">
        <pixmap resource="PBI.qrc">:/header.png</pixmap>
       </property>
@@ -481,7 +512,7 @@
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
+         <enum>QSizePolicy::Preferred</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -513,7 +544,7 @@
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
+         <enum>QSizePolicy::Preferred</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -530,7 +561,7 @@
       <item row="0" column="1">
        <widget class="QLabel" name="textDesktopLinks_2">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -658,7 +689,7 @@
       </property>
       <property name="sizeHint" stdset="0">
        <size>
-        <width>568</width>
+        <width>490</width>
         <height>17</height>
        </size>
       </property>
@@ -775,194 +806,17 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWizardPage" name="wizardPage_3">
-   <property name="subTitle">
-    <string>Icon Selection</string>
-   </property>
-   <layout class="QGridLayout" name="gridLayout_4">
-    <item row="0" column="0" colspan="3">
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <widget class="QLabel" name="headerPixmap2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="PBI.qrc">:/header.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="spacer18">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>238</width>
-          <height>21</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
-    <item row="1" column="0" colspan="3">
-     <layout class="QHBoxLayout" name="horizontalLayout_6">
-      <item>
-       <spacer name="spacer19">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>21</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="textDesktopLinks">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>The installer can create desktop and launch menu icons for this package. If you do not wish these icons, uncheck the boxes below, and click &quot;Next&quot;.</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="spacer17">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>21</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
-    <item row="2" column="0" rowspan="2">
-     <spacer name="spacer16">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Expanding</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>210</width>
-        <height>158</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="2" column="1">
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QCheckBox" name="LaunchCheckBox">
-        <property name="text">
-         <string>Start Menu Icons</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="DesktopCheckBox">
-        <property name="text">
-         <string>Desktop Icons</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="TaskbarCheckBox">
-        <property name="text">
-         <string>Taskbar Icon</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item row="2" column="2" rowspan="2">
-     <spacer name="spacer14">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Expanding</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>209</width>
-        <height>138</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="3" column="1">
-     <spacer name="spacer15">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Expanding</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>128</width>
-        <height>75</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-   </layout>
-  </widget>
   <widget class="QWizardPage" name="wizardPage_4">
    <property name="subTitle">
     <string>Install Software</string>
    </property>
    <layout class="QGridLayout" name="gridLayout_5">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <item row="0" column="0" colspan="3">
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
@@ -973,6 +827,12 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="maximumSize">
+         <size>
+          <width>490</width>
+          <height>50</height>
+         </size>
+        </property>
         <property name="pixmap">
          <pixmap resource="PBI.qrc">:/header.png</pixmap>
         </property>
@@ -1140,6 +1000,12 @@
     <string>Install Finished</string>
    </property>
    <layout class="QGridLayout" name="gridLayout_6">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <item row="0" column="0">
      <layout class="QVBoxLayout" name="verticalLayout_6">
       <item>
@@ -1150,6 +1016,12 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="maximumSize">
+         <size>
+          <width>490</width>
+          <height>50</height>
+         </size>
+        </property>
         <property name="pixmap">
          <pixmap resource="PBI.qrc">:/header.png</pixmap>
         </property>



More information about the Commits mailing list