revert change in draw_information_window and change translations

prusa3d · Nov 10, 2017 · e79ae10 · e79ae10
1 parent 2b8e058
commit e79ae10
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 46 deletions.
diff --git a/data/v.txt b/data/v.txt
@@ -1 +1 @@
-v0.9.4-414_beta-g7531637
+v0.9.4-415_beta-g2b8e058
diff --git a/sceneRender.py b/sceneRender.py
@@ -870,19 +870,13 @@ def draw_information_window(self):
             if self.controller.app_config.system_platform in ['Darwin']:
                 font.setPointSize(19)
             else:
-                if self.controller.dpi_scale == 2:
-                    font.setPointSize(15 * self.controller.dpi_coef - self.controller.dpi_scale)
-                else:
-                    font.setPointSize(17 *self.controller.dpi_coef - self.controller.dpi_scale)
+                font.setPointSize(17 * self.controller.dpi_coef - self.controller.dpi_scale)
             self.renderText(position_x + 8, sH - position_y - size_h + 30, self.tr("PRINT INFO"), font)
 
             if self.controller.app_config.system_platform in ['Darwin']:
                 font.setPointSize(11)
             else:
-                if self.controller.dpi_scale == 2:
-                    font.setPointSize(7 * self.controller.dpi_coef - self.controller.dpi_scale)
-                else:
-                    font.setPointSize(9 *self.controller.dpi_coef - self.controller.dpi_scale)
+                font.setPointSize(9 * self.controller.dpi_coef - self.controller.dpi_scale)
 
             #header = '{:>20}{:>10}{:>14}'.format(' ', 'time:', 'filament:')
             #print(header)

diff --git a/translation/cs_CZ.qm b/translation/cs_CZ.qm
diff --git a/translation/de_DE.qm b/translation/de_DE.qm
diff --git a/translation/en_US.qm b/translation/en_US.qm
diff --git a/translation/es_ES.qm b/translation/es_ES.qm
diff --git a/ts/cs_CZ.ts b/ts/cs_CZ.ts
@@ -228,7 +228,7 @@
     <message>
         <location filename="sceneRender.py" line="724"/>
         <source>change filament. Learn more about Colorprint at prusaprinters.</source>
-        <translation>materiál. Více informací o Colorprintu na prusaprinters.</translation>
+        <translation>materiál. Více informací o Colorprintu na prusaprinters.org</translation>
     </message>
 </context>
 <context>

diff --git a/ts/de_DE.ts b/ts/de_DE.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="de_DE" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.0" language="de_DE">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -17,7 +18,7 @@
     <name>AppScene</name>
     <message>
         <location filename="sceneData.py" line="312"/>
-        <source>&#xe2;&#x80;&#xa2; Object %s... is out of printable area!</source>
+        <source>â¢ Object %s... is out of printable area!</source>
         <translation type="obsolete">â¢ Objekt %s... ist außerhalb des druckbaren Bereiches!</translation>
     </message>
 </context>
@@ -222,12 +223,12 @@
     <message>
         <location filename="sceneRender.py" line="722"/>
         <source>Add stops at specific layer heights where you can manually</source>
-        <translation type="unfinished"></translation>
+        <translation>Add stops at specific layer heights where you can manually</translation>
     </message>
     <message>
         <location filename="sceneRender.py" line="724"/>
         <source>change filament. Learn more about Colorprint at prusaprinters.</source>
-        <translation type="unfinished"></translation>
+        <translation>change filament. Learn more about Colorprint at prusaprinters.org</translation>
     </message>
 </context>
 <context>
@@ -566,27 +567,27 @@
     </message>
     <message>
         <location filename="gui.py" line="1350"/>
-        <source>Undo<byte value="x9"/>Ctrl+Z</source>
+        <source>Undo	Ctrl+Z</source>
         <translation type="obsolete">Zurück</translation>
     </message>
     <message>
         <location filename="gui.py" line="1351"/>
-        <source>Redo<byte value="x9"/>Ctrl+Y</source>
+        <source>Redo	Ctrl+Y</source>
         <translation type="obsolete">Wiederherstellen</translation>
     </message>
     <message>
         <location filename="gui.py" line="1353"/>
-        <source>Copy<byte value="x9"/>Ctrl+C</source>
+        <source>Copy	Ctrl+C</source>
         <translation type="obsolete">Kopieren</translation>
     </message>
     <message>
         <location filename="gui.py" line="1354"/>
-        <source>Paste<byte value="x9"/>Ctrl+V</source>
+        <source>Paste	Ctrl+V</source>
         <translation type="obsolete">Einfügen</translation>
     </message>
     <message>
         <location filename="gui.py" line="1355"/>
-        <source>Delete<byte value="x9"/>Del</source>
+        <source>Delete	Del</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>

diff --git a/ts/en_US.ts b/ts/en_US.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="en_US" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.0" language="en_US">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -17,7 +18,7 @@
     <name>AppScene</name>
     <message>
         <location filename="sceneData.py" line="312"/>
-        <source>&#xe2;&#x80;&#xa2; Object %s... is out of printable area!</source>
+        <source>â¢ Object %s... is out of printable area!</source>
         <translation type="obsolete">â¢ Object %s... is out of printable area!</translation>
     </message>
 </context>
@@ -222,12 +223,12 @@
     <message>
         <location filename="sceneRender.py" line="722"/>
         <source>Add stops at specific layer heights where you can manually</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Add stops at specific layer heights where you can manually</translation>
     </message>
     <message>
         <location filename="sceneRender.py" line="724"/>
         <source>change filament. Learn more about Colorprint at prusaprinters.</source>
