- Add possibility to use the default dark blue interface

dbkblk · Dec 13, 2014 · 97d702b · 97d702b
1 parent 0f16ef6
commit 97d702b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/checker/TODO.md b/checker/TODO.md
@@ -92,10 +92,10 @@ DONE -> Improved updater progress
 DONE -> Updater: Create a "updating" file at start then delete it at the end. The launcher should check if the file is present, and then relaunch the updater again.
 
 ## 1.02
-
 DONE -> Force installer to make a folder named "Rise of Mankind - A New Dawn" and to decompress into "Mods/" folder + Check the folder name at start
-- Possibility to use the default color (!?)
-- GUI to exclude files
+DONE - Possibility to use the default color (!?)
+DONE -> GUI to exclude files
+- Drop support for Sinhala (unmaintened and less than 1% translated)
 
 ## Pending
 ? - Fix the weird updating loop !?

diff --git a/checker/f_civ.cpp b/checker/f_civ.cpp
@@ -112,7 +112,7 @@ int readColorsCounter()
     QDomElement value_el = read.firstChildElement("Civ4ModularLoadControls").firstChildElement("ConfigurationInfos").firstChildElement("ConfigurationInfo").firstChildElement("Modules").firstChildElement("Module").toElement();
 
     // Loop
-    int counter = -1;
+    int counter = 0;
     for(;; value_el=value_el.nextSiblingElement() ) {
 
         QString bLoad = value_el.firstChildElement("bLoad").text();
@@ -152,18 +152,19 @@ bool setColors(QString color)
     // Reset all values
     for(color_element ; !color_element.isNull(); color_element=color_element.nextSiblingElement() ) {
         color_element.firstChildElement("bLoad").firstChild().setNodeValue("0");
-    }
+        }
 
-    color_element = read.firstChildElement("Civ4ModularLoadControls").firstChildElement("ConfigurationInfos").firstChildElement("ConfigurationInfo").firstChildElement("Modules").firstChildElement("Module").toElement();
+        if(color != "default"){
+        color_element = read.firstChildElement("Civ4ModularLoadControls").firstChildElement("ConfigurationInfos").firstChildElement("ConfigurationInfo").firstChildElement("Modules").firstChildElement("Module").toElement();
 
-    for(color_element ; !color_element.isNull(); color_element=color_element.nextSiblingElement() ) {
-        QString txtValue = color_element.firstChildElement("Directory").firstChild().nodeValue();
-        if (txtValue == color) {
-            color_element.firstChildElement("bLoad").firstChild().setNodeValue("1");
+        for(color_element ; !color_element.isNull(); color_element=color_element.nextSiblingElement() ) {
+            QString txtValue = color_element.firstChildElement("Directory").firstChild().nodeValue();
+            if (txtValue == color) {
+                color_element.firstChildElement("bLoad").firstChild().setNodeValue("1");
+            }
         }
     }
 
-
     // Save content back to the file
     if (!file.open(QIODevice::Truncate | QIODevice::WriteOnly)) {
         return 0;

diff --git a/checker/w_options.cpp b/checker/w_options.cpp
@@ -58,34 +58,38 @@ void w_options::on_colorBox_currentIndexChanged(int index)
     switch (index)
     {
     case 0:
-       colorUI = "Black UI";
+       colorUI = "default";
        break;
 
     case 1:
-       colorUI = "Coal UI";
+       colorUI = "Black UI";
        break;
 
     case 2:
-       colorUI = "Dark Red UI";
+       colorUI = "Coal UI";
        break;
 
     case 3:
-       colorUI = "Forest UI";
+       colorUI = "Dark Red UI";
        break;
 
     case 4:
-       colorUI = "Purple UI";
+       colorUI = "Forest UI";
        break;
 
     case 5:
-       colorUI = "Red UI";
+       colorUI = "Purple UI";
        break;
 
     case 6:
-       colorUI = "Silver UI";
+       colorUI = "Red UI";
        break;
 
     case 7:
+       colorUI = "Silver UI";
+       break;
+
+    case 8:
        colorUI = "Cerulean UI";
        break;
     }

diff --git a/checker/w_options.ui b/checker/w_options.ui
@@ -106,6 +106,11 @@
           <height>25</height>
          </size>
         </property>
+        <item>
+         <property name="text">
+          <string>Dark blue (default)</string>
+         </property>
+        </item>
         <item>
          <property name="text">
           <string>Black</string>