[PC-BSD Commits] r7208 - pcbsd/current/XGUISource

[svn at pcbsd.org]

Author: kris
Date: 2010-07-14 11:21:50 -0700 (Wed, 14 Jul 2010)
New Revision: 7208

Modified:
   pcbsd/current/XGUISource/XGUI.pro
   pcbsd/current/XGUISource/main.cpp
Log:

Updated XGUI to use /usr/local PREFIX, and not need any KDE4 libs anymore



Modified: pcbsd/current/XGUISource/XGUI.pro
===================================================================
--- pcbsd/current/XGUISource/XGUI.pro	2010-07-14 17:25:57 UTC (rev 7207)
+++ pcbsd/current/XGUISource/XGUI.pro	2010-07-14 18:21:50 UTC (rev 7208)
@@ -5,10 +5,8 @@
 
 TRANSLATIONS = xgui_en.ts
 
-LIBS += -L/usr/local/kde4/lib -L/usr/local/lib/qt4 -lkdecore -lkio -lkdeui -Ikdelibs
+QMAKE_LIBDIR = /usr/local/lib/qt4
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4
-
 SOURCES	+= main.cpp xgui.cpp dialogconfirm.cpp
 
 FORMS	= xgui.ui \
@@ -80,34 +78,32 @@
 
 RESOURCES += XGUI.qrc
 
-INCLUDEPATH += /usr/local/kde4/include
+TARGET  = pc-xgui
 
-TARGET  = XGUI
+DESTDIR = /usr/local/bin/
 
-DESTDIR = /usr/PCBSD/xorg-gui/bin/
-
-bin.path = /usr/PCBSD/xorg-gui/bin/
+bin.path = /usr/local/bin/
 bin.files = resources/bin/*
-scripts.path = /usr/PCBSD/xorg-gui/scripts/
+scripts.path = /usr/local/share/xorg-gui/scripts/
 scripts.files = resources/scripts/*
-conf.path = /usr/PCBSD/xorg-gui/conf/
+conf.path = /usr/local/share/xorg-gui/conf/
 conf.files = resources/conf/*
-fluxbox.path = /usr/PCBSD/xorg-gui/conf/.fluxbox
+fluxbox.path = /usr/local/share/xorg-gui/conf/.fluxbox
 fluxbox.files = resources/conf/.fluxbox/*
-carddetect.path = /usr/PCBSD/xorg-gui/cardDetect
+carddetect.path = /usr/local/share/xorg-gui/cardDetect
 carddetect.files = resources/cardDetect/*
-settings.path = /usr/PCBSD/xorg-gui/settings
+settings.path = /usr/local/share/xorg-gui/settings
 settings.files = resources/settings/*
-temscripts.path = /usr/PCBSD/xorg-gui/templates/scripts/
+temscripts.path = /usr/local/share/xorg-gui/templates/scripts/
 temscripts.files = resources/templates/scripts/*
-temheader.path = /usr/PCBSD/xorg-gui/templates/header/
+temheader.path = /usr/local/share/xorg-gui/templates/header/
 temheader.files = resources/templates/header/*
-temdriver.path = /usr/PCBSD/xorg-gui/templates/driver/
+temdriver.path = /usr/local/share/xorg-gui/templates/driver/
 temdriver.files = resources/templates/driver/*
-nvdetect.path = /usr/PCBSD/xorg-gui/nvidia-detect
+nvdetect.path = /usr/local/share/xorg-gui/nvidia-detect
 nvdetect.files = resources/nvidia-detect/*
-dotrans.path=/usr/local/kde4/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/kde4/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/apps/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
 
 INSTALLS += bin scripts conf fluxbox carddetect settings temscripts temheader temdriver nvdetect dotrans
 

Modified: pcbsd/current/XGUISource/main.cpp
===================================================================
--- pcbsd/current/XGUISource/main.cpp	2010-07-14 17:25:57 UTC (rev 7207)
+++ pcbsd/current/XGUISource/main.cpp	2010-07-14 18:21:50 UTC (rev 7208)
@@ -1,47 +1,22 @@
 #include <qapplication.h>
 #include <qtranslator.h>
 #include <qtextcodec.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
 #include <qstylefactory.h>
 #include <qdesktopwidget.h>
 #include <QDebug>
 #include "xgui.h"
 #include "dialogconfirm.h"
 
-static const char description[] = I18N_NOOP("Xorg Setup GUI");
-
 int main( int argc, char ** argv )
 {
+   QApplication a(argc, argv);
 
-    KAboutData aboutData("XGUI", 0, ki18n("XGUI"),
-                            "1.2", 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 configuration"));
-    options.add("test", ki18n("Display the confirm resolution dialog"));
-
-
-
-    // Tell which options are supported
-    KCmdLineArgs::addCmdLineOptions( options );
-
-
-    KApplication a;
-
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/kde4/share/apps/pcbsd/i18n/XGUISource_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/XGUISource_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("XGUISource_") + langCode, "/usr/local/kde4/share/apps/pcbsd/i18n/" );
+    translator.load( QString("XGUISource_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;