| 
				
			 | 
			
			
				
				@@ -4681,7 +4681,7 @@ while(i < windowChildren.count()) 
			 | 
		
		
	
		
			
			| 
				4681
			 | 
			
				4681
			 | 
			
			
				
				         } 
			 | 
		
		
	
		
			
			| 
				4682
			 | 
			
				4682
			 | 
			
			
				
				         else if(element.tagName() == "layout") 
			 | 
		
		
	
		
			
			| 
				4683
			 | 
			
				4683
			 | 
			
			
				
				         { 
			 | 
		
		
	
		
			
			| 
				4684
			 | 
			
				
			 | 
			
			
				
				-            element.setAttribute("trcontext", targetID); 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				4684
			 | 
			
			
				
				+            element.setAttribute("trcontext", "configuration"); 
			 | 
		
		
	
		
			
			| 
				4685
			 | 
			
				4685
			 | 
			
			
				
				             addLayoutToWidget(element, &widgetStack, &layoutStack); 
			 | 
		
		
	
		
			
			| 
				4686
			 | 
			
				4686
			 | 
			
			
				
				         } 
			 | 
		
		
	
		
			
			| 
				4687
			 | 
			
				4687
			 | 
			
			
				
				         else if(element.tagName() == "menu") 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -4868,7 +4868,7 @@ void populateStackedLayout(QDomElement element, QStack<QWidget *> *widgetStack, 
			 | 
		
		
	
		
			
			| 
				4868
			 | 
			
				4868
			 | 
			
			
				
				                 QWidget *widget = new QWidget; 
			 | 
		
		
	
		
			
			| 
				4869
			 | 
			
				4869
			 | 
			
			
				
				                 layout->addWidget(widget); 
			 | 
		
		
	
		
			
			| 
				4870
			 | 
			
				4870
			 | 
			
			
				
				                 widgetStack->push(widget); 
			 | 
		
		
	
		
			
			| 
				4871
			 | 
			
				
			 | 
			
			
				
				-                currentElement.setAttribute("trcontext", element.attribute("trcontext")); 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				4871
			 | 
			
			
				
				+                currentElement.setAttribute("trcontext", "configuration"); 
			 | 
		
		
	
		
			
			| 
				4872
			 | 
			
				4872
			 | 
			
			
				
				                 populateWidget(currentElement, widgetStack, layoutStack); 
			 | 
		
		
	
		
			
			| 
				4873
			 | 
			
				4873
			 | 
			
			
				
				                 widgetStack->pop(); 
			 | 
		
		
	
		
			
			| 
				4874
			 | 
			
				4874
			 | 
			
			
				
				             } 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -4979,7 +4979,7 @@ for(int j = 0; j < rowChildren.count(); j++) 
			 | 
		
		
	
		
			
			| 
				4979
			 | 
			
				4979
			 | 
			
			
				
				             QHBoxLayout *cell = new QHBoxLayout; 
			 | 
		
		
	
		
			
			| 
				4980
			 | 
			
				4980
			 | 
			
			
				
				             layout->addLayout(cell, row, column, vspan, hspan); 
			 | 
		
		
	
		
			
			| 
				4981
			 | 
			
				4981
			 | 
			
			
				
				             layoutStack->push(cell); 
			 | 
		
		
	
		
			
			| 
				4982
			 | 
			
				
			 | 
			
			
				
				-            columnElement.setAttribute("trcontext", element.attribute("trcontext")); 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				4982
			 | 
			
			
				
				+            columnElement.setAttribute("trcontext", "configuration"); 
			 | 
		
		
	
		
			
			| 
				4983
			 | 
			
				4983
			 | 
			
			
				
				             populateBoxLayout(columnElement, widgetStack, layoutStack); 
			 | 
		
		
	
		
			
			| 
				4984
			 | 
			
				4984
			 | 
			
			
				
				             layoutStack->pop(); 
			 | 
		
		
	
		
			
			| 
				4985
			 | 
			
				4985
			 | 
			
			
				
				         } 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5002,7 +5002,7 @@ void populateBoxLayout(QDomElement element, QStack<QWidget *> *widgetStack, 
			 | 
		
		
	
		
			
			| 
				5002
			 | 
			
				5002
			 | 
			
			
				
				         if(current.isElement()) 
			 | 
		
		
	
		
			
			| 
				5003
			 | 
			
				5003
			 | 
			
			
				
				         { 
			 | 
		
		
	
		
			
			| 
				5004
			 | 
			
				5004
			 | 
			
			
				
				             currentElement = current.toElement(); 
			 | 
		
		
	
		
			
			| 
				5005
			 | 
			
				
			 | 
			
			
				
				-            currentElement.setAttribute("trcontext", element.attribute("trcontext")); 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5005
			 | 
			
			
				
				+            currentElement.setAttribute("trcontext", "configuration"); 
			 | 
		
		
	
		
			
			| 
				5006
			 | 
			
				5006
			 | 
			
			
				
				             if(currentElement.tagName() == "button") 
			 | 
		
		
	
		
			
			| 
				5007
			 | 
			
				5007
			 | 
			
			
				
				             { 
			 | 
		
		
	
		
			
			| 
				5008
			 | 
			
				5008
			 | 
			
			
				
				                 addButtonToLayout(currentElement, widgetStack, layoutStack); 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5029,7 +5029,7 @@ void populateBoxLayout(QDomElement element, QStack<QWidget *> *widgetStack, 
			 | 
		
		
	
		
			
			| 
				5029
			 | 
			
				5029
			 | 
			
			
				
				                 QBoxLayout *layout = 
			 | 
		
		
	
		
			
			| 
				5030
			 | 
			
				5030
			 | 
			
			
				
				                     qobject_cast<QBoxLayout *>(layoutStack->top()); 
			 | 
		
		
	
		
			
			| 
				5031
			 | 
			
				5031
			 | 
			
			
				
				                 QLabel *label = new QLabel(QCoreApplication::translate( 
			 | 
		
		
	
		
			
			| 
				5032
			 | 
			
				
			 | 
			
			
				
				-                    element.attribute("trcontext").toAscii().data(), 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5032
			 | 
			
			
				
				+                    "configuration", 
			 | 
		
		
	
		
			
			| 
				5033
			 | 
			
				5033
			 | 
			
			
				
				                     currentElement.text().toUtf8().data())); 
			 | 
		
		
	
		
			
			| 
				5034
			 | 
			
				5034
			 | 
			
			
				
				                 layout->addWidget(label); 
			 | 
		
		
	
		
			
			| 
				5035
			 | 
			
				5035
			 | 
			
			
				
				             } 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5174,7 +5174,7 @@ void populateSplitter(QDomElement element, QStack<QWidget *> *widgetStack,@| 
			 | 
		
		
	
		
			
			| 
				5174
			 | 
			
				5174
			 | 
			
			
				
				         if(current.isElement()) 
			 | 
		
		
	
		
			
			| 
				5175
			 | 
			
				5175
			 | 
			
			
				
				         { 
			 | 
		
		
	
		
			
			| 
				5176
			 | 
			
				5176
			 | 
			
			
				
				             currentElement = current.toElement(); 
			 | 
		
		
	
		
			
			| 
				5177
			 | 
			
				
			 | 
			
			
				
				-            currentElement.setAttribute("trcontext", element.attribute("trcontext")); 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5177
			 | 
			
			
				
				+            currentElement.setAttribute("trcontext", "configuration"); 
			 | 
		
		
	
		
			
			| 
				5178
			 | 
			
				5178
			 | 
			
			
				
				             if(currentElement.tagName() == "decoration") 
			 | 
		
		
	
		
			
			| 
				5179
			 | 
			
				5179
			 | 
			
			
				
				             { 
			 | 
		
		
	
		
			
			| 
				5180
			 | 
			
				5180
			 | 
			
			
				
				                 addDecorationToSplitter(currentElement, widgetStack, 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5321,7 +5321,7 @@ labeled. 
			 | 
		
		
	
		
			
			| 
				5321
			 | 
			
				5321
			 | 
			
			
				
				  
			 | 
		
		
	
		
			
			| 
				5322
			 | 
			
				5322
			 | 
			
			
				
				 @<Set up decoration@>= 
			 | 
		
		
	
		
			
			| 
				5323
			 | 
			
				5323
			 | 
			
			
				
				 QString labelText = 
			 | 
		
		
	
		
			
			| 
				5324
			 | 
			
				
			 | 
			
			
				
				-    QCoreApplication::translate(element.attribute("trcontext").toAscii().data(), 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5324
			 | 
			
			
				
				+    QCoreApplication::translate("configuration", 
			 | 
		
		
	
		
			
			| 
				5325
			 | 
			
				5325
			 | 
			
			
				
				     element.attribute("name").toUtf8().data()); 
			 | 
		
		
	
		
			
			| 
				5326
			 | 
			
				5326
			 | 
			
			
				
				 Qt::Orientations@, orientation = Qt::Horizontal; 
			 | 
		
		
	
		
			
			| 
				5327
			 | 
			
				5327
			 | 
			
			
				
				 if(element.hasAttribute("type")) 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5418,7 +5418,7 @@ void populateWidget(QDomElement element, QStack<QWidget *> *widgetStack,@| 
			 | 
		
		
	
		
			
			| 
				5418
			 | 
			
				5418
			 | 
			
			
				
				             currentElement = current.toElement(); 
			 | 
		
		
	
		
			
			| 
				5419
			 | 
			
				5419
			 | 
			
			
				
				             if(currentElement.tagName() == "layout") 
			 | 
		
		
	
		
			
			| 
				5420
			 | 
			
				5420
			 | 
			
			
				
				             { 
			 | 
		
		
	
		
			
			| 
				5421
			 | 
			
				
			 | 
			
			
				
				-                currentElement.setAttribute("trcontext", element.attribute("trcontext")); 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5421
			 | 
			
			
				
				+                currentElement.setAttribute("trcontext", "configuration"); 
			 | 
		
		
	
		
			
			| 
				5422
			 | 
			
				5422
			 | 
			
			
				
				                 addLayoutToWidget(currentElement, widgetStack, layoutStack); 
			 | 
		
		
	
		
			
			| 
				5423
			 | 
			
				5423
			 | 
			
			
				
				             } 
			 | 
		
		
	
		
			
			| 
				5424
			 | 
			
				5424
			 | 
			
			
				
				         } 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5435,7 +5435,7 @@ void addButtonToLayout(QDomElement element, QStack<QWidget *> *,@| 
			 | 
		
		
	
		
			
			| 
				5435
			 | 
			
				5435
			 | 
			
			
				
				 { 
			 | 
		
		
	
		
			
			| 
				5436
			 | 
			
				5436
			 | 
			
			
				
				     QAbstractButton *button = NULL; 
			 | 
		
		
	
		
			
			| 
				5437
			 | 
			
				5437
			 | 
			
			
				
				     QString text = 
			 | 
		
		
	
		
			
			| 
				5438
			 | 
			
				
			 | 
			
			
				
				-        QCoreApplication::translate(element.attribute("trcontext").toAscii().data(), 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5438
			 | 
			
			
				
				+        QCoreApplication::translate("configuration", 
			 | 
		
		
	
		
			
			| 
				5439
			 | 
			
				5439
			 | 
			
			
				
				                                     element.attribute("name").toUtf8().data()); 
			 | 
		
		
	
		
			
			| 
				5440
			 | 
			
				5440
			 | 
			
			
				
				     if(element.hasAttribute("type")) 
			 | 
		
		
	
		
			
			| 
				5441
			 | 
			
				5441
			 | 
			
			
				
				     { 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5491,13 +5491,13 @@ void addSpinBoxToLayout(QDomElement element, QStack<QWidget *> *,@| 
			 | 
		
		
	
		
			
			| 
				5491
			 | 
			
				5491
			 | 
			
			
				
				     if(element.hasAttribute("pretext")) 
			 | 
		
		
	
		
			
			| 
				5492
			 | 
			
				5492
			 | 
			
			
				
				     { 
			 | 
		
		
	
		
			
			| 
				5493
			 | 
			
				5493
			 | 
			
			
				
				         box->setPretext(QCoreApplication::translate( 
			 | 
		
		
	
		
			
			| 
				5494
			 | 
			
				
			 | 
			
			
				
				-                        element.attribute("trcontext").toAscii().data(), 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5494
			 | 
			
			
				
				+                        "configuration", 
			 | 
		
		
	
		
			
			| 
				5495
			 | 
			
				5495
			 | 
			
			
				
				                         element.attribute("pretext").toUtf8().data())); 
			 | 
		
		
	
		
			
			| 
				5496
			 | 
			
				5496
			 | 
			
			
				
				     } 
			 | 
		
		
	
		
			
			| 
				5497
			 | 
			
				5497
			 | 
			
			
				
				     if(element.hasAttribute("posttext")) 
			 | 
		
		
	
		
			
			| 
				5498
			 | 
			
				5498
			 | 
			
			
				
				     { 
			 | 
		
		
	
		
			
			| 
				5499
			 | 
			
				5499
			 | 
			
			
				
				         box->setPosttext(QCoreApplication::translate( 
			 | 
		
		
	
		
			
			| 
				5500
			 | 
			
				
			 | 
			
			
				
				-                         element.attribute("trcontext").toAscii().data(), 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5500
			 | 
			
			
				
				+                         "configuration", 
			 | 
		
		
	
		
			
			| 
				5501
			 | 
			
				5501
			 | 
			
			
				
				                          element.attribute("posttext").toUtf8().data())); 
			 | 
		
		
	
		
			
			| 
				5502
			 | 
			
				5502
			 | 
			
			
				
				     } 
			 | 
		
		
	
		
			
			| 
				5503
			 | 
			
				5503
			 | 
			
			
				
				     if(element.hasAttribute("series")) 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5568,7 +5568,7 @@ void addZoomLogToSplitter(QDomElement element, QStack<QWidget *> *widgetStack, 
			 | 
		
		
	
		
			
			| 
				5568
			 | 
			
				5568
			 | 
			
			
				
				                 { 
			 | 
		
		
	
		
			
			| 
				5569
			 | 
			
				5569
			 | 
			
			
				
				                     QString text = 
			 | 
		
		
	
		
			
			| 
				5570
			 | 
			
				5570
			 | 
			
			
				
				                         QCoreApplication::translate( 
			 | 
		
		
	
		
			
			| 
				5571
			 | 
			
				
			 | 
			
			
				
				-                            element.attribute("trcontext").toAscii().data(), 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5571
			 | 
			
			
				
				+                            "configuration", 
			 | 
		
		
	
		
			
			| 
				5572
			 | 
			
				5572
			 | 
			
			
				
				                             currentElement.text().toUtf8().data()); 
			 | 
		
		
	
		
			
			| 
				5573
			 | 
			
				5573
			 | 
			
			
				
				                     widget->setHeaderData(column, text); 
			 | 
		
		
	
		
			
			| 
				5574
			 | 
			
				5574
			 | 
			
			
				
				                     column++; 
			 | 
		
		
	
	
		
			
			| 
				
			 | 
			
			
				
				@@ -5716,8 +5716,8 @@ void addSaltToLayout(QDomElement element, QStack<QWidget *> *,@| 
			 | 
		
		
	
		
			
			| 
				5716
			 | 
			
				5716
			 | 
			
			
				
				                         model->setHeaderData(currentColumn, 
			 | 
		
		
	
		
			
			| 
				5717
			 | 
			
				5717
			 | 
			
			
				
				                             Qt::Horizontal, 
			 | 
		
		
	
		
			
			| 
				5718
			 | 
			
				5718
			 | 
			
			
				
				                             QCoreApplication::translate( 
			 | 
		
		
	
		
			
			| 
				5719
			 | 
			
				
			 | 
			
			
				
				-                                element.attribute("trcontext").toAscii().data(), 
			 | 
		
		
	
		
			
			| 
				5720
			 | 
			
				
			 | 
			
			
				
				-                                    currentElement.attribute("name").toUtf8().data())); 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5719
			 | 
			
			
				
				+                                "configuration", 
			 | 
		
		
	
		
			
			| 
				
			 | 
			
				5720
			 | 
			
			
				
				+                                currentElement.attribute("name").toUtf8().data())); 
			 | 
		
		
	
		
			
			| 
				5721
			 | 
			
				5721
			 | 
			
			
				
				                     } 
			 | 
		
		
	
		
			
			| 
				5722
			 | 
			
				5722
			 | 
			
			
				
				                     if(currentElement.hasAttribute("delegate")) 
			 | 
		
		
	
		
			
			| 
				5723
			 | 
			
				5723
			 | 
			
			
				
				                     { 
			 |