[PC-BSD Commits] r7888 - in pcbsd/current: src-qt4/pc-sysmanager system-overlay/usr/PCBSD

[svn at pcbsd.org]

Author: kris
Date: 2010-10-25 10:29:24 -0700 (Mon, 25 Oct 2010)
New Revision: 7888

Added:
   pcbsd/current/src-qt4/pc-sysmanager/splash-screens/
Removed:
   pcbsd/current/system-overlay/usr/PCBSD/splash-screens/
Modified:
   pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
   pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
Log:

Move splash-screens into src-qt4/pc-sysmanager where they belong



Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp	2010-10-23 15:20:44 UTC (rev 7887)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp	2010-10-25 17:29:24 UTC (rev 7888)
@@ -401,7 +401,7 @@
     settings.setValue("/PCBSD/splash-screen", code);
     
     //Move files about
-    system("cp /PCBSD/splash-screens/loading-screen-" + code.toAscii() + ".pcx /boot/loading-screen.pcx");
+    system("cp /usr/local/share/pcbsd/splash-screens/loading-screen-" + code.toAscii() + ".pcx /boot/loading-screen.pcx");
     system("chmod 644 /boot/loading-screen.pcx");
     
     if ( showBootCheck->isChecked() )
@@ -436,10 +436,10 @@
 void PBSystemTab::loadBootData()
 {
     //Trawl screens directory
-    QDir screens = QDir("/PCBSD/splash-screens/");
+    QDir screens = QDir("/usr/local/share/pcbsd/splash-screens/");
     if (! screens.exists())
     {
-	qWarning("/PCBSD/splash-screens doesn't exist!");
+	qWarning("/usr/local/share/pcbsd/splash-screens doesn't exist!");
 	return;
     }
     screens.setFilter(QDir::Files);

Modified: pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-10-23 15:20:44 UTC (rev 7887)
+++ pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-10-25 17:29:24 UTC (rev 7888)
@@ -95,10 +95,13 @@
 scripts.path = /usr/local/share/pcbsd/scripts/
 scripts.files = scripts/*
 
+sscreens.path = /usr/local/share/pcbsd/splash-screens/
+sscreens.files = splash-screens/*
+
 chmod.path=/usr/local/share/pcbsd/scripts
 chmod.extra=cd /usr/local/share/pcbsd/scripts && chmod 755 *
 
-INSTALLS += dotrans scripts chmod
+INSTALLS += dotrans scripts chmod sscreens
 
 QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib