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

[svn at pcbsd.org]

Author: kris
Date: 2009-03-06 12:55:50 -0800 (Fri, 06 Mar 2009)
New Revision: 3605

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

Roll back updates to PBIsource removing KDElibs4. Tried it out here, and it makes the theme look pretty bad, and not consitent with desktop



Modified: pbibuild/pbi-source/PBIsource/PBI.pro
===================================================================
--- pbibuild/pbi-source/PBIsource/PBI.pro	2009-03-06 19:40:23 UTC (rev 3604)
+++ pbibuild/pbi-source/PBIsource/PBI.pro	2009-03-06 20:55:50 UTC (rev 3605)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -L/usr/local/lib 
+LIBS	+= -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs 
 
-INCLUDEPATH += /usr/local/include
+INCLUDEPATH += /usr/local/kde4/include
 
 HEADERS += pbi.h
 
@@ -25,4 +25,4 @@
 
 QT += qt3support
 
-QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib

Modified: pbibuild/pbi-source/PBIsource/main.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/main.cpp	2009-03-06 19:40:23 UTC (rev 3604)
+++ pbibuild/pbi-source/PBIsource/main.cpp	2009-03-06 20:55:50 UTC (rev 3605)
@@ -1,37 +1,36 @@
 #include <qapplication.h>
-//#include <kapplication.h>
-//#include <kcmdlineargs.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
 #include <qtranslator.h>
 #include <qtextcodec.h>
-//#include <kaboutdata.h>
+#include <kaboutdata.h>
 #include "pbi.h"
 
-//static const char description[] = I18N_NOOP("PBI Install GUI");
+static const char description[] = I18N_NOOP("PBI Install GUI");
 
 int main( int argc, char ** argv )
 {
 
-    //KAboutData aboutData("PBI", 0, ki18n("PBI"),
-    //                        "4.4", ki18n(description),
-    //                        KAboutData::License_BSD,
-    //                        ki18n("(c) 2008, Kris Moore(c)"));
+    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");
+    aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris at pcbsd.org");
 
-    //KCmdLineArgs::init(argc, argv, &aboutData);
+    KCmdLineArgs::init(argc, argv, &aboutData);
 
-    //KCmdLineOptions options;
+    KCmdLineOptions options;
 
-    //options.add("", ki18n("Start the PBI Install"));
-    //options.add("extract", ki18n("Extract the PBI files and create the .pbc configuration"));
+    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 );
+    KCmdLineArgs::addCmdLineOptions( options );
 
 
-    //KApplication a;
-    QApplication a( argc, argv );
+    KApplication a;
 
           
    
@@ -56,11 +55,8 @@
     
  
      
-    w.ProgramInit(QApplication::applicationDirPath());
+    w.ProgramInit(a.applicationDirPath());
     w.show();
     a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
     return a.exec();
-
-    return a.exec();
-
 }