From b32457a7d2af4aeb095308c7f358a7a398ad849e Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sat, 7 Dec 2013 16:07:28 +0100
Subject: - minor text fixes - versions without a subminor version are now
 displayed without it (1.1 instead of 1.1.0) - version compares now prefer the
 decimal comparison over the traditional

---
 src/mainwindow.cpp |  6 +++---
 src/mainwindow.h   |  2 +-
 src/mainwindow.ui  | 57 ++++++------------------------------------------------
 src/version.rc     |  4 ++--
 4 files changed, 12 insertions(+), 57 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5c487e7a..59666a20 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3998,7 +3998,7 @@ void MainWindow::downloadRequested(QNetworkReply *reply, int modID, const QStrin
 }
 
 
-QTranslator *MainWindow::installTranslator(const QString &name)
+void MainWindow::installTranslator(const QString &name)
 {
   QTranslator *translator = new QTranslator(this);
   QString fileName = name + "_" + m_CurrentLanguage;
@@ -4006,7 +4006,7 @@ QTranslator *MainWindow::installTranslator(const QString &name)
     qWarning("localization file %s not found", qPrintable(fileName));
   }
   qApp->installTranslator(translator);
-  return translator;
+  m_Translators.push_back(translator);
 }
 
 
@@ -4028,7 +4028,7 @@ void MainWindow::languageChange(const QString &newLanguage)
         QVariant fileNameVariant = pluginObj->property("filename");
         if (fileNameVariant.isValid()) {
           QString fileName = QFileInfo(fileNameVariant.toString()).baseName();
-          m_Translators.push_back(installTranslator(fileName));
+          installTranslator(fileName);
         }
       }
     }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 5a8278f9..197ac73c 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -272,7 +272,7 @@ private:
 
   static void setupNetworkProxy(bool activate);
   void activateProxy(bool activate);
-  QTranslator *installTranslator(const QString &name);
+  void installTranslator(const QString &name);
 
 private:
 
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index bc7dc212..73ca868e 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -31,16 +31,7 @@
     <property name="spacing">
      <number>4</number>
     </property>
-    <property name="leftMargin">
-     <number>6</number>
-    </property>
-    <property name="topMargin">
-     <number>6</number>
-    </property>
-    <property name="rightMargin">
-     <number>6</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
      <number>6</number>
     </property>
     <item>
@@ -586,7 +577,7 @@ p, li { white-space: pre-wrap; }
            <enum>QTabWidget::Rounded</enum>
           </property>
           <property name="currentIndex">
-           <number>0</number>
+           <number>1</number>
           </property>
           <widget class="QWidget" name="espTab">
            <property name="sizePolicy">
@@ -730,16 +721,7 @@ p, li { white-space: pre-wrap; }
             <string notr="true">Archives</string>
            </attribute>
            <layout class="QVBoxLayout" name="verticalLayout_9">
-            <property name="leftMargin">
-             <number>6</number>
-            </property>
-            <property name="topMargin">
-             <number>6</number>
-            </property>
-            <property name="rightMargin">
-             <number>6</number>
-            </property>
-            <property name="bottomMargin">
+            <property name="margin">
              <number>6</number>
             </property>
             <item>
@@ -819,16 +801,7 @@ BSAs checked here are loaded in such a way that your installation order is obeye
             <string>Data</string>
            </attribute>
            <layout class="QVBoxLayout" name="verticalLayout_5">
-            <property name="leftMargin">
-             <number>6</number>
-            </property>
-            <property name="topMargin">
-             <number>6</number>
-            </property>
-            <property name="rightMargin">
-             <number>6</number>
-            </property>
-            <property name="bottomMargin">
+            <property name="margin">
              <number>6</number>
             </property>
             <item>
@@ -898,16 +871,7 @@ BSAs checked here are loaded in such a way that your installation order is obeye
             <string>Saves</string>
            </attribute>
            <layout class="QVBoxLayout" name="verticalLayout_3">
-            <property name="leftMargin">
-             <number>6</number>
-            </property>
-            <property name="topMargin">
-             <number>6</number>
-            </property>
-            <property name="rightMargin">
-             <number>6</number>
-            </property>
-            <property name="bottomMargin">
+            <property name="margin">
              <number>6</number>
             </property>
             <item>
@@ -936,16 +900,7 @@ p, li { white-space: pre-wrap; }
             <string>Downloads</string>
            </attribute>
            <layout class="QVBoxLayout" name="verticalLayout_7">
-            <property name="leftMargin">
-             <number>2</number>
-            </property>
-            <property name="topMargin">
-             <number>2</number>
-            </property>
-            <property name="rightMargin">
-             <number>2</number>
-            </property>
-            <property name="bottomMargin">
+            <property name="margin">
              <number>2</number>
             </property>
             <item>
diff --git a/src/version.rc b/src/version.rc
index ab144909..b91dce85 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -1,7 +1,7 @@
 #include "Winver.h"
 
-#define VER_FILEVERSION     1,0,8,0
-#define VER_FILEVERSION_STR "1,0,8,0\0"
+#define VER_FILEVERSION     1,0,10,0
+#define VER_FILEVERSION_STR "1,0,10,0\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
-- 
cgit v1.3.1