-        <translation type="unfinished"></translation>
+        <translation>change filament. Learn more about Colorprint at prusaprinters.org</translation>
     </message>
 </context>
 <context>
@@ -566,27 +567,27 @@
     </message>
     <message>
         <location filename="gui.py" line="1350"/>
-        <source>Undo<byte value="x9"/>Ctrl+Z</source>
+        <source>Undo	Ctrl+Z</source>
         <translation type="obsolete">Undo</translation>
     </message>
     <message>
         <location filename="gui.py" line="1351"/>
-        <source>Redo<byte value="x9"/>Ctrl+Y</source>
+        <source>Redo	Ctrl+Y</source>
         <translation type="obsolete">Redo</translation>
     </message>
     <message>
         <location filename="gui.py" line="1353"/>
-        <source>Copy<byte value="x9"/>Ctrl+C</source>
+        <source>Copy	Ctrl+C</source>
         <translation type="obsolete">Copy</translation>
     </message>
     <message>
         <location filename="gui.py" line="1354"/>
-        <source>Paste<byte value="x9"/>Ctrl+V</source>
+        <source>Paste	Ctrl+V</source>
         <translation type="obsolete">Paste</translation>
     </message>
     <message>
         <location filename="gui.py" line="1355"/>
-        <source>Delete<byte value="x9"/>Del</source>
+        <source>Delete	Del</source>
         <translation type="obsolete">Delete</translation>
     </message>
     <message>

diff --git a/ts/es_ES.ts b/ts/es_ES.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="es_ES" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.0" language="es_ES">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -17,7 +18,7 @@
     <name>AppScene</name>
     <message>
         <location filename="sceneData.py" line="312"/>
-        <source>&#xe2;&#x80;&#xa2; Object %s... is out of printable area!</source>
+        <source>â¢ Object %s... is out of printable area!</source>
         <translation type="obsolete">â¢ Objeto %s... fuera del área de impresión!</translation>
     </message>
 </context>
@@ -222,12 +223,12 @@
     <message>
         <location filename="sceneRender.py" line="722"/>
         <source>Add stops at specific layer heights where you can manually</source>
-        <translation type="unfinished"></translation>
+        <translation>Add stops at specific layer heights where you can manually</translation>
     </message>
     <message>
         <location filename="sceneRender.py" line="724"/>
         <source>change filament. Learn more about Colorprint at prusaprinters.</source>
-        <translation type="unfinished"></translation>
+        <translation>change filament. Learn more about Colorprint at prusaprinters.org</translation>
     </message>
 </context>
 <context>
@@ -566,28 +567,28 @@
     </message>
     <message>
         <location filename="gui.py" line="1350"/>
-        <source>Undo<byte value="x9"/>Ctrl+Z</source>
-        <translation type="obsolete">Deshacer<byte value="x9"/>Ctrl+Z</translation>
+        <source>Undo	Ctrl+Z</source>
+        <translation type="obsolete">Deshacer	Ctrl+Z</translation>
     </message>
     <message>
         <location filename="gui.py" line="1351"/>
-        <source>Redo<byte value="x9"/>Ctrl+Y</source>
-        <translation type="obsolete">Rehacer<byte value="x9"/>Ctrl+Y</translation>
+        <source>Redo	Ctrl+Y</source>
+        <translation type="obsolete">Rehacer	Ctrl+Y</translation>
     </message>
     <message>
         <location filename="gui.py" line="1353"/>
-        <source>Copy<byte value="x9"/>Ctrl+C</source>
-        <translation type="obsolete">Copiar<byte value="x9"/>Ctrl+C</translation>
+        <source>Copy	Ctrl+C</source>
+        <translation type="obsolete">Copiar	Ctrl+C</translation>
     </message>
     <message>
         <location filename="gui.py" line="1354"/>
-        <source>Paste<byte value="x9"/>Ctrl+V</source>
-        <translation type="obsolete">Pegar<byte value="x9"/>Ctrl+V</translation>
+        <source>Paste	Ctrl+V</source>
+        <translation type="obsolete">Pegar	Ctrl+V</translation>
     </message>
     <message>
         <location filename="gui.py" line="1355"/>
-        <source>Delete<byte value="x9"/>Del</source>
-        <translation type="obsolete">Borrar<byte value="x9"/>Del</translation>
+        <source>Delete	Del</source>
+        <translation type="obsolete">Borrar	Del</translation>
     </message>
     <message>
         <location filename="gui.py" line="1697"/>

diff --git a/version.txt b/version.txt
@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(0, 9, 4, 414),
-    prodvers=(0, 9, 4, 414),
+    filevers=(0, 9, 4, 415),
+    prodvers=(0, 9, 4, 415),
     mask=0x3f,
     flags=0x0,
     OS=0x4,
@@ -16,10 +16,10 @@ VSVersionInfo(
         u'040904b0',
         [StringStruct(u'CompanyName', u'Prusa Research, s.r.o.'),
         StringStruct(u'ProductName', u'PrusaControl'),
-        StringStruct(u'ProductVersion', u'0, 9, 4, 414'),
+        StringStruct(u'ProductVersion', u'0, 9, 4, 415'),
         StringStruct(u'InternalName', u'PrusaControl'),
         StringStruct(u'OriginalFilename', u'PrusaControl.exe'),
-        StringStruct(u'FileVersion', u'0, 9, 4, 414'),
+        StringStruct(u'FileVersion', u'0, 9, 4, 415'),
         StringStruct(u'FileDescription', u'PrusaControl'),
         StringStruct(u'LegalCopyright', u'Copyright 2017 Prusa Research s.r.o.'),
         StringStruct(u'LegalTrademarks', u''),])