Changeset 2949

Timestamp:

11/03/08 10:57:51 (17 months ago)

Author:

kris

Message:

Fixed a number of bugs in the System Utility:

• Fixed a crash in the port snap tool
• Fixed a bug which prevented being able to click apply when making changes
• Fixed a bug with resolving the splash screen language names
• Fixed a bug when trying to remember which language splash is being used

Location:

pcbsd

Files:

• branches/7.0/kcmPBSystem/PBSystem.pro (modified) (1 diff)
• branches/7.0/kcmPBSystem/kcm.cpp (modified) (1 diff)
• branches/7.0/kcmPBSystem/pbsystemtab.cpp (modified) (6 diffs)
• branches/7.0/kcmPBSystem/portsnapprogress.cpp (modified) (1 diff)
• trunk/kcmPBSystem/PBSystem.pro (modified) (1 diff)
• trunk/kcmPBSystem/kcm.cpp (modified) (1 diff)
• trunk/kcmPBSystem/pbsystemtab.cpp (modified) (6 diffs)
• trunk/kcmPBSystem/portsnapprogress.cpp (modified) (1 diff)

pcbsd/branches/7.0/kcmPBSystem/PBSystem.pro

@@ -24 +24 @@
 DESTDIR = /usr/local/kde4/lib/kde4/
 
-TRANSLATIONS = PBSystem_en.ts
+TRANSLATIONS = PBSystem_en.ts PBSystem_af.ts PBSystem_ar.ts PBSystem_az.ts PBSystem_bg.ts PBSystem_bn.ts PBSystem_bs.ts PBSystem_ca.ts PBSystem_cs.ts PBSystem_cy.ts PBSystem_da.ts PBSystem_de.ts PBSystem_el.ts PBSystem_es.ts PBSystem_et.ts PBSystem_eu.ts PBSystem_fa.ts PBSystem_fi.ts PBSystem_fr.ts PBSystem_gl.ts PBSystem_he.ts PBSystem_hi.ts PBSystem_hr.ts PBSystem_hu.ts PBSystem_id.ts PBSystem_is.ts PBSystem_it.ts PBSystem_ja.ts PBSystem_ka.ts PBSystem_ko.ts PBSystem_lt.ts PBSystem_lv.ts PBSystem_mk.ts PBSystem_mn.ts PBSystem_ms.ts PBSystem_mt.ts PBSystem_nb.ts PBSystem_nl.ts PBSystem_pa.ts PBSystem_pl.ts PBSystem_pt.ts PBSystem_pt_BR.ts PBSystem_ro.ts PBSystem_ru.ts PBSystem_sk.ts PBSystem_sl.ts PBSystem_sr.ts PBSystem_sv.ts PBSystem_ta.ts PBSystem_tg.ts PBSystem_th.ts PBSystem_tr.ts PBSystem_uk.ts PBSystem_uz.ts PBSystem_vi.ts PBSystem_zh_CN.ts PBSystem_zh_HK.ts PBSystem_zh_TW.ts PBSystem_zu.ts
 
 QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib

pcbsd/branches/7.0/kcmPBSystem/kcm.cpp

@@ -30 +30 @@
   systab = new PBSystemTab();
   systab->ProgramInit();
+
+  connect(systab, SIGNAL(changed() ), this, SLOT(configChanged() ) );
   
   if ( checkRoot() ) { systab->reparent(this, QPoint()); }

pcbsd/branches/7.0/kcmPBSystem/pbsystemtab.cpp

@@ -343 +343 @@
             line = stream.readLine(); // line of text excluding '\n'
             
