Merge pull request #574 from opentx/dvogonen/blue_companion_theme_569

Fixes #569
2014-01-21 06:31:25 -08:00
parent 8a53e7345a 9829059e66
commit 6c798882aa
444 changed files with 375 additions and 11 deletions
@@ -637,5 +637,348 @@
    <file>themes/classic/48/contributors.png</file>
    <file>themes/classic/48/stop.png</file>
    <file>themes/classic/48/write_eeprom.png</file>
+    <file>themes/monoblue/16/open.png</file>
+    <file>themes/monoblue/16/edit.png</file>
+    <file>themes/monoblue/16/information.png</file>
+    <file>themes/monoblue/16/configure.png</file>
+    <file>themes/monoblue/16/switch_dir.png</file>
+    <file>themes/monoblue/16/list.png</file>
+    <file>themes/monoblue/16/wizard.png</file>
+    <file>themes/monoblue/16/logs.png</file>
+    <file>themes/monoblue/16/new.png</file>
+    <file>themes/monoblue/16/save.png</file>
+    <file>themes/monoblue/16/recentdocument.png</file>
+    <file>themes/monoblue/16/simulate.png</file>
+    <file>themes/monoblue/16/changelog.png</file>
+    <file>themes/monoblue/16/copy.png</file>
+    <file>themes/monoblue/16/write_flash.png</file>
+    <file>themes/monoblue/16/read_eeprom_file.png</file>
+    <file>themes/monoblue/16/clear.png</file>
+    <file>themes/monoblue/16/play.png</file>
+    <file>themes/monoblue/16/fuses.png</file>
+    <file>themes/monoblue/16/arrow-right.png</file>
+    <file>themes/monoblue/16/exit.png</file>
+    <file>themes/monoblue/16/moveup.png</file>
+    <file>themes/monoblue/16/read_eeprom.png</file>
+    <file>themes/monoblue/16/cut.png</file>
+    <file>themes/monoblue/16/arrow-left.png</file>
+    <file>themes/monoblue/16/write_eeprom_file.png</file>
+    <file>themes/monoblue/16/library.png</file>
+    <file>themes/monoblue/16/profiles.png</file>
+    <file>themes/monoblue/16/paste.png</file>
+    <file>themes/monoblue/16/print.png</file>
+    <file>themes/monoblue/16/compare.png</file>
+    <file>themes/monoblue/16/customize.png</file>
+    <file>themes/monoblue/16/saveas.png</file>
+    <file>themes/monoblue/16/preferences.png</file>
+    <file>themes/monoblue/16/movedown.png</file>
+    <file>themes/monoblue/16/currentmodel.png</file>
+    <file>themes/monoblue/16/read_flash.png</file>
+    <file>themes/monoblue/16/duplicate.png</file>
+    <file>themes/monoblue/16/add.png</file>
+    <file>themes/monoblue/16/update.png</file>
+    <file>themes/monoblue/16/contributors.png</file>
+    <file>themes/monoblue/16/stop.png</file>
+    <file>themes/monoblue/16/write_eeprom.png</file>
+    <file>themes/monoblue/24/open.png</file>
+    <file>themes/monoblue/24/edit.png</file>
+    <file>themes/monoblue/24/information.png</file>
+    <file>themes/monoblue/24/configure.png</file>
+    <file>themes/monoblue/24/switch_dir.png</file>
+    <file>themes/monoblue/24/list.png</file>
+    <file>themes/monoblue/24/wizard.png</file>
+    <file>themes/monoblue/24/logs.png</file>
+    <file>themes/monoblue/24/new.png</file>
+    <file>themes/monoblue/24/save.png</file>
+    <file>themes/monoblue/24/recentdocument.png</file>
+    <file>themes/monoblue/24/simulate.png</file>
+    <file>themes/monoblue/24/changelog.png</file>
+    <file>themes/monoblue/24/copy.png</file>
+    <file>themes/monoblue/24/write_flash.png</file>
+    <file>themes/monoblue/24/read_eeprom_file.png</file>
+    <file>themes/monoblue/24/clear.png</file>
+    <file>themes/monoblue/24/play.png</file>
+    <file>themes/monoblue/24/fuses.png</file>
+    <file>themes/monoblue/24/arrow-right.png</file>
+    <file>themes/monoblue/24/exit.png</file>
+    <file>themes/monoblue/24/moveup.png</file>
+    <file>themes/monoblue/24/read_eeprom.png</file>
+    <file>themes/monoblue/24/cut.png</file>
+    <file>themes/monoblue/24/arrow-left.png</file>
+    <file>themes/monoblue/24/write_eeprom_file.png</file>
+    <file>themes/monoblue/24/library.png</file>
+    <file>themes/monoblue/24/profiles.png</file>
+    <file>themes/monoblue/24/paste.png</file>
+    <file>themes/monoblue/24/print.png</file>
+    <file>themes/monoblue/24/compare.png</file>
+    <file>themes/monoblue/24/customize.png</file>
+    <file>themes/monoblue/24/saveas.png</file>
+    <file>themes/monoblue/24/preferences.png</file>
+    <file>themes/monoblue/24/movedown.png</file>
+    <file>themes/monoblue/24/currentmodel.png</file>
+    <file>themes/monoblue/24/read_flash.png</file>
+    <file>themes/monoblue/24/duplicate.png</file>
+    <file>themes/monoblue/24/add.png</file>
+    <file>themes/monoblue/24/update.png</file>
+    <file>themes/monoblue/24/contributors.png</file>
+    <file>themes/monoblue/24/stop.png</file>
+    <file>themes/monoblue/24/write_eeprom.png</file>
+    <file>themes/monoblue/32/open.png</file>
+    <file>themes/monoblue/32/edit.png</file>
+    <file>themes/monoblue/32/information.png</file>
+    <file>themes/monoblue/32/configure.png</file>
+    <file>themes/monoblue/32/switch_dir.png</file>
+    <file>themes/monoblue/32/list.png</file>
+    <file>themes/monoblue/32/wizard.png</file>
+    <file>themes/monoblue/32/logs.png</file>
+    <file>themes/monoblue/32/new.png</file>
+    <file>themes/monoblue/32/save.png</file>
+    <file>themes/monoblue/32/recentdocument.png</file>
+    <file>themes/monoblue/32/simulate.png</file>
+    <file>themes/monoblue/32/changelog.png</file>
+    <file>themes/monoblue/32/copy.png</file>
+    <file>themes/monoblue/32/write_flash.png</file>
+    <file>themes/monoblue/32/read_eeprom_file.png</file>
+    <file>themes/monoblue/32/clear.png</file>
+    <file>themes/monoblue/32/play.png</file>
+    <file>themes/monoblue/32/fuses.png</file>
+    <file>themes/monoblue/32/arrow-right.png</file>
+    <file>themes/monoblue/32/exit.png</file>
+    <file>themes/monoblue/32/moveup.png</file>
+    <file>themes/monoblue/32/read_eeprom.png</file>
+    <file>themes/monoblue/32/cut.png</file>
+    <file>themes/monoblue/32/arrow-left.png</file>
+    <file>themes/monoblue/32/write_eeprom_file.png</file>
+    <file>themes/monoblue/32/library.png</file>
+    <file>themes/monoblue/32/profiles.png</file>
+    <file>themes/monoblue/32/paste.png</file>
+    <file>themes/monoblue/32/print.png</file>
+    <file>themes/monoblue/32/compare.png</file>
+    <file>themes/monoblue/32/customize.png</file>
+    <file>themes/monoblue/32/saveas.png</file>
+    <file>themes/monoblue/32/preferences.png</file>
+    <file>themes/monoblue/32/movedown.png</file>
+    <file>themes/monoblue/32/currentmodel.png</file>
+    <file>themes/monoblue/32/read_flash.png</file>
+    <file>themes/monoblue/32/duplicate.png</file>
+    <file>themes/monoblue/32/add.png</file>
+    <file>themes/monoblue/32/update.png</file>
+    <file>themes/monoblue/32/contributors.png</file>
+    <file>themes/monoblue/32/stop.png</file>
+    <file>themes/monoblue/32/write_eeprom.png</file>
+    <file>themes/monoblue/48/open.png</file>
+    <file>themes/monoblue/48/edit.png</file>
+    <file>themes/monoblue/48/information.png</file>
+    <file>themes/monoblue/48/configure.png</file>
+    <file>themes/monoblue/48/switch_dir.png</file>
+    <file>themes/monoblue/48/list.png</file>
+    <file>themes/monoblue/48/wizard.png</file>
+    <file>themes/monoblue/48/logs.png</file>
+    <file>themes/monoblue/48/new.png</file>
+    <file>themes/monoblue/48/save.png</file>
+    <file>themes/monoblue/48/recentdocument.png</file>
+    <file>themes/monoblue/48/simulate.png</file>
+    <file>themes/monoblue/48/changelog.png</file>
+    <file>themes/monoblue/48/copy.png</file>
+    <file>themes/monoblue/48/write_flash.png</file>
+    <file>themes/monoblue/48/read_eeprom_file.png</file>
+    <file>themes/monoblue/48/clear.png</file>
+    <file>themes/monoblue/48/play.png</file>
+    <file>themes/monoblue/48/fuses.png</file>
+    <file>themes/monoblue/48/arrow-right.png</file>
+    <file>themes/monoblue/48/exit.png</file>
+    <file>themes/monoblue/48/moveup.png</file>
+    <file>themes/monoblue/48/read_eeprom.png</file>
+    <file>themes/monoblue/48/cut.png</file>
+    <file>themes/monoblue/48/arrow-left.png</file>
+    <file>themes/monoblue/48/write_eeprom_file.png</file>
+    <file>themes/monoblue/48/library.png</file>
+    <file>themes/monoblue/48/profiles.png</file>
+    <file>themes/monoblue/48/paste.png</file>
+    <file>themes/monoblue/48/print.png</file>
+    <file>themes/monoblue/48/compare.png</file>
+    <file>themes/monoblue/48/customize.png</file>
+    <file>themes/monoblue/48/saveas.png</file>
+    <file>themes/monoblue/48/preferences.png</file>
+    <file>themes/monoblue/48/movedown.png</file>
+    <file>themes/monoblue/48/currentmodel.png</file>
+    <file>themes/monoblue/48/read_flash.png</file>
+    <file>themes/monoblue/48/duplicate.png</file>
+    <file>themes/monoblue/48/add.png</file>
+    <file>themes/monoblue/48/update.png</file>
+    <file>themes/monoblue/48/contributors.png</file>
+    <file>themes/monoblue/48/stop.png</file>
+    <file>themes/monoblue/48/write_eeprom.png</file>
+    <file>themes/monowhite/16/edit.png</file>
+    <file>themes/monowhite/16/information.png</file>
+    <file>themes/monowhite/16/configure.png</file>
+    <file>themes/monowhite/16/switch_dir.png</file>
+    <file>themes/monowhite/16/list.png</file>
+    <file>themes/monowhite/16/wizard.png</file>
+    <file>themes/monowhite/16/logs.png</file>
+    <file>themes/monowhite/16/new.png</file>
+    <file>themes/monowhite/16/save.png</file>
+    <file>themes/monowhite/16/recentdocument.png</file>
+    <file>themes/monowhite/16/simulate.png</file>
+    <file>themes/monowhite/16/changelog.png</file>
+    <file>themes/monowhite/16/copy.png</file>
+    <file>themes/monowhite/16/write_flash.png</file>
+    <file>themes/monowhite/16/read_eeprom_file.png</file>
+    <file>themes/monowhite/16/clear.png</file>
+    <file>themes/monowhite/16/play.png</file>
+    <file>themes/monowhite/16/fuses.png</file>
+    <file>themes/monowhite/16/arrow-right.png</file>
+    <file>themes/monowhite/16/exit.png</file>
+    <file>themes/monowhite/16/moveup.png</file>
+    <file>themes/monowhite/16/read_eeprom.png</file>
+    <file>themes/monowhite/16/cut.png</file>
+    <file>themes/monowhite/16/arrow-left.png</file>
+    <file>themes/monowhite/16/write_eeprom_file.png</file>
+    <file>themes/monowhite/16/library.png</file>
+    <file>themes/monowhite/16/profiles.png</file>
+    <file>themes/monowhite/16/paste.png</file>
+    <file>themes/monowhite/16/print.png</file>
+    <file>themes/monowhite/16/compare.png</file>
+    <file>themes/monowhite/16/customize.png</file>
+    <file>themes/monowhite/16/saveas.png</file>
+    <file>themes/monowhite/16/preferences.png</file>
+    <file>themes/monowhite/16/movedown.png</file>
+    <file>themes/monowhite/16/currentmodel.png</file>
+    <file>themes/monowhite/16/read_flash.png</file>
+    <file>themes/monowhite/16/duplicate.png</file>
+    <file>themes/monowhite/16/add.png</file>
+    <file>themes/monowhite/16/update.png</file>
+    <file>themes/monowhite/16/contributors.png</file>
+    <file>themes/monowhite/16/stop.png</file>
+    <file>themes/monowhite/16/write_eeprom.png</file>
+    <file>themes/monowhite/24/open.png</file>
+    <file>themes/monowhite/24/edit.png</file>
+    <file>themes/monowhite/24/information.png</file>
+    <file>themes/monowhite/24/configure.png</file>
+    <file>themes/monowhite/24/switch_dir.png</file>
+    <file>themes/monowhite/24/list.png</file>
+    <file>themes/monowhite/24/wizard.png</file>
+    <file>themes/monowhite/24/logs.png</file>
+    <file>themes/monowhite/24/new.png</file>
+    <file>themes/monowhite/24/save.png</file>
+    <file>themes/monowhite/24/recentdocument.png</file>
+    <file>themes/monowhite/24/simulate.png</file>
+    <file>themes/monowhite/24/changelog.png</file>
+    <file>themes/monowhite/24/copy.png</file>
+    <file>themes/monowhite/24/write_flash.png</file>
+    <file>themes/monowhite/24/read_eeprom_file.png</file>
+    <file>themes/monowhite/24/clear.png</file>
+    <file>themes/monowhite/24/play.png</file>
+    <file>themes/monowhite/24/fuses.png</file>
+    <file>themes/monowhite/24/arrow-right.png</file>
+    <file>themes/monowhite/24/exit.png</file>
+    <file>themes/monowhite/24/moveup.png</file>
+    <file>themes/monowhite/24/read_eeprom.png</file>
+    <file>themes/monowhite/24/cut.png</file>
+    <file>themes/monowhite/24/arrow-left.png</file>
+    <file>themes/monowhite/24/write_eeprom_file.png</file>
+    <file>themes/monowhite/24/library.png</file>
+    <file>themes/monowhite/24/profiles.png</file>
+    <file>themes/monowhite/24/paste.png</file>
+    <file>themes/monowhite/24/print.png</file>
+    <file>themes/monowhite/24/compare.png</file>
+    <file>themes/monowhite/24/customize.png</file>
+    <file>themes/monowhite/24/saveas.png</file>
+    <file>themes/monowhite/24/preferences.png</file>
+    <file>themes/monowhite/24/movedown.png</file>
+    <file>themes/monowhite/24/currentmodel.png</file>
+    <file>themes/monowhite/24/read_flash.png</file>
+    <file>themes/monowhite/24/duplicate.png</file>
+    <file>themes/monowhite/24/add.png</file>
+    <file>themes/monowhite/24/update.png</file>
+    <file>themes/monowhite/24/contributors.png</file>
+    <file>themes/monowhite/24/stop.png</file>
+    <file>themes/monowhite/24/write_eeprom.png</file>
+    <file>themes/monowhite/32/open.png</file>
+    <file>themes/monowhite/32/edit.png</file>
+    <file>themes/monowhite/32/information.png</file>
+    <file>themes/monowhite/32/configure.png</file>
+    <file>themes/monowhite/32/switch_dir.png</file>
+    <file>themes/monowhite/32/list.png</file>
+    <file>themes/monowhite/32/wizard.png</file>
+    <file>themes/monowhite/32/logs.png</file>
+    <file>themes/monowhite/32/new.png</file>
+    <file>themes/monowhite/32/save.png</file>
+    <file>themes/monowhite/32/recentdocument.png</file>
+    <file>themes/monowhite/32/simulate.png</file>
+    <file>themes/monowhite/32/changelog.png</file>
+    <file>themes/monowhite/32/copy.png</file>
+    <file>themes/monowhite/32/write_flash.png</file>
+    <file>themes/monowhite/32/read_eeprom_file.png</file>
+    <file>themes/monowhite/32/clear.png</file>
+    <file>themes/monowhite/32/play.png</file>
+    <file>themes/monowhite/32/fuses.png</file>
+    <file>themes/monowhite/32/arrow-right.png</file>
+    <file>themes/monowhite/32/exit.png</file>
+    <file>themes/monowhite/32/moveup.png</file>
+    <file>themes/monowhite/32/read_eeprom.png</file>
+    <file>themes/monowhite/32/cut.png</file>
+    <file>themes/monowhite/32/arrow-left.png</file>
+    <file>themes/monowhite/32/write_eeprom_file.png</file>
+    <file>themes/monowhite/32/library.png</file>
+    <file>themes/monowhite/32/profiles.png</file>
+    <file>themes/monowhite/32/paste.png</file>
+    <file>themes/monowhite/32/print.png</file>
+    <file>themes/monowhite/32/compare.png</file>
+    <file>themes/monowhite/32/customize.png</file>
+    <file>themes/monowhite/32/saveas.png</file>
+    <file>themes/monowhite/32/preferences.png</file>
+    <file>themes/monowhite/32/movedown.png</file>
+    <file>themes/monowhite/32/currentmodel.png</file>
+    <file>themes/monowhite/32/read_flash.png</file>
+    <file>themes/monowhite/32/duplicate.png</file>
+    <file>themes/monowhite/32/add.png</file>
+    <file>themes/monowhite/32/update.png</file>
+    <file>themes/monowhite/32/contributors.png</file>
+    <file>themes/monowhite/32/stop.png</file>
+    <file>themes/monowhite/32/write_eeprom.png</file>
+    <file>themes/monowhite/48/open.png</file>
+    <file>themes/monowhite/48/edit.png</file>
+    <file>themes/monowhite/48/information.png</file>
+    <file>themes/monowhite/48/configure.png</file>
+    <file>themes/monowhite/48/switch_dir.png</file>
+    <file>themes/monowhite/48/list.png</file>
+    <file>themes/monowhite/48/wizard.png</file>
+    <file>themes/monowhite/48/logs.png</file>
+    <file>themes/monowhite/48/new.png</file>
+    <file>themes/monowhite/48/save.png</file>
+    <file>themes/monowhite/48/recentdocument.png</file>
+    <file>themes/monowhite/48/simulate.png</file>
+    <file>themes/monowhite/48/changelog.png</file>
+    <file>themes/monowhite/48/copy.png</file>
+    <file>themes/monowhite/48/write_flash.png</file>
+    <file>themes/monowhite/48/read_eeprom_file.png</file>
+    <file>themes/monowhite/48/clear.png</file>
+    <file>themes/monowhite/48/play.png</file>
+    <file>themes/monowhite/48/fuses.png</file>
+    <file>themes/monowhite/48/arrow-right.png</file>
+    <file>themes/monowhite/48/exit.png</file>
+    <file>themes/monowhite/48/moveup.png</file>
+    <file>themes/monowhite/48/read_eeprom.png</file>
+    <file>themes/monowhite/48/cut.png</file>
+    <file>themes/monowhite/48/arrow-left.png</file>
+    <file>themes/monowhite/48/write_eeprom_file.png</file>
+    <file>themes/monowhite/48/library.png</file>
+    <file>themes/monowhite/48/profiles.png</file>
+    <file>themes/monowhite/48/paste.png</file>
+    <file>themes/monowhite/48/print.png</file>
+    <file>themes/monowhite/48/compare.png</file>
+    <file>themes/monowhite/48/customize.png</file>
+    <file>themes/monowhite/48/saveas.png</file>
+    <file>themes/monowhite/48/preferences.png</file>
+    <file>themes/monowhite/48/movedown.png</file>
+    <file>themes/monowhite/48/currentmodel.png</file>
+    <file>themes/monowhite/48/read_flash.png</file>
+    <file>themes/monowhite/48/duplicate.png</file>
+    <file>themes/monowhite/48/add.png</file>
+    <file>themes/monowhite/48/update.png</file>
+    <file>themes/monowhite/48/contributors.png</file>
+    <file>themes/monowhite/48/stop.png</file>
+    <file>themes/monowhite/48/write_eeprom.png</file>
  </qresource>
 </RCC>
