From 2f67344b818ec778d830c68a3e4b74841c6ca8bb Mon Sep 17 00:00:00 2001
From: Dvogonen <github@kernen.se>
Date: Wed, 15 Jan 2014 21:13:57 +0100
Subject: [PATCH] Fixes #512

---
 companion/src/CMakeLists.txt                     |  2 +-
 companion/src/avroutputdialog.ui                 |  4 ++--
 companion/src/burnconfigdialog.ui                |  4 ++--
 companion/src/burndialog.ui                      |  4 ++--
 companion/src/{companion9x.qrc => companion.qrc} |  0
 companion/src/comparedialog.ui                   |  4 ++--
 companion/src/contributorsdialog.ui              |  4 ++--
 companion/src/customizesplashdialog.ui           |  6 +++---
 companion/src/downloaddialog.ui                  |  4 ++--
 companion/src/fusesdialog.ui                     |  4 ++--
 companion/src/generaledit.ui                     |  4 ++--
 companion/src/joystickdialog.ui                  |  2 +-
 companion/src/logsdialog.ui                      |  6 +++---
 companion/src/main.cpp                           |  2 +-
 companion/src/mdichild.ui                        |  4 ++--
 companion/src/modelconfigdialog.ui               | 16 ++++++++--------
 companion/src/preferencesdialog.ui               |  8 ++++----
 companion/src/printdialog.ui                     |  4 ++--
 companion/src/simulatordialog.ui                 |  6 ++++--
 companion/src/splashlibrary.ui                   |  6 +++---
 companion/src/xsimulatordialog.ui                |  5 +++--
 21 files changed, 51 insertions(+), 48 deletions(-)
 rename companion/src/{companion9x.qrc => companion.qrc} (100%)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 8ec853eaa..85e3db295 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -234,7 +234,7 @@ IF ( SDL_FOUND )
 ENDIF( ) 
 
 SET( companion_RCS
-     companion9x.qrc
+     companion.qrc
      ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
 )
 
diff --git a/companion/src/avroutputdialog.ui b/companion/src/avroutputdialog.ui
index 54ecf8d74..ded09363e 100644
--- a/companion/src/avroutputdialog.ui
+++ b/companion/src/avroutputdialog.ui
@@ -32,7 +32,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -109,7 +109,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/burnconfigdialog.ui b/companion/src/burnconfigdialog.ui
index ba1adbf17..bb85de6f5 100644
--- a/companion/src/burnconfigdialog.ui
+++ b/companion/src/burnconfigdialog.ui
@@ -26,7 +26,7 @@
    <string>Programmer Configuration</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/configure.png</normaloff>:/images/configure.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
@@ -760,7 +760,7 @@ Please only use this if you know what you are doing.  There are no error checks
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/companion/src/burndialog.ui b/companion/src/burndialog.ui
index 7c739d0a1..a15ae25a1 100644
--- a/companion/src/burndialog.ui
+++ b/companion/src/burndialog.ui
@@ -456,7 +456,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="companion9x.qrc">
+             <iconset resource="companion.qrc">
               <normaloff>:/images/library.png</normaloff>:/images/library.png</iconset>
             </property>
             <property name="iconSize">
@@ -488,7 +488,7 @@
   <tabstop>BurnFlashButton</tabstop>
  </tabstops>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/companion9x.qrc b/companion/src/companion.qrc
similarity index 100%
rename from companion/src/companion9x.qrc
rename to companion/src/companion.qrc
diff --git a/companion/src/comparedialog.ui b/companion/src/comparedialog.ui
index 456d1db87..7667ad3ce 100644
--- a/companion/src/comparedialog.ui
+++ b/companion/src/comparedialog.ui
@@ -29,7 +29,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/print.png</normaloff>:/images/print.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -129,7 +129,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/companion/src/contributorsdialog.ui b/companion/src/contributorsdialog.ui
index 1c09ba66d..4c0fff21b 100644
--- a/companion/src/contributorsdialog.ui
+++ b/companion/src/contributorsdialog.ui
@@ -14,7 +14,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -24,7 +24,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui
index 69762f1ba..b7d0285aa 100644
--- a/companion/src/customizesplashdialog.ui
+++ b/companion/src/customizesplashdialog.ui
@@ -71,7 +71,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="companion9x.qrc">:/images/customize.png</pixmap>
+          <pixmap resource="companion.qrc">:/images/customize.png</pixmap>
          </property>
          <property name="scaledContents">
           <bool>true</bool>
