[PC-BSD Commits] r7349 - in pcbsd/current/src-qt4: pc-crashhandler pc-netmanager pc-netmanager/src/NetworkManager pc-netmanager/src/NetworkManagerAdmin pc-netmanager/src/NetworkTray pc-netmanager/src/ethernetconfig pc-netmanager/src/wificonfig pc-pbigui pc-pfmanager pc-servicemanager pc-sounderror pc-sysmanager pc-systemupdatertray pc-usermanager pc-xdgutil pc-xgui pc-xgui/resources/bin pc-xgui/resources/cardDetect pc-xgui/resources/nvidia-detect

svn at pcbsd.org svn at pcbsd.org
Wed Aug 4 08:06:27 PDT 2010


Author: kris
Date: 2010-08-04 08:06:26 -0700 (Wed, 04 Aug 2010)
New Revision: 7349

Modified:
   pcbsd/current/src-qt4/pc-crashhandler/main.cpp
   pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro
   pcbsd/current/src-qt4/pc-netmanager/pc-netmanager.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/main.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/main.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.h
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/main.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
   pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/main.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/main.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wifiscanssid.h
   pcbsd/current/src-qt4/pc-pbigui/main.cpp
   pcbsd/current/src-qt4/pc-pbigui/pc-pbigui.pro
   pcbsd/current/src-qt4/pc-pfmanager/main.cpp
   pcbsd/current/src-qt4/pc-pfmanager/pc-pfmanager.pro
   pcbsd/current/src-qt4/pc-servicemanager/main.cpp
   pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.pro
   pcbsd/current/src-qt4/pc-sounderror/main.cpp
   pcbsd/current/src-qt4/pc-sounderror/pc-sounderror.pro
   pcbsd/current/src-qt4/pc-sysmanager/main.cpp
   pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
   pcbsd/current/src-qt4/pc-systemupdatertray/main.cpp
   pcbsd/current/src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro
   pcbsd/current/src-qt4/pc-usermanager/main.cpp
   pcbsd/current/src-qt4/pc-usermanager/pc-usermanager.pro
   pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil
   pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil.pro
   pcbsd/current/src-qt4/pc-xgui/pc-xgui.pro
   pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
   pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh
   pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/x_config.sh
   pcbsd/current/src-qt4/pc-xgui/resources/nvidia-detect/detect-nvidia.sh
   pcbsd/current/src-qt4/pc-xgui/xgui.cpp
Log:

Updated all src-qt4 source, combine all apps support files into /usr/local/share/pcbsd/ to keep things tidy, also update pc-xgui to not use "kdialog" anymore