@@ -1504,6 +1504,12 @@ QString getTheme()
    case 0:
      Theme="classic";
      break;
+    case 2:
+      Theme="monowhite";
+      break;
+    case 3:
+      Theme="monoblue";
+      break;
    default:
      Theme="monochrome";
      break;          
@@ -0,0 +1,3 @@
+#!/bin/bash  
+mogrify -modulate 100,100,70 *.png
+mogrify +level-colors "#000066","#0000cc" *.png
@@ -0,0 +1,3 @@
+#!/bin/bash  
+mogrify -negate -level 0,0,0 *.png
+
@@ -76,9 +76,15 @@ class MyProxyStyle : public QProxyStyle

 int main(int argc, char *argv[])
 {
-  QCoreApplication::setOrganizationName("OpenTX");
-  QCoreApplication::setOrganizationDomain("open-tx.org");
-  QCoreApplication::setApplicationName("Companion");
+  Q_INIT_RESOURCE(companion);
+  QApplication app(argc, argv);
+  app.setApplicationName("OpenTX Companion");
+  app.setOrganizationName("OpenTX");
+  app.setOrganizationDomain("open-tx.org");
+
+#ifdef __APPLE__
+  app.setStyle(new MyProxyStyle);
+#endif

  // Start by borrowing any left over settings from companion9x
  QSettings c9x_settings("companion9x", "companion9x");
@@ -91,13 +97,6 @@ int main(int argc, char *argv[])
    }
  }

-  Q_INIT_RESOURCE(companion);
-  QApplication app(argc, argv);
-  app.setApplicationName("OpenTX Companion");
-#ifdef __APPLE__
-  app.setStyle(new MyProxyStyle);
-#endif
-
  QString dir;
  if (argc) dir = QFileInfo(argv[0]).canonicalPath() + "/lang";

@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>685</width>
-    <height>764</height>
+    <height>838</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -1596,6 +1596,16 @@ May be different from firmware language</string>
         <string>Monochrome</string>
        </property>
       </item>
+       <item>
+        <property name="text">
+         <string>MonoWhite</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>MonoBlue</string>
+        </property>
+       </item>
      </widget>
     </item>
     <item>
--- a/Show More
+++ b/Show More