@@ -212,7 +212,7 @@ p, li { white-space: pre-wrap; }
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset resource="companion9x.qrc">
+        <iconset resource="companion.qrc">
          <normaloff>:/images/library.png</normaloff>:/images/library.png</iconset>
        </property>
        <property name="iconSize">
@@ -264,7 +264,7 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/downloaddialog.ui b/companion/src/downloaddialog.ui
index 9f5681542..dcd05c405 100644
--- a/companion/src/downloaddialog.ui
+++ b/companion/src/downloaddialog.ui
@@ -14,7 +14,7 @@
    <string>Downloading: </string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -51,7 +51,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/companion/src/fusesdialog.ui b/companion/src/fusesdialog.ui
index e6b4acb92..e7e6bbe9d 100644
--- a/companion/src/fusesdialog.ui
+++ b/companion/src/fusesdialog.ui
@@ -14,7 +14,7 @@
    <string>Fuses</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/fuses.png</normaloff>:/images/fuses.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -116,7 +116,7 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui
index d47781a69..48a7445b5 100644
--- a/companion/src/generaledit.ui
+++ b/companion/src/generaledit.ui
@@ -20,7 +20,7 @@
    <string>General Edit</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <property name="sizeGripEnabled">
@@ -3555,7 +3555,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>PPM_MultiplierDSB</tabstop>
  </tabstops>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
  <designerdata>
diff --git a/companion/src/joystickdialog.ui b/companion/src/joystickdialog.ui
index 25a5fe2c9..2d18fdb0a 100644
--- a/companion/src/joystickdialog.ui
+++ b/companion/src/joystickdialog.ui
@@ -909,7 +909,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/logsdialog.ui b/companion/src/logsdialog.ui
index 4d0c91939..c645110d0 100644
--- a/companion/src/logsdialog.ui
+++ b/companion/src/logsdialog.ui
@@ -14,7 +14,7 @@
    <string>Companion Log Viewer</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <property name="sizeGripEnabled">
@@ -262,7 +262,7 @@
       <string/>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/maps.png</normaloff>:/images/maps.png</iconset>
      </property>
      <property name="iconSize">