-               // If the KEY is found in the line, continue processing 
-            if ( line.find(oldKey, 0) != -1 && found == 0 && line.find("#", 0) != 0)
+        // If the KEY is found in the line, continue processing 
+        if ( line.indexOf(oldKey, 0) != -1 && found == 0 && line.indexOf("#") != 0)
         {
             SavedFile = SavedFile + newKey + "\n";
@@ -405 +405 @@
             
                // If the KEY is found in the line, continue processing 
-        if ( line.find(Key, 0) != -1)
+        if ( line.indexOf(Key, 0) != -1 && line.indexOf("#") != 0)
         {
             line.remove(line.find(Key, 0), Key.length());
@@ -439 +439 @@
         return;
     }
-    KUrl url1 = KUrl::fromPath(file);
-    KUrl url2 = KUrl::fromPath("/PCBSD/splash-screens/loading-screen-custom.pcx");
-    KIO::file_copy(url1, url2, 0);
+
+    system("cp '" + file + "' /boot/loading-screen.pcx");
     splashSelect->clear();
     loadBootData();
@@ -456 +455 @@
     
     //Move files about
-    KUrl url1 = KUrl::fromPath("/PCBSD/splash-screens/loading-screen-" + code + ".pcx");
-    KUrl url2 = KUrl::fromPath("/boot/loading-screen.pcx");
-    KIO::file_copy(url1, url2, 0);
+    system("cp /PCBSD/splash-screens/loading-screen-" + code + ".pcx /boot/loading-screen.pcx");
+    system("chmod 644 /boot/loading-screen.pcx");
     
     if ( showBootCheck->isChecked() )
     {
         saveValue("/boot/loader.conf", "splash_pcx_load=", "splash_pcx_load=\"YES\"" );
+        saveValue("/boot/loader.conf", "vesa_load=", "vesa_load=\"YES\"" );
+        saveValue("/boot/loader.conf", "bitmap_load=", "bitmap_load=\"YES\"" );
+        saveValue("/boot/loader.conf", "bitmap_name=", "bitmap_name=\"/boot/loading-screen.pcx\"" );
      } else {
         saveValue("/boot/loader.conf", "splash_pcx_load=", "splash_pcx_load=\"NO\"" );
+        saveValue("/boot/loader.conf", "vesa_load=", "vesa_load=\"NO\"" );
+        saveValue("/boot/loader.conf", "bitmap_load=", "bitmap_load=\"NO\"" );
      }
 }