Modified: pcbsd/current/src-qt4/pc-crashhandler/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-crashhandler/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-crashhandler/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -13,9 +13,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/CrashHandler_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/CrashHandler_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("CrashHandler_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("CrashHandler_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
     

Modified: pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro
===================================================================
--- pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-crashhandler/pc-crashhandler.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -80,8 +80,8 @@
 		i18n/CrashHandler_zh_TW.ts \
 		i18n/CrashHandler_zu.ts 
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans
 

Modified: pcbsd/current/src-qt4/pc-netmanager/pc-netmanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/pc-netmanager.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/pc-netmanager.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -2,7 +2,7 @@
 
 SUBDIRS+=src
 
-images.path=/usr/local/share/pc-netmanager/pics/
+images.path=/usr/local/share/pcbsd/pc-netmanager/pics/
 images.files=pics/*.png
 
 INSTALLS+= images

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -82,7 +82,7 @@
 desktop.path=/usr/local/share/applications/
 desktop.files=pcnetwork.desktop
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS+= desktop dotrans target

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -12,9 +12,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/NetworkManager_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/NetworkManager_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("NetworkManager_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("NetworkManager_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -733,12 +733,12 @@
 		if ( DevsType[i] == "Wireless")
 		{
 		    
-		    QPixmap PixmapIcon("/usr/local/share/pc-netmanager/pics/network_wifi.png");
+		    QPixmap PixmapIcon("/usr/local/share/pcbsd/pc-netmanager/pics/network_wifi.png");
 		    listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		    
 		 } else {
 		    // If we are looking at a regular Ethernet device  
-		    QPixmap PixmapIcon("/usr/local/share/pc-netmanager/pics/network_local.png");
+		    QPixmap PixmapIcon("/usr/local/share/pcbsd/pc-netmanager/pics/network_local.png");
 		    listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		}
 	

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -75,8 +75,8 @@
 		i18n/NetworkManagerAdmin_zh_TW.ts \
 		i18n/NetworkManagerAdmin_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans target
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManagerAdmin/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -12,9 +12,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/NetworkManagerAdmin_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/NetworkManagerAdmin_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("NetworkManagerAdmin_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("NetworkManagerAdmin_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.h
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.h	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.h	2010-08-04 15:06:26 UTC (rev 7349)
@@ -5,7 +5,7 @@
 #include <QSystemTrayIcon>
 #include <QMenu>
 
-#define PROGPATH QString("/usr/local/share/pc-netmanager")
+#define PROGPATH QString("/usr/local/share/pcbsd/pc-netmanager")
 
 class QString;
 class QPixmap;

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -70,8 +70,8 @@
 		i18n/NetworkTray_zh_TW.ts \
 		i18n/NetworkTray_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans target
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -19,9 +19,9 @@
    QTranslator translator;
    QLocale mylocale;
    QString langCode = mylocale.name();
-   if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/NetworkTray_" + langCode + ".qm" ) )
+   if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/NetworkTray_" + langCode + ".qm" ) )
      langCode.truncate(langCode.indexOf("_"));
-   translator.load( QString("NetworkTray_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+   translator.load( QString("NetworkTray_") + langCode, "/usr/local/share/pcbsd/i18n/" );
    a.installTranslator( &translator );
    qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -75,8 +75,8 @@
 		i18n/ethernetconfig_zh_TW.ts \
 		i18n/ethernetconfig_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans target
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -37,9 +37,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/ethernetconfig_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/ethernetconfig_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("ethernetconfig_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("ethernetconfig_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -12,9 +12,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/wificonfig_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/wificonfig_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("wificonfig_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("wificonfig_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -75,8 +75,8 @@
 		i18n/wificonfig_zh_TW.ts \
 		i18n/wificonfig_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans target
 

Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wifiscanssid.h
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wifiscanssid.h	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wifiscanssid.h	2010-08-04 15:06:26 UTC (rev 7349)
@@ -1,7 +1,7 @@
 #ifndef WIFISCANSSID_H
 #define WIFISCANSSID_H
 
-#define PROGPATH QString("/usr/local/share/pc-netmanager")
+#define PROGPATH QString("/usr/local/share/pcbsd/pc-netmanager")
 
 #include <qfile.h>
 #include <qmessagebox.h>

Modified: pcbsd/current/src-qt4/pc-pbigui/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-pbigui/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-pbigui/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -11,9 +11,9 @@
     QTranslator translator( 0 );
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/PBI_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/PBI_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("PBI_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("PBI_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-pbigui/pc-pbigui.pro
===================================================================
--- pcbsd/current/src-qt4/pc-pbigui/pc-pbigui.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-pbigui/pc-pbigui.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -71,8 +71,8 @@
 		i18n/PBI_zh_TW.ts \
 		i18n/PBI_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 applnk.path=/usr/local/share/applnk/.hidden
 applnk.files=resources/pbistart.desktop

Modified: pcbsd/current/src-qt4/pc-pfmanager/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-pfmanager/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-pfmanager/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -14,9 +14,9 @@
     QLocale mylocale;
     QTranslator translator;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/PFManager_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/PFManager_" + langCode + ".qm" ) )
      langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("PFManager_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("PFManager_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     app.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-pfmanager/pc-pfmanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-pfmanager/pc-pfmanager.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-pfmanager/pc-pfmanager.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -98,8 +98,8 @@
 desktop.path=/usr/local/share/applications/
 desktop.files=pfmanager.desktop
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans desktop
 

Modified: pcbsd/current/src-qt4/pc-servicemanager/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-servicemanager/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-servicemanager/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -13,9 +13,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/ServiceManager_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/ServiceManager_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("ServiceManager_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("ServiceManager_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -79,8 +79,8 @@
 desktop.path=/usr/local/share/applications/
 desktop.files=pc-servicemanager.desktop
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans desktop
 

Modified: pcbsd/current/src-qt4/pc-sounderror/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sounderror/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-sounderror/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -12,9 +12,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/SoundError_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/SoundError_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("SoundError_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("SoundError_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-sounderror/pc-sounderror.pro
===================================================================
--- pcbsd/current/src-qt4/pc-sounderror/pc-sounderror.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-sounderror/pc-sounderror.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -77,8 +77,8 @@
 		i18n/SoundError_zh_TW.ts \
 		i18n/SoundError_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += dotrans
 

Modified: pcbsd/current/src-qt4/pc-sysmanager/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-sysmanager/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -13,9 +13,9 @@
    QTranslator translator;
    QLocale mylocale;
    QString langCode = mylocale.name();
-   if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/PBSystem_" + langCode + ".qm" ) )
+   if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/PBSystem_" + langCode + ".qm" ) )
      langCode.truncate(langCode.indexOf("_"));
-   translator.load( QString("PBSystem_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+   translator.load( QString("PBSystem_") + langCode, "/usr/local/share/pcbsd/i18n/" );
    a.installTranslator( &translator );
    qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -84,17 +84,17 @@
 		i18n/PBSystem_zh_TW.ts \
 		i18n/PBSystem_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 desktop.path=/usr/local/share/applications/ 
 desktop.files=pc-sysmanager.desktop
 
-scripts.path = /usr/local/share/apps/pcbsd/scripts/
+scripts.path = /usr/local/share/pcbsd/scripts/
 scripts.files = scripts/*
 
-chmod.path=/usr/local/share/apps/pcbsd/scripts
-chmod.extra=cd /usr/local/share/apps/pcbsd/scripts && chmod 755 *
+chmod.path=/usr/local/share/pcbsd/scripts
+chmod.extra=cd /usr/local/share/pcbsd/scripts && chmod 755 *
 
 INSTALLS += dotrans desktop scripts chmod
 

Modified: pcbsd/current/src-qt4/pc-systemupdatertray/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-systemupdatertray/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-systemupdatertray/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -19,9 +19,9 @@
    QTranslator translator;
    QLocale mylocale;
    QString langCode = mylocale.name();
-   if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/SystemUpdaterTray_" + langCode + ".qm" ) )
+   if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/SystemUpdaterTray_" + langCode + ".qm" ) )
      langCode.truncate(langCode.indexOf("_"));
-   translator.load( QString("SystemUpdaterTray_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+   translator.load( QString("SystemUpdaterTray_") + langCode, "/usr/local/share/pcbsd/i18n/" );
    a.installTranslator( &translator );
    qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro
===================================================================
--- pcbsd/current/src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -75,8 +75,8 @@
 		i18n/SystemUpdaterTray_zh_TW.ts \
 		i18n/SystemUpdaterTray_zu.ts
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 desktop.path=/usr/local/share/applications/
 desktop.files=pcbsdpbu.desktop

Modified: pcbsd/current/src-qt4/pc-usermanager/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-usermanager/main.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-usermanager/main.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -12,9 +12,9 @@
     QTranslator translator;
     QLocale mylocale;
     QString langCode = mylocale.name();
-    if ( ! QFile::exists("/usr/local/share/apps/pcbsd/i18n/pcbsdusermanager_" + langCode + ".qm" ) )
+    if ( ! QFile::exists("/usr/local/share/pcbsd/i18n/pcbsdusermanager_" + langCode + ".qm" ) )
       langCode.truncate(langCode.indexOf("_"));
-    translator.load( QString("pcbsdusermanager_") + langCode, "/usr/local/share/apps/pcbsd/i18n/" );
+    translator.load( QString("pcbsdusermanager_") + langCode, "/usr/local/share/pcbsd/i18n/" );
     a.installTranslator( &translator );
     qDebug() << "Locale:" << langCode;
 

Modified: pcbsd/current/src-qt4/pc-usermanager/pc-usermanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-usermanager/pc-usermanager.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-usermanager/pc-usermanager.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -104,8 +104,8 @@
 desktop.path=/usr/local/share/applications/
 desktop.files=pcusermanager.desktop
 
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += desktop dotrans
 

Modified: pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil
===================================================================
--- pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil	2010-08-04 15:06:26 UTC (rev 7349)
@@ -3,7 +3,7 @@
 # - updatemenu
 # - applyoverlay
 
-PROGDIR="/usr/local/share/pc-xdgutil"
+PROGDIR="/usr/local/share/pcbsd/pc-xdgutil"
 
 show_usage() {
 	echo "${0}: Available Options

Modified: pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil.pro
===================================================================
--- pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xdgutil/pc-xdgutil.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -4,10 +4,10 @@
 dochmod.path = /usr/local/bin
 dochmod.extra = chmod 755 /usr/local/bin/pc-xdgutil
 
-ddirs.path = /usr/local/share/pc-xdgutil
+ddirs.path = /usr/local/share/pcbsd/pc-xdgutil
 ddirs.files = desktop-dirs
 
-xdgmenu.path = /usr/local/share/pc-xdgutil
+xdgmenu.path = /usr/local/share/pcbsd/pc-xdgutil
 xdgmenu.files = menus/*.menu
 
 INSTALLS += scripts dochmod ddirs xdgmenu

Modified: pcbsd/current/src-qt4/pc-xgui/pc-xgui.pro
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/pc-xgui.pro	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xgui/pc-xgui.pro	2010-08-04 15:06:26 UTC (rev 7349)
@@ -84,26 +84,26 @@
 
 bin.path = /usr/local/bin/
 bin.files = resources/bin/*
-scripts.path = /usr/local/share/xorg-gui/scripts/
+scripts.path = /usr/local/share/pcbsd/xorg-gui/scripts/
 scripts.files = resources/scripts/*
-conf.path = /usr/local/share/xorg-gui/conf/
+conf.path = /usr/local/share/pcbsd/xorg-gui/conf/
 conf.files = resources/conf/*
-fluxbox.path = /usr/local/share/xorg-gui/conf/.fluxbox
+fluxbox.path = /usr/local/share/pcbsd/xorg-gui/conf/.fluxbox
 fluxbox.files = resources/conf/.fluxbox/*
-carddetect.path = /usr/local/share/xorg-gui/cardDetect
+carddetect.path = /usr/local/share/pcbsd/xorg-gui/cardDetect
 carddetect.files = resources/cardDetect/*
-settings.path = /usr/local/share/xorg-gui/settings
+settings.path = /usr/local/share/pcbsd/xorg-gui/settings
 settings.files = resources/settings/*
-temscripts.path = /usr/local/share/xorg-gui/templates/scripts/
+temscripts.path = /usr/local/share/pcbsd/xorg-gui/templates/scripts/
 temscripts.files = resources/templates/scripts/*
-temheader.path = /usr/local/share/xorg-gui/templates/header/
+temheader.path = /usr/local/share/pcbsd/xorg-gui/templates/header/
 temheader.files = resources/templates/header/*
-temdriver.path = /usr/local/share/xorg-gui/templates/driver/
+temdriver.path = /usr/local/share/pcbsd/xorg-gui/templates/driver/
 temdriver.files = resources/templates/driver/*
-nvdetect.path = /usr/local/share/xorg-gui/nvidia-detect
+nvdetect.path = /usr/local/share/pcbsd/xorg-gui/nvidia-detect
 nvdetect.files = resources/nvidia-detect/*
-dotrans.path=/usr/local/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
 INSTALLS += bin scripts conf fluxbox carddetect settings temscripts temheader temdriver nvdetect dotrans
 

Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2010-08-04 15:06:26 UTC (rev 7349)
@@ -21,7 +21,7 @@
 . /usr/PCBSD/LANGS/PCBSDLANG 2>/dev/null
 
 # Program Directory
-PROGDIR="/usr/local/share/xorg-gui" ; export PROGDIR
+PROGDIR="/usr/local/share/pcbsd/xorg-gui" ; export PROGDIR
 
 XGUITMP="/tmp/.xgui" ; export XGUITMP
 
@@ -140,11 +140,9 @@
 touch ${XGUITMP}/.xstartupsuccess
 /usr/local/bin/fluxbox &
 PID=$!
-/usr/local/kde4/bin/kdialog --msgbox "The previous attempt failed, please check your settings and try again!"
 /usr/local/bin/pc-xgui
 if [ "$?" = "1" ]
 then
- /usr/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
  echo "Canceled" > ${XGUITMP}/.canceled
 fi
 kill -9 ${PID}
@@ -170,7 +168,6 @@
 /usr/local/bin/pc-xgui
 if [ "$?" = "1" ]
 then
- /usr/local/kde4/bin/kdialog --msgbox "PC-BSD will now load using the default resolution."
  echo "Canceled" > ${XGUITMP}/.canceled
 fi
 

Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh	2010-08-04 15:06:26 UTC (rev 7349)
@@ -7,7 +7,7 @@
 . ${XGUITMP}/.xsettings.sh
 
 # Program Directory
-PROGDIR="/usr/local/share/xorg-gui" ; export PROGDIR
+PROGDIR="/usr/local/share/pcbsd/xorg-gui" ; export PROGDIR
 
 # Set the tmp xorg file
 TMPFILE="${XGUITMP}/.xorg.conf.tmp"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/x_config.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/x_config.sh	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/x_config.sh	2010-08-04 15:06:26 UTC (rev 7349)
@@ -7,8 +7,8 @@
 
 XFREE_CONF="/etc/X11/xorg.conf"
 XFREE_NEWCONF="/root/xorg.conf.new"
-XFREE_TMPCONF="/usr/local/share/xorg-gui/cardDetect/XF86Config.default"
-XFREE_VMWARE="/usr/local/share/xorg-gui/cardDetect/XF86Config.vmware"
+XFREE_TMPCONF="/usr/local/share/pcbsd/xorg-gui/cardDetect/XF86Config.default"
+XFREE_VMWARE="/usr/local/share/pcbsd/xorg-gui/cardDetect/XF86Config.vmware"
 
 if [ -f ${XFREE_CONF} ]; then
 	echo "Found config file \"${XFREE_CONF}\" - skiping autoconfiguration."

Modified: pcbsd/current/src-qt4/pc-xgui/resources/nvidia-detect/detect-nvidia.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/nvidia-detect/detect-nvidia.sh	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xgui/resources/nvidia-detect/detect-nvidia.sh	2010-08-04 15:06:26 UTC (rev 7349)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script which checks the nvidia cards PCIID and figures out which driver it needs
 ##################################################################################
-PROGDIR="/usr/local/share/xorg-gui"
+PROGDIR="/usr/local/share/pcbsd/xorg-gui"
 
 NV17FILE="${PROGDIR}/nvidia-detect/nvidia17-pciid.txt"
 NV9XFILE="${PROGDIR}/nvidia-detect/nvidia9x-pciid.txt"

Modified: pcbsd/current/src-qt4/pc-xgui/xgui.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/xgui.cpp	2010-08-04 14:41:31 UTC (rev 7348)
+++ pcbsd/current/src-qt4/pc-xgui/xgui.cpp	2010-08-04 15:06:26 UTC (rev 7349)
@@ -16,7 +16,7 @@
 #include <QDir>
 #include <QDebug>
 
-#define PROGDIR QString("/usr/local/share/xorg-gui")
+#define PROGDIR QString("/usr/local/share/pcbsd/xorg-gui")
 #define TMPDIR QString("/tmp/.xgui")
 
 



More information about the Commits mailing list