translation and gui fixes

ghorwin · Sep 20, 2022 · f22fe1b · f22fe1b
1 parent 45c04e7
commit f22fe1b
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 147 deletions.
diff --git a/SIM-VICUS/resources/translations/SIM-VICUS_de.ts b/SIM-VICUS/resources/translations/SIM-VICUS_de.ts
@@ -5037,12 +5037,16 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../src/SVDBSurfaceHeatingEditWidget.ui" line="63"/>
         <source>Max. heating limit:</source>
-        <translation>max. Heizgrenze:</translation>
+        <translation>Max. Heizleistung:</translation>
     </message>
     <message>
         <location filename="../../src/SVDBSurfaceHeatingEditWidget.ui" line="91"/>
+        <source>Max. cooling limit:</source>
+        <translation>Max. Kühlleistung:</translation>
+    </message>
+    <message>
         <source>Max. Cooling limit:</source>
-        <translation>max. Kühlgrenze:</translation>
+        <translation type="vanished">max. Kühlgrenze:</translation>
     </message>
     <message>
         <location filename="../../src/SVDBSurfaceHeatingEditWidget.ui" line="159"/>
@@ -5239,27 +5243,27 @@ p, li { white-space: pre-wrap; }
         <translation>Luftwechselrate.</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="81"/>
+        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="83"/>
         <source>Air change rate:</source>
         <translation>Luftwechselrate:</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="82"/>
+        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="84"/>
         <source>Schedule name:</source>
         <translation>Zeitplanname:</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="110"/>
+        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="112"/>
         <source>&lt;select schedule&gt;</source>
         <translation>&lt;Zeitplan auswählen&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="249"/>
+        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="251"/>
         <source>Time [d]</source>
         <translation>Zeit [d]</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="252"/>
+        <location filename="../../src/SVDBVentilationNaturalEditWidget.cpp" line="254"/>
         <source>Natural Ventilation [1/h]</source>
         <translation>Natürliche Belüftung [1/h]</translation>
     </message>
@@ -5713,12 +5717,12 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="146"/>
+        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="20"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="74"/>
+        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="27"/>
         <source>Method:</source>
         <translation>Methode:</translation>
     </message>
@@ -5728,30 +5732,33 @@ p, li { white-space: pre-wrap; }
         <translation>Controller-Typ:</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="86"/>
+        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="41"/>
         <source>Heating Setpoint Schedule:</source>
         <translation>Heizsollwertzeitplan:</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="57"/>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="100"/>
+        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="55"/>
+        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="84"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="43"/>
+        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="70"/>
         <source>Cooling Setpoint Schedule:</source>
         <translation>Kühlsollwertzeitplan:</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="20"/>
+        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="99"/>
+        <source>Tolerance [K]:</source>
+        <translation>Toleranz [K]:</translation>
+    </message>
+    <message>
         <source>Tolerance:</source>
-        <translation>Toleranz:</translation>
+        <translation type="vanished">Toleranz:</translation>
     </message>
     <message>
-        <location filename="../../src/SVDBZoneControlThermostatEditWidget.ui" line="27"/>
         <source>K</source>
-        <translation>K</translation>
+        <translation type="vanished">K</translation>
     </message>
     <message>
         <source>Hier muss bitte ein SCI Chart wie im CCM für die Diagramme rein. Wichtig dabei man muss vom Jahresdatensatz alles sehen und rein bis zur Stundenauflösung.</source>

diff --git a/SIM-VICUS/src/SVDBSurfaceHeatingEditWidget.ui b/SIM-VICUS/src/SVDBSurfaceHeatingEditWidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1061</width>
-    <height>582</height>
+    <width>846</width>
+    <height>426</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -68,7 +68,7 @@
           <widget class="QtExt::ValidatingLineEdit" name="lineEditHeatingLimit">
            <property name="maximumSize">
             <size>
-             <width>100</width>
+             <width>16777215</width>
              <height>16777215</height>
             </size>
            </property>
@@ -88,15 +88,15 @@
          <item>
           <widget class="QLabel" name="labelShieldCoefficient">
            <property name="text">
-            <string>Max. Cooling limit:</string>
+            <string>Max. cooling limit:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QtExt::ValidatingLineEdit" name="lineEditCoolingLimit">
            <property name="maximumSize">
             <size>
-             <width>100</width>
+             <width>16777215</width>
              <height>16777215</height>
             </size>
            </property>
@@ -318,17 +318,20 @@
     <signal>editingFinishedSuccessfully()</signal>
    </slots>
   </customwidget>
+  <customwidget>
+   <class>QtExt::ColorButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">QtExt_ColorButton.h</header>
+   <slots>
+    <signal>colorChanged()</signal>
+   </slots>
+  </customwidget>
   <customwidget>
    <class>QtExt::LanguageStringEditWidget1</class>
    <extends>QLineEdit</extends>
    <header location="global">QtExt_LanguageStringEditWidget1.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QtExt::ColorButton</class>
-   <extends>QPushButton</extends>
-   <header location="global">QtExt_ColorButton.h</header>
-  </customwidget>
   <customwidget>
    <class>QwtPlot</class>
    <extends>QWidget</extends>

diff --git a/SIM-VICUS/src/SVDBVentilationNaturalEditWidget.cpp b/SIM-VICUS/src/SVDBVentilationNaturalEditWidget.cpp
@@ -59,6 +59,8 @@ SVDBVentilationNaturalEditWidget::SVDBVentilationNaturalEditWidget(QWidget *pare
 
 	configureChart(m_ui->widgetPlot);
 
+	m_ui->label_2->setVisible(false);
+
 	// initial state is "nothing selected"
 	updateInput(-1);
 }

diff --git a/SIM-VICUS/src/SVDBZoneControlThermostatEditWidget.cpp b/SIM-VICUS/src/SVDBZoneControlThermostatEditWidget.cpp
@@ -48,7 +48,7 @@ SVDBZoneControlThermostatEditWidget::SVDBZoneControlThermostatEditWidget(QWidget
 	m_ui(new Ui::SVDBZoneControlThermostatEditWidget)
 {
 	m_ui->setupUi(this);
-	m_ui->gridMasterLayout->setMargin(4);
+	m_ui->gridLayout->setMargin(4);
 
 	// *** populate combo boxes ***