From 93a1bfcdd795b436cb41d419a1aa8064b9f2987d Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 18 Nov 2016 20:05:11 +0100
Subject: gui, modules: add more translatable strings

---
 gui/main-window.ui     | 24 ++++++++++++------------
 gui/new_file_dialog.h  |  3 ++-
 gui/options-dialog.cpp |  1 +
 gui/options-dialog.ui  | 18 +++++++++++++++---
 4 files changed, 30 insertions(+), 16 deletions(-)

(limited to 'gui')

diff --git a/gui/main-window.ui b/gui/main-window.ui
index 8bf78efd..33ee99d3 100644
--- a/gui/main-window.ui
+++ b/gui/main-window.ui
@@ -342,7 +342,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>TZ</string>
+                <string>Z</string>
                </property>
               </widget>
              </item>
@@ -358,7 +358,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>pitch</string>
+                <string>Pitch</string>
                </property>
               </widget>
              </item>
@@ -411,7 +411,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>TY</string>
+                <string>Y</string>
                </property>
               </widget>
              </item>
@@ -427,7 +427,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>TX</string>
+                <string>X</string>
                </property>
               </widget>
              </item>
@@ -474,7 +474,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>roll</string>
+                <string>Roll</string>
                </property>
               </widget>
              </item>
@@ -490,7 +490,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>yaw</string>
+                <string>Yaw</string>
                </property>
               </widget>
              </item>
@@ -704,7 +704,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>TX</string>
+                <string>X</string>
                </property>
               </widget>
              </item>
@@ -726,7 +726,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>TY</string>
+                <string>Y</string>
                </property>
               </widget>
              </item>
@@ -767,7 +767,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>pitch</string>
+                <string>Pitch</string>
                </property>
               </widget>
              </item>
@@ -783,7 +783,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>roll</string>
+                <string>Roll</string>
                </property>
               </widget>
              </item>
@@ -799,7 +799,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>yaw</string>
+                <string>Yaw</string>
                </property>
               </widget>
              </item>
@@ -821,7 +821,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="text">
-                <string>TZ</string>
+                <string>Z</string>
                </property>
               </widget>
              </item>
diff --git a/gui/new_file_dialog.h b/gui/new_file_dialog.h
index 6ba3ede3..cd5ca528 100644
--- a/gui/new_file_dialog.h
+++ b/gui/new_file_dialog.h
@@ -39,7 +39,8 @@ private slots:
         if (text == "" || text == ".ini" || QFile(options::group::ini_directory() + "/" + text).exists())
         {
             QMessageBox::warning(this,
-                                 "File exists", "This file already exists. Pick another name.",
+                                 tr("File exists"),
+                                 tr("This file already exists. Pick another name."),
                                  QMessageBox::Ok, QMessageBox::NoButton);
             return;
         }
diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp
index a0d26b8a..8cf67e6d 100644
--- a/gui/options-dialog.cpp
+++ b/gui/options-dialog.cpp
@@ -142,6 +142,7 @@ void OptionsDialog::bind_key(key_opts& kopts, QLabel* label)
     d.setLayout(&l);
     d.setFixedSize(QSize(500, 300));
     d.setWindowFlags(Qt::Dialog);
+    setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | windowFlags());
     d.setWindowModality(Qt::ApplicationModal);
     connect(&k,
             &KeyboardListener::key_pressed,
diff --git a/gui/options-dialog.ui b/gui/options-dialog.ui
index 471bd712..f23dd63f 100644
--- a/gui/options-dialog.ui
+++ b/gui/options-dialog.ui
@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>525</width>
-    <height>603</height>
+    <width>450</width>
+    <height>599</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>450</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Options</string>
   </property>
@@ -465,6 +471,12 @@
           </item>
           <item row="5" column="0">
            <widget class="QLabel" name="label_17">
+            <property name="minimumSize">
+             <size>
+              <width>300</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="text">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Specify an angle to rotate position tracking. It lets the tracker avoid moving on the X and Y axes when zooming, since camera isn't mounted perfectly in front of the model, but above or below.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
@@ -865,7 +877,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
-- 
cgit v1.2.3