Split of preferences completed.

Old preferences still left for testing (last checking with that).
Work started on updating the splash editor.
This commit is contained in:
Kjell Kernen
2014-02-06 17:59:58 +01:00
parent 2d241ea9d9
commit 7b8a7ffd58
63 changed files with 6921 additions and 3046 deletions
-16
View File
@@ -325,7 +325,6 @@
<file>themes/monochrome/16/print.png</file> <file>themes/monochrome/16/print.png</file>
<file>themes/monochrome/16/compare.png</file> <file>themes/monochrome/16/compare.png</file>
<file>themes/monochrome/16/saveas.png</file> <file>themes/monochrome/16/saveas.png</file>
<file>themes/monochrome/16/preferences.png</file>
<file>themes/monochrome/16/apppreferences.png</file> <file>themes/monochrome/16/apppreferences.png</file>
<file>themes/monochrome/16/fwpreferences.png</file> <file>themes/monochrome/16/fwpreferences.png</file>
<file>themes/monochrome/16/movedown.png</file> <file>themes/monochrome/16/movedown.png</file>
@@ -369,7 +368,6 @@
<file>themes/monochrome/24/print.png</file> <file>themes/monochrome/24/print.png</file>
<file>themes/monochrome/24/compare.png</file> <file>themes/monochrome/24/compare.png</file>
<file>themes/monochrome/24/saveas.png</file> <file>themes/monochrome/24/saveas.png</file>
<file>themes/monochrome/24/preferences.png</file>
<file>themes/monochrome/24/apppreferences.png</file> <file>themes/monochrome/24/apppreferences.png</file>
<file>themes/monochrome/24/fwpreferences.png</file> <file>themes/monochrome/24/fwpreferences.png</file>
<file>themes/monochrome/24/movedown.png</file> <file>themes/monochrome/24/movedown.png</file>
@@ -413,7 +411,6 @@
<file>themes/monochrome/32/print.png</file> <file>themes/monochrome/32/print.png</file>
<file>themes/monochrome/32/compare.png</file> <file>themes/monochrome/32/compare.png</file>
<file>themes/monochrome/32/saveas.png</file> <file>themes/monochrome/32/saveas.png</file>
<file>themes/monochrome/32/preferences.png</file>
<file>themes/monochrome/32/apppreferences.png</file> <file>themes/monochrome/32/apppreferences.png</file>
<file>themes/monochrome/32/fwpreferences.png</file> <file>themes/monochrome/32/fwpreferences.png</file>
<file>themes/monochrome/32/movedown.png</file> <file>themes/monochrome/32/movedown.png</file>
@@ -457,7 +454,6 @@
<file>themes/monochrome/48/print.png</file> <file>themes/monochrome/48/print.png</file>
<file>themes/monochrome/48/compare.png</file> <file>themes/monochrome/48/compare.png</file>
<file>themes/monochrome/48/saveas.png</file> <file>themes/monochrome/48/saveas.png</file>
<file>themes/monochrome/48/preferences.png</file>
<file>themes/monochrome/48/apppreferences.png</file> <file>themes/monochrome/48/apppreferences.png</file>
<file>themes/monochrome/48/fwpreferences.png</file> <file>themes/monochrome/48/fwpreferences.png</file>
<file>themes/monochrome/48/movedown.png</file> <file>themes/monochrome/48/movedown.png</file>
@@ -501,7 +497,6 @@
<file>themes/classic/16/print.png</file> <file>themes/classic/16/print.png</file>
<file>themes/classic/16/compare.png</file> <file>themes/classic/16/compare.png</file>
<file>themes/classic/16/saveas.png</file> <file>themes/classic/16/saveas.png</file>
<file>themes/classic/16/preferences.png</file>
<file>themes/classic/16/apppreferences.png</file> <file>themes/classic/16/apppreferences.png</file>
<file>themes/classic/16/fwpreferences.png</file> <file>themes/classic/16/fwpreferences.png</file>
<file>themes/classic/16/movedown.png</file> <file>themes/classic/16/movedown.png</file>
@@ -545,7 +540,6 @@
<file>themes/classic/24/print.png</file> <file>themes/classic/24/print.png</file>
<file>themes/classic/24/compare.png</file> <file>themes/classic/24/compare.png</file>
<file>themes/classic/24/saveas.png</file> <file>themes/classic/24/saveas.png</file>
<file>themes/classic/24/preferences.png</file>
<file>themes/classic/24/apppreferences.png</file> <file>themes/classic/24/apppreferences.png</file>
<file>themes/classic/24/fwpreferences.png</file> <file>themes/classic/24/fwpreferences.png</file>
<file>themes/classic/24/movedown.png</file> <file>themes/classic/24/movedown.png</file>
@@ -589,7 +583,6 @@
<file>themes/classic/32/print.png</file> <file>themes/classic/32/print.png</file>
<file>themes/classic/32/compare.png</file> <file>themes/classic/32/compare.png</file>
<file>themes/classic/32/saveas.png</file> <file>themes/classic/32/saveas.png</file>
<file>themes/classic/32/preferences.png</file>
<file>themes/classic/32/apppreferences.png</file> <file>themes/classic/32/apppreferences.png</file>
<file>themes/classic/32/fwpreferences.png</file> <file>themes/classic/32/fwpreferences.png</file>
<file>themes/classic/32/movedown.png</file> <file>themes/classic/32/movedown.png</file>
@@ -633,7 +626,6 @@
<file>themes/classic/48/print.png</file> <file>themes/classic/48/print.png</file>
<file>themes/classic/48/compare.png</file> <file>themes/classic/48/compare.png</file>
<file>themes/classic/48/saveas.png</file> <file>themes/classic/48/saveas.png</file>
<file>themes/classic/48/preferences.png</file>
<file>themes/classic/48/apppreferences.png</file> <file>themes/classic/48/apppreferences.png</file>
<file>themes/classic/48/fwpreferences.png</file> <file>themes/classic/48/fwpreferences.png</file>
<file>themes/classic/48/movedown.png</file> <file>themes/classic/48/movedown.png</file>
@@ -677,7 +669,6 @@
<file>themes/monoblue/16/print.png</file> <file>themes/monoblue/16/print.png</file>
<file>themes/monoblue/16/compare.png</file> <file>themes/monoblue/16/compare.png</file>
<file>themes/monoblue/16/saveas.png</file> <file>themes/monoblue/16/saveas.png</file>
<file>themes/monoblue/16/preferences.png</file>
<file>themes/monoblue/16/apppreferences.png</file> <file>themes/monoblue/16/apppreferences.png</file>
<file>themes/monoblue/16/fwpreferences.png</file> <file>themes/monoblue/16/fwpreferences.png</file>
<file>themes/monoblue/16/movedown.png</file> <file>themes/monoblue/16/movedown.png</file>
@@ -721,7 +712,6 @@
<file>themes/monoblue/24/print.png</file> <file>themes/monoblue/24/print.png</file>
<file>themes/monoblue/24/compare.png</file> <file>themes/monoblue/24/compare.png</file>
<file>themes/monoblue/24/saveas.png</file> <file>themes/monoblue/24/saveas.png</file>
<file>themes/monoblue/24/preferences.png</file>
<file>themes/monoblue/24/apppreferences.png</file> <file>themes/monoblue/24/apppreferences.png</file>
<file>themes/monoblue/24/fwpreferences.png</file> <file>themes/monoblue/24/fwpreferences.png</file>
<file>themes/monoblue/24/movedown.png</file> <file>themes/monoblue/24/movedown.png</file>
@@ -765,7 +755,6 @@
<file>themes/monoblue/32/print.png</file> <file>themes/monoblue/32/print.png</file>
<file>themes/monoblue/32/compare.png</file> <file>themes/monoblue/32/compare.png</file>
<file>themes/monoblue/32/saveas.png</file> <file>themes/monoblue/32/saveas.png</file>
<file>themes/monoblue/32/preferences.png</file>
<file>themes/monoblue/32/apppreferences.png</file> <file>themes/monoblue/32/apppreferences.png</file>
<file>themes/monoblue/32/fwpreferences.png</file> <file>themes/monoblue/32/fwpreferences.png</file>
<file>themes/monoblue/32/movedown.png</file> <file>themes/monoblue/32/movedown.png</file>
@@ -809,7 +798,6 @@
<file>themes/monoblue/48/print.png</file> <file>themes/monoblue/48/print.png</file>
<file>themes/monoblue/48/compare.png</file> <file>themes/monoblue/48/compare.png</file>
<file>themes/monoblue/48/saveas.png</file> <file>themes/monoblue/48/saveas.png</file>
<file>themes/monoblue/48/preferences.png</file>
<file>themes/monoblue/48/apppreferences.png</file> <file>themes/monoblue/48/apppreferences.png</file>
<file>themes/monoblue/48/fwpreferences.png</file> <file>themes/monoblue/48/fwpreferences.png</file>
<file>themes/monoblue/48/movedown.png</file> <file>themes/monoblue/48/movedown.png</file>
@@ -853,7 +841,6 @@
<file>themes/monowhite/16/print.png</file> <file>themes/monowhite/16/print.png</file>
<file>themes/monowhite/16/compare.png</file> <file>themes/monowhite/16/compare.png</file>
<file>themes/monowhite/16/saveas.png</file> <file>themes/monowhite/16/saveas.png</file>
<file>themes/monowhite/16/preferences.png</file>
<file>themes/monowhite/16/apppreferences.png</file> <file>themes/monowhite/16/apppreferences.png</file>
<file>themes/monowhite/16/fwpreferences.png</file> <file>themes/monowhite/16/fwpreferences.png</file>
<file>themes/monowhite/16/movedown.png</file> <file>themes/monowhite/16/movedown.png</file>
@@ -897,7 +884,6 @@
<file>themes/monowhite/24/print.png</file> <file>themes/monowhite/24/print.png</file>
<file>themes/monowhite/24/compare.png</file> <file>themes/monowhite/24/compare.png</file>
<file>themes/monowhite/24/saveas.png</file> <file>themes/monowhite/24/saveas.png</file>
<file>themes/monowhite/24/preferences.png</file>
<file>themes/monowhite/24/apppreferences.png</file> <file>themes/monowhite/24/apppreferences.png</file>
<file>themes/monowhite/24/fwpreferences.png</file> <file>themes/monowhite/24/fwpreferences.png</file>
<file>themes/monowhite/24/movedown.png</file> <file>themes/monowhite/24/movedown.png</file>
@@ -941,7 +927,6 @@
<file>themes/monowhite/32/print.png</file> <file>themes/monowhite/32/print.png</file>
<file>themes/monowhite/32/compare.png</file> <file>themes/monowhite/32/compare.png</file>
<file>themes/monowhite/32/saveas.png</file> <file>themes/monowhite/32/saveas.png</file>
<file>themes/monowhite/32/preferences.png</file>
<file>themes/monowhite/32/apppreferences.png</file> <file>themes/monowhite/32/apppreferences.png</file>
<file>themes/monowhite/32/fwpreferences.png</file> <file>themes/monowhite/32/fwpreferences.png</file>
<file>themes/monowhite/32/movedown.png</file> <file>themes/monowhite/32/movedown.png</file>
@@ -985,7 +970,6 @@
<file>themes/monowhite/48/print.png</file> <file>themes/monowhite/48/print.png</file>
<file>themes/monowhite/48/compare.png</file> <file>themes/monowhite/48/compare.png</file>
<file>themes/monowhite/48/saveas.png</file> <file>themes/monowhite/48/saveas.png</file>
<file>themes/monowhite/48/preferences.png</file>
<file>themes/monowhite/48/apppreferences.png</file> <file>themes/monowhite/48/apppreferences.png</file>
<file>themes/monowhite/48/fwpreferences.png</file> <file>themes/monowhite/48/fwpreferences.png</file>
<file>themes/monowhite/48/movedown.png</file> <file>themes/monowhite/48/movedown.png</file>
+316 -235
View File
@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>366</width> <width>739</width>
<height>303</height> <height>238</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -23,241 +23,322 @@
<iconset resource="companion.qrc"> <iconset resource="companion.qrc">
<normaloff>:/icon.png</normaloff>:/icon.png</iconset> <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <widget class="QTextEdit" name="HowToLabel">
<item row="0" column="0"> <property name="geometry">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <rect>
<item> <x>100</x>
<spacer name="horizontalSpacer"> <y>190</y>
<property name="orientation"> <width>541</width>
<enum>Qt::Horizontal</enum> <height>40</height>
</property> </rect>
<property name="sizeHint" stdset="0"> </property>
<size> <property name="sizePolicy">
<width>40</width> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<height>20</height> <horstretch>0</horstretch>
</size> <verstretch>0</verstretch>
</property> </sizepolicy>
</spacer> </property>
</item> <property name="maximumSize">
<item> <size>
<layout class="QVBoxLayout" name="verticalLayout_3"> <width>16777215</width>
<item> <height>40</height>
<widget class="QLabel" name="imageLabel"> </size>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <property name="styleSheet">
<horstretch>0</horstretch> <string notr="true">background:rgb(255, 255, 0);</string>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="verticalScrollBarPolicy">
</property> <enum>Qt::ScrollBarAlwaysOff</enum>
<property name="minimumSize"> </property>
<size> <property name="horizontalScrollBarPolicy">
<width>256</width> <enum>Qt::ScrollBarAlwaysOff</enum>
<height>128</height> </property>
</size> <property name="readOnly">
</property> <bool>true</bool>
<property name="maximumSize"> </property>
<size> <property name="html">
<width>424</width> <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<height>128</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="companion.qrc">:/images/customize.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="SaveImageButton">
<property name="text">
<string>Save Image</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="InvertColorButton">
<property name="text">
<string>Invert Color</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>50</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QTextEdit" name="HowToLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:rgb(255, 255, 0);</string>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&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; &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; } 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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; 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> &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="acceptRichText"> <property name="acceptRichText">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> <widget class="QPushButton" name="pushButton">
<item row="2" column="0"> <property name="geometry">
<layout class="QGridLayout" name="gridLayout"> <rect>
<item row="0" column="0"> <x>350</x>
<widget class="QLineEdit" name="FWFileName"> <y>30</y>
<property name="enabled"> <width>31</width>
<bool>true</bool> <height>27</height>
</property> </rect>
<property name="readOnly"> </property>
<bool>true</bool> <property name="font">
</property> <font>
</widget> <family>Courier 10 Pitch</family>
</item> <pointsize>10</pointsize>
<item row="0" column="1" colspan="2"> <weight>75</weight>
<widget class="QPushButton" name="FlashLoadButton"> <bold>true</bold>
<property name="text"> </font>
<string>Load Firmware</string> </property>
</property> <property name="text">
</widget> <string notr="true">=&gt;</string>
</item> </property>
<item row="1" column="0"> </widget>
<widget class="QLineEdit" name="ImageFileName"> <widget class="QPushButton" name="pushButton_2">
<property name="enabled"> <property name="geometry">
<bool>true</bool> <rect>
</property> <x>350</x>
<property name="readOnly"> <y>60</y>
<bool>true</bool> <width>31</width>
</property> <height>27</height>
</widget> </rect>
</item> </property>
<item row="1" column="1"> <property name="font">
<widget class="QPushButton" name="ImageLoadButton"> <font>
<property name="enabled"> <family>Courier 10 Pitch</family>
<bool>false</bool> <pointsize>10</pointsize>
</property> <weight>75</weight>
<property name="text"> <bold>true</bold>
<string>Load Image</string> </font>
</property> </property>
</widget> <property name="text">
</item> <string notr="true">&lt;=</string>
<item row="1" column="2"> </property>
<widget class="QToolButton" name="libraryButton"> </widget>
<property name="toolTip"> <widget class="QLineEdit" name="ImageFileName">
<string>Open Splash Library</string> <property name="enabled">
</property> <bool>true</bool>
<property name="text"> </property>
<string>...</string> <property name="geometry">
</property> <rect>
<property name="iconSize"> <x>390</x>
<size> <y>130</y>
<width>16</width> <width>251</width>
<height>16</height> <height>25</height>
</size> </rect>
</property> </property>
</widget> <property name="readOnly">
</item> <bool>true</bool>
<item row="2" column="0"> </property>
<spacer name="horizontalSpacer_3"> </widget>
<property name="orientation"> <widget class="QPushButton" name="FlashLoadButton">
<enum>Qt::Horizontal</enum> <property name="geometry">
</property> <rect>
<property name="sizeHint" stdset="0"> <x>90</x>
<size> <y>160</y>
<width>208</width> <width>108</width>
<height>20</height> <height>27</height>
</size> </rect>
</property> </property>
</spacer> <property name="text">
</item> <string>Load Firmware</string>
<item row="2" column="1" colspan="2"> </property>
<widget class="QPushButton" name="SaveFlashButton"> </widget>
<property name="enabled"> <widget class="QToolButton" name="libraryButton">
<bool>false</bool> <property name="geometry">
</property> <rect>
<property name="text"> <x>200</x>
<string>Save Firmware</string> <y>160</y>
</property> <width>26</width>
</widget> <height>23</height>
</item> </rect>
</layout> </property>
</item> <property name="toolTip">
<item row="3" column="0"> <string>Open Splash Library</string>
<spacer name="verticalSpacer"> </property>
<property name="orientation"> <property name="text">
<enum>Qt::Vertical</enum> <string>...</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="iconSize">
<size> <size>
<width>20</width> <width>16</width>
<height>1</height> <height>16</height>
</size> </size>
</property> </property>
</spacer> </widget>
</item> <widget class="QPushButton" name="ImageLoadButton">
</layout> <property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>390</x>
<y>160</y>
<width>90</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Load Image</string>
</property>
</widget>
<widget class="QLineEdit" name="FWFileName">
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>90</x>
<y>130</y>
<width>251</width>
<height>25</height>
</rect>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="SaveFlashButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>230</x>
<y>160</y>
<width>108</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Save Firmware</string>
</property>
</widget>
<widget class="QLabel" name="imageLabel_2">
<property name="geometry">
<rect>
<x>390</x>
<y>0</y>
<width>256</width>
<height>128</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>256</width>
<height>128</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>424</width>
<height>128</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="companion.qrc">:/images/customize.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="imageLabel">
<property name="geometry">
<rect>
<x>91</x>
<y>1</y>
<width>256</width>
<height>128</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>256</width>
<height>128</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>424</width>
<height>128</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="companion.qrc">:/images/customize.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="InvertColorButton_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>90</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Invert</string>
</property>
</widget>
<widget class="QPushButton" name="SaveImageButton">
<property name="geometry">
<rect>
<x>550</x>
<y>160</y>
<width>90</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Save Image</string>
</property>
</widget>
<widget class="QPushButton" name="InvertColorButton">
<property name="geometry">
<rect>
<x>650</x>
<y>0</y>
<width>90</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Invert</string>
</property>
</widget>
<zorder>HowToLabel</zorder>
<zorder>layoutWidget</zorder>
<zorder>layoutWidget_2</zorder>
<zorder>imageLabel</zorder>
<zorder>pushButton</zorder>
<zorder>pushButton_2</zorder>
</widget> </widget>
<resources> <resources>
<include location="companion.qrc"/> <include location="companion.qrc"/>
+2 -2
View File
@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>634</width> <width>634</width>
<height>794</height> <height>800</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -23,7 +23,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Firmware Preferences</string> <string>Download Firmware and Voice</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="13" column="5"> <item row="13" column="5">
Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 731 B