@@ -510 +513 @@
             else
             {
-                QString langName = langResolver.countryCodeToName(code);
+                QString langName = langResolver.languageCodeToName(code);
+                if ( langName.isEmpty() )
+                {
+                    langName = "Splash Screen: " + code;
+                }
                 langList += langName;
                 codeMap[langName] = code;
@@ -540 +547 @@
     {
         //If we don't have a splash for the user's language, default to english
-        if (codeMap[selectedLang] == "") selectedLang = "en";
-        selectedLang = langResolver.countryCodeToName(selectedLang);
+        QString testLangName = langResolver.languageCodeToName(selectedLang);
+        if (codeMap[testLangName] == "") selectedLang = "en";
+
+        selectedLang = langResolver.languageCodeToName(selectedLang);
+        if ( selectedLang.isEmpty() )
+        {
+             selectedLang = "Splash Screen: " + selectedLang;
+        }
+
         splashSelect->setCurrentItem(langList.findIndex(selectedLang) + indexMod);
     }

pcbsd/branches/7.0/kcmPBSystem/portsnapprogress.cpp

@@ -108 +108 @@
         displayString += output;
         QStringList outputSplit = QStringList::split(" ", output);
-        if (outputSplit[1].toInt() != 0)
+        bool ok;
+        outputSplit[1].toInt(&ok);
+        if (ok)
         {
             numberSteps += outputSplit[1].toInt();

pcbsd/trunk/kcmPBSystem/PBSystem.pro

@@ -24 +24 @@
 DESTDIR = /usr/local/kde4/lib/kde4/
 
-TRANSLATIONS = PBSystem_en.ts
+TRANSLATIONS = PBSystem_en.ts PBSystem_af.ts PBSystem_ar.ts PBSystem_az.ts PBSystem_bg.ts PBSystem_bn.ts PBSystem_bs.ts PBSystem_ca.ts PBSystem_cs.ts PBSystem_cy.ts PBSystem_da.ts PBSystem_de.ts PBSystem_el.ts PBSystem_es.ts PBSystem_et.ts PBSystem_eu.ts PBSystem_fa.ts PBSystem_fi.ts PBSystem_fr.ts PBSystem_gl.ts PBSystem_he.ts PBSystem_hi.ts PBSystem_hr.ts PBSystem_hu.ts PBSystem_id.ts PBSystem_is.ts PBSystem_it.ts PBSystem_ja.ts PBSystem_ka.ts PBSystem_ko.ts PBSystem_lt.ts PBSystem_lv.ts PBSystem_mk.ts PBSystem_mn.ts PBSystem_ms.ts PBSystem_mt.ts PBSystem_nb.ts PBSystem_nl.ts PBSystem_pa.ts PBSystem_pl.ts PBSystem_pt.ts PBSystem_pt_BR.ts PBSystem_ro.ts PBSystem_ru.ts PBSystem_sk.ts PBSystem_sl.ts PBSystem_sr.ts PBSystem_sv.ts PBSystem_ta.ts PBSystem_tg.ts PBSystem_th.ts PBSystem_tr.ts PBSystem_uk.ts PBSystem_uz.ts PBSystem_vi.ts PBSystem_zh_CN.ts PBSystem_zh_HK.ts PBSystem_zh_TW.ts PBSystem_zu.ts
 
 QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib

pcbsd/trunk/kcmPBSystem/kcm.cpp

@@ -30 +30 @@
   systab = new PBSystemTab();
   systab->ProgramInit();
+
+  connect(systab, SIGNAL(changed() ), this, SLOT(configChanged() ) );
   
   if ( checkRoot() ) { systab->reparent(this, QPoint()); }

pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp

@@ -343 +343 @@
             line = stream.readLine(); // line of text excluding '\n'
             
-               // If the KEY is found in the line, continue processing 
-            if ( line.find(oldKey, 0) != -1 && found == 0 && line.find("#", 0) != 0)
+        // If the KEY is found in the line, continue processing 
+        if ( line.indexOf(oldKey, 0) != -1 && found == 0 && line.indexOf("#") != 0)
         {
             SavedFile = SavedFile + newKey + "\n";
@@ -405 +405 @@
             
                // If the KEY is found in the line, continue processing 
-        if ( line.find(Key, 0) != -1)
+        if ( line.indexOf(Key, 0) != -1 && line.indexOf("#") != 0)
         {
             line.remove(line.find(Key, 0), Key.length());
@@ -439 +439 @@
         return;
     }
-    KUrl url1 = KUrl::fromPath(file);
-    KUrl url2 = KUrl::fromPath("/PCBSD/splash-screens/loading-screen-custom.pcx");
-    KIO::file_copy(url1, url2, 0);
+
+    system("cp '" + file + "' /boot/loading-screen.pcx");
     splashSelect->clear();
     loadBootData();
@@ -456 +455 @@
     
     //Move files about
-    KUrl url1 = KUrl::fromPath("/PCBSD/splash-screens/loading-screen-" + code + ".pcx");
-    KUrl url2 = KUrl::fromPath("/boot/loading-screen.pcx");
-    KIO::file_copy(url1, url2, 0);
+    system("cp /PCBSD/splash-screens/loading-screen-" + code + ".pcx /boot/loading-screen.pcx");
+    system("chmod 644 /boot/loading-screen.pcx");
     
     if ( showBootCheck->isChecked() )
     {
         saveValue("/boot/loader.conf", "splash_pcx_load=", "splash_pcx_load=\"YES\"" );
+        saveValue("/boot/loader.conf", "vesa_load=", "vesa_load=\"YES\"" );
+        saveValue("/boot/loader.conf", "bitmap_load=", "bitmap_load=\"YES\"" );
+        saveValue("/boot/loader.conf", "bitmap_name=", "bitmap_name=\"/boot/loading-screen.pcx\"" );
      } else {
         saveValue("/boot/loader.conf", "splash_pcx_load=", "splash_pcx_load=\"NO\"" );
+        saveValue("/boot/loader.conf", "vesa_load=", "vesa_load=\"NO\"" );
+        saveValue("/boot/loader.conf", "bitmap_load=", "bitmap_load=\"NO\"" );
      }
 }
@@ -510 +513 @@
             else
             {
-                QString langName = langResolver.countryCodeToName(code);
+                QString langName = langResolver.languageCodeToName(code);
+                if ( langName.isEmpty() )
+                {
+                    langName = "Splash Screen: " + code;
+                }
                 langList += langName;
                 codeMap[langName] = code;
@@ -540 +547 @@
     {
         //If we don't have a splash for the user's language, default to english
-        if (codeMap[selectedLang] == "") selectedLang = "en";
-        selectedLang = langResolver.countryCodeToName(selectedLang);
+        QString testLangName = langResolver.languageCodeToName(selectedLang);
+        if (codeMap[testLangName] == "") selectedLang = "en";
+
+        selectedLang = langResolver.languageCodeToName(selectedLang);
+        if ( selectedLang.isEmpty() )
+        {
+             selectedLang = "Splash Screen: " + selectedLang;
+        }
+
         splashSelect->setCurrentItem(langList.findIndex(selectedLang) + indexMod);
     }

pcbsd/trunk/kcmPBSystem/portsnapprogress.cpp

@@ -108 +108 @@
         displayString += output;
         QStringList outputSplit = QStringList::split(" ", output);
-        if (outputSplit[1].toInt() != 0)
+        bool ok;
+        outputSplit[1].toInt(&ok);
+        if (ok)
         {
             numberSteps += outputSplit[1].toInt();