User survey: small updates

Just make it behave a little more sanely
- support Ctrl-W and Ctrl-Q
- remove the silly placeholder text for system info
- add language and version information

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 22 insertions, 15 deletions

diff --git a/qt-ui/usersurvey.cpp b/qt-ui/usersurvey.cpp
index d9cee8ce8..10beb94ee 100644
--- a/qt-ui/usersurvey.cpp
+++ b/qt-ui/usersurvey.cpp
@@ -13,9 +13,16 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),
 	ui(new Ui::UserSurvey)
 {
 	ui->setupUi(this);
+	QShortcut *closeKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this);
+	connect(closeKey, SIGNAL(activated()), this, SLOT(close()));
+	QShortcut *quitKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this);
+	connect(quitKey, SIGNAL(activated()), parent, SLOT(close()));
+
 	// fill in the system data
+	ui->system->append(tr("Subsurface %1").arg(VERSION_STRING));
 	ui->system->append(tr("Operating System: %1").arg(SubsurfaceSysInfo::prettyOsName()));
 	ui->system->append(tr("CPU Architecture: %1").arg(SubsurfaceSysInfo::cpuArchitecture()));
+	ui->system->append(tr("Language: %1").arg(uiLanguage(NULL)));
 }
 
 UserSurvey::~UserSurvey()
diff --git a/qt-ui/usersurvey.ui b/qt-ui/usersurvey.ui
index 436ec9079..67d8d9870 100644
--- a/qt-ui/usersurvey.ui
+++ b/qt-ui/usersurvey.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>410</width>
+    <width>500</width>
     <height>524</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
     <rect>
      <x>40</x>
      <y>490</y>
-     <width>341</width>
+     <width>451</width>
      <height>32</height>
     </rect>
    </property>
@@ -34,7 +34,7 @@
     <rect>
      <x>10</x>
      <y>10</y>
-     <width>381</width>
+     <width>481</width>
      <height>16</height>
     </rect>
    </property>
@@ -52,7 +52,7 @@
     <rect>
      <x>10</x>
      <y>40</y>
-     <width>371</width>
+     <width>481</width>
      <height>81</height>
     </rect>
    </property>
@@ -71,7 +71,7 @@
     <rect>
      <x>10</x>
      <y>140</y>
-     <width>151</width>
+     <width>261</width>
      <height>20</height>
     </rect>
    </property>
@@ -82,9 +82,9 @@
   <widget class="QCheckBox" name="tech">
    <property name="geometry">
     <rect>
-     <x>160</x>
+     <x>290</x>
      <y>140</y>
-     <width>151</width>
+     <width>201</width>
      <height>20</height>
     </rect>
    </property>
@@ -97,7 +97,7 @@
     <rect>
      <x>10</x>
      <y>160</y>
-     <width>211</width>
+     <width>421</width>
      <height>20</height>
     </rect>
    </property>
@@ -110,7 +110,7 @@
     <rect>
      <x>10</x>
      <y>180</y>
-     <width>371</width>
+     <width>481</width>
      <height>20</height>
     </rect>
    </property>
@@ -123,7 +123,7 @@
     <rect>
      <x>10</x>
      <y>200</y>
-     <width>371</width>
+     <width>481</width>
      <height>20</height>
     </rect>
    </property>
@@ -136,7 +136,7 @@
     <rect>
      <x>10</x>
      <y>220</y>
-     <width>371</width>
+     <width>481</width>
      <height>20</height>
     </rect>
    </property>
@@ -149,7 +149,7 @@
     <rect>
      <x>10</x>
      <y>270</y>
-     <width>371</width>
+     <width>481</width>
      <height>101</height>
     </rect>
    </property>
@@ -166,7 +166,7 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>10</x>
      <y>240</y>
-     <width>381</width>
+     <width>481</width>
      <height>20</height>
     </rect>
    </property>
@@ -179,7 +179,7 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>10</x>
      <y>380</y>
-     <width>371</width>
+     <width>481</width>
      <height>101</height>
     </rect>
    </property>
@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Filled with some preferences (language, units, etc) plus system data (OS detailed version)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
  </widget>