piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #535 from opentx/dvogonen/Rename_companion9x_qrc_to_companion_qrc_512

Browse Source 
Fixes #512
This commit is contained in:
Andre Bernet
2014-01-15 12:59:15 -08:00
parent e7dc6644c7 2f67344b81
commit cfec9ed00e
21 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/CMakeLists.txt
+1 -1
View File
@@ -234,7 +234,7 @@ IF ( SDL_FOUND )
ENDIF( )
SET( companion_RCS
companion9x.qrc
companion.qrc
${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
)
companion/src/avroutputdialog.ui
+2 -2
View File
@@ -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>
companion/src/burnconfigdialog.ui
+2 -2
View File
@@ -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>
companion/src/burndialog.ui
+2 -2
View File
@@ -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>
companion/src/companion9x.qrc → companion/src/companion.qrc
View File
companion/src/comparedialog.ui
+2 -2
View File
@@ -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>
companion/src/contributorsdialog.ui
+2 -2
View File
@@ -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>
companion/src/customizesplashdialog.ui
+3 -3
View File
@@ -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>
companion/src/downloaddialog.ui
+2 -2
View File
@@ -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>
companion/src/fusesdialog.ui
+2 -2
View File
@@ -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>
companion/src/generaledit.ui
+2 -2
View File
@@ -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>
companion/src/joystickdialog.ui
+1 -1
View File
@@ -909,7 +909,7 @@
</layout>
</widget>
<resources>
<include location="companion9x.qrc"/>
<include location="companion.qrc"/>
</resources>
<connections/>
</ui>
companion/src/logsdialog.ui
+3 -3
View File
@@ -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>
companion/src/main.cpp
+1 -1
View File
@@ -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__
companion/src/mdichild.ui
+2 -2
View File
@@ -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>
companion/src/modelconfigdialog.ui
+8 -8
View File
@@ -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>
companion/src/preferencesdialog.ui
+4 -4
View File
@@ -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>
companion/src/printdialog.ui
+2 -2
View File
@@ -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>
companion/src/simulatordialog.ui
+4 -2
View File
@@ -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>
companion/src/splashlibrary.ui
+3 -3
View File
@@ -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>
companion/src/xsimulatordialog.ui
+3 -2
View File
@@ -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>