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

[svn at pcbsd.org]

Author: kris
Date: 2009-07-22 11:46:15 -0700 (Wed, 22 Jul 2009)
New Revision: 4267

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

Make PBIsource a QT4 only app, remove KDE4 stuff, since QT 4.5 now can inherit the KDE / oxygen theme
properly. 



Modified: pbibuild/pbi-source/PBIsource/PBI.pro
===================================================================
--- pbibuild/pbi-source/PBIsource/PBI.pro	2009-07-22 18:09:37 UTC (rev 4266)
+++ pbibuild/pbi-source/PBIsource/PBI.pro	2009-07-22 18:46:15 UTC (rev 4267)
@@ -3,10 +3,6 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -L/PCBSD/local/kde4/lib -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs 
-
-INCLUDEPATH += /PCBSD/local/kde4/include /usr/local/kde4/include
-
 HEADERS += pbi.h
 
 SOURCES	+= main.cpp pbi.cpp
@@ -23,4 +19,4 @@
   OBJECTS_DIR = .obj
 }
 
-QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/lib/qt4 /PCBSD/local/lib /usr/local/lib/qt4 /usr/local/lib

Modified: pbibuild/pbi-source/PBIsource/main.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/main.cpp	2009-07-22 18:09:37 UTC (rev 4266)
+++ pbibuild/pbi-source/PBIsource/main.cpp	2009-07-22 18:46:15 UTC (rev 4267)
@@ -1,48 +1,18 @@
 #include <qapplication.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
 #include <qtranslator.h>
 #include <qlocale.h>
-#include <kaboutdata.h>
 #include "pbi.h"
 
-static const char description[] = I18N_NOOP("PBI Install GUI");
-
 int main( int argc, char ** argv )
 {
+    QApplication a(argc, argv, TRUE);
 
-    KAboutData aboutData("PBI", 0, ki18n("PBI"),
-                            "5.1", ki18n(description),
-                            KAboutData::License_BSD,
-                            ki18n("(c) 2009, 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"));
-    options.add("32bitcompat", ki18n("Install a 32bit PBI on 64bit platform."));
-
-
-    // Tell which options are supported
-    KCmdLineArgs::addCmdLineOptions( options );
-
-
-    KApplication a;
-
-          
-   
-
     QTranslator translator( 0 );
     QLocale mylocale;
     translator.load( QString("PBI_") + QLocale::languageToString(mylocale.language()), "." );
     a.installTranslator( &translator );
     PBI w; 
 	
-	
     if ( argc == 2)
     {
         QString flag = argv[1];

Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp	2009-07-22 18:09:37 UTC (rev 4266)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp	2009-07-22 18:46:15 UTC (rev 4267)
@@ -36,22 +36,25 @@
     // Lets the app know if the file-extraction has begun
     ExtractStarted = 0;
     
-   // Set the fixed size
-   setFixedSize(510,315);
-   setMaximumWidth(510);
-   setContentsMargins(0,0,0,0);
-   gridLayout->setMargin(0);
-   gridLayout->setContentsMargins(0,0,0,0);
-   gridLayout->setSpacing(0);
-   gridLayout_2->setMargin(0);
-   gridLayout_2->setSpacing(0);
-   gridLayout_3->setMargin(0);
-   gridLayout_5->setMargin(0);
-   gridLayout_5->setSpacing(0);
-   gridLayout_6->setMargin(0);
-   gridLayout_6->setSpacing(0);
-   gridLayout->update();
+    // Set the fixed size
+    setFixedSize(510,315);
+    setMaximumWidth(510);
+    setContentsMargins(0,0,0,0);
+    /*
+    gridLayout->setMargin(0);
+    gridLayout->setContentsMargins(0,0,0,0);
+    gridLayout->setSpacing(0);
+    gridLayout_2->setMargin(0);
+    gridLayout_2->setSpacing(0);
+    gridLayout_3->setMargin(0);
+    gridLayout_5->setMargin(0);
+    gridLayout_5->setSpacing(0);
+    gridLayout_6->setMargin(0);
+    gridLayout_6->setSpacing(0);
+    gridLayout->update();
+    */
 
+
     ProgramDir = ProgDir;
     OverWrote = 0;
      
@@ -148,7 +151,7 @@
     {
        return;
     }
-
+    
     //setHelpEnabled(currentPage(), FALSE);
     //helpButton()->setHidden(TRUE);
 

Modified: pbibuild/pbi-source/PBIsource/pbi.ui
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.ui	2009-07-22 18:09:37 UTC (rev 4266)
+++ pbibuild/pbi-source/PBIsource/pbi.ui	2009-07-22 18:46:15 UTC (rev 4267)
@@ -24,7 +24,7 @@
     <normaloff>:/application.png</normaloff>:/application.png</iconset>
   </property>
   <property name="wizardStyle">
-   <enum>QWizard::ClassicStyle</enum>
+   <enum>QWizard::ModernStyle</enum>
   </property>
   <property name="options">
    <set>QWizard::IgnoreSubTitles</set>
@@ -40,10 +40,13 @@
     <property name="margin">
      <number>0</number>
     </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <item row="0" column="0">
      <widget class="QLabel" name="leftBarPixmap">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>