@@ -285,7 +285,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/main.cpp b/companion/src/main.cpp
index 06ae8167f..a7dea31a0 100644
--- a/companion/src/main.cpp
+++ b/companion/src/main.cpp
@@ -76,7 +76,7 @@ class MyProxyStyle : public QProxyStyle
 
 int main(int argc, char *argv[])
 {
-    Q_INIT_RESOURCE(companion9x);
+    Q_INIT_RESOURCE(companion);
     QApplication app(argc, argv);
     app.setApplicationName("OpenTX Companion");
 #ifdef __APPLE__
diff --git a/companion/src/mdichild.ui b/companion/src/mdichild.ui
index 00cf8af7d..d32b3cffb 100644
--- a/companion/src/mdichild.ui
+++ b/companion/src/mdichild.ui
@@ -23,7 +23,7 @@
       <string>Simulate Tx</string>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/simulate.png</normaloff>:/images/simulate.png</iconset>
      </property>
     </widget>
@@ -38,7 +38,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/modelconfigdialog.ui b/companion/src/modelconfigdialog.ui
index bc36d6ac6..ea119cabc 100644
--- a/companion/src/modelconfigdialog.ui
+++ b/companion/src/modelconfigdialog.ui
@@ -26,7 +26,7 @@
    <string>Model Configuration Wizard</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/configure.png</normaloff>:/images/configure.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,1" columnstretch="0,0,1,1,1,1">
@@ -79,7 +79,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="companion9x.qrc">:/images/mcw/aw0a0f.png</pixmap>
+        <pixmap resource="companion.qrc">:/images/mcw/aw0a0f.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>false</bool>
@@ -113,7 +113,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="companion9x.qrc">:/images/mcw/atailv.png</pixmap>
+        <pixmap resource="companion.qrc">:/images/mcw/atailv.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>false</bool>
@@ -168,7 +168,7 @@
       <string/>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/mcw/aicon.png</normaloff>:/images/mcw/aicon.png</iconset>
      </property>
      <property name="iconSize">
@@ -200,7 +200,7 @@
       <string/>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/mcw/hicon.png</normaloff>:/images/mcw/hicon.png</iconset>
      </property>
      <property name="iconSize">
@@ -226,7 +226,7 @@
       <string/>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/mcw/gicon.png</normaloff>:/images/mcw/gicon.png</iconset>
      </property>
      <property name="iconSize">
@@ -1208,7 +1208,7 @@
       <string/>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/mcw/dicon.png</normaloff>:/images/mcw/dicon.png</iconset>
      </property>
      <property name="iconSize">
@@ -1262,7 +1262,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/preferencesdialog.ui b/companion/src/preferencesdialog.ui
index b52060211..021a38b58 100644
--- a/companion/src/preferencesdialog.ui
+++ b/companion/src/preferencesdialog.ui
@@ -26,7 +26,7 @@
    <string>Preferences</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/preferences.png</normaloff>:/images/preferences.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0,0,1,0">
@@ -161,7 +161,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset resource="companion9x.qrc">
+        <iconset resource="companion.qrc">
          <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
        </property>
       </widget>
@@ -228,7 +228,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset resource="companion9x.qrc">
+        <iconset resource="companion.qrc">
          <normaloff>:/images/library.png</normaloff>:/images/library.png</iconset>
        </property>
       </widget>
@@ -1649,7 +1649,7 @@ May be different from firmware language</string>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/companion/src/printdialog.ui b/companion/src/printdialog.ui
index 3cff71f1b..5e45d5a2c 100644
--- a/companion/src/printdialog.ui
+++ b/companion/src/printdialog.ui
@@ -26,7 +26,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/print.png</normaloff>:/images/print.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -78,7 +78,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/companion/src/simulatordialog.ui b/companion/src/simulatordialog.ui
index 004da67c6..a739492ac 100644
--- a/companion/src/simulatordialog.ui
+++ b/companion/src/simulatordialog.ui
@@ -26,7 +26,7 @@
    <string>Companion Simulator</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/simulate.png</normaloff>:/images/simulate.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_6">
@@ -1093,6 +1093,7 @@ QPushButton:checked {
           </widget>
          </item>
 
+
          <item row="0" column="4" rowspan="3">
           <widget class="menuWidget" name="menu" native="true">
            <property name="sizePolicy">
@@ -1812,6 +1813,7 @@ QPushButton:checked {
             <enum>QFrame::Raised</enum>
            </property>
 
+
            <property name="lineWidth">
             <number>2</number>
            </property>
@@ -3711,7 +3713,7 @@ border-radius: 4px;
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/splashlibrary.ui b/companion/src/splashlibrary.ui
index e5e8c5de6..8c5bcaf1d 100644
--- a/companion/src/splashlibrary.ui
+++ b/companion/src/splashlibrary.ui
@@ -47,7 +47,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/arrow-left.png</normaloff>:/images/arrow-left.png</iconset>
      </property>
      <property name="iconSize">
@@ -946,7 +946,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="companion9x.qrc">
+      <iconset resource="companion.qrc">
        <normaloff>:/images/arrow-right.png</normaloff>:/images/arrow-right.png</iconset>
      </property>
      <property name="iconSize">
@@ -967,7 +967,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/companion/src/xsimulatordialog.ui b/companion/src/xsimulatordialog.ui
index 2ddd8f310..d8f7d3f6f 100644
--- a/companion/src/xsimulatordialog.ui
+++ b/companion/src/xsimulatordialog.ui
@@ -26,7 +26,7 @@
    <string>Companion Simulator</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="companion.qrc">
     <normaloff>:/images/simulate.png</normaloff>:/images/simulate.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_6">
@@ -2054,6 +2054,7 @@ border-radius: 4px;
              <height>18</height>
             </size>
 
+
            </property>
            <property name="styleSheet">
             <string notr="true">QSlider::sub-page:horizontal:disabled {
@@ -3901,7 +3902,7 @@ border-radius: 4px;
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="companion.qrc"/>
  </resources>
  <connections/>
 </ui>