After

Width:  |  Height:  |  Size: 731 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

+7 -6
View File
@@ -1695,16 +1695,16 @@ void MainWindow::createActions()
logsAct->setStatusTip(tr("Open log file")); logsAct->setStatusTip(tr("Open log file"));
connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile())); connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile()));
preferencesAct = new QAction(CompanionIcon("preferences.png"), tr("&General Preferences..."), this); preferencesAct = new QAction(tr("&Old Preferences Dialog..."), this);
preferencesAct->setStatusTip(tr("Edit general preferences")); preferencesAct->setStatusTip(tr("Used the old Preferences Dialog"));
connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences())); connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Application Preferences..."), this); appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Application Preferences..."), this);
appPreferencesAct->setStatusTip(tr("Edit application preferences")); appPreferencesAct->setStatusTip(tr("Edit application preferences"));
connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences())); connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences()));
fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Firmware Preferences..."), this); fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Download Firmware and Voice..."), this);
fwPreferencesAct->setStatusTip(tr("Edit firmware preferences")); fwPreferencesAct->setStatusTip(tr("Download firmware and voice files"));
connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences())); connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences()));
checkForUpdatesAct = new QAction(CompanionIcon("update.png"), tr("&Check for updates..."), this); checkForUpdatesAct = new QAction(CompanionIcon("update.png"), tr("&Check for updates..."), this);
@@ -1927,6 +1927,7 @@ void MainWindow::createMenus()
fileMenu->addAction(printAct); fileMenu->addAction(printAct);
fileMenu->addAction(compareAct); fileMenu->addAction(compareAct);
fileMenu->addSeparator(); fileMenu->addSeparator();
fileMenu->addAction(fwPreferencesAct);
fileMenu->addMenu(profilesMenu); fileMenu->addMenu(profilesMenu);
profilesMenu->setIcon(CompanionIcon("profiles.png")); profilesMenu->setIcon(CompanionIcon("profiles.png"));
@@ -1964,9 +1965,8 @@ void MainWindow::createMenus()
iconThemeSizeMenu->addAction(hugeIconAct); iconThemeSizeMenu->addAction(hugeIconAct);
settingsMenu->addSeparator(); settingsMenu->addSeparator();
settingsMenu->addAction(appPreferencesAct); settingsMenu->addAction(appPreferencesAct);
settingsMenu->addAction(fwPreferencesAct);
settingsMenu->addAction(preferencesAct);
settingsMenu->addAction(customizeSplashAct); settingsMenu->addAction(customizeSplashAct);
settingsMenu->addAction(preferencesAct);
settingsMenu->addAction(burnConfigAct); settingsMenu->addAction(burnConfigAct);
burnMenu = menuBar()->addMenu(tr("&Read/Write")); burnMenu = menuBar()->addMenu(tr("&Read/Write"));
@@ -2050,6 +2050,7 @@ void MainWindow::createToolBars()
fileToolBar->addSeparator(); fileToolBar->addSeparator();
fileToolBar->addAction(appPreferencesAct); fileToolBar->addAction(appPreferencesAct);
fileToolBar->addAction(fwPreferencesAct); fileToolBar->addAction(fwPreferencesAct);
fileToolBar->addAction(customizeSplashAct);
profileButton = new QToolButton; profileButton = new QToolButton;
profileButton->setPopupMode(QToolButton::InstantPopup); profileButton->setPopupMode(QToolButton::InstantPopup);
profileButton->setMenu(createProfilesMenu()); profileButton->setMenu(createProfilesMenu());
Binary file not shown.

Before

Width:  |  Height:  |  Size: 804 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 564 B

After

Width:  |  Height:  |  Size: 783 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 454 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 500 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 727 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 377 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 377 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 916 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 462 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 916 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 435 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 724 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 724 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 675 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 724 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff