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

svn at pcbsd.org svn at pcbsd.org
Mon Jun 16 11:29:40 PDT 2008


Author: kris
Date: 2008-06-16 11:29:40 -0700 (Mon, 16 Jun 2008)
New Revision: 2104

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

Forgot to commin main.cpp for the PBI installer GUI, and also fixed a bug
with the license box being too small during install



Modified: pbibuild/pbi-source/PBIsource/main.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/main.cpp	2008-06-16 17:04:13 UTC (rev 2103)
+++ pbibuild/pbi-source/PBIsource/main.cpp	2008-06-16 18:29:40 UTC (rev 2104)
@@ -3,27 +3,37 @@
 #include <kcmdlineargs.h>
 #include <qtranslator.h>
 #include <qtextcodec.h>
+#include <kaboutdata.h>
 #include "pbi.h"
 
+static const char description[] = I18N_NOOP("PBI Install GUI");
+
 int main( int argc, char ** argv )
 {
-          
- KCmdLineArgs::init(argc, argv, "PBI", "PBI", "PBI Installer", "3.1");
 
-   
- static KCmdLineOptions options[] =
- {
-    { "", "Start the PBI Install", 0 },
-    { "extract", "Extract the PBI files and create the .pbc configuration", 0 },
-    KCmdLineLastOption
- };
+    KAboutData aboutData("PBI", 0, ki18n("PBI"),
+                            "4.4", ki18n(description),
+                            KAboutData::License_BSD,
+                            ki18n("(c) 2008, Kris Moore(c)"));
 
+    aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris at pcbsd.org");
+
+    KCmdLineArgs::init(argc, argv, &aboutData);
+
+    KCmdLineOptions options;
+
+    options.add("", ki18n("Start the PBI Install"));
+    options.add("extract", ki18n("Extract the PBI files and create the .pbc configuration"));
+
+
     // Tell which options are supported
     KCmdLineArgs::addCmdLineOptions( options );
- 
+
+
     KApplication a;
 
-    //QApplication a( argc, argv);
+          
+   
 
     QTranslator translator( 0 );
     translator.load( QString("PBI_") + QTextCodec::locale(), "." );

Modified: pbibuild/pbi-source/PBIsource/pbi.ui
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.ui	2008-06-16 17:04:13 UTC (rev 2103)
+++ pbibuild/pbi-source/PBIsource/pbi.ui	2008-06-16 18:29:40 UTC (rev 2104)
@@ -56,6 +56,14 @@
    <bool>false</bool>
   </property>
   <widget class="QWidget" name="WizardPage" >
+   <property name="geometry" >
+    <rect>
+     <x>6</x>
+     <y>36</y>
+     <width>503</width>
+     <height>321</height>
+    </rect>
+   </property>
    <attribute name="title" >
     <string>Welcome Screen</string>
    </attribute>
@@ -803,8 +811,8 @@
    <attribute name="title" >
     <string>License Agreement</string>
    </attribute>
-   <layout class="QGridLayout" >
-    <item row="0" column="0" colspan="5" >
+   <layout class="QGridLayout" name="gridLayout_2" >
+    <item row="0" column="0" colspan="3" >
      <widget class="QLabel" name="headerPixmap" >
       <property name="pixmap" >
        <pixmap resource="PBI.qrc" >:/header.png</pixmap>
@@ -817,7 +825,7 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="2" >
+    <item row="1" column="1" >
      <spacer name="spacer31_3" >
       <property name="orientation" >
        <enum>Qt::Vertical</enum>
@@ -833,52 +841,100 @@
       </property>
      </spacer>
     </item>
-    <item row="2" column="1" colspan="3" >
-     <widget class="Q3TextEdit" name="LicenseTextEdit" >
-      <property name="text" >
-       <string/>
+    <item row="2" column="0" colspan="3" >
+     <layout class="QHBoxLayout" name="horizontalLayout_3" >
+      <property name="sizeConstraint" >
+       <enum>QLayout::SetMaximumSize</enum>
       </property>
-      <property name="wordWrap" >
-       <enum>Q3TextEdit::WidgetWidth</enum>
-      </property>
-      <property name="readOnly" >
-       <bool>true</bool>
-      </property>
-     </widget>
+      <item>
+       <spacer name="spacer31_2" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>15</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="Q3TextEdit" name="LicenseTextEdit" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="wordWrap" >
+         <enum>Q3TextEdit::WidgetWidth</enum>
+        </property>
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="spacer31" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>15</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
     </item>
-    <item row="2" column="4" >
-     <spacer name="spacer31" >
+    <item row="3" column="0" >
+     <spacer name="spacer28" >
       <property name="orientation" >
        <enum>Qt::Horizontal</enum>
       </property>
       <property name="sizeType" >
-       <enum>QSizePolicy::Fixed</enum>
+       <enum>QSizePolicy::Expanding</enum>
       </property>
       <property name="sizeHint" stdset="0" >
        <size>
-        <width>21</width>
-        <height>20</height>
+        <width>220</width>
+        <height>31</height>
        </size>
       </property>
      </spacer>
     </item>
-    <item row="2" column="0" >
-     <spacer name="spacer31_2" >
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
+    <item row="3" column="1" >
+     <widget class="QCheckBox" name="LicenseCheckBox" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
       </property>
-      <property name="sizeType" >
-       <enum>QSizePolicy::Fixed</enum>
+      <property name="text" >
+       <string>I Agree</string>
       </property>
-      <property name="sizeHint" stdset="0" >
-       <size>
-        <width>21</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
+     </widget>
     </item>
-    <item row="3" column="3" colspan="2" >
+    <item row="3" column="2" >
      <spacer name="spacer29" >
       <property name="orientation" >
        <enum>Qt::Horizontal</enum>
@@ -894,46 +950,9 @@
       </property>
      </spacer>
     </item>
-    <item row="3" column="0" colspan="2" >
-     <spacer name="spacer28" >
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType" >
-       <enum>QSizePolicy::Expanding</enum>
-      </property>
-      <property name="sizeHint" stdset="0" >
-       <size>
-        <width>220</width>
-        <height>31</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="3" column="2" >
-     <widget class="QCheckBox" name="LicenseCheckBox" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text" >
-       <string>I Agree</string>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="WizardPage" >
-   <property name="geometry" >
-    <rect>
-     <x>6</x>
-     <y>36</y>
-     <width>503</width>
-     <height>321</height>
-    </rect>
-   </property>
    <attribute name="title" >
     <string>Install Directory</string>
    </attribute>



More information about the Commits mailing list