Merge pull request siemens#93 from esaprykin/main

Error messages on opening "Settings" on a newly created project

Author: dhoegerlETM

WinCCOA_QualityChecks/panels/WinCCOA_QualityChecks/general/Settings.pnl

@@ -300,10 +300,11 @@ string getBasePart(const string &id)
 }
 
 " 0
- 3
+ 4
 "CBRef" "1"
 "EClose" E
 "dpi" "120"
+"pdpi" "120"
 2 1 0 0 0 0 0
 ""
 DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
@@ -327,7 +328,7 @@ LANG:10000 0
 "dashclr"N "_Transparent"
 "antiAliased" "0"
 "transformable" "0"
-E E 0 1 3 2 1 E 0.9988465974635842 0 1 -55.41061130365657 -9.5 0 E 77.5 29 511 60
+E E 0 1 3 2 1 E 0.9988465974635842 0 1 -55.41061130365657 -9.5 0 E 77.5 29 506 60
 0 2 2 "0s" 0 0 0 192 0 0  77.5 29 1
 2
 LANG:10001 26 Arial,-1,27,5,50,0,0,0,0,0
@@ -485,14 +486,14 @@ LANG:10000 26 Arial,-1,13,5,50,0,0,0,0,0
     editSettings(id);
   }"
 "main()
-{   
+{
   initTree();
   fillWithData();
   this.expandAll();
   this.alternatingRowColors(true);
 }
 
-void initTree()    
+void initTree()
 {
   this.addColumn(\"Id\");
   this.addColumn(\"Description\");
@@ -509,79 +510,84 @@ void initTree()
 void fillWithData()
 {
   settings = QgSettings::getAllSettingsAsMapping();
-  
+
   for (int i = 1; i <= dynlen(settings); i++)
   {
     mapping json_data = settings[i];
-    
+
     if (mappingHasKey(json_data, \"settingsVersion\") == false ||
         mappingHasKey(json_data, \"checks\") == false )
     {
       continue;
     }
-    
+
     //determine machting check for id
     dyn_mapping checks = json_data[\"checks\"];
-    
-    
+
+
     for (int j = 1; j <= dynlen(checks); j++)
     {
-      mapping check = checks[j];      
-      
+      mapping check = checks[j];
+
       if ( mappinglen(check) < 1 )
       {
         continue;
-      }    
-    
+      }
+
       Mapping map = Mapping(check);
       dyn_string id_parts = strsplit(map.getAt(\"id\"), \".\");
       string id = \"\";
-      string parent_id = \"\"; 
-      
+      string parent_id = \"\";
+
       for (int z = 1; z <= dynlen(id_parts); z++)
-      {      
+      {
         if (id != \"\")
-        {     
+        {
           id += \".\";
         }
-        
-        id += id_parts[z];    
-        
+
+        id += id_parts[z];
+
         if (z > 1)
         {
           if (parent_id != \"\")
-          {     
+          {
             parent_id += \".\";
           }
           parent_id += id_parts[z-1];
         }
-        
+
         if (!this.itemExists(id))
         {
           this.appendItem(parent_id, id, id_parts[z]);
         }
-      }      
-      
+      }
+
       //read settings depeding on the version
+      OaLanguage lang = getActiveLangId();
+
+      string sLang = getLocale(lang, LOCALE_FORMAT_ISO).startsWith(\"de_\") ? \"de_AT.utf8\" : \"en_US.utf8\";
+
       switch(json_data[\"settingsVersion\"])
       {
         case 0:
         default:
-      
-          
-          this.setText(id, 1, map.getAt(\"description\")[getActiveLang()]);
-          
+
+
+          this.setText(id, 1, map.getAt(\"description\")[sLang]);
+
           setSettingsValue(id, 2, map.getAt(\"lowLimit\", -1), \"lowLimit\");
           setSettingsValue(id, 3, map.getAt(\"highLimit\", -1), \"highLimit\");
           setSettingsValue(id, 4, getReferenceValuesAsString(map.getAt(\"referenceValues\", makeDynMixed(\"-1\"))), \"referenceValues\");
           setSettingsValue(id, 5, map.getAt(\"scorePoints\", -1), \"scorePoints\");
           setSettingsValue(id, 6, map.getAt(\"enabled\", -1), \"enabled\");
-          
+
           this.setText(id, 7, \"...\");
       }
     }
   }
-}" 0
+}
+" 0
 13 43
 "PUSH_BUTTON2"
 ""