diff --git a/companion/src/burnconfigdialog.cpp b/companion/src/burnconfigdialog.cpp index 9e08d860f..d7ce28e6d 100644 --- a/companion/src/burnconfigdialog.cpp +++ b/companion/src/burnconfigdialog.cpp @@ -2,6 +2,7 @@ #include "ui_burnconfigdialog.h" #include "avroutputdialog.h" #include "eeprominterface.h" +#include "helpers.h" #include #if !defined WIN32 && defined __GNUC__ @@ -278,7 +279,9 @@ void burnConfigDialog::listProgrammers() QStringList arguments; arguments << "-c?"; avrOutputDialog *ad = new avrOutputDialog(this, ui->avrdude_location->text(), arguments, "List available programmers", AVR_DIALOG_KEEP_OPEN, TRUE); - ad->setWindowIcon(QIcon(":/images/list.png")); + QIcon Icon; + populate_icon(&Icon,"list.png"); + ad->setWindowIcon(Icon); ad->show(); } @@ -295,7 +298,9 @@ void burnConfigDialog::on_pushButton_4_clicked() arguments << "-?"; avrOutputDialog *ad = new avrOutputDialog(this, ui->avrdude_location->text(), arguments, "Show help", AVR_DIALOG_KEEP_OPEN,TRUE); - ad->setWindowIcon(QIcon(":/images/configure.png")); + QIcon Icon; + populate_icon(&Icon,"configure.png"); + ad->setWindowIcon(Icon); ad->show(); } @@ -312,7 +317,9 @@ void burnConfigDialog::readFuses() arguments << "-c" << avrProgrammer << "-p" << avrMCU << args << str; avrOutputDialog *ad = new avrOutputDialog(this, avrLoc, arguments, "Read Fuses",AVR_DIALOG_KEEP_OPEN,TRUE); - ad->setWindowIcon(QIcon(":/images/fuses.png")); + QIcon Icon; + populate_icon(&Icon,"fuses.png"); + ad->setWindowIcon(Icon); ad->show(); } @@ -324,7 +331,6 @@ void burnConfigDialog::restFuses(bool eeProtect) //avrdude -c usbasp -p m64 -U efuse:w:<0xFF>:m QMessageBox::StandardButton ret = QMessageBox::No; - ret = QMessageBox::warning(this, tr("Companion"), tr("WARNING!
This will reset the fuses of %1 to the factory settings.
Writing fuses can mess up your radio.
Do this only if you are sure they are wrong!
Are you sure you want to continue?").arg(avrMCU), QMessageBox::Yes | QMessageBox::No); @@ -346,7 +352,9 @@ void burnConfigDialog::restFuses(bool eeProtect) QStringList argread; argread << "-c" << avrProgrammer << "-p" << avrMCU << args <<"-U" << "lfuse:r:"+tempFile+":r" ; avrOutputDialog *ad = new avrOutputDialog(this, avrLoc, argread, "Reset Fuses",AVR_DIALOG_CLOSE_IF_SUCCESSFUL,FALSE); - ad->setWindowIcon(QIcon(":/images/fuses.png")); + QIcon Icon; + populate_icon(&Icon,"fuses.png"); + ad->setWindowIcon(Icon); ad->exec(); QFile file(tempFile); if (file.exists() && file.size()==1) { @@ -375,7 +383,9 @@ void burnConfigDialog::restFuses(bool eeProtect) arguments << "-c" << avrProgrammer << "-p" << avrMCU << args << "-B" << "100" << "-u" << str; } avrOutputDialog *ad = new avrOutputDialog(this, avrLoc, arguments, "Reset Fuses",AVR_DIALOG_KEEP_OPEN,TRUE); - ad->setWindowIcon(QIcon(":/images/fuses.png")); + QIcon Icon; + populate_icon(&Icon,"fuses.png"); + ad->setWindowIcon(Icon); ad->show(); } diff --git a/companion/src/burnconfigdialog.ui b/companion/src/burnconfigdialog.ui index bb85de6f5..b5419d37f 100644 --- a/companion/src/burnconfigdialog.ui +++ b/companion/src/burnconfigdialog.ui @@ -27,7 +27,7 @@ - :/images/configure.png:/images/configure.png + :/icon.png:/icon.png diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index 1851310d6..167bba702 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -16,6 +16,9 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac hexType(Type) { ui->setupUi(this); + QIcon LibraryIcon; + populate_icon(&LibraryIcon,"library.png"); + ui->libraryButton->setIcon(LibraryIcon); ui->SplashFrame->hide(); ui->FramFWInfo->hide(); ui->EEbackupCB->hide(); diff --git a/companion/src/burndialog.ui b/companion/src/burndialog.ui index a15ae25a1..e86634e9a 100644 --- a/companion/src/burndialog.ui +++ b/companion/src/burndialog.ui @@ -26,8 +26,8 @@ Customize Splash - - :/images/c_home.png:/images/c_home.png + + :/icon.png:/icon.png @@ -455,10 +455,6 @@ ... - - - :/images/library.png:/images/library.png - 16 diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 6f84186da..5a86ebc50 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -1,5 +1,6 @@ + images/customize.png icon.png ../../CREDITS.txt ../../DONATIONS.txt @@ -37,56 +38,13 @@ images/9xcursmin.png images/9xcursdown.png images/9xcursphoto.png - images/copy.png - images/cut.png - images/currentmodel.png - images/information.png - images/new.png - images/open.png - images/paste.png - images/save.png - images/saveas.png images/screenshot.png images/splash.png images/splasht.png images/companion-title.png - images/read_eeprom.png - images/write_eeprom.png - images/write_flash.png - images/read_flash.png - images/simulate.png - images/configure.png - images/customize.png - images/print.png - images/clear.png - images/add.png - images/edit.png - images/wizard.png - images/duplicate.png - images/fuses.png - images/list.png images/maps.png images/track.png images/track0.png - images/play.png - images/stop.png - images/read_eeprom_file.png - images/write_eeprom_file.png - images/moveup.png - images/movedown.png - images/update.png - images/contributors.png - images/changelog.png - images/preferences.png - images/switch_dir.png - images/exit.png - images/recentdocument.png - images/profiles.png - images/library.png - images/logs.png - images/arrow-left.png - images/arrow-right.png - images/compare.png images/x9b0.png images/x9l0.png images/x9l1.png @@ -335,5 +293,349 @@ images/library/30002.png images/library/30003.png images/library/30004.png + themes/monochrome/16/open.png + themes/monochrome/16/edit.png + themes/monochrome/16/information.png + themes/monochrome/16/configure.png + themes/monochrome/16/switch_dir.png + themes/monochrome/16/list.png + themes/monochrome/16/wizard.png + themes/monochrome/16/logs.png + themes/monochrome/16/new.png + themes/monochrome/16/save.png + themes/monochrome/16/recentdocument.png + themes/monochrome/16/simulate.png + themes/monochrome/16/changelog.png + themes/monochrome/16/copy.png + themes/monochrome/16/write_flash.png + themes/monochrome/16/read_eeprom_file.png + themes/monochrome/16/clear.png + themes/monochrome/16/play.png + themes/monochrome/16/fuses.png + themes/monochrome/16/arrow-right.png + themes/monochrome/16/exit.png + themes/monochrome/16/moveup.png + themes/monochrome/16/read_eeprom.png + themes/monochrome/16/cut.png + themes/monochrome/16/arrow-left.png + themes/monochrome/16/write_eeprom_file.png + themes/monochrome/16/library.png + themes/monochrome/16/profiles.png + themes/monochrome/16/paste.png + themes/monochrome/16/print.png + themes/monochrome/16/compare.png + themes/monochrome/16/customize.png + themes/monochrome/16/saveas.png + themes/monochrome/16/preferences.png + themes/monochrome/16/movedown.png + themes/monochrome/16/currentmodel.png + themes/monochrome/16/read_flash.png + themes/monochrome/16/duplicate.png + themes/monochrome/16/add.png + themes/monochrome/16/update.png + themes/monochrome/16/contributors.png + themes/monochrome/16/stop.png + themes/monochrome/16/write_eeprom.png + themes/monochrome/24/open.png + themes/monochrome/24/edit.png + themes/monochrome/24/information.png + themes/monochrome/24/configure.png + themes/monochrome/24/switch_dir.png + themes/monochrome/24/list.png + themes/monochrome/24/wizard.png + themes/monochrome/24/logs.png + themes/monochrome/24/new.png + themes/monochrome/24/save.png + themes/monochrome/24/recentdocument.png + themes/monochrome/24/simulate.png + themes/monochrome/24/changelog.png + themes/monochrome/24/copy.png + themes/monochrome/24/write_flash.png + themes/monochrome/24/read_eeprom_file.png + themes/monochrome/24/clear.png + themes/monochrome/24/play.png + themes/monochrome/24/fuses.png + themes/monochrome/24/arrow-right.png + themes/monochrome/24/exit.png + themes/monochrome/24/moveup.png + themes/monochrome/24/read_eeprom.png + themes/monochrome/24/cut.png + themes/monochrome/24/arrow-left.png + themes/monochrome/24/write_eeprom_file.png + themes/monochrome/24/library.png + themes/monochrome/24/profiles.png + themes/monochrome/24/paste.png + themes/monochrome/24/print.png + themes/monochrome/24/compare.png + themes/monochrome/24/customize.png + themes/monochrome/24/saveas.png + themes/monochrome/24/preferences.png + themes/monochrome/24/movedown.png + themes/monochrome/24/currentmodel.png + themes/monochrome/24/read_flash.png + themes/monochrome/24/duplicate.png + themes/monochrome/24/add.png + themes/monochrome/24/update.png + themes/monochrome/24/contributors.png + themes/monochrome/24/stop.png + themes/monochrome/24/write_eeprom.png + themes/monochrome/32/open.png + themes/monochrome/32/edit.png + themes/monochrome/32/information.png + themes/monochrome/32/configure.png + themes/monochrome/32/switch_dir.png + themes/monochrome/32/list.png + themes/monochrome/32/wizard.png + themes/monochrome/32/logs.png + themes/monochrome/32/new.png + themes/monochrome/32/save.png + themes/monochrome/32/recentdocument.png + themes/monochrome/32/simulate.png + themes/monochrome/32/changelog.png + themes/monochrome/32/copy.png + themes/monochrome/32/write_flash.png + themes/monochrome/32/read_eeprom_file.png + themes/monochrome/32/clear.png + themes/monochrome/32/play.png + themes/monochrome/32/fuses.png + themes/monochrome/32/arrow-right.png + themes/monochrome/32/exit.png + themes/monochrome/32/moveup.png + themes/monochrome/32/read_eeprom.png + themes/monochrome/32/cut.png + themes/monochrome/32/arrow-left.png + themes/monochrome/32/write_eeprom_file.png + themes/monochrome/32/library.png + themes/monochrome/32/profiles.png + themes/monochrome/32/paste.png + themes/monochrome/32/print.png + themes/monochrome/32/compare.png + themes/monochrome/32/customize.png + themes/monochrome/32/saveas.png + themes/monochrome/32/preferences.png + themes/monochrome/32/movedown.png + themes/monochrome/32/currentmodel.png + themes/monochrome/32/read_flash.png + themes/monochrome/32/duplicate.png + themes/monochrome/32/add.png + themes/monochrome/32/update.png + themes/monochrome/32/contributors.png + themes/monochrome/32/stop.png + themes/monochrome/32/write_eeprom.png + themes/monochrome/48/open.png + themes/monochrome/48/edit.png + themes/monochrome/48/information.png + themes/monochrome/48/configure.png + themes/monochrome/48/switch_dir.png + themes/monochrome/48/list.png + themes/monochrome/48/wizard.png + themes/monochrome/48/logs.png + themes/monochrome/48/new.png + themes/monochrome/48/save.png + themes/monochrome/48/recentdocument.png + themes/monochrome/48/simulate.png + themes/monochrome/48/changelog.png + themes/monochrome/48/copy.png + themes/monochrome/48/write_flash.png + themes/monochrome/48/read_eeprom_file.png + themes/monochrome/48/clear.png + themes/monochrome/48/play.png + themes/monochrome/48/fuses.png + themes/monochrome/48/arrow-right.png + themes/monochrome/48/exit.png + themes/monochrome/48/moveup.png + themes/monochrome/48/read_eeprom.png + themes/monochrome/48/cut.png + themes/monochrome/48/arrow-left.png + themes/monochrome/48/write_eeprom_file.png + themes/monochrome/48/library.png + themes/monochrome/48/profiles.png + themes/monochrome/48/paste.png + themes/monochrome/48/print.png + themes/monochrome/48/compare.png + themes/monochrome/48/customize.png + themes/monochrome/48/saveas.png + themes/monochrome/48/preferences.png + themes/monochrome/48/movedown.png + themes/monochrome/48/currentmodel.png + themes/monochrome/48/read_flash.png + themes/monochrome/48/duplicate.png + themes/monochrome/48/add.png + themes/monochrome/48/update.png + themes/monochrome/48/contributors.png + themes/monochrome/48/stop.png + themes/monochrome/48/write_eeprom.png + themes/classic/16/open.png + themes/classic/16/edit.png + themes/classic/16/information.png + themes/classic/16/configure.png + themes/classic/16/switch_dir.png + themes/classic/16/list.png + themes/classic/16/wizard.png + themes/classic/16/logs.png + themes/classic/16/new.png + themes/classic/16/save.png + themes/classic/16/recentdocument.png + themes/classic/16/simulate.png + themes/classic/16/changelog.png + themes/classic/16/copy.png + themes/classic/16/write_flash.png + themes/classic/16/read_eeprom_file.png + themes/classic/16/clear.png + themes/classic/16/play.png + themes/classic/16/fuses.png + themes/classic/16/arrow-right.png + themes/classic/16/exit.png + themes/classic/16/moveup.png + themes/classic/16/read_eeprom.png + themes/classic/16/cut.png + themes/classic/16/arrow-left.png + themes/classic/16/write_eeprom_file.png + themes/classic/16/library.png + themes/classic/16/profiles.png + themes/classic/16/paste.png + themes/classic/16/print.png + themes/classic/16/compare.png + themes/classic/16/customize.png + themes/classic/16/saveas.png + themes/classic/16/preferences.png + themes/classic/16/movedown.png + themes/classic/16/currentmodel.png + themes/classic/16/read_flash.png + themes/classic/16/duplicate.png + themes/classic/16/add.png + themes/classic/16/update.png + themes/classic/16/contributors.png + themes/classic/16/stop.png + themes/classic/16/write_eeprom.png + themes/classic/24/open.png + themes/classic/24/edit.png + themes/classic/24/information.png + themes/classic/24/configure.png + themes/classic/24/switch_dir.png + themes/classic/24/list.png + themes/classic/24/wizard.png + themes/classic/24/logs.png + themes/classic/24/new.png + themes/classic/24/save.png + themes/classic/24/recentdocument.png + themes/classic/24/simulate.png + themes/classic/24/changelog.png + themes/classic/24/copy.png + themes/classic/24/write_flash.png + themes/classic/24/read_eeprom_file.png + themes/classic/24/clear.png + themes/classic/24/play.png + themes/classic/24/fuses.png + themes/classic/24/arrow-right.png + themes/classic/24/exit.png + themes/classic/24/moveup.png + themes/classic/24/read_eeprom.png + themes/classic/24/cut.png + themes/classic/24/arrow-left.png + themes/classic/24/write_eeprom_file.png + themes/classic/24/library.png + themes/classic/24/profiles.png + themes/classic/24/paste.png + themes/classic/24/print.png + themes/classic/24/compare.png + themes/classic/24/customize.png + themes/classic/24/saveas.png + themes/classic/24/preferences.png + themes/classic/24/movedown.png + themes/classic/24/currentmodel.png + themes/classic/24/read_flash.png + themes/classic/24/duplicate.png + themes/classic/24/add.png + themes/classic/24/update.png + themes/classic/24/contributors.png + themes/classic/24/stop.png + themes/classic/24/write_eeprom.png + themes/classic/32/open.png + themes/classic/32/edit.png + themes/classic/32/information.png + themes/classic/32/configure.png + themes/classic/32/switch_dir.png + themes/classic/32/list.png + themes/classic/32/wizard.png + themes/classic/32/logs.png + themes/classic/32/new.png + themes/classic/32/save.png + themes/classic/32/recentdocument.png + themes/classic/32/simulate.png + themes/classic/32/changelog.png + themes/classic/32/copy.png + themes/classic/32/write_flash.png + themes/classic/32/read_eeprom_file.png + themes/classic/32/clear.png + themes/classic/32/play.png + themes/classic/32/fuses.png + themes/classic/32/arrow-right.png + themes/classic/32/exit.png + themes/classic/32/moveup.png + themes/classic/32/read_eeprom.png + themes/classic/32/cut.png + themes/classic/32/arrow-left.png + themes/classic/32/write_eeprom_file.png + themes/classic/32/library.png + themes/classic/32/profiles.png + themes/classic/32/paste.png + themes/classic/32/print.png + themes/classic/32/compare.png + themes/classic/32/customize.png + themes/classic/32/saveas.png + themes/classic/32/preferences.png + themes/classic/32/movedown.png + themes/classic/32/currentmodel.png + themes/classic/32/read_flash.png + themes/classic/32/duplicate.png + themes/classic/32/add.png + themes/classic/32/update.png + themes/classic/32/contributors.png + themes/classic/32/stop.png + themes/classic/32/write_eeprom.png + themes/classic/48/open.png + themes/classic/48/edit.png + themes/classic/48/information.png + themes/classic/48/configure.png + themes/classic/48/switch_dir.png + themes/classic/48/list.png + themes/classic/48/wizard.png + themes/classic/48/logs.png + themes/classic/48/new.png + themes/classic/48/save.png + themes/classic/48/recentdocument.png + themes/classic/48/simulate.png + themes/classic/48/changelog.png + themes/classic/48/copy.png + themes/classic/48/write_flash.png + themes/classic/48/read_eeprom_file.png + themes/classic/48/clear.png + themes/classic/48/play.png + themes/classic/48/fuses.png + themes/classic/48/arrow-right.png + themes/classic/48/exit.png + themes/classic/48/moveup.png + themes/classic/48/read_eeprom.png + themes/classic/48/cut.png + themes/classic/48/arrow-left.png + themes/classic/48/write_eeprom_file.png + themes/classic/48/library.png + themes/classic/48/profiles.png + themes/classic/48/paste.png + themes/classic/48/print.png + themes/classic/48/compare.png + themes/classic/48/customize.png + themes/classic/48/saveas.png + themes/classic/48/preferences.png + themes/classic/48/movedown.png + themes/classic/48/currentmodel.png + themes/classic/48/read_flash.png + themes/classic/48/duplicate.png + themes/classic/48/add.png + themes/classic/48/update.png + themes/classic/48/contributors.png + themes/classic/48/stop.png + themes/classic/48/write_eeprom.png diff --git a/companion/src/comparedialog.ui b/companion/src/comparedialog.ui index 7667ad3ce..6f11bf138 100644 --- a/companion/src/comparedialog.ui +++ b/companion/src/comparedialog.ui @@ -30,7 +30,7 @@ - :/images/print.png:/images/print.png + :/icon.png:/icon.png diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 7912b3ec5..5fa478291 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -11,6 +11,9 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) : QDialog(parent), ui(new Ui::customizeSplashDialog) { ui->setupUi(this); + QIcon LibraryIcon; + populate_icon(&LibraryIcon,"library.png"); + ui->libraryButton->setIcon(LibraryIcon); ui->HowToLabel->clear(); ui->HowToLabel->append("
" + tr("Select an original firmware file") + "
"); } diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui index b7d0285aa..15a803656 100644 --- a/companion/src/customizesplashdialog.ui +++ b/companion/src/customizesplashdialog.ui @@ -20,8 +20,8 @@ Customize Splash - - :/images/c_home.png:/images/c_home.png + + :/icon.png:/icon.png @@ -211,10 +211,6 @@ p, li { white-space: pre-wrap; } ... - - - :/images/library.png:/images/library.png - 16 diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp index f2eed4608..9d413654d 100644 --- a/companion/src/firmwares/er9x/er9xinterface.cpp +++ b/companion/src/firmwares/er9x/er9xinterface.cpp @@ -44,7 +44,7 @@ const char * Er9xInterface::getName() const int Er9xInterface::getEEpromSize() { - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString avrMCU = settings.value("mcu", QString("m64")).toString(); if (avrMCU==QString("m128")) { return 2*EESIZE_STOCK; diff --git a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp index cdb6d4124..1115f46f1 100644 --- a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp +++ b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp @@ -47,7 +47,7 @@ const char * Gruvin9xInterface::getName() const int Gruvin9xInterface::getEEpromSize() { if (board == BOARD_STOCK) { - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString avrMCU = settings.value("mcu", QString("m64")).toString(); if (avrMCU==QString("m128")) { return EESIZE_STOCK*2; diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp index 9f444c808..393eff229 100644 --- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp +++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp @@ -135,7 +135,7 @@ using namespace Open9xSky9x; Open9xSky9xSimulator::Open9xSky9xSimulator(Open9xInterface * open9xInterface): open9xInterface(open9xInterface) { - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString path=settings.value("sdPath", ".").toString()+"/"; int i=0; for (i=0; i< std::min(path.length(),1022); i++) { diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index ae4424797..3af9d4a86 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -145,7 +145,7 @@ OpentxTaranisSimulator::OpentxTaranisSimulator(Open9xInterface * open9xInterface open9xInterface(open9xInterface) { taranisSimulatorBoard = GetEepromInterface()->getBoard(); - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString path=settings.value("sdPath", ".").toString()+"/"; int i=0; for (i=0; i< std::min(path.length(),1022); i++) { diff --git a/companion/src/firmwares/th9x/th9xinterface.cpp b/companion/src/firmwares/th9x/th9xinterface.cpp index d86065ddb..bf49284ce 100644 --- a/companion/src/firmwares/th9x/th9xinterface.cpp +++ b/companion/src/firmwares/th9x/th9xinterface.cpp @@ -44,7 +44,7 @@ const char * Th9xInterface::getName() const int Th9xInterface::getEEpromSize() { - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString avrMCU = settings.value("mcu", QString("m64")).toString(); if (avrMCU==QString("m128")) { return 2*EESIZE_STOCK; diff --git a/companion/src/fusesdialog.ui b/companion/src/fusesdialog.ui index e7e6bbe9d..1a32ff96c 100644 --- a/companion/src/fusesdialog.ui +++ b/companion/src/fusesdialog.ui @@ -15,7 +15,7 @@ - :/images/fuses.png:/images/fuses.png + :/icon.png:/icon.png diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index d89deaa6f..739353e63 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -1484,3 +1484,28 @@ QString getCenterBeep(ModelData * g_model) if(g_model->beepANACenter & 0x80) strl << "LS"; return strl.join(", "); } + +void populate_icon(QIcon *Icon, QString baseimage) +{ + static QString usedtheme=getTheme(); + Icon->addFile(":/themes/"+usedtheme+"/16/"+baseimage,QSize(16,16)); + Icon->addFile(":/themes/"+usedtheme+"/24/"+baseimage,QSize(24,24)); + Icon->addFile(":/themes/"+usedtheme+"/32/"+baseimage,QSize(32,32)); + Icon->addFile(":/themes/"+usedtheme+"/48/"+baseimage,QSize(48,48)); +} + +QString getTheme() +{ + QSettings settings("companion", "companion"); + int theme_set=settings.value("theme", 1).toInt(); + QString Theme; + switch(theme_set) { + case 0: + Theme="classic"; + break; + default: + Theme="monochrome"; + break; + } + return Theme; +} \ No newline at end of file diff --git a/companion/src/helpers.h b/companion/src/helpers.h index 6f104480c..f2dcbc51e 100644 --- a/companion/src/helpers.h +++ b/companion/src/helpers.h @@ -28,6 +28,8 @@ void populateVoiceLangCB(QComboBox *b, QString language); void populateTTraceCB(QComboBox *b, int value); void populateRotEncCB(QComboBox *b, int value, int renumber); void populateBacklightCB(QComboBox *b, const uint8_t value); +void populate_icon(QIcon *Icon, QString baseimage); +QString getTheme(); class GVarGroup : public QObject { diff --git a/companion/src/images/originals/classical icons/add.png b/companion/src/images/originals/classical icons/add.png new file mode 100644 index 000000000..24cc027da Binary files /dev/null and b/companion/src/images/originals/classical icons/add.png differ diff --git a/companion/src/images/originals/classical icons/arrow-left.png b/companion/src/images/originals/classical icons/arrow-left.png new file mode 100644 index 000000000..759e58950 Binary files /dev/null and b/companion/src/images/originals/classical icons/arrow-left.png differ diff --git a/companion/src/images/originals/classical icons/arrow-right.png b/companion/src/images/originals/classical icons/arrow-right.png new file mode 100644 index 000000000..1d056715f Binary files /dev/null and b/companion/src/images/originals/classical icons/arrow-right.png differ diff --git a/companion/src/images/originals/classical icons/changelog.png b/companion/src/images/originals/classical icons/changelog.png new file mode 100644 index 000000000..3c60e6745 Binary files /dev/null and b/companion/src/images/originals/classical icons/changelog.png differ diff --git a/companion/src/images/originals/classical icons/clear.png b/companion/src/images/originals/classical icons/clear.png new file mode 100644 index 000000000..a599c0332 Binary files /dev/null and b/companion/src/images/originals/classical icons/clear.png differ diff --git a/companion/src/images/originals/classical icons/compare.png b/companion/src/images/originals/classical icons/compare.png new file mode 100644 index 000000000..5b7e41c4f Binary files /dev/null and b/companion/src/images/originals/classical icons/compare.png differ diff --git a/companion/src/images/originals/classical icons/configure.png b/companion/src/images/originals/classical icons/configure.png new file mode 100644 index 000000000..ec6fad759 Binary files /dev/null and b/companion/src/images/originals/classical icons/configure.png differ diff --git a/companion/src/images/originals/classical icons/contributors.png b/companion/src/images/originals/classical icons/contributors.png new file mode 100644 index 000000000..276949198 Binary files /dev/null and b/companion/src/images/originals/classical icons/contributors.png differ diff --git a/companion/src/images/originals/classical icons/copy.png b/companion/src/images/originals/classical icons/copy.png new file mode 100644 index 000000000..2aeb28288 Binary files /dev/null and b/companion/src/images/originals/classical icons/copy.png differ diff --git a/companion/src/images/originals/classical icons/currentmodel.png b/companion/src/images/originals/classical icons/currentmodel.png new file mode 100644 index 000000000..35a37b766 Binary files /dev/null and b/companion/src/images/originals/classical icons/currentmodel.png differ diff --git a/companion/src/images/originals/classical icons/customize.png b/companion/src/images/originals/classical icons/customize.png new file mode 100644 index 000000000..96259b922 Binary files /dev/null and b/companion/src/images/originals/classical icons/customize.png differ diff --git a/companion/src/images/originals/classical icons/cut.png b/companion/src/images/originals/classical icons/cut.png new file mode 100644 index 000000000..54638e938 Binary files /dev/null and b/companion/src/images/originals/classical icons/cut.png differ diff --git a/companion/src/images/originals/classical icons/duplicate.png b/companion/src/images/originals/classical icons/duplicate.png new file mode 100644 index 000000000..811691d98 Binary files /dev/null and b/companion/src/images/originals/classical icons/duplicate.png differ diff --git a/companion/src/images/originals/classical icons/edit.png b/companion/src/images/originals/classical icons/edit.png new file mode 100644 index 000000000..106709cae Binary files /dev/null and b/companion/src/images/originals/classical icons/edit.png differ diff --git a/companion/src/images/originals/classical icons/exit.png b/companion/src/images/originals/classical icons/exit.png new file mode 100644 index 000000000..5319a9480 Binary files /dev/null and b/companion/src/images/originals/classical icons/exit.png differ diff --git a/companion/src/images/originals/classical icons/fuses.png b/companion/src/images/originals/classical icons/fuses.png new file mode 100644 index 000000000..4354cdcb2 Binary files /dev/null and b/companion/src/images/originals/classical icons/fuses.png differ diff --git a/companion/src/images/originals/classical icons/information.png b/companion/src/images/originals/classical icons/information.png new file mode 100644 index 000000000..76b6d5966 Binary files /dev/null and b/companion/src/images/originals/classical icons/information.png differ diff --git a/companion/src/images/originals/classical icons/library.png b/companion/src/images/originals/classical icons/library.png new file mode 100644 index 000000000..16bfde4b9 Binary files /dev/null and b/companion/src/images/originals/classical icons/library.png differ diff --git a/companion/src/images/originals/classical icons/list.png b/companion/src/images/originals/classical icons/list.png new file mode 100644 index 000000000..fd4db26dc Binary files /dev/null and b/companion/src/images/originals/classical icons/list.png differ diff --git a/companion/src/images/originals/classical icons/logs.png b/companion/src/images/originals/classical icons/logs.png new file mode 100644 index 000000000..8dc7ce194 Binary files /dev/null and b/companion/src/images/originals/classical icons/logs.png differ diff --git a/companion/src/images/originals/classical icons/movedown.png b/companion/src/images/originals/classical icons/movedown.png new file mode 100644 index 000000000..2632877c1 Binary files /dev/null and b/companion/src/images/originals/classical icons/movedown.png differ diff --git a/companion/src/images/originals/classical icons/moveup.png b/companion/src/images/originals/classical icons/moveup.png new file mode 100644 index 000000000..447f087cc Binary files /dev/null and b/companion/src/images/originals/classical icons/moveup.png differ diff --git a/companion/src/images/originals/classical icons/new.png b/companion/src/images/originals/classical icons/new.png new file mode 100644 index 000000000..12131b010 Binary files /dev/null and b/companion/src/images/originals/classical icons/new.png differ diff --git a/companion/src/images/originals/classical icons/open.png b/companion/src/images/originals/classical icons/open.png new file mode 100644 index 000000000..45fa2883a Binary files /dev/null and b/companion/src/images/originals/classical icons/open.png differ diff --git a/companion/src/images/originals/classical icons/paintbrush.png b/companion/src/images/originals/classical icons/paintbrush.png new file mode 100644 index 000000000..814fdb47e Binary files /dev/null and b/companion/src/images/originals/classical icons/paintbrush.png differ diff --git a/companion/src/images/originals/classical icons/paste.png b/companion/src/images/originals/classical icons/paste.png new file mode 100644 index 000000000..c14425cad Binary files /dev/null and b/companion/src/images/originals/classical icons/paste.png differ diff --git a/companion/src/images/play.png b/companion/src/images/originals/classical icons/play.png similarity index 100% rename from companion/src/images/play.png rename to companion/src/images/originals/classical icons/play.png diff --git a/companion/src/images/originals/classical icons/preferences.png b/companion/src/images/originals/classical icons/preferences.png new file mode 100644 index 000000000..1f6613e40 Binary files /dev/null and b/companion/src/images/originals/classical icons/preferences.png differ diff --git a/companion/src/images/originals/classical icons/print.png b/companion/src/images/originals/classical icons/print.png new file mode 100644 index 000000000..578980db7 Binary files /dev/null and b/companion/src/images/originals/classical icons/print.png differ diff --git a/companion/src/images/originals/classical icons/profiles.png b/companion/src/images/originals/classical icons/profiles.png new file mode 100644 index 000000000..bfa571cff Binary files /dev/null and b/companion/src/images/originals/classical icons/profiles.png differ diff --git a/companion/src/images/originals/classical icons/read_eeprom.png b/companion/src/images/originals/classical icons/read_eeprom.png new file mode 100644 index 000000000..08e861b31 Binary files /dev/null and b/companion/src/images/originals/classical icons/read_eeprom.png differ diff --git a/companion/src/images/originals/classical icons/read_eeprom_file.png b/companion/src/images/originals/classical icons/read_eeprom_file.png new file mode 100644 index 000000000..67a41176b Binary files /dev/null and b/companion/src/images/originals/classical icons/read_eeprom_file.png differ diff --git a/companion/src/images/originals/classical icons/read_flash.png b/companion/src/images/originals/classical icons/read_flash.png new file mode 100644 index 000000000..c9065819b Binary files /dev/null and b/companion/src/images/originals/classical icons/read_flash.png differ diff --git a/companion/src/images/originals/classical icons/recentdocument.png b/companion/src/images/originals/classical icons/recentdocument.png new file mode 100644 index 000000000..567494905 Binary files /dev/null and b/companion/src/images/originals/classical icons/recentdocument.png differ diff --git a/companion/src/images/originals/classical icons/save.png b/companion/src/images/originals/classical icons/save.png new file mode 100644 index 000000000..651b2a41f Binary files /dev/null and b/companion/src/images/originals/classical icons/save.png differ diff --git a/companion/src/images/originals/classical icons/saveas.png b/companion/src/images/originals/classical icons/saveas.png new file mode 100644 index 000000000..d5d3176b8 Binary files /dev/null and b/companion/src/images/originals/classical icons/saveas.png differ diff --git a/companion/src/images/originals/classical icons/simulate.png b/companion/src/images/originals/classical icons/simulate.png new file mode 100644 index 000000000..429e12b9a Binary files /dev/null and b/companion/src/images/originals/classical icons/simulate.png differ diff --git a/companion/src/images/stop.png b/companion/src/images/originals/classical icons/stop.png similarity index 100% rename from companion/src/images/stop.png rename to companion/src/images/originals/classical icons/stop.png diff --git a/companion/src/images/originals/classical icons/switch_dir.png b/companion/src/images/originals/classical icons/switch_dir.png new file mode 100644 index 000000000..a9ba5f47a Binary files /dev/null and b/companion/src/images/originals/classical icons/switch_dir.png differ diff --git a/companion/src/images/originals/classical icons/update.png b/companion/src/images/originals/classical icons/update.png new file mode 100644 index 000000000..034ee58e8 Binary files /dev/null and b/companion/src/images/originals/classical icons/update.png differ diff --git a/companion/src/images/originals/classical icons/wizard.png b/companion/src/images/originals/classical icons/wizard.png new file mode 100644 index 000000000..ccd964e1d Binary files /dev/null and b/companion/src/images/originals/classical icons/wizard.png differ diff --git a/companion/src/images/originals/classical icons/write_eeprom.png b/companion/src/images/originals/classical icons/write_eeprom.png new file mode 100644 index 000000000..15e58d0a3 Binary files /dev/null and b/companion/src/images/originals/classical icons/write_eeprom.png differ diff --git a/companion/src/images/originals/classical icons/write_eeprom_file.png b/companion/src/images/originals/classical icons/write_eeprom_file.png new file mode 100644 index 000000000..60d7c312e Binary files /dev/null and b/companion/src/images/originals/classical icons/write_eeprom_file.png differ diff --git a/companion/src/images/originals/classical icons/write_flash.png b/companion/src/images/originals/classical icons/write_flash.png new file mode 100644 index 000000000..1664cb228 Binary files /dev/null and b/companion/src/images/originals/classical icons/write_flash.png differ diff --git a/companion/src/images/originals/monochrome icons/paintbrush.png b/companion/src/images/originals/monochrome icons/paintbrush.png new file mode 100644 index 000000000..437655aee Binary files /dev/null and b/companion/src/images/originals/monochrome icons/paintbrush.png differ diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 948e2a8e7..4a5e0aa97 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -59,6 +59,7 @@ #include "burndialog.h" #include "hexinterface.h" #include "warnings.h" +#include "helpers.h" #include "firmwares/opentx/opentxinterface.h" // TODO get rid of this include #define DONATE_STR "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2" @@ -80,6 +81,7 @@ #include "mountlist.h" #endif + MainWindow::MainWindow(): downloadDialog_forWait(NULL) { @@ -95,6 +97,24 @@ downloadDialog_forWait(NULL) MaxRecentFiles=MAX_RECENT; QSettings settings("companion", "companion"); + int icon_size=settings.value("icon_size", 1).toInt(); + switch (icon_size) { + case 0: + ISize="16"; + break; + case 1: + ISize="24"; + break; + case 2: + ISize="32"; + break; + case 3: + ISize="48"; + break; + default: + ISize="24"; + break; + } restoreGeometry(settings.value("mainWindowGeometry").toByteArray()); createActions(); createMenus(); @@ -1060,14 +1080,18 @@ void MainWindow::burnFrom() QStringList str; str << path << tempFile; avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Read Models and Settings From Tx")); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); res = ad->exec(); sleep(1); } } else { QStringList str = GetReceiveEEpromCommand(tempFile); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Read Models and Settings From Tx")); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); res = ad->exec(); } if(QFileInfo(tempFile).exists() && res) { @@ -1117,14 +1141,18 @@ void MainWindow::burnExtenalToEEPROM() QStringList str; str << path << backupFile; avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Backup Models and Settings From Tx")); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); sleep(1); } } else { QStringList str = GetReceiveEEpromCommand(backupFile); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Backup Models and Settings From Tx")); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); sleep(1); } @@ -1134,7 +1162,9 @@ void MainWindow::burnExtenalToEEPROM() QString tempFlash = tempDir + "/flash.bin"; QStringList str = GetReceiveFlashCommand(tempFlash); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Read Firmware From Tx"); - ad->setWindowIcon(QIcon(":/images/read_flash.png")); + QIcon icon; + populate_icon(&icon,"read_flash.png"); + ad->setWindowIcon(icon); ad->exec(); sleep(1); QString restoreFile = tempDir + "/compat.bin"; @@ -1167,14 +1197,18 @@ void MainWindow::burnExtenalToEEPROM() QStringList str; str << path << backupFile; avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Backup Models and Settings From Tx")); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); sleep(1); } } else { QStringList str = ((MainWindow *)this->parent())->GetReceiveEEpromCommand(backupFile); avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, tr("Backup Models and Settings From Tx")); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); sleep(1); } @@ -1189,14 +1223,18 @@ void MainWindow::burnExtenalToEEPROM() QStringList str; str << fileName << path; avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Write Models and Settings To Tx")); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); sleep(1); } } else { QStringList str = GetSendEEpromCommand(fileName); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Write Models and Settings To Tx", AVR_DIALOG_SHOW_DONE); - ad->setWindowIcon(QIcon(":/images/write_eeprom.png")); + QIcon icon; + populate_icon(&icon,"write_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); } } @@ -1361,13 +1399,17 @@ void MainWindow::burnToFlash(QString fileToFlash) } QStringList str = GetReceiveEEpromCommand(backupFile); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Backup Models and Settings From Tx"), AVR_DIALOG_CLOSE_IF_SUCCESSFUL); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); int res = ad->exec(); if (QFileInfo(backupFile).exists() && res) { sleep(1); QStringList str = GetSendFlashCommand(fileName); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Write Firmware To Tx"), AVR_DIALOG_CLOSE_IF_SUCCESSFUL); - ad->setWindowIcon(QIcon(":/images/write_flash.png")); + QIcon iconw; + populate_icon(&iconw,"write_eeprom.png"); + ad->setWindowIcon(iconw); int res = ad->exec(); if (res) { QString restoreFile = tempDir + "/restore.bin"; @@ -1378,7 +1420,7 @@ void MainWindow::burnToFlash(QString fileToFlash) sleep(1); QStringList str = GetSendEEpromCommand(restoreFile); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Restore Models and Settings To Tx"), AVR_DIALOG_CLOSE_IF_SUCCESSFUL); - ad->setWindowIcon(QIcon(":/images/write_eeprom.png")); + ad->setWindowIcon(iconw); res=ad->exec(); if (!res) { QMessageBox::warning(this, tr("Restore failed"), tr("Could not restore Models and Settings to TX. The models and settings data file can be found at: %1").arg(backupFile)); @@ -1403,14 +1445,18 @@ void MainWindow::burnToFlash(QString fileToFlash) QString backupFile=backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin"; QStringList str = GetReceiveEEpromCommand(backupFile); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Backup Models and Settings From Tx")); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); sleep(1); } QStringList str = GetSendFlashCommand(fileName); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Write Firmware To Tx"), AVR_DIALOG_SHOW_DONE); - ad->setWindowIcon(QIcon(":/images/write_flash.png")); + QIcon iconw; + populate_icon(&iconw,"write_flash.png"); + ad->setWindowIcon(iconw); ad->exec(); } } @@ -1431,14 +1477,18 @@ void MainWindow::burnExtenalFromEEPROM() QStringList str; str << path << fileName; avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Read Models and Settings From Tx")); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); } } else { settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); QStringList str = GetReceiveEEpromCommand(fileName); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Read Models and Settings From Tx")); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon icon; + populate_icon(&icon,"read_eeprom.png"); + ad->setWindowIcon(icon); ad->exec(); } } @@ -1456,7 +1506,9 @@ void MainWindow::burnFromFlash() settings.setValue("lastFlashDir",QFileInfo(fileName).dir().absolutePath()); QStringList str = GetReceiveFlashCommand(fileName); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Read Firmware From Tx"); - ad->setWindowIcon(QIcon(":/images/read_flash.png")); + QIcon icon; + populate_icon(&icon,"read_flash.png"); + ad->setWindowIcon(icon); ad->exec(); } @@ -1596,137 +1648,191 @@ MdiChild *MainWindow::createMdiChild() void MainWindow::createActions() { - newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this); + QIcon newActIcon; + populate_icon(&newActIcon,"new.png"); + + newAct = new QAction(newActIcon, tr("&New"), this); newAct->setShortcuts(QKeySequence::New); newAct->setStatusTip(tr("Create a new file")); connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); - openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this); + QIcon openActIcon; + populate_icon(&openActIcon,"open.png"); + openAct = new QAction(openActIcon, tr("&Open..."), this); openAct->setShortcuts(QKeySequence::Open); openAct->setStatusTip(tr("Open an existing file")); connect(openAct, SIGNAL(triggered()), this, SLOT(openFile())); - loadbackupAct = new QAction(QIcon(":/images/open.png"), tr("&loadBackup..."), this); + loadbackupAct = new QAction(openActIcon, tr("&loadBackup..."), this); loadbackupAct->setStatusTip(tr("Load backup from file")); connect(loadbackupAct, SIGNAL(triggered()), this, SLOT(loadBackup())); - saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this); + QIcon saveActIcon; + populate_icon(&saveActIcon,"save.png"); + saveAct = new QAction(saveActIcon, tr("&Save"), this); saveAct->setShortcuts(QKeySequence::Save); saveAct->setStatusTip(tr("Save the document to disk")); connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); - saveAsAct = new QAction(QIcon(":/images/saveas.png"), tr("Save &As..."), this); + QIcon saveAsActIcon; + populate_icon(&saveAsActIcon,"saveas.png"); + saveAsAct = new QAction(saveAsActIcon, tr("Save &As..."), this); saveAsAct->setShortcuts(QKeySequence::SaveAs); saveAsAct->setStatusTip(tr("Save the document under a new name")); connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); - logsAct = new QAction(QIcon(":/images/logs.png"), tr("Lo&gs"), this); + QIcon logsActIcon; + populate_icon(&logsActIcon,"logs.png"); + logsAct = new QAction(logsActIcon, tr("Lo&gs"), this); logsAct->setShortcut(tr("Ctrl+G")); logsAct->setStatusTip(tr("Open log file")); connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile())); - preferencesAct = new QAction(QIcon(":/images/preferences.png"), tr("&Preferences..."), this); + QIcon preferencesActIcon; + populate_icon(&preferencesActIcon,"preferences.png"); + preferencesAct = new QAction(preferencesActIcon, tr("&Preferences..."), this); preferencesAct->setStatusTip(tr("Edit general preferences")); connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences())); - checkForUpdatesAct = new QAction(QIcon(":/images/update.png"), tr("&Check for updates..."), this); + QIcon checkForUpdatesActIcon; + populate_icon(&checkForUpdatesActIcon,"update.png"); + checkForUpdatesAct = new QAction(checkForUpdatesActIcon, tr("&Check for updates..."), this); checkForUpdatesAct->setStatusTip(tr("Check for new version of Companion")); connect(checkForUpdatesAct, SIGNAL(triggered()), this, SLOT(doUpdates())); - contributorsAct = new QAction(QIcon(":/images/contributors.png"), tr("Contributors &List..."), this); + QIcon contributorsActIcon; + populate_icon(&contributorsActIcon,"contributors.png"); + contributorsAct = new QAction(contributorsActIcon, tr("Contributors &List..."), this); contributorsAct->setStatusTip(tr("Show Companion contributors list")); connect(contributorsAct, SIGNAL(triggered()), this, SLOT(contributors())); - changelogAct = new QAction(QIcon(":/images/changelog.png"), tr("ChangeLog..."), this); + QIcon changelogActIcon; + populate_icon(&changelogActIcon,"changelog.png"); + changelogAct = new QAction(changelogActIcon, tr("ChangeLog..."), this); changelogAct->setStatusTip(tr("Show Companion changelog")); connect(changelogAct, SIGNAL(triggered()), this, SLOT(changelog())); - fwchangelogAct = new QAction(QIcon(":/images/changelog.png"), tr("Firmware ChangeLog..."), this); + QIcon fwchangelogActIcon; + populate_icon(&fwchangelogActIcon,"changelog.png"); + fwchangelogAct = new QAction(fwchangelogActIcon, tr("Firmware ChangeLog..."), this); fwchangelogAct->setStatusTip(tr("Show firmware changelog")); connect(fwchangelogAct, SIGNAL(triggered()), this, SLOT(fwchangelog())); - compareAct = new QAction(QIcon(":/images/compare.png"), tr("Compare..."), this); + QIcon compareActIcon; + populate_icon(&compareActIcon,"compare.png"); + compareAct = new QAction(compareActIcon, tr("Compare..."), this); compareAct->setStatusTip(tr("Compare models")); compareAct->setEnabled(false); connect(compareAct, SIGNAL(triggered()), this, SLOT(compare())); - customizeSplashAct = new QAction(QIcon(":/images/customize.png"), tr("Customize your &TX..."), this); + QIcon customizeSplashActIcon; + populate_icon(&customizeSplashActIcon,"customize.png"); + customizeSplashAct = new QAction(customizeSplashActIcon, tr("Customize your &TX..."), this); customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX")); connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash())); //! [0] - exitAct = new QAction(QIcon(":/images/exit.png"), tr("E&xit"), this); + QIcon exitActIcon; + populate_icon(&exitActIcon,"exit.png"); + exitAct = new QAction(exitActIcon, tr("E&xit"), this); exitAct->setShortcuts(QKeySequence::Quit); exitAct->setStatusTip(tr("Exit the application")); connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows())); //! [0] - cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this); + QIcon cutActIcon; + populate_icon(&cutActIcon,"cut.png"); + cutAct = new QAction(cutActIcon, tr("Cu&t"), this); cutAct->setShortcuts(QKeySequence::Cut); cutAct->setStatusTip(tr("Cut the current selection's contents to the " "clipboard")); connect(cutAct, SIGNAL(triggered()), this, SLOT(cut())); - copyAct = new QAction(QIcon(":/images/copy.png"), tr("&Copy"), this); + QIcon copyActIcon; + populate_icon(©ActIcon,"copy.png"); + copyAct = new QAction(copyActIcon, tr("&Copy"), this); copyAct->setShortcuts(QKeySequence::Copy); copyAct->setStatusTip(tr("Copy the current selection's contents to the " "clipboard")); connect(copyAct, SIGNAL(triggered()), this, SLOT(copy())); - pasteAct = new QAction(QIcon(":/images/paste.png"), tr("&Paste"), this); + QIcon pasteActIcon; + populate_icon(&pasteActIcon,"paste.png"); + pasteAct = new QAction(pasteActIcon, tr("&Paste"), this); pasteAct->setShortcuts(QKeySequence::Paste); pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " "selection")); connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste())); - - burnToAct = new QAction(QIcon(":/images/write_eeprom.png"), tr("&Write Models and Settings To Tx"), this); + QIcon burnToActIcon; + populate_icon(&burnToActIcon,"write_eeprom.png"); + burnToAct = new QAction(burnToActIcon, tr("&Write Models and Settings To Tx"), this); burnToAct->setShortcut(tr("Ctrl+Alt+W")); burnToAct->setStatusTip(tr("Write Models and Settings to transmitter")); connect(burnToAct,SIGNAL(triggered()),this,SLOT(burnTo())); - burnFromAct = new QAction(QIcon(":/images/read_eeprom.png"), tr("&Read Models and Settings From Tx"), this); + QIcon burnFromActIcon; + populate_icon(&burnFromActIcon,"read_eeprom.png"); + burnFromAct = new QAction(burnFromActIcon, tr("&Read Models and Settings From Tx"), this); burnFromAct->setShortcut(tr("Ctrl+Alt+R")); burnFromAct->setStatusTip(tr("Read Models and Settings from transmitter")); connect(burnFromAct,SIGNAL(triggered()),this,SLOT(burnFrom())); - burnToFlashAct = new QAction(QIcon(":/images/write_flash.png"), tr("Write Firmware"), this); + QIcon burnToFlashActIcon; + populate_icon(&burnToFlashActIcon,"write_flash.png"); + burnToFlashAct = new QAction(burnToFlashActIcon, tr("Write Firmware"), this); burnToFlashAct->setStatusTip(tr("Write firmware to transmitter")); connect(burnToFlashAct,SIGNAL(triggered()),this,SLOT(burnToFlash())); - burnExtenalToEEPROMAct = new QAction(QIcon(":/images/write_eeprom_file.png"), tr("Write Models and Settings from file to Tx"), this); + QIcon burnExtenalToEEPROMActIcon; + populate_icon(&burnExtenalToEEPROMActIcon,"write_eeprom_file.png"); + burnExtenalToEEPROMAct = new QAction(burnExtenalToEEPROMActIcon, tr("Write Models and Settings from file to Tx"), this); burnExtenalToEEPROMAct->setStatusTip(tr("Write Models and Settings from file to transmitter")); connect(burnExtenalToEEPROMAct,SIGNAL(triggered()),this,SLOT(burnExtenalToEEPROM())); - burnExtenalFromEEPROMAct = new QAction(QIcon(":/images/read_eeprom_file.png"), tr("Save transmitter Models and Settings to file"), this); + QIcon burnExtenalFromEEPROMActIcon; + populate_icon(&burnExtenalFromEEPROMActIcon,"read_eeprom_file.png"); + burnExtenalFromEEPROMAct = new QAction(burnExtenalFromEEPROMActIcon, tr("Save transmitter Models and Settings to file"), this); burnExtenalFromEEPROMAct->setStatusTip(tr("Save the Models and Settings from the transmitter to a file")); connect(burnExtenalFromEEPROMAct,SIGNAL(triggered()),this,SLOT(burnExtenalFromEEPROM())); - burnFromFlashAct = new QAction(QIcon(":/images/read_flash.png"), tr("Read Firmware"), this); + QIcon burnFromFlashActIcon; + populate_icon(&burnFromFlashActIcon,"read_flash.png"); + burnFromFlashAct = new QAction(burnFromFlashActIcon, tr("Read Firmware"), this); burnFromFlashAct->setStatusTip(tr("Read firmware from transmitter")); connect(burnFromFlashAct,SIGNAL(triggered()),this,SLOT(burnFromFlash())); - burnConfigAct = new QAction(QIcon(":/images/configure.png"), tr("&Configure..."), this); + QIcon burnConfigActIcon; + populate_icon(&burnConfigActIcon,"configure.png"); + burnConfigAct = new QAction(burnConfigActIcon, tr("&Configure..."), this); burnConfigAct->setStatusTip(tr("Configure software for reading from and writing to the transmitter")); connect(burnConfigAct,SIGNAL(triggered()),this,SLOT(burnConfig())); EEPROMInterface *eepromInterface = GetEepromInterface(); if (!IS_ARM(eepromInterface->getBoard())) { - burnListAct = new QAction(QIcon(":/images/list.png"), tr("&List programmers"), this); + QIcon burnListActIcon; + populate_icon(&burnListActIcon,"list.png"); + burnListAct = new QAction(burnListActIcon, tr("&List programmers"), this); burnListAct->setStatusTip(tr("List available programmers")); connect(burnListAct,SIGNAL(triggered()),this,SLOT(burnList())); - burnFusesAct = new QAction(QIcon(":/images/fuses.png"), tr("&Fuses..."), this); + QIcon burnFusesActIcon; + populate_icon(&burnFusesActIcon,"fuses.png"); + burnFusesAct = new QAction(burnFusesActIcon, tr("&Fuses..."), this); burnFusesAct->setStatusTip(tr("Show fuses dialog")); connect(burnFusesAct,SIGNAL(triggered()),this,SLOT(burnFuses())); } - simulateAct = new QAction(QIcon(":/images/simulate.png"), tr("&Simulate"), this); + QIcon simulateActIcon; + populate_icon(&simulateActIcon,"simulate.png"); + simulateAct = new QAction(simulateActIcon, tr("&Simulate"), this); simulateAct->setShortcut(tr("Alt+S")); simulateAct->setStatusTip(tr("Simulate selected model.")); simulateAct->setEnabled(false); connect(simulateAct,SIGNAL(triggered()),this,SLOT(simulate())); - printAct = new QAction(QIcon(":/images/print.png"), tr("&Print"), this); + QIcon printActIcon; + populate_icon(&printActIcon,"print.png"); + printAct = new QAction(printActIcon, tr("&Print"), this); printAct->setShortcut(tr("Ctrl+P")); printAct->setStatusTip(tr("Print current model.")); printAct->setEnabled(false); @@ -1766,11 +1872,15 @@ void MainWindow::createActions() separatorAct = new QAction(this); separatorAct->setSeparator(true); - aboutAct = new QAction(QIcon(":/images/information.png"), tr("&About"), this); + QIcon aboutActIcon; + populate_icon(&aboutActIcon,"information.png"); + aboutAct = new QAction(aboutActIcon, tr("&About"), this); aboutAct->setStatusTip(tr("Show the application's About box")); connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); - switchLayoutDirectionAct = new QAction(QIcon(":/images/switch_dir.png"), tr("Switch layout direction"), this); + QIcon switchLayoutDirectionActIcon; + populate_icon(&switchLayoutDirectionActIcon,"switch_dir.png"); + switchLayoutDirectionAct = new QAction(switchLayoutDirectionActIcon, tr("Switch layout direction"), this); switchLayoutDirectionAct->setStatusTip(tr("Switch layout Left/Right")); connect(switchLayoutDirectionAct, SIGNAL(triggered()), this, SLOT(switchLayoutDirection())); for (int i = 0; i < MaxRecentFiles; ++i) { @@ -1800,7 +1910,9 @@ void MainWindow::createMenus() fileMenu->addAction(saveAct); fileMenu->addAction(saveAsAct); fileMenu->addMenu(recentFileMenu); - recentFileMenu->setIcon(QIcon(":/images/recentdocument.png")); + QIcon recentFileMenuIcon; + populate_icon(&recentFileMenuIcon,"recentdocument.png"); + recentFileMenu->setIcon(recentFileMenuIcon); for ( int i = 0; i < MaxRecentFiles; ++i) recentFileMenu->addAction(recentFileActs[i]); fileMenu->addSeparator(); @@ -1813,7 +1925,9 @@ void MainWindow::createMenus() fileMenu->addAction(preferencesAct); fileMenu->addMenu(profilesMenu); - profilesMenu->setIcon(QIcon(":/images/profiles.png")); + QIcon profilesMenuIcon; + populate_icon(&profilesMenuIcon,"profiles.png"); + profilesMenu->setIcon(profilesMenuIcon); for ( int i = 0; i < MAX_PROFILES; ++i) profilesMenu->addAction(profileActs[i]); fileMenu->addAction(switchLayoutDirectionAct); @@ -1878,14 +1992,34 @@ QMenu *MainWindow::createProfilesMenu() void MainWindow::createToolBars() { + QSettings settings("companion", "companion"); + int icon_size=settings.value("icon_size",2 ).toInt(); + QSize size; + switch(icon_size) { + case 0: + size=QSize(16,16); + break; + case 1: + size=QSize(24,24); + break; + case 3: + size=QSize(48,48); + break; + default: + size=QSize(32,32); + break; + } fileToolBar = addToolBar(tr("File")); + fileToolBar->setIconSize(size); fileToolBar->setObjectName("File"); fileToolBar->addAction(newAct); fileToolBar->addAction(openAct); QToolButton * recentToolButton = new QToolButton; recentToolButton->setPopupMode(QToolButton::InstantPopup); recentToolButton->setMenu(createRecentFileMenu()); - recentToolButton->setIcon(QIcon(":/images/recentdocument.png")); + QIcon recentToolButtonIcon; + populate_icon(&recentToolButtonIcon,"recentdocument.png"); + recentToolButton->setIcon(recentToolButtonIcon); recentToolButton->setToolTip(tr("Recent Files")); fileToolBar->addWidget(recentToolButton); fileToolBar->addAction(saveAct); @@ -1895,11 +2029,12 @@ void MainWindow::createToolBars() profileButton = new QToolButton; profileButton->setPopupMode(QToolButton::InstantPopup); profileButton->setMenu(createProfilesMenu()); - profileButton->setIcon(QIcon(":/images/profiles.png")); + QIcon profileButtonIcon; + populate_icon(&profileButtonIcon,"profiles.png"); + profileButton->setIcon(profileButtonIcon); profileButton->setToolTip(tr("Firmware Profiles")); fileToolBar->addWidget(profileButton); bool notfound=true; - QSettings settings("companion", "companion"); settings.beginGroup("Profiles"); for (int i=0; iaddAction(compareAct); editToolBar = addToolBar(tr("Edit")); + editToolBar->setIconSize(size); editToolBar->setObjectName("Edit"); editToolBar->addAction(cutAct); editToolBar->addAction(copyAct); @@ -1925,6 +2061,7 @@ void MainWindow::createToolBars() burnToolBar = new QToolBar(tr("Write")); addToolBar( Qt::LeftToolBarArea, burnToolBar ); + burnToolBar->setIconSize(size); burnToolBar->setObjectName("Write"); burnToolBar->addAction(burnToAct); burnToolBar->addAction(burnFromAct); @@ -1938,6 +2075,7 @@ void MainWindow::createToolBars() burnToolBar->addAction(burnConfigAct); helpToolBar = addToolBar(tr("Help")); + helpToolBar->setIconSize(size); helpToolBar->setObjectName("Help"); helpToolBar->addAction(checkForUpdatesAct); helpToolBar->addAction(aboutAct); diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index 300bac507..de5b1083f 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -138,6 +138,8 @@ private: void updateProfilesActions(); int getFileType(const QString &fullFileName); QString FindTaranisPath(); + QString Theme; + QString ISize; QString strippedName(const QString &fullFileName); MdiChild *activeMdiChild(); diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index e9049bd1f..c3b5b2468 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -68,8 +68,11 @@ MdiChild::MdiChild(): isUntitled(true), fileChanged(false) { - ui->setupUi(this); + QIcon SimulateIcon; + populate_icon(&SimulateIcon,"simulate.png"); + ui->setupUi(this); + ui->SimulateTxButton->setIcon(SimulateIcon); setAttribute(Qt::WA_DeleteOnClose); eepromInterfaceChanged(); @@ -553,14 +556,18 @@ void MdiChild::burnTo() // write to Tx QStringList str; str << path << backupFile; avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Backup EEPROM From Tx")); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon Icon; + populate_icon(&Icon,"read_eeprom.png"); + ad->setWindowIcon(Icon); ad->exec(); sleep(1); } } else { QStringList str = ((MainWindow *)this->parent())->GetReceiveEEpromCommand(backupFile); avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, tr("Backup EEPROM From Tx")); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon Icon; + populate_icon(&Icon,"read_eeprom.png"); + ad->setWindowIcon(Icon); ad->exec(); sleep(1); } @@ -569,7 +576,9 @@ void MdiChild::burnTo() // write to Tx QString tempFlash=tempDir + "/flash.bin"; QStringList str = ((MainWindow *)this->parent())->GetReceiveFlashCommand(tempFlash); avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, "Read Flash From Tx"); - ad->setWindowIcon(QIcon(":/images/read_flash.png")); + QIcon Icon; + populate_icon(&Icon,"read_flash.png"); + ad->setWindowIcon(Icon); ad->exec(); sleep(1); QString restoreFile = tempDir + "/compat.bin"; @@ -605,7 +614,9 @@ void MdiChild::burnTo() // write to Tx } else { QStringList str = ((MainWindow *)this->parent())->GetReceiveEEpromCommand(backupFile); avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, tr("Backup EEPROM From Tx")); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon Icon; + populate_icon(&Icon,"read_eeprom.png"); + ad->setWindowIcon(Icon); ad->exec(); sleep(1); } @@ -620,14 +631,18 @@ void MdiChild::burnTo() // write to Tx QStringList str; str << tempFile << path; avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Write EEPROM To Tx"), AVR_DIALOG_SHOW_DONE); //, AVR_DIALOG_KEEP_OPEN); - ad->setWindowIcon(QIcon(":/images/read_eeprom.png")); + QIcon Icon; + populate_icon(&Icon,"read_eeprom.png"); + ad->setWindowIcon(Icon); ad->show(); sleep(1); } } else { QStringList str = ((MainWindow *)this->parent())->GetSendEEpromCommand(tempFile); avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, "Write EEPROM To Tx", AVR_DIALOG_SHOW_DONE); - ad->setWindowIcon(QIcon(":/images/write_eeprom.png")); + QIcon Icon; + populate_icon(&Icon,"write_eeprom.png"); + ad->setWindowIcon(Icon); ad->show(); } } diff --git a/companion/src/mdichild.ui b/companion/src/mdichild.ui index d32b3cffb..b2fb21e2f 100644 --- a/companion/src/mdichild.ui +++ b/companion/src/mdichild.ui @@ -13,6 +13,10 @@ + + + :/icon.png:/icon.png + @@ -22,10 +26,6 @@ Simulate Tx - - - :/images/simulate.png:/images/simulate.png - diff --git a/companion/src/modelconfigdialog.ui b/companion/src/modelconfigdialog.ui index ea119cabc..f9c7abba6 100644 --- a/companion/src/modelconfigdialog.ui +++ b/companion/src/modelconfigdialog.ui @@ -27,7 +27,7 @@ - :/images/configure.png:/images/configure.png + :/icon.png:/icon.png diff --git a/companion/src/modeledit/curves.cpp b/companion/src/modeledit/curves.cpp index 2e52c54ea..428435928 100644 --- a/companion/src/modeledit/curves.cpp +++ b/companion/src/modeledit/curves.cpp @@ -2,6 +2,7 @@ #include "ui_curves.h" #include "node.h" #include "edge.h" +#include "helpers.h" #include #include #include @@ -83,9 +84,8 @@ Curves::Curves(QWidget * parent, ModelData & model): QGraphicsScene *scene = new QGraphicsScene(ui->curvePreview); scene->setItemIndexMethod(QGraphicsScene::NoIndex); ui->curvePreview->setScene(scene); - - QIcon clearIcon; - clearIcon.addFile(":/images/clear.png", QSize(), QIcon::Normal, QIcon::Off); + QIcon ClearIcon; + populate_icon(&ClearIcon,"clear.png"); for (int i=0; igetCapability(NumCurves); i++) { visibleCurves[i] = false; @@ -94,7 +94,7 @@ Curves::Curves(QWidget * parent, ModelData & model): QPushButton * reset = new QPushButton(this); reset->setProperty("index", i); reset->setMinimumSize(QSize(0, 0)); - reset->setIcon(clearIcon); + reset->setIcon(ClearIcon); reset->setIconSize(QSize(14, 14)); connect(reset, SIGNAL(clicked()), this, SLOT(resetCurve())); ui->curvesLayout->addWidget(reset, i, 0, 1, 1); diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index e6c883ee6..23e6a1e28 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -36,7 +36,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, } } - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString path = settings.value("sdPath", ".").toString(); path.append("/SOUNDS/"); QString lang = generalSettings.ttsLanguage; @@ -123,9 +123,11 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited())); #ifdef PHONON + QIcon PlayIcon; + populate_icon(&PlayIcon,"play.png"); playBT[i] = new QPushButton(this); playBT[i]->setObjectName(QString("play_%1").arg(i)); - playBT[i]->setIcon(QIcon(":/images/play.png")); + playBT[i]->setIcon(PlayIcon); paramLayout->addWidget(playBT[i]); connect(playBT[i], SIGNAL(pressed()), this, SLOT(playMusic())); #endif @@ -160,6 +162,9 @@ void CustomFunctionsPanel::mediaPlayer_state(Phonon::State newState, Phonon::Sta { if (phononLock) return; + QIcon PlayIcon; + populate_icon(&PlayIcon,"play.png"); + phononLock=true; if ((newState==Phonon::StoppedState || newState==Phonon::PausedState) && oldState==Phonon::PlayingState) { clickObject->stop(); @@ -167,7 +172,7 @@ void CustomFunctionsPanel::mediaPlayer_state(Phonon::State newState, Phonon::Sta clickObject->clear(); for (int i=0; igetCapability(CustomFunctions); i++) { playBT[i]->setObjectName(QString("play_%1").arg(i)); - playBT[i]->setIcon(QIcon(":/images/play.png")); + playBT[i]->setIcon(PlayIcon); } } if (newState==Phonon::ErrorState) { @@ -176,7 +181,7 @@ void CustomFunctionsPanel::mediaPlayer_state(Phonon::State newState, Phonon::Sta clickObject->clear(); for (int i=0; igetCapability(CustomFunctions); i++) { playBT[i]->setObjectName(QString("play_%1").arg(i)); - playBT[i]->setIcon(QIcon(":/images/play.png")); + playBT[i]->setIcon(PlayIcon); } } @@ -189,7 +194,12 @@ void CustomFunctionsPanel::playMusic() QPushButton *playButton = qobject_cast(sender()); int index=playButton->objectName().mid(5,2).toInt(); QString function=playButton->objectName().left(4); - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); + QIcon PlayIcon; + populate_icon(&PlayIcon,"play.png"); + QIcon StopIcon; + populate_icon(&StopIcon,"stop.png"); + QString path=settings.value("sdPath", ".").toString(); QDir qd(path); QString track; @@ -217,12 +227,12 @@ void CustomFunctionsPanel::playMusic() clickObject->setCurrentSource(Phonon::MediaSource(track)); clickObject->play(); playBT[index]->setObjectName(QString("stop_%1").arg(index)); - playBT[index]->setIcon(QIcon(":/images/stop.png")); + playBT[index]->setIcon(StopIcon); } else { clickObject->stop(); clickObject->clear(); playBT[index]->setObjectName(QString("play_%1").arg(index)); - playBT[index]->setIcon(QIcon(":/images/play.png")); + playBT[index]->setIcon(PlayIcon); } #endif } @@ -457,6 +467,14 @@ void CustomFunctionsPanel::fsw_customContextMenuRequested(QPoint pos) { QLabel *label = (QLabel *)sender(); selectedFunction = label->property("index").toInt(); + QIcon ClearIcon; + populate_icon(&ClearIcon,"clear.png"); + QIcon CopyIcon; + populate_icon(&CopyIcon,"copy.png"); + QIcon CutIcon; + populate_icon(&CutIcon,"cut.png"); + QIcon PasteIcon; + populate_icon(&PasteIcon,"paste.png"); QPoint globalPos = label->mapToGlobal(pos); @@ -465,10 +483,10 @@ void CustomFunctionsPanel::fsw_customContextMenuRequested(QPoint pos) bool hasData = mimeData->hasFormat("application/x-companion9x-fsw"); QMenu contextMenu; - contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(fswDelete()),tr("Delete")); - contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(fswCopy()),tr("Ctrl+C")); - contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(fswCut()),tr("Ctrl+X")); - contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(fswPaste()),tr("Ctrl+V"))->setEnabled(hasData); + contextMenu.addAction(ClearIcon, tr("&Delete"),this,SLOT(fswDelete()),tr("Delete")); + contextMenu.addAction(CopyIcon, tr("&Copy"),this,SLOT(fswCopy()),tr("Ctrl+C")); + contextMenu.addAction(CutIcon, tr("&Cut"),this,SLOT(fswCut()),tr("Ctrl+X")); + contextMenu.addAction(PasteIcon, tr("&Paste"),this,SLOT(fswPaste()),tr("Ctrl+V"))->setEnabled(hasData); contextMenu.exec(globalPos); } diff --git a/companion/src/modeledit/customswitches.cpp b/companion/src/modeledit/customswitches.cpp index 8270689b6..852ae8410 100644 --- a/companion/src/modeledit/customswitches.cpp +++ b/companion/src/modeledit/customswitches.cpp @@ -382,6 +382,14 @@ void CustomSwitchesPanel::csw_customContextMenuRequested(QPoint pos) { QLabel *label = (QLabel *)sender(); selectedSwitch = label->property("index").toInt(); + QIcon ClearIcon; + populate_icon(&ClearIcon,"clear.png"); + QIcon CopyIcon; + populate_icon(&CopyIcon,"copy.png"); + QIcon CutIcon; + populate_icon(&CutIcon,"cut.png"); + QIcon PasteIcon; + populate_icon(&PasteIcon,"paste.png"); QPoint globalPos = label->mapToGlobal(pos); @@ -390,10 +398,10 @@ void CustomSwitchesPanel::csw_customContextMenuRequested(QPoint pos) bool hasData = mimeData->hasFormat("application/x-companion9x-csw"); QMenu contextMenu; - contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(cswDelete()),tr("Delete")); - contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(cswCopy()),tr("Ctrl+C")); - contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(cswCut()),tr("Ctrl+X")); - contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(cswPaste()),tr("Ctrl+V"))->setEnabled(hasData); + contextMenu.addAction(ClearIcon, tr("&Delete"),this,SLOT(cswDelete()),tr("Delete")); + contextMenu.addAction(CopyIcon, tr("&Copy"),this,SLOT(cswCopy()),tr("Ctrl+C")); + contextMenu.addAction(CutIcon, tr("&Cut"),this,SLOT(cswCut()),tr("Ctrl+X")); + contextMenu.addAction(PasteIcon, tr("&Paste"),this,SLOT(cswPaste()),tr("Ctrl+V"))->setEnabled(hasData); contextMenu.exec(globalPos); } diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp index 015080f76..efab606b9 100644 --- a/companion/src/modeledit/inputs.cpp +++ b/companion/src/modeledit/inputs.cpp @@ -8,21 +8,28 @@ InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & g generalSettings(generalSettings), expoInserted(false) { + QString Theme=getTheme(); + QGridLayout * exposLayout = new QGridLayout(this); ExposlistWidget = new MixersList(this, true); QPushButton * qbUp = new QPushButton(this); QPushButton * qbDown = new QPushButton(this); QPushButton * qbClear = new QPushButton(this); - + QIcon qbUpIcon; + populate_icon(&qbUpIcon,"moveup.png"); qbUp->setText(tr("Move Up")); - qbUp->setIcon(QIcon(":/images/moveup.png")); + qbUp->setIcon(qbUpIcon); qbUp->setShortcut(QKeySequence(tr("Ctrl+Up"))); + QIcon qbDownIcon; + populate_icon(&qbDownIcon,"movedown.png"); qbDown->setText(tr("Move Down")); - qbDown->setIcon(QIcon(":/images/movedown.png")); + qbDown->setIcon(qbDownIcon); qbDown->setShortcut(QKeySequence(tr("Ctrl+Down"))); + QIcon qbClearIcon; + populate_icon(&qbClearIcon,"clear.png"); qbClear->setText(tr("Clear Expo Settings")); - qbClear->setIcon(QIcon(":/images/clear.png")); + qbClear->setIcon(qbClearIcon); exposLayout->addWidget(ExposlistWidget,1,1,1,3); exposLayout->addWidget(qbUp,2,1); @@ -341,6 +348,24 @@ void InputsPanel::expoAdd() void InputsPanel::expolistWidget_customContextMenuRequested(QPoint pos) { + QIcon AddIcon; + populate_icon(&AddIcon,"add.png"); + QIcon EditIcon; + populate_icon(&EditIcon,"edit.png"); + QIcon ClearIcon; + populate_icon(&ClearIcon,"clear.png"); + QIcon CopyIcon; + populate_icon(&CopyIcon,"copy.png"); + QIcon CutIcon; + populate_icon(&CutIcon,"cut.png"); + QIcon PasteIcon; + populate_icon(&PasteIcon,"paste.png"); + QIcon DuplicateIcon; + populate_icon(&DuplicateIcon,"duplicate.png"); + QIcon MoveUpIcon; + populate_icon(&MoveUpIcon,"moveup.png"); + QIcon MoveDownIcon; + populate_icon(&MoveDownIcon,"movedown.png"); QPoint globalPos = ExposlistWidget->mapToGlobal(pos); const QClipboard *clipboard = QApplication::clipboard(); @@ -348,17 +373,17 @@ void InputsPanel::expolistWidget_customContextMenuRequested(QPoint pos) bool hasData = mimeData->hasFormat("application/x-companion9x-expo"); QMenu contextMenu; - contextMenu.addAction(QIcon(":/images/add.png"), tr("&Add"),this,SLOT(expoAdd()),tr("Ctrl+A")); - contextMenu.addAction(QIcon(":/images/edit.png"), tr("&Edit"),this,SLOT(expoOpen()),tr("Enter")); + contextMenu.addAction(AddIcon, tr("&Add"),this,SLOT(expoAdd()),tr("Ctrl+A")); + contextMenu.addAction(EditIcon, tr("&Edit"),this,SLOT(expoOpen()),tr("Enter")); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(exposDelete()),tr("Delete")); - contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(exposCopy()),tr("Ctrl+C")); - contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(exposCut()),tr("Ctrl+X")); - contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(exposPaste()),tr("Ctrl+V"))->setEnabled(hasData); - contextMenu.addAction(QIcon(":/images/duplicate.png"), tr("Du&plicate"),this,SLOT(exposDuplicate()),tr("Ctrl+U")); + contextMenu.addAction(ClearIcon, tr("&Delete"),this,SLOT(exposDelete()),tr("Delete")); + contextMenu.addAction(CopyIcon, tr("&Copy"),this,SLOT(exposCopy()),tr("Ctrl+C")); + contextMenu.addAction(CutIcon, tr("&Cut"),this,SLOT(exposCut()),tr("Ctrl+X")); + contextMenu.addAction(PasteIcon, tr("&Paste"),this,SLOT(exposPaste()),tr("Ctrl+V"))->setEnabled(hasData); + contextMenu.addAction(DuplicateIcon, tr("Du&plicate"),this,SLOT(exposDuplicate()),tr("Ctrl+U")); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/moveup.png"), tr("Move Up"),this,SLOT(moveExpoUp()),tr("Ctrl+Up")); - contextMenu.addAction(QIcon(":/images/movedown.png"), tr("Move Down"),this,SLOT(moveExpoDown()),tr("Ctrl+Down")); + contextMenu.addAction(MoveUpIcon, tr("Move Up"),this,SLOT(moveExpoUp()),tr("Ctrl+Up")); + contextMenu.addAction(MoveDownIcon, tr("Move Down"),this,SLOT(moveExpoDown()),tr("Ctrl+Down")); contextMenu.exec(globalPos); } diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp index 63a4bcb9c..4defde10f 100644 --- a/companion/src/modeledit/mixes.cpp +++ b/companion/src/modeledit/mixes.cpp @@ -14,15 +14,20 @@ MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & gen QPushButton * qbUp = new QPushButton(this); QPushButton * qbDown = new QPushButton(this); QPushButton * qbClear = new QPushButton(this); - + QIcon qbUpIcon; + populate_icon(&qbUpIcon,"moveup.png"); qbUp->setText(tr("Move Up")); - qbUp->setIcon(QIcon(":/images/moveup.png")); + qbUp->setIcon(qbUpIcon); qbUp->setShortcut(QKeySequence(tr("Ctrl+Up"))); + QIcon qbDownIcon; + populate_icon(&qbDownIcon,"movedown.png"); qbDown->setText(tr("Move Down")); - qbDown->setIcon(QIcon(":/images/movedown.png")); + qbDown->setIcon(qbDownIcon); qbDown->setShortcut(QKeySequence(tr("Ctrl+Down"))); + QIcon qbClearIcon; + populate_icon(&qbClearIcon,"clear.png"); qbClear->setText(tr("Clear Mixes")); - qbClear->setIcon(QIcon(":/images/clear.png")); + qbClear->setIcon(qbClearIcon); mixesLayout->addWidget(MixerlistWidget,1,1,1,3); mixesLayout->addWidget(qbUp,2,1); @@ -406,6 +411,24 @@ void MixesPanel::mixerAdd() void MixesPanel::mixerlistWidget_customContextMenuRequested(QPoint pos) { + QIcon AddIcon; + populate_icon(&AddIcon,"add.png"); + QIcon EditIcon; + populate_icon(&EditIcon,"edit.png"); + QIcon ClearIcon; + populate_icon(&ClearIcon,"clear.png"); + QIcon CopyIcon; + populate_icon(&CopyIcon,"copy.png"); + QIcon CutIcon; + populate_icon(&CutIcon,"cut.png"); + QIcon PasteIcon; + populate_icon(&PasteIcon,"paste.png"); + QIcon DuplicateIcon; + populate_icon(&DuplicateIcon,"duplicate.png"); + QIcon MoveUpIcon; + populate_icon(&MoveUpIcon,"moveup.png"); + QIcon MoveDownIcon; + populate_icon(&MoveDownIcon,"movedown.png"); QPoint globalPos = MixerlistWidget->mapToGlobal(pos); const QClipboard *clipboard = QApplication::clipboard(); @@ -413,17 +436,17 @@ void MixesPanel::mixerlistWidget_customContextMenuRequested(QPoint pos) bool hasData = mimeData->hasFormat("application/x-companion9x-mix"); QMenu contextMenu; - contextMenu.addAction(QIcon(":/images/add.png"), tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A")); - contextMenu.addAction(QIcon(":/images/edit.png"), tr("&Edit"),this,SLOT(mixerOpen()),tr("Enter")); + contextMenu.addAction(AddIcon, tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A")); + contextMenu.addAction(EditIcon, tr("&Edit"),this,SLOT(mixerOpen()),tr("Enter")); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(mixersDelete()),tr("Delete")); - contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(mixersCopy()),tr("Ctrl+C")); - contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(mixersCut()),tr("Ctrl+X")); - contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(mixersPaste()),tr("Ctrl+V"))->setEnabled(hasData); - contextMenu.addAction(QIcon(":/images/duplicate.png"), tr("Du&plicate"),this,SLOT(mixersDuplicate()),tr("Ctrl+U")); + contextMenu.addAction(ClearIcon, tr("&Delete"),this,SLOT(mixersDelete()),tr("Delete")); + contextMenu.addAction(CopyIcon, tr("&Copy"),this,SLOT(mixersCopy()),tr("Ctrl+C")); + contextMenu.addAction(CutIcon, tr("&Cut"),this,SLOT(mixersCut()),tr("Ctrl+X")); + contextMenu.addAction(PasteIcon, tr("&Paste"),this,SLOT(mixersPaste()),tr("Ctrl+V"))->setEnabled(hasData); + contextMenu.addAction(DuplicateIcon, tr("Du&plicate"),this,SLOT(mixersDuplicate()),tr("Ctrl+U")); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/moveup.png"), tr("Move Up"),this,SLOT(moveMixUp()),tr("Ctrl+Up")); - contextMenu.addAction(QIcon(":/images/movedown.png"), tr("Move Down"),this,SLOT(moveMixDown()),tr("Ctrl+Down")); + contextMenu.addAction(MoveUpIcon, tr("Move Up"),this,SLOT(moveMixUp()),tr("Ctrl+Up")); + contextMenu.addAction(MoveDownIcon, tr("Move Down"),this,SLOT(moveMixDown()),tr("Ctrl+Down")); contextMenu.exec(globalPos); } diff --git a/companion/src/modeledit/modeledit.cpp b/companion/src/modeledit/modeledit.cpp index 169b32378..34016edf3 100644 --- a/companion/src/modeledit/modeledit.cpp +++ b/companion/src/modeledit/modeledit.cpp @@ -7,6 +7,7 @@ #include "mixes.h" #include "channels.h" #include "curves.h" +#include "../helpers.h" #include "customswitches.h" #include "customfunctions.h" #include "telemetry.h" @@ -22,6 +23,9 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i ui->setupUi(this); QSettings settings("companion", "companion"); restoreGeometry(settings.value("modelEditGeometry").toByteArray()); + QIcon SimulateIcon; + populate_icon(&SimulateIcon,"simulate.png"); + ui->pushButton->setIcon(SimulateIcon); addTab(new Setup(this, model), tr("Setup")); addTab(new HeliPanel(this, model), tr("Heli")); addTab(new FlightModes(this, model, radioData.generalSettings), tr("Flight Modes")); diff --git a/companion/src/modeledit/modeledit.ui b/companion/src/modeledit/modeledit.ui index a4ac2fa1e..9002e383b 100644 --- a/companion/src/modeledit/modeledit.ui +++ b/companion/src/modeledit/modeledit.ui @@ -20,7 +20,7 @@ Dialog - + :/icon.png:/icon.png @@ -50,10 +50,6 @@ Simulate - - - :/images/simulate.png:/images/simulate.png - @@ -61,7 +57,7 @@ - + diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index 0302d367e..1d67137d1 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -353,7 +353,7 @@ Setup::Setup(QWidget *parent, ModelData & model): if (GetEepromInterface()->getCapability(ModelImage)) { QStringList items; items.append(""); - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString path = settings.value("sdPath", ".").toString(); path.append("/BMP/"); QDir qd(path); @@ -497,7 +497,7 @@ void Setup::on_image_currentIndexChanged(int index) { if (!lock) { strncpy(model.bitmap, ui->image->currentText().toAscii(), GetEepromInterface()->getCapability(VoicesMaxLength)); - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString path=settings.value("sdPath", ".").toString(); path.append("/BMP/"); QDir qd(path); diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp index 22db68ae4..e0637f4df 100644 --- a/companion/src/modeledit/telemetry.cpp +++ b/companion/src/modeledit/telemetry.cpp @@ -342,7 +342,7 @@ TelemetryPanel::~TelemetryPanel() void TelemetryPanel::setup() { - QSettings settings("companion9x", "companion9x"); + QSettings settings("companion", "companion"); QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString(); lock=true; diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp index 4f3b3eb02..9b19c5ccc 100644 --- a/companion/src/modelslist.cpp +++ b/companion/src/modelslist.cpp @@ -41,6 +41,7 @@ #include "modelslist.h" #include "mdichild.h" +#include "helpers.h" class DragDropHeader { public: @@ -82,23 +83,47 @@ void ModelsListWidget::ShowContextMenu(const QPoint& pos) const QClipboard *clipboard = QApplication::clipboard(); const QMimeData *mimeData = clipboard->mimeData(); bool hasData = mimeData->hasFormat("application/x-companion9x"); + QIcon AddIcon; + populate_icon(&AddIcon,"add.png"); + QIcon EditIcon; + populate_icon(&EditIcon,"edit.png"); + QIcon OpenIcon; + populate_icon(&OpenIcon,"open.png"); + QIcon WizardIcon; + populate_icon(&WizardIcon,"wizard.png"); + QIcon ClearIcon; + populate_icon(&ClearIcon,"clear.png"); + QIcon CopyIcon; + populate_icon(&CopyIcon,"copy.png"); + QIcon CutIcon; + populate_icon(&CutIcon,"cut.png"); + QIcon PasteIcon; + populate_icon(&PasteIcon,"paste.png"); + QIcon DuplicateIcon; + populate_icon(&DuplicateIcon,"duplicate.png"); + QIcon CurrentModelIcon; + populate_icon(&CurrentModelIcon,"currentmodel.png"); + QIcon PrintIcon; + populate_icon(&PrintIcon,"print.png"); + QIcon SimulateIcon; + populate_icon(&SimulateIcon,"simulate.png"); QMenu contextMenu; - contextMenu.addAction(QIcon(":/images/edit.png"), tr("&Edit"),this,SLOT(OpenEditWindow())); - contextMenu.addAction(QIcon(":/images/open.png"), tr("&Restore from backup"),this,SLOT(LoadBackup())); - contextMenu.addAction(QIcon(":/images/wizard.png"), tr("&Model Wizard"),this,SLOT(OpenWizard())); + contextMenu.addAction(EditIcon, tr("&Edit"),this,SLOT(OpenEditWindow())); + contextMenu.addAction(OpenIcon, tr("&Restore from backup"),this,SLOT(LoadBackup())); + contextMenu.addAction(WizardIcon, tr("&Model Wizard"),this,SLOT(OpenWizard())); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(confirmDelete()),tr("Delete")); - contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(copy()),tr("Ctrl+C")); - contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(cut()),tr("Ctrl+X")); - contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(paste()),tr("Ctrl+V"))->setEnabled(hasData); - contextMenu.addAction(QIcon(":/images/duplicate.png"), tr("D&uplicate"),this,SLOT(duplicate()),tr("Ctrl+U")); + contextMenu.addAction(ClearIcon, tr("&Delete"),this,SLOT(confirmDelete()),tr("Delete")); + contextMenu.addAction(CopyIcon, tr("&Copy"),this,SLOT(copy()),tr("Ctrl+C")); + contextMenu.addAction(CutIcon, tr("&Cut"),this,SLOT(cut()),tr("Ctrl+X")); + contextMenu.addAction(PasteIcon, tr("&Paste"),this,SLOT(paste()),tr("Ctrl+V"))->setEnabled(hasData); + contextMenu.addAction(DuplicateIcon, tr("D&uplicate"),this,SLOT(duplicate()),tr("Ctrl+U")); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/currentmodel.png"), tr("&Use as default"),this,SLOT(setdefault())); + contextMenu.addAction(CurrentModelIcon, tr("&Use as default"),this,SLOT(setdefault())); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/print.png"), tr("P&rint model"),this, SLOT(print()),tr("Alt+R")); + contextMenu.addAction(PrintIcon, tr("P&rint model"),this, SLOT(print()),tr("Alt+R")); contextMenu.addSeparator(); - contextMenu.addAction(QIcon(":/images/simulate.png"), tr("&Simulate model"),this, SLOT(simulate()),tr("Alt+S")); + contextMenu.addAction(SimulateIcon, tr("&Simulate model"),this, SLOT(simulate()),tr("Alt+S")); contextMenu.exec(globalPos); } diff --git a/companion/src/preferencesdialog.cpp b/companion/src/preferencesdialog.cpp index 1e97e5785..73b6d3d8a 100644 --- a/companion/src/preferencesdialog.cpp +++ b/companion/src/preferencesdialog.cpp @@ -17,7 +17,15 @@ preferencesDialog::preferencesDialog(QWidget *parent) : updateLock(false) { ui->setupUi(this); - + QIcon Icon; + populate_icon(&Icon,"preferences.png"); + this->setWindowIcon(Icon); + QIcon LibraryIcon; + populate_icon(&LibraryIcon,"library.png"); + ui->splashLibraryButton->setIcon(LibraryIcon); + QIcon ClearIcon; + populate_icon(&ClearIcon,"clear.png"); + ui->clearImageButton->setIcon(ClearIcon); QCheckBox * OptionCheckBox[]= { ui->optionCheckBox_1, ui->optionCheckBox_2, ui->optionCheckBox_3, ui->optionCheckBox_4, ui->optionCheckBox_5, ui->optionCheckBox_6, ui->optionCheckBox_7, @@ -265,6 +273,8 @@ void preferencesDialog::writeValues() settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked()); settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked()); settings.setValue("show_splash", ui->showSplash->isChecked()); + settings.setValue("theme", ui->theme_CB->currentIndex()); + settings.setValue("icon_size", ui->iconSize_CB->currentIndex()); settings.setValue("simuSW", ui->simuSW->isChecked()); settings.setValue("history_size", ui->historySize->value()); settings.setValue("burnFirmware", ui->burnFirmware->isChecked()); @@ -404,6 +414,8 @@ void preferencesDialog::initSettings() ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool()); ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool()); ui->showSplash->setChecked(settings.value("show_splash", true).toBool()); + ui->theme_CB->setCurrentIndex(settings.value("theme", 1).toInt()); + ui->iconSize_CB->setCurrentIndex(settings.value("icon_size", 2).toInt()); ui->historySize->setValue(settings.value("history_size", 10).toInt()); ui->backLightColor->setCurrentIndex(settings.value("backLight", 0).toInt()); ui->startupCheck_fw->setChecked(settings.value("startup_check_fw", true).toBool()); diff --git a/companion/src/preferencesdialog.ui b/companion/src/preferencesdialog.ui index 021a38b58..7160c715b 100644 --- a/companion/src/preferencesdialog.ui +++ b/companion/src/preferencesdialog.ui @@ -7,7 +7,7 @@ 0 0 685 - 710 + 764 @@ -25,10 +25,6 @@ Preferences - - - :/images/preferences.png:/images/preferences.png - QLayout::SetMinimumSize @@ -39,7 +35,32 @@ 4 - + + + + + + true + + + + + + + Open Folder + + + + + + + auto backup before write + + + + + + @@ -48,18 +69,96 @@ - Show Splash Screen + Show Splash At Start - + + + + + + Enable + + + + + + + + 0 + 0 + + + + + + + + Calibrate + + + + + + + + + Automatic Backup Folder + + + + + + + + + + 40 + 0 + + + + 15 + + + 10 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Ask use of wizard for new models + + + true + + + + + + Qt::Horizontal - + @@ -75,41 +174,7 @@ - - - - - - Check for updates on startup - - - true - - - - - - - Check for selected Fw updates - - - true - - - - - - - - - Ask use of wizard for new models - - - true - - - - + @@ -160,25 +225,18 @@ ... - - - :/images/clear.png:/images/clear.png - - - - - + Remember switches in simulator - + @@ -207,7 +265,7 @@ - + 6 @@ -227,10 +285,6 @@ ... - - - :/images/library.png:/images/library.png - @@ -248,33 +302,27 @@ - - + + - - - - true + Simulator capture folder - - + + - - 40 + + 0 0 - - 15 - - - 10 + + Language (requires restart) - + @@ -418,7 +466,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -431,35 +479,7 @@ This is used by the templated to determine which channel goes to what number out - - - - - - Enable - - - - - - - - 0 - 0 - - - - - - - - Calibrate - - - - - - + 1 @@ -483,7 +503,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -507,7 +527,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -520,7 +540,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -563,7 +583,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -590,7 +610,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -638,20 +658,7 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - Language (requires restart) - - - - + 1 @@ -682,7 +689,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -695,7 +702,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -711,7 +718,7 @@ This is used by the templated to determine which channel goes to what number out - + Mode selection: @@ -759,95 +766,14 @@ Mode 4: - - - - - 0 - 0 - - - - Joystick - - - - - - - - 0 - 0 - - - - - Include companion splashes - - - - - Only user defined splashes - - - - - - - - - 0 - 0 - - - - Splash library behaviour - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + Profile slot - - - - Automatic Backup Folder - - - - - - - - - true - - - - - - - Open Folder - - - - - - - auto backup before write - - - - - - + Qt::Vertical @@ -863,7 +789,7 @@ Mode 4: - + @@ -890,7 +816,7 @@ Mode 4: - + QLayout::SetMaximumSize @@ -981,7 +907,7 @@ May be different from firmware language - + @@ -1021,13 +947,6 @@ May be different from firmware language - - - - Simulator capture folder - - - @@ -1041,14 +960,14 @@ May be different from firmware language - + Qt::Horizontal - + QLayout::SetMaximumSize @@ -1601,7 +1520,207 @@ May be different from firmware language - + + + + + 0 + 0 + + + + Splash library behaviour + + + + + + + + 0 + 0 + + + + + Include companion splashes + + + + + Only user defined splashes + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Theme + + + + + + + Requires restart + + + + Classic + + + + + Monochrome + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + Icon size + + + + + + + Requires restart + + + + Small + + + + + Normal + + + + + Big + + + + + Huge + + + + + + + + + + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Check for updates on startup + + + true + + + + + + + Check for selected Fw updates + + + true + + + + + + + + + + 0 + 0 + + + + Joystick + + + + + + + Google Earth Executable + + + + @@ -1619,17 +1738,9 @@ May be different from firmware language - - - - Google Earth Executable - - - - locale_QB InvertPixels clearImageButton SplashFileName diff --git a/companion/src/printdialog.ui b/companion/src/printdialog.ui index 5e45d5a2c..169c33103 100644 --- a/companion/src/printdialog.ui +++ b/companion/src/printdialog.ui @@ -27,7 +27,7 @@ - :/images/print.png:/images/print.png + :/icon.png:/icon.png diff --git a/companion/src/simulatordialog.ui b/companion/src/simulatordialog.ui index a739492ac..de9a3a43a 100644 --- a/companion/src/simulatordialog.ui +++ b/companion/src/simulatordialog.ui @@ -27,7 +27,7 @@ - :/images/simulate.png:/images/simulate.png + :/icon.png:/icon.png @@ -1092,8 +1092,6 @@ QPushButton:checked { - - @@ -1812,8 +1810,6 @@ QPushButton:checked { QFrame::Raised - - 2 @@ -2298,7 +2294,6 @@ border-radius: 4px; - 0 diff --git a/companion/src/splashlibrary.cpp b/companion/src/splashlibrary.cpp index 9e5a7cc82..e8a1a4090 100644 --- a/companion/src/splashlibrary.cpp +++ b/companion/src/splashlibrary.cpp @@ -9,6 +9,12 @@ splashLibrary::splashLibrary(QWidget *parent, QString * fileName) : QDialog(parent), ui(new Ui::splashLibrary) { splashFileName = fileName; ui->setupUi(this); + QIcon NextIcon; + populate_icon(&NextIcon,"arrow-right.png"); + QIcon PrevIcon; + populate_icon(&PrevIcon,"arrow-left.png"); + ui->nextPage->setIcon(NextIcon); + ui->prevPage->setIcon(PrevIcon); page = 0; getFileList(); if (imageList.size() > 20) { diff --git a/companion/src/splashlibrary.ui b/companion/src/splashlibrary.ui index 8c5bcaf1d..9507a2d08 100644 --- a/companion/src/splashlibrary.ui +++ b/companion/src/splashlibrary.ui @@ -25,6 +25,10 @@ + + + :/icon.png:/icon.png + @@ -46,10 +50,6 @@ ... - - - :/images/arrow-left.png:/images/arrow-left.png - 50 @@ -945,10 +945,6 @@ ... - - - :/images/arrow-right.png:/images/arrow-right.png - 50 diff --git a/companion/src/themes/classic/16/add.png b/companion/src/themes/classic/16/add.png new file mode 100644 index 000000000..7976174fd Binary files /dev/null and b/companion/src/themes/classic/16/add.png differ diff --git a/companion/src/themes/classic/16/arrow-left.png b/companion/src/themes/classic/16/arrow-left.png new file mode 100644 index 000000000..a1b3d0964 Binary files /dev/null and b/companion/src/themes/classic/16/arrow-left.png differ diff --git a/companion/src/themes/classic/16/arrow-right.png b/companion/src/themes/classic/16/arrow-right.png new file mode 100644 index 000000000..1311fb52f Binary files /dev/null and b/companion/src/themes/classic/16/arrow-right.png differ diff --git a/companion/src/themes/classic/16/changelog.png b/companion/src/themes/classic/16/changelog.png new file mode 100644 index 000000000..9e4e6ae57 Binary files /dev/null and b/companion/src/themes/classic/16/changelog.png differ diff --git a/companion/src/themes/classic/16/clear.png b/companion/src/themes/classic/16/clear.png new file mode 100644 index 000000000..12c465218 Binary files /dev/null and b/companion/src/themes/classic/16/clear.png differ diff --git a/companion/src/themes/classic/16/compare.png b/companion/src/themes/classic/16/compare.png new file mode 100644 index 000000000..eda5f13b9 Binary files /dev/null and b/companion/src/themes/classic/16/compare.png differ diff --git a/companion/src/themes/classic/16/configure.png b/companion/src/themes/classic/16/configure.png new file mode 100644 index 000000000..a627160f9 Binary files /dev/null and b/companion/src/themes/classic/16/configure.png differ diff --git a/companion/src/themes/classic/16/contributors.png b/companion/src/themes/classic/16/contributors.png new file mode 100644 index 000000000..439d2bcb8 Binary files /dev/null and b/companion/src/themes/classic/16/contributors.png differ diff --git a/companion/src/themes/classic/16/copy.png b/companion/src/themes/classic/16/copy.png new file mode 100644 index 000000000..0d016ee10 Binary files /dev/null and b/companion/src/themes/classic/16/copy.png differ diff --git a/companion/src/themes/classic/16/currentmodel.png b/companion/src/themes/classic/16/currentmodel.png new file mode 100644 index 000000000..691f8f92d Binary files /dev/null and b/companion/src/themes/classic/16/currentmodel.png differ diff --git a/companion/src/themes/classic/16/customize.png b/companion/src/themes/classic/16/customize.png new file mode 100644 index 000000000..878a614b5 Binary files /dev/null and b/companion/src/themes/classic/16/customize.png differ diff --git a/companion/src/themes/classic/16/cut.png b/companion/src/themes/classic/16/cut.png new file mode 100644 index 000000000..600e320c6 Binary files /dev/null and b/companion/src/themes/classic/16/cut.png differ diff --git a/companion/src/themes/classic/16/duplicate.png b/companion/src/themes/classic/16/duplicate.png new file mode 100644 index 000000000..90c7319e5 Binary files /dev/null and b/companion/src/themes/classic/16/duplicate.png differ diff --git a/companion/src/themes/classic/16/edit.png b/companion/src/themes/classic/16/edit.png new file mode 100644 index 000000000..5358d50bb Binary files /dev/null and b/companion/src/themes/classic/16/edit.png differ diff --git a/companion/src/themes/classic/16/exit.png b/companion/src/themes/classic/16/exit.png new file mode 100644 index 000000000..c188d80d8 Binary files /dev/null and b/companion/src/themes/classic/16/exit.png differ diff --git a/companion/src/themes/classic/16/fuses.png b/companion/src/themes/classic/16/fuses.png new file mode 100644 index 000000000..512a067ed Binary files /dev/null and b/companion/src/themes/classic/16/fuses.png differ diff --git a/companion/src/themes/classic/16/information.png b/companion/src/themes/classic/16/information.png new file mode 100644 index 000000000..aca1565dd Binary files /dev/null and b/companion/src/themes/classic/16/information.png differ diff --git a/companion/src/themes/classic/16/library.png b/companion/src/themes/classic/16/library.png new file mode 100644 index 000000000..2a4df7457 Binary files /dev/null and b/companion/src/themes/classic/16/library.png differ diff --git a/companion/src/themes/classic/16/list.png b/companion/src/themes/classic/16/list.png new file mode 100644 index 000000000..6bac38a45 Binary files /dev/null and b/companion/src/themes/classic/16/list.png differ diff --git a/companion/src/themes/classic/16/logs.png b/companion/src/themes/classic/16/logs.png new file mode 100644 index 000000000..880923fb6 Binary files /dev/null and b/companion/src/themes/classic/16/logs.png differ diff --git a/companion/src/themes/classic/16/movedown.png b/companion/src/themes/classic/16/movedown.png new file mode 100644 index 000000000..f609f5581 Binary files /dev/null and b/companion/src/themes/classic/16/movedown.png differ diff --git a/companion/src/themes/classic/16/moveup.png b/companion/src/themes/classic/16/moveup.png new file mode 100644 index 000000000..f44bf8b64 Binary files /dev/null and b/companion/src/themes/classic/16/moveup.png differ diff --git a/companion/src/themes/classic/16/new.png b/companion/src/themes/classic/16/new.png new file mode 100644 index 000000000..b40281b64 Binary files /dev/null and b/companion/src/themes/classic/16/new.png differ diff --git a/companion/src/themes/classic/16/open.png b/companion/src/themes/classic/16/open.png new file mode 100644 index 000000000..48509ab56 Binary files /dev/null and b/companion/src/themes/classic/16/open.png differ diff --git a/companion/src/themes/classic/16/paintbrush.png b/companion/src/themes/classic/16/paintbrush.png new file mode 100644 index 000000000..fc99fd5f2 Binary files /dev/null and b/companion/src/themes/classic/16/paintbrush.png differ diff --git a/companion/src/themes/classic/16/paste.png b/companion/src/themes/classic/16/paste.png new file mode 100644 index 000000000..7f1b0a7a8 Binary files /dev/null and b/companion/src/themes/classic/16/paste.png differ diff --git a/companion/src/themes/classic/16/play.png b/companion/src/themes/classic/16/play.png new file mode 100644 index 000000000..d4720f2d8 Binary files /dev/null and b/companion/src/themes/classic/16/play.png differ diff --git a/companion/src/themes/classic/16/preferences.png b/companion/src/themes/classic/16/preferences.png new file mode 100644 index 000000000..dae98ee8a Binary files /dev/null and b/companion/src/themes/classic/16/preferences.png differ diff --git a/companion/src/themes/classic/16/print.png b/companion/src/themes/classic/16/print.png new file mode 100644 index 000000000..9f1d39eee Binary files /dev/null and b/companion/src/themes/classic/16/print.png differ diff --git a/companion/src/themes/classic/16/profiles.png b/companion/src/themes/classic/16/profiles.png new file mode 100644 index 000000000..8343cc5c1 Binary files /dev/null and b/companion/src/themes/classic/16/profiles.png differ diff --git a/companion/src/themes/classic/16/read_eeprom.png b/companion/src/themes/classic/16/read_eeprom.png new file mode 100644 index 000000000..c9ef59ca4 Binary files /dev/null and b/companion/src/themes/classic/16/read_eeprom.png differ diff --git a/companion/src/themes/classic/16/read_eeprom_file.png b/companion/src/themes/classic/16/read_eeprom_file.png new file mode 100644 index 000000000..7617c17ba Binary files /dev/null and b/companion/src/themes/classic/16/read_eeprom_file.png differ diff --git a/companion/src/themes/classic/16/read_flash.png b/companion/src/themes/classic/16/read_flash.png new file mode 100644 index 000000000..3591516de Binary files /dev/null and b/companion/src/themes/classic/16/read_flash.png differ diff --git a/companion/src/themes/classic/16/recentdocument.png b/companion/src/themes/classic/16/recentdocument.png new file mode 100644 index 000000000..965e45f2d Binary files /dev/null and b/companion/src/themes/classic/16/recentdocument.png differ diff --git a/companion/src/themes/classic/16/save.png b/companion/src/themes/classic/16/save.png new file mode 100644 index 000000000..fbcbc53a4 Binary files /dev/null and b/companion/src/themes/classic/16/save.png differ diff --git a/companion/src/themes/classic/16/saveas.png b/companion/src/themes/classic/16/saveas.png new file mode 100644 index 000000000..2e4ba2b82 Binary files /dev/null and b/companion/src/themes/classic/16/saveas.png differ diff --git a/companion/src/themes/classic/16/simulate.png b/companion/src/themes/classic/16/simulate.png new file mode 100644 index 000000000..94a8a4003 Binary files /dev/null and b/companion/src/themes/classic/16/simulate.png differ diff --git a/companion/src/themes/classic/16/stop.png b/companion/src/themes/classic/16/stop.png new file mode 100644 index 000000000..f2bb8792b Binary files /dev/null and b/companion/src/themes/classic/16/stop.png differ diff --git a/companion/src/themes/classic/16/switch_dir.png b/companion/src/themes/classic/16/switch_dir.png new file mode 100644 index 000000000..006788cc0 Binary files /dev/null and b/companion/src/themes/classic/16/switch_dir.png differ diff --git a/companion/src/themes/classic/16/update.png b/companion/src/themes/classic/16/update.png new file mode 100644 index 000000000..0af079b3f Binary files /dev/null and b/companion/src/themes/classic/16/update.png differ diff --git a/companion/src/themes/classic/16/wizard.png b/companion/src/themes/classic/16/wizard.png new file mode 100644 index 000000000..6bb4d070b Binary files /dev/null and b/companion/src/themes/classic/16/wizard.png differ diff --git a/companion/src/themes/classic/16/write_eeprom.png b/companion/src/themes/classic/16/write_eeprom.png new file mode 100644 index 000000000..3dd15566a Binary files /dev/null and b/companion/src/themes/classic/16/write_eeprom.png differ diff --git a/companion/src/themes/classic/16/write_eeprom_file.png b/companion/src/themes/classic/16/write_eeprom_file.png new file mode 100644 index 000000000..efbce2843 Binary files /dev/null and b/companion/src/themes/classic/16/write_eeprom_file.png differ diff --git a/companion/src/themes/classic/16/write_flash.png b/companion/src/themes/classic/16/write_flash.png new file mode 100644 index 000000000..c82b8c9e8 Binary files /dev/null and b/companion/src/themes/classic/16/write_flash.png differ diff --git a/companion/src/themes/classic/24/add.png b/companion/src/themes/classic/24/add.png new file mode 100644 index 000000000..073c0b2f1 Binary files /dev/null and b/companion/src/themes/classic/24/add.png differ diff --git a/companion/src/themes/classic/24/arrow-left.png b/companion/src/themes/classic/24/arrow-left.png new file mode 100644 index 000000000..9ad670cce Binary files /dev/null and b/companion/src/themes/classic/24/arrow-left.png differ diff --git a/companion/src/themes/classic/24/arrow-right.png b/companion/src/themes/classic/24/arrow-right.png new file mode 100644 index 000000000..084d6597c Binary files /dev/null and b/companion/src/themes/classic/24/arrow-right.png differ diff --git a/companion/src/themes/classic/24/changelog.png b/companion/src/themes/classic/24/changelog.png new file mode 100644 index 000000000..7f26eafcc Binary files /dev/null and b/companion/src/themes/classic/24/changelog.png differ diff --git a/companion/src/themes/classic/24/clear.png b/companion/src/themes/classic/24/clear.png new file mode 100644 index 000000000..5a2f16f23 Binary files /dev/null and b/companion/src/themes/classic/24/clear.png differ diff --git a/companion/src/themes/classic/24/compare.png b/companion/src/themes/classic/24/compare.png new file mode 100644 index 000000000..2d9e035d8 Binary files /dev/null and b/companion/src/themes/classic/24/compare.png differ diff --git a/companion/src/themes/classic/24/configure.png b/companion/src/themes/classic/24/configure.png new file mode 100644 index 000000000..f3972b18f Binary files /dev/null and b/companion/src/themes/classic/24/configure.png differ diff --git a/companion/src/themes/classic/24/contributors.png b/companion/src/themes/classic/24/contributors.png new file mode 100644 index 000000000..c35d8737e Binary files /dev/null and b/companion/src/themes/classic/24/contributors.png differ diff --git a/companion/src/themes/classic/24/copy.png b/companion/src/themes/classic/24/copy.png new file mode 100644 index 000000000..714a0d590 Binary files /dev/null and b/companion/src/themes/classic/24/copy.png differ diff --git a/companion/src/themes/classic/24/currentmodel.png b/companion/src/themes/classic/24/currentmodel.png new file mode 100644 index 000000000..192a227fe Binary files /dev/null and b/companion/src/themes/classic/24/currentmodel.png differ diff --git a/companion/src/themes/classic/24/customize.png b/companion/src/themes/classic/24/customize.png new file mode 100644 index 000000000..922d0b64d Binary files /dev/null and b/companion/src/themes/classic/24/customize.png differ diff --git a/companion/src/themes/classic/24/cut.png b/companion/src/themes/classic/24/cut.png new file mode 100644 index 000000000..33b947198 Binary files /dev/null and b/companion/src/themes/classic/24/cut.png differ diff --git a/companion/src/themes/classic/24/duplicate.png b/companion/src/themes/classic/24/duplicate.png new file mode 100644 index 000000000..8ff23def9 Binary files /dev/null and b/companion/src/themes/classic/24/duplicate.png differ diff --git a/companion/src/themes/classic/24/edit.png b/companion/src/themes/classic/24/edit.png new file mode 100644 index 000000000..259e39bd3 Binary files /dev/null and b/companion/src/themes/classic/24/edit.png differ diff --git a/companion/src/themes/classic/24/exit.png b/companion/src/themes/classic/24/exit.png new file mode 100644 index 000000000..ba91c7bfc Binary files /dev/null and b/companion/src/themes/classic/24/exit.png differ diff --git a/companion/src/themes/classic/24/fuses.png b/companion/src/themes/classic/24/fuses.png new file mode 100644 index 000000000..38ce749a1 Binary files /dev/null and b/companion/src/themes/classic/24/fuses.png differ diff --git a/companion/src/themes/classic/24/information.png b/companion/src/themes/classic/24/information.png new file mode 100644 index 000000000..ccf17132b Binary files /dev/null and b/companion/src/themes/classic/24/information.png differ diff --git a/companion/src/themes/classic/24/library.png b/companion/src/themes/classic/24/library.png new file mode 100644 index 000000000..97e9bf596 Binary files /dev/null and b/companion/src/themes/classic/24/library.png differ diff --git a/companion/src/themes/classic/24/list.png b/companion/src/themes/classic/24/list.png new file mode 100644 index 000000000..5eeb66474 Binary files /dev/null and b/companion/src/themes/classic/24/list.png differ diff --git a/companion/src/themes/classic/24/logs.png b/companion/src/themes/classic/24/logs.png new file mode 100644 index 000000000..a9c247b27 Binary files /dev/null and b/companion/src/themes/classic/24/logs.png differ diff --git a/companion/src/themes/classic/24/movedown.png b/companion/src/themes/classic/24/movedown.png new file mode 100644 index 000000000..47f210256 Binary files /dev/null and b/companion/src/themes/classic/24/movedown.png differ diff --git a/companion/src/themes/classic/24/moveup.png b/companion/src/themes/classic/24/moveup.png new file mode 100644 index 000000000..1bf02bdff Binary files /dev/null and b/companion/src/themes/classic/24/moveup.png differ diff --git a/companion/src/themes/classic/24/new.png b/companion/src/themes/classic/24/new.png new file mode 100644 index 000000000..0181a1ca2 Binary files /dev/null and b/companion/src/themes/classic/24/new.png differ diff --git a/companion/src/themes/classic/24/open.png b/companion/src/themes/classic/24/open.png new file mode 100644 index 000000000..45e64135a Binary files /dev/null and b/companion/src/themes/classic/24/open.png differ diff --git a/companion/src/themes/classic/24/paintbrush.png b/companion/src/themes/classic/24/paintbrush.png new file mode 100644 index 000000000..de9e1806f Binary files /dev/null and b/companion/src/themes/classic/24/paintbrush.png differ diff --git a/companion/src/themes/classic/24/paste.png b/companion/src/themes/classic/24/paste.png new file mode 100644 index 000000000..2a762fbfb Binary files /dev/null and b/companion/src/themes/classic/24/paste.png differ diff --git a/companion/src/themes/classic/24/play.png b/companion/src/themes/classic/24/play.png new file mode 100644 index 000000000..7e1b547d9 Binary files /dev/null and b/companion/src/themes/classic/24/play.png differ diff --git a/companion/src/themes/classic/24/preferences.png b/companion/src/themes/classic/24/preferences.png new file mode 100644 index 000000000..ebca2028c Binary files /dev/null and b/companion/src/themes/classic/24/preferences.png differ diff --git a/companion/src/themes/classic/24/print.png b/companion/src/themes/classic/24/print.png new file mode 100644 index 000000000..edb7bcfb1 Binary files /dev/null and b/companion/src/themes/classic/24/print.png differ diff --git a/companion/src/themes/classic/24/profiles.png b/companion/src/themes/classic/24/profiles.png new file mode 100644 index 000000000..394e8079f Binary files /dev/null and b/companion/src/themes/classic/24/profiles.png differ diff --git a/companion/src/themes/classic/24/read_eeprom.png b/companion/src/themes/classic/24/read_eeprom.png new file mode 100644 index 000000000..9a0bbd6b7 Binary files /dev/null and b/companion/src/themes/classic/24/read_eeprom.png differ diff --git a/companion/src/themes/classic/24/read_eeprom_file.png b/companion/src/themes/classic/24/read_eeprom_file.png new file mode 100644 index 000000000..9f557a3c7 Binary files /dev/null and b/companion/src/themes/classic/24/read_eeprom_file.png differ diff --git a/companion/src/themes/classic/24/read_flash.png b/companion/src/themes/classic/24/read_flash.png new file mode 100644 index 000000000..ed77ff739 Binary files /dev/null and b/companion/src/themes/classic/24/read_flash.png differ diff --git a/companion/src/themes/classic/24/recentdocument.png b/companion/src/themes/classic/24/recentdocument.png new file mode 100644 index 000000000..1e3d9266b Binary files /dev/null and b/companion/src/themes/classic/24/recentdocument.png differ diff --git a/companion/src/themes/classic/24/save.png b/companion/src/themes/classic/24/save.png new file mode 100644 index 000000000..bec9b6c13 Binary files /dev/null and b/companion/src/themes/classic/24/save.png differ diff --git a/companion/src/themes/classic/24/saveas.png b/companion/src/themes/classic/24/saveas.png new file mode 100644 index 000000000..83df4c639 Binary files /dev/null and b/companion/src/themes/classic/24/saveas.png differ diff --git a/companion/src/themes/classic/24/simulate.png b/companion/src/themes/classic/24/simulate.png new file mode 100644 index 000000000..8bc4db398 Binary files /dev/null and b/companion/src/themes/classic/24/simulate.png differ diff --git a/companion/src/themes/classic/24/stop.png b/companion/src/themes/classic/24/stop.png new file mode 100644 index 000000000..00f4ab1c1 Binary files /dev/null and b/companion/src/themes/classic/24/stop.png differ diff --git a/companion/src/themes/classic/24/switch_dir.png b/companion/src/themes/classic/24/switch_dir.png new file mode 100644 index 000000000..798b94926 Binary files /dev/null and b/companion/src/themes/classic/24/switch_dir.png differ diff --git a/companion/src/themes/classic/24/update.png b/companion/src/themes/classic/24/update.png new file mode 100644 index 000000000..f50b423b9 Binary files /dev/null and b/companion/src/themes/classic/24/update.png differ diff --git a/companion/src/themes/classic/24/wizard.png b/companion/src/themes/classic/24/wizard.png new file mode 100644 index 000000000..63879342f Binary files /dev/null and b/companion/src/themes/classic/24/wizard.png differ diff --git a/companion/src/themes/classic/24/write_eeprom.png b/companion/src/themes/classic/24/write_eeprom.png new file mode 100644 index 000000000..8591f6f70 Binary files /dev/null and b/companion/src/themes/classic/24/write_eeprom.png differ diff --git a/companion/src/themes/classic/24/write_eeprom_file.png b/companion/src/themes/classic/24/write_eeprom_file.png new file mode 100644 index 000000000..a3cd7898c Binary files /dev/null and b/companion/src/themes/classic/24/write_eeprom_file.png differ diff --git a/companion/src/themes/classic/24/write_flash.png b/companion/src/themes/classic/24/write_flash.png new file mode 100644 index 000000000..8ef65965f Binary files /dev/null and b/companion/src/themes/classic/24/write_flash.png differ diff --git a/companion/src/themes/classic/32/add.png b/companion/src/themes/classic/32/add.png new file mode 100644 index 000000000..9b1e2ebf3 Binary files /dev/null and b/companion/src/themes/classic/32/add.png differ diff --git a/companion/src/themes/classic/32/arrow-left.png b/companion/src/themes/classic/32/arrow-left.png new file mode 100644 index 000000000..94f5afcb4 Binary files /dev/null and b/companion/src/themes/classic/32/arrow-left.png differ diff --git a/companion/src/themes/classic/32/arrow-right.png b/companion/src/themes/classic/32/arrow-right.png new file mode 100644 index 000000000..5b26520c7 Binary files /dev/null and b/companion/src/themes/classic/32/arrow-right.png differ diff --git a/companion/src/themes/classic/32/changelog.png b/companion/src/themes/classic/32/changelog.png new file mode 100644 index 000000000..952a231dd Binary files /dev/null and b/companion/src/themes/classic/32/changelog.png differ diff --git a/companion/src/themes/classic/32/clear.png b/companion/src/themes/classic/32/clear.png new file mode 100644 index 000000000..e1d481f35 Binary files /dev/null and b/companion/src/themes/classic/32/clear.png differ diff --git a/companion/src/themes/classic/32/compare.png b/companion/src/themes/classic/32/compare.png new file mode 100644 index 000000000..4cf84e940 Binary files /dev/null and b/companion/src/themes/classic/32/compare.png differ diff --git a/companion/src/themes/classic/32/configure.png b/companion/src/themes/classic/32/configure.png new file mode 100644 index 000000000..9fd4c2cd9 Binary files /dev/null and b/companion/src/themes/classic/32/configure.png differ diff --git a/companion/src/themes/classic/32/contributors.png b/companion/src/themes/classic/32/contributors.png new file mode 100644 index 000000000..d90cc70de Binary files /dev/null and b/companion/src/themes/classic/32/contributors.png differ diff --git a/companion/src/themes/classic/32/copy.png b/companion/src/themes/classic/32/copy.png new file mode 100644 index 000000000..a24bb4b1d Binary files /dev/null and b/companion/src/themes/classic/32/copy.png differ diff --git a/companion/src/themes/classic/32/currentmodel.png b/companion/src/themes/classic/32/currentmodel.png new file mode 100644 index 000000000..6fde618ef Binary files /dev/null and b/companion/src/themes/classic/32/currentmodel.png differ diff --git a/companion/src/themes/classic/32/customize.png b/companion/src/themes/classic/32/customize.png new file mode 100644 index 000000000..1f924d2bf Binary files /dev/null and b/companion/src/themes/classic/32/customize.png differ diff --git a/companion/src/themes/classic/32/cut.png b/companion/src/themes/classic/32/cut.png new file mode 100644 index 000000000..d68161089 Binary files /dev/null and b/companion/src/themes/classic/32/cut.png differ diff --git a/companion/src/themes/classic/32/duplicate.png b/companion/src/themes/classic/32/duplicate.png new file mode 100644 index 000000000..a6c66b117 Binary files /dev/null and b/companion/src/themes/classic/32/duplicate.png differ diff --git a/companion/src/themes/classic/32/edit.png b/companion/src/themes/classic/32/edit.png new file mode 100644 index 000000000..a00693407 Binary files /dev/null and b/companion/src/themes/classic/32/edit.png differ diff --git a/companion/src/themes/classic/32/exit.png b/companion/src/themes/classic/32/exit.png new file mode 100644 index 000000000..7eb24a666 Binary files /dev/null and b/companion/src/themes/classic/32/exit.png differ diff --git a/companion/src/themes/classic/32/fuses.png b/companion/src/themes/classic/32/fuses.png new file mode 100644 index 000000000..c0bb8bf4c Binary files /dev/null and b/companion/src/themes/classic/32/fuses.png differ diff --git a/companion/src/themes/classic/32/information.png b/companion/src/themes/classic/32/information.png new file mode 100644 index 000000000..47fa8f3fe Binary files /dev/null and b/companion/src/themes/classic/32/information.png differ diff --git a/companion/src/themes/classic/32/library.png b/companion/src/themes/classic/32/library.png new file mode 100644 index 000000000..763983830 Binary files /dev/null and b/companion/src/themes/classic/32/library.png differ diff --git a/companion/src/themes/classic/32/list.png b/companion/src/themes/classic/32/list.png new file mode 100644 index 000000000..3b6f45e45 Binary files /dev/null and b/companion/src/themes/classic/32/list.png differ diff --git a/companion/src/themes/classic/32/logs.png b/companion/src/themes/classic/32/logs.png new file mode 100644 index 000000000..11af72b25 Binary files /dev/null and b/companion/src/themes/classic/32/logs.png differ diff --git a/companion/src/themes/classic/32/movedown.png b/companion/src/themes/classic/32/movedown.png new file mode 100644 index 000000000..8d2671cc1 Binary files /dev/null and b/companion/src/themes/classic/32/movedown.png differ diff --git a/companion/src/themes/classic/32/moveup.png b/companion/src/themes/classic/32/moveup.png new file mode 100644 index 000000000..7d52059e2 Binary files /dev/null and b/companion/src/themes/classic/32/moveup.png differ diff --git a/companion/src/themes/classic/32/new.png b/companion/src/themes/classic/32/new.png new file mode 100644 index 000000000..3c79b7994 Binary files /dev/null and b/companion/src/themes/classic/32/new.png differ diff --git a/companion/src/themes/classic/32/open.png b/companion/src/themes/classic/32/open.png new file mode 100644 index 000000000..516ad06c0 Binary files /dev/null and b/companion/src/themes/classic/32/open.png differ diff --git a/companion/src/themes/classic/32/paintbrush.png b/companion/src/themes/classic/32/paintbrush.png new file mode 100644 index 000000000..33d2249c0 Binary files /dev/null and b/companion/src/themes/classic/32/paintbrush.png differ diff --git a/companion/src/themes/classic/32/paste.png b/companion/src/themes/classic/32/paste.png new file mode 100644 index 000000000..17c82102a Binary files /dev/null and b/companion/src/themes/classic/32/paste.png differ diff --git a/companion/src/themes/classic/32/play.png b/companion/src/themes/classic/32/play.png new file mode 100644 index 000000000..d47a3040e Binary files /dev/null and b/companion/src/themes/classic/32/play.png differ diff --git a/companion/src/themes/classic/32/preferences.png b/companion/src/themes/classic/32/preferences.png new file mode 100644 index 000000000..a9cee976b Binary files /dev/null and b/companion/src/themes/classic/32/preferences.png differ diff --git a/companion/src/themes/classic/32/print.png b/companion/src/themes/classic/32/print.png new file mode 100644 index 000000000..6c27107b5 Binary files /dev/null and b/companion/src/themes/classic/32/print.png differ diff --git a/companion/src/themes/classic/32/profiles.png b/companion/src/themes/classic/32/profiles.png new file mode 100644 index 000000000..03fab9601 Binary files /dev/null and b/companion/src/themes/classic/32/profiles.png differ diff --git a/companion/src/themes/classic/32/read_eeprom.png b/companion/src/themes/classic/32/read_eeprom.png new file mode 100644 index 000000000..9e1aa0e2a Binary files /dev/null and b/companion/src/themes/classic/32/read_eeprom.png differ diff --git a/companion/src/themes/classic/32/read_eeprom_file.png b/companion/src/themes/classic/32/read_eeprom_file.png new file mode 100644 index 000000000..6c6997046 Binary files /dev/null and b/companion/src/themes/classic/32/read_eeprom_file.png differ diff --git a/companion/src/themes/classic/32/read_flash.png b/companion/src/themes/classic/32/read_flash.png new file mode 100644 index 000000000..2ebd0f34b Binary files /dev/null and b/companion/src/themes/classic/32/read_flash.png differ diff --git a/companion/src/themes/classic/32/recentdocument.png b/companion/src/themes/classic/32/recentdocument.png new file mode 100644 index 000000000..e4bdc52da Binary files /dev/null and b/companion/src/themes/classic/32/recentdocument.png differ diff --git a/companion/src/themes/classic/32/save.png b/companion/src/themes/classic/32/save.png new file mode 100644 index 000000000..380fb7264 Binary files /dev/null and b/companion/src/themes/classic/32/save.png differ diff --git a/companion/src/themes/classic/32/saveas.png b/companion/src/themes/classic/32/saveas.png new file mode 100644 index 000000000..e2af8d1fa Binary files /dev/null and b/companion/src/themes/classic/32/saveas.png differ diff --git a/companion/src/themes/classic/32/simulate.png b/companion/src/themes/classic/32/simulate.png new file mode 100644 index 000000000..c67e7cb99 Binary files /dev/null and b/companion/src/themes/classic/32/simulate.png differ diff --git a/companion/src/themes/classic/32/stop.png b/companion/src/themes/classic/32/stop.png new file mode 100644 index 000000000..a0338d139 Binary files /dev/null and b/companion/src/themes/classic/32/stop.png differ diff --git a/companion/src/themes/classic/32/switch_dir.png b/companion/src/themes/classic/32/switch_dir.png new file mode 100644 index 000000000..6e297dd3a Binary files /dev/null and b/companion/src/themes/classic/32/switch_dir.png differ diff --git a/companion/src/themes/classic/32/update.png b/companion/src/themes/classic/32/update.png new file mode 100644 index 000000000..9f57be2d7 Binary files /dev/null and b/companion/src/themes/classic/32/update.png differ diff --git a/companion/src/themes/classic/32/wizard.png b/companion/src/themes/classic/32/wizard.png new file mode 100644 index 000000000..ff5161498 Binary files /dev/null and b/companion/src/themes/classic/32/wizard.png differ diff --git a/companion/src/themes/classic/32/write_eeprom.png b/companion/src/themes/classic/32/write_eeprom.png new file mode 100644 index 000000000..005766b0b Binary files /dev/null and b/companion/src/themes/classic/32/write_eeprom.png differ diff --git a/companion/src/themes/classic/32/write_eeprom_file.png b/companion/src/themes/classic/32/write_eeprom_file.png new file mode 100644 index 000000000..1ead1095b Binary files /dev/null and b/companion/src/themes/classic/32/write_eeprom_file.png differ diff --git a/companion/src/themes/classic/32/write_flash.png b/companion/src/themes/classic/32/write_flash.png new file mode 100644 index 000000000..231b72041 Binary files /dev/null and b/companion/src/themes/classic/32/write_flash.png differ diff --git a/companion/src/themes/classic/48/add.png b/companion/src/themes/classic/48/add.png new file mode 100644 index 000000000..fe8a28097 Binary files /dev/null and b/companion/src/themes/classic/48/add.png differ diff --git a/companion/src/themes/classic/48/arrow-left.png b/companion/src/themes/classic/48/arrow-left.png new file mode 100644 index 000000000..f6bb5eb08 Binary files /dev/null and b/companion/src/themes/classic/48/arrow-left.png differ diff --git a/companion/src/themes/classic/48/arrow-right.png b/companion/src/themes/classic/48/arrow-right.png new file mode 100644 index 000000000..25dfe0dab Binary files /dev/null and b/companion/src/themes/classic/48/arrow-right.png differ diff --git a/companion/src/themes/classic/48/changelog.png b/companion/src/themes/classic/48/changelog.png new file mode 100644 index 000000000..bf3ed7459 Binary files /dev/null and b/companion/src/themes/classic/48/changelog.png differ diff --git a/companion/src/themes/classic/48/clear.png b/companion/src/themes/classic/48/clear.png new file mode 100644 index 000000000..4cc914074 Binary files /dev/null and b/companion/src/themes/classic/48/clear.png differ diff --git a/companion/src/themes/classic/48/compare.png b/companion/src/themes/classic/48/compare.png new file mode 100644 index 000000000..499c40192 Binary files /dev/null and b/companion/src/themes/classic/48/compare.png differ diff --git a/companion/src/themes/classic/48/configure.png b/companion/src/themes/classic/48/configure.png new file mode 100644 index 000000000..9b0506ed5 Binary files /dev/null and b/companion/src/themes/classic/48/configure.png differ diff --git a/companion/src/themes/classic/48/contributors.png b/companion/src/themes/classic/48/contributors.png new file mode 100644 index 000000000..98bc58202 Binary files /dev/null and b/companion/src/themes/classic/48/contributors.png differ diff --git a/companion/src/themes/classic/48/copy.png b/companion/src/themes/classic/48/copy.png new file mode 100644 index 000000000..9bc5c654c Binary files /dev/null and b/companion/src/themes/classic/48/copy.png differ diff --git a/companion/src/themes/classic/48/currentmodel.png b/companion/src/themes/classic/48/currentmodel.png new file mode 100644 index 000000000..860941f75 Binary files /dev/null and b/companion/src/themes/classic/48/currentmodel.png differ diff --git a/companion/src/themes/classic/48/customize.png b/companion/src/themes/classic/48/customize.png new file mode 100644 index 000000000..a64ea0a35 Binary files /dev/null and b/companion/src/themes/classic/48/customize.png differ diff --git a/companion/src/themes/classic/48/cut.png b/companion/src/themes/classic/48/cut.png new file mode 100644 index 000000000..45d111adf Binary files /dev/null and b/companion/src/themes/classic/48/cut.png differ diff --git a/companion/src/themes/classic/48/duplicate.png b/companion/src/themes/classic/48/duplicate.png new file mode 100644 index 000000000..903afdd6c Binary files /dev/null and b/companion/src/themes/classic/48/duplicate.png differ diff --git a/companion/src/themes/classic/48/edit.png b/companion/src/themes/classic/48/edit.png new file mode 100644 index 000000000..2869e5bbd Binary files /dev/null and b/companion/src/themes/classic/48/edit.png differ diff --git a/companion/src/themes/classic/48/exit.png b/companion/src/themes/classic/48/exit.png new file mode 100644 index 000000000..159dccb93 Binary files /dev/null and b/companion/src/themes/classic/48/exit.png differ diff --git a/companion/src/themes/classic/48/fuses.png b/companion/src/themes/classic/48/fuses.png new file mode 100644 index 000000000..d7fb789c4 Binary files /dev/null and b/companion/src/themes/classic/48/fuses.png differ diff --git a/companion/src/themes/classic/48/information.png b/companion/src/themes/classic/48/information.png new file mode 100644 index 000000000..e62f8ee19 Binary files /dev/null and b/companion/src/themes/classic/48/information.png differ diff --git a/companion/src/themes/classic/48/library.png b/companion/src/themes/classic/48/library.png new file mode 100644 index 000000000..df4cf1e0c Binary files /dev/null and b/companion/src/themes/classic/48/library.png differ diff --git a/companion/src/themes/classic/48/list.png b/companion/src/themes/classic/48/list.png new file mode 100644 index 000000000..564d76118 Binary files /dev/null and b/companion/src/themes/classic/48/list.png differ diff --git a/companion/src/themes/classic/48/logs.png b/companion/src/themes/classic/48/logs.png new file mode 100644 index 000000000..55c6f8d0b Binary files /dev/null and b/companion/src/themes/classic/48/logs.png differ diff --git a/companion/src/themes/classic/48/movedown.png b/companion/src/themes/classic/48/movedown.png new file mode 100644 index 000000000..7f6cb094d Binary files /dev/null and b/companion/src/themes/classic/48/movedown.png differ diff --git a/companion/src/themes/classic/48/moveup.png b/companion/src/themes/classic/48/moveup.png new file mode 100644 index 000000000..62f818d20 Binary files /dev/null and b/companion/src/themes/classic/48/moveup.png differ diff --git a/companion/src/themes/classic/48/new.png b/companion/src/themes/classic/48/new.png new file mode 100644 index 000000000..35ba8e361 Binary files /dev/null and b/companion/src/themes/classic/48/new.png differ diff --git a/companion/src/themes/classic/48/open.png b/companion/src/themes/classic/48/open.png new file mode 100644 index 000000000..04aebb09f Binary files /dev/null and b/companion/src/themes/classic/48/open.png differ diff --git a/companion/src/themes/classic/48/paintbrush.png b/companion/src/themes/classic/48/paintbrush.png new file mode 100644 index 000000000..8f90906c7 Binary files /dev/null and b/companion/src/themes/classic/48/paintbrush.png differ diff --git a/companion/src/themes/classic/48/paste.png b/companion/src/themes/classic/48/paste.png new file mode 100644 index 000000000..bbc349158 Binary files /dev/null and b/companion/src/themes/classic/48/paste.png differ diff --git a/companion/src/themes/classic/48/play.png b/companion/src/themes/classic/48/play.png new file mode 100644 index 000000000..740f36842 Binary files /dev/null and b/companion/src/themes/classic/48/play.png differ diff --git a/companion/src/themes/classic/48/preferences.png b/companion/src/themes/classic/48/preferences.png new file mode 100644 index 000000000..713e2cbeb Binary files /dev/null and b/companion/src/themes/classic/48/preferences.png differ diff --git a/companion/src/themes/classic/48/print.png b/companion/src/themes/classic/48/print.png new file mode 100644 index 000000000..5bafa08d8 Binary files /dev/null and b/companion/src/themes/classic/48/print.png differ diff --git a/companion/src/themes/classic/48/profiles.png b/companion/src/themes/classic/48/profiles.png new file mode 100644 index 000000000..52721bd5f Binary files /dev/null and b/companion/src/themes/classic/48/profiles.png differ diff --git a/companion/src/themes/classic/48/read_eeprom.png b/companion/src/themes/classic/48/read_eeprom.png new file mode 100644 index 000000000..a7ef5d2c0 Binary files /dev/null and b/companion/src/themes/classic/48/read_eeprom.png differ diff --git a/companion/src/themes/classic/48/read_eeprom_file.png b/companion/src/themes/classic/48/read_eeprom_file.png new file mode 100644 index 000000000..fdd2e5588 Binary files /dev/null and b/companion/src/themes/classic/48/read_eeprom_file.png differ diff --git a/companion/src/themes/classic/48/read_flash.png b/companion/src/themes/classic/48/read_flash.png new file mode 100644 index 000000000..0b5440588 Binary files /dev/null and b/companion/src/themes/classic/48/read_flash.png differ diff --git a/companion/src/themes/classic/48/recentdocument.png b/companion/src/themes/classic/48/recentdocument.png new file mode 100644 index 000000000..2f8eb1ba9 Binary files /dev/null and b/companion/src/themes/classic/48/recentdocument.png differ diff --git a/companion/src/themes/classic/48/save.png b/companion/src/themes/classic/48/save.png new file mode 100644 index 000000000..9153bd84c Binary files /dev/null and b/companion/src/themes/classic/48/save.png differ diff --git a/companion/src/themes/classic/48/saveas.png b/companion/src/themes/classic/48/saveas.png new file mode 100644 index 000000000..1bb79a525 Binary files /dev/null and b/companion/src/themes/classic/48/saveas.png differ diff --git a/companion/src/themes/classic/48/simulate.png b/companion/src/themes/classic/48/simulate.png new file mode 100644 index 000000000..e9c338619 Binary files /dev/null and b/companion/src/themes/classic/48/simulate.png differ diff --git a/companion/src/themes/classic/48/stop.png b/companion/src/themes/classic/48/stop.png new file mode 100644 index 000000000..c513babaa Binary files /dev/null and b/companion/src/themes/classic/48/stop.png differ diff --git a/companion/src/themes/classic/48/switch_dir.png b/companion/src/themes/classic/48/switch_dir.png new file mode 100644 index 000000000..179d5a07f Binary files /dev/null and b/companion/src/themes/classic/48/switch_dir.png differ diff --git a/companion/src/themes/classic/48/update.png b/companion/src/themes/classic/48/update.png new file mode 100644 index 000000000..27112e871 Binary files /dev/null and b/companion/src/themes/classic/48/update.png differ diff --git a/companion/src/themes/classic/48/wizard.png b/companion/src/themes/classic/48/wizard.png new file mode 100644 index 000000000..3fbd7d780 Binary files /dev/null and b/companion/src/themes/classic/48/wizard.png differ diff --git a/companion/src/themes/classic/48/write_eeprom.png b/companion/src/themes/classic/48/write_eeprom.png new file mode 100644 index 000000000..1c873f8e0 Binary files /dev/null and b/companion/src/themes/classic/48/write_eeprom.png differ diff --git a/companion/src/themes/classic/48/write_eeprom_file.png b/companion/src/themes/classic/48/write_eeprom_file.png new file mode 100644 index 000000000..57804bd68 Binary files /dev/null and b/companion/src/themes/classic/48/write_eeprom_file.png differ diff --git a/companion/src/themes/classic/48/write_flash.png b/companion/src/themes/classic/48/write_flash.png new file mode 100644 index 000000000..3600b5e37 Binary files /dev/null and b/companion/src/themes/classic/48/write_flash.png differ diff --git a/companion/src/themes/classic/add.png b/companion/src/themes/classic/add.png new file mode 100644 index 000000000..24cc027da Binary files /dev/null and b/companion/src/themes/classic/add.png differ diff --git a/companion/src/themes/classic/arrow-left.png b/companion/src/themes/classic/arrow-left.png new file mode 100644 index 000000000..759e58950 Binary files /dev/null and b/companion/src/themes/classic/arrow-left.png differ diff --git a/companion/src/themes/classic/arrow-right.png b/companion/src/themes/classic/arrow-right.png new file mode 100644 index 000000000..1d056715f Binary files /dev/null and b/companion/src/themes/classic/arrow-right.png differ diff --git a/companion/src/themes/classic/changelog.png b/companion/src/themes/classic/changelog.png new file mode 100644 index 000000000..3c60e6745 Binary files /dev/null and b/companion/src/themes/classic/changelog.png differ diff --git a/companion/src/themes/classic/clear.png b/companion/src/themes/classic/clear.png new file mode 100644 index 000000000..a599c0332 Binary files /dev/null and b/companion/src/themes/classic/clear.png differ diff --git a/companion/src/themes/classic/compare.png b/companion/src/themes/classic/compare.png new file mode 100644 index 000000000..5b7e41c4f Binary files /dev/null and b/companion/src/themes/classic/compare.png differ diff --git a/companion/src/themes/classic/configure.png b/companion/src/themes/classic/configure.png new file mode 100644 index 000000000..ec6fad759 Binary files /dev/null and b/companion/src/themes/classic/configure.png differ diff --git a/companion/src/themes/classic/contributors.png b/companion/src/themes/classic/contributors.png new file mode 100644 index 000000000..276949198 Binary files /dev/null and b/companion/src/themes/classic/contributors.png differ diff --git a/companion/src/themes/classic/copy.png b/companion/src/themes/classic/copy.png new file mode 100644 index 000000000..2aeb28288 Binary files /dev/null and b/companion/src/themes/classic/copy.png differ diff --git a/companion/src/themes/classic/currentmodel.png b/companion/src/themes/classic/currentmodel.png new file mode 100644 index 000000000..35a37b766 Binary files /dev/null and b/companion/src/themes/classic/currentmodel.png differ diff --git a/companion/src/themes/classic/cut.png b/companion/src/themes/classic/cut.png new file mode 100644 index 000000000..54638e938 Binary files /dev/null and b/companion/src/themes/classic/cut.png differ diff --git a/companion/src/themes/classic/duplicate.png b/companion/src/themes/classic/duplicate.png new file mode 100644 index 000000000..811691d98 Binary files /dev/null and b/companion/src/themes/classic/duplicate.png differ diff --git a/companion/src/themes/classic/edit.png b/companion/src/themes/classic/edit.png new file mode 100644 index 000000000..106709cae Binary files /dev/null and b/companion/src/themes/classic/edit.png differ diff --git a/companion/src/themes/classic/exit.png b/companion/src/themes/classic/exit.png new file mode 100644 index 000000000..5319a9480 Binary files /dev/null and b/companion/src/themes/classic/exit.png differ diff --git a/companion/src/themes/classic/fuses.png b/companion/src/themes/classic/fuses.png new file mode 100644 index 000000000..4354cdcb2 Binary files /dev/null and b/companion/src/themes/classic/fuses.png differ diff --git a/companion/src/themes/classic/information.png b/companion/src/themes/classic/information.png new file mode 100644 index 000000000..76b6d5966 Binary files /dev/null and b/companion/src/themes/classic/information.png differ diff --git a/companion/src/themes/classic/library.png b/companion/src/themes/classic/library.png new file mode 100644 index 000000000..16bfde4b9 Binary files /dev/null and b/companion/src/themes/classic/library.png differ diff --git a/companion/src/themes/classic/list.png b/companion/src/themes/classic/list.png new file mode 100644 index 000000000..fd4db26dc Binary files /dev/null and b/companion/src/themes/classic/list.png differ diff --git a/companion/src/themes/classic/logs.png b/companion/src/themes/classic/logs.png new file mode 100644 index 000000000..8dc7ce194 Binary files /dev/null and b/companion/src/themes/classic/logs.png differ diff --git a/companion/src/themes/classic/movedown.png b/companion/src/themes/classic/movedown.png new file mode 100644 index 000000000..2632877c1 Binary files /dev/null and b/companion/src/themes/classic/movedown.png differ diff --git a/companion/src/themes/classic/moveup.png b/companion/src/themes/classic/moveup.png new file mode 100644 index 000000000..447f087cc Binary files /dev/null and b/companion/src/themes/classic/moveup.png differ diff --git a/companion/src/themes/classic/new.png b/companion/src/themes/classic/new.png new file mode 100644 index 000000000..12131b010 Binary files /dev/null and b/companion/src/themes/classic/new.png differ diff --git a/companion/src/themes/classic/open.png b/companion/src/themes/classic/open.png new file mode 100644 index 000000000..45fa2883a Binary files /dev/null and b/companion/src/themes/classic/open.png differ diff --git a/companion/src/themes/classic/paintbrush.png b/companion/src/themes/classic/paintbrush.png new file mode 100644 index 000000000..814fdb47e Binary files /dev/null and b/companion/src/themes/classic/paintbrush.png differ diff --git a/companion/src/themes/classic/paste.png b/companion/src/themes/classic/paste.png new file mode 100644 index 000000000..c14425cad Binary files /dev/null and b/companion/src/themes/classic/paste.png differ diff --git a/companion/src/themes/classic/play.png b/companion/src/themes/classic/play.png new file mode 100644 index 000000000..8501a8b58 Binary files /dev/null and b/companion/src/themes/classic/play.png differ diff --git a/companion/src/themes/classic/preferences.png b/companion/src/themes/classic/preferences.png new file mode 100644 index 000000000..1f6613e40 Binary files /dev/null and b/companion/src/themes/classic/preferences.png differ diff --git a/companion/src/themes/classic/print.png b/companion/src/themes/classic/print.png new file mode 100644 index 000000000..578980db7 Binary files /dev/null and b/companion/src/themes/classic/print.png differ diff --git a/companion/src/themes/classic/profiles.png b/companion/src/themes/classic/profiles.png new file mode 100644 index 000000000..bfa571cff Binary files /dev/null and b/companion/src/themes/classic/profiles.png differ diff --git a/companion/src/themes/classic/read_eeprom.png b/companion/src/themes/classic/read_eeprom.png new file mode 100644 index 000000000..08e861b31 Binary files /dev/null and b/companion/src/themes/classic/read_eeprom.png differ diff --git a/companion/src/themes/classic/read_eeprom_file.png b/companion/src/themes/classic/read_eeprom_file.png new file mode 100644 index 000000000..67a41176b Binary files /dev/null and b/companion/src/themes/classic/read_eeprom_file.png differ diff --git a/companion/src/themes/classic/read_flash.png b/companion/src/themes/classic/read_flash.png new file mode 100644 index 000000000..c9065819b Binary files /dev/null and b/companion/src/themes/classic/read_flash.png differ diff --git a/companion/src/themes/classic/recentdocument.png b/companion/src/themes/classic/recentdocument.png new file mode 100644 index 000000000..567494905 Binary files /dev/null and b/companion/src/themes/classic/recentdocument.png differ diff --git a/companion/src/themes/classic/save.png b/companion/src/themes/classic/save.png new file mode 100644 index 000000000..651b2a41f Binary files /dev/null and b/companion/src/themes/classic/save.png differ diff --git a/companion/src/themes/classic/saveas.png b/companion/src/themes/classic/saveas.png new file mode 100644 index 000000000..d5d3176b8 Binary files /dev/null and b/companion/src/themes/classic/saveas.png differ diff --git a/companion/src/themes/classic/simulate.png b/companion/src/themes/classic/simulate.png new file mode 100644 index 000000000..429e12b9a Binary files /dev/null and b/companion/src/themes/classic/simulate.png differ diff --git a/companion/src/themes/classic/stop.png b/companion/src/themes/classic/stop.png new file mode 100644 index 000000000..3bf2af6e9 Binary files /dev/null and b/companion/src/themes/classic/stop.png differ diff --git a/companion/src/themes/classic/switch_dir.png b/companion/src/themes/classic/switch_dir.png new file mode 100644 index 000000000..a9ba5f47a Binary files /dev/null and b/companion/src/themes/classic/switch_dir.png differ diff --git a/companion/src/themes/classic/update.png b/companion/src/themes/classic/update.png new file mode 100644 index 000000000..034ee58e8 Binary files /dev/null and b/companion/src/themes/classic/update.png differ diff --git a/companion/src/themes/classic/wizard.png b/companion/src/themes/classic/wizard.png new file mode 100644 index 000000000..ccd964e1d Binary files /dev/null and b/companion/src/themes/classic/wizard.png differ diff --git a/companion/src/themes/classic/write_eeprom.png b/companion/src/themes/classic/write_eeprom.png new file mode 100644 index 000000000..15e58d0a3 Binary files /dev/null and b/companion/src/themes/classic/write_eeprom.png differ diff --git a/companion/src/themes/classic/write_eeprom_file.png b/companion/src/themes/classic/write_eeprom_file.png new file mode 100644 index 000000000..60d7c312e Binary files /dev/null and b/companion/src/themes/classic/write_eeprom_file.png differ diff --git a/companion/src/themes/classic/write_flash.png b/companion/src/themes/classic/write_flash.png new file mode 100644 index 000000000..1664cb228 Binary files /dev/null and b/companion/src/themes/classic/write_flash.png differ diff --git a/companion/src/themes/monochrome/16/add.png b/companion/src/themes/monochrome/16/add.png new file mode 100644 index 000000000..7d853823c Binary files /dev/null and b/companion/src/themes/monochrome/16/add.png differ diff --git a/companion/src/themes/monochrome/16/arrow-left.png b/companion/src/themes/monochrome/16/arrow-left.png new file mode 100644 index 000000000..4b7498f99 Binary files /dev/null and b/companion/src/themes/monochrome/16/arrow-left.png differ diff --git a/companion/src/themes/monochrome/16/arrow-right.png b/companion/src/themes/monochrome/16/arrow-right.png new file mode 100644 index 000000000..ed95c8a80 Binary files /dev/null and b/companion/src/themes/monochrome/16/arrow-right.png differ diff --git a/companion/src/themes/monochrome/16/changelog.png b/companion/src/themes/monochrome/16/changelog.png new file mode 100644 index 000000000..744544da6 Binary files /dev/null and b/companion/src/themes/monochrome/16/changelog.png differ diff --git a/companion/src/themes/monochrome/16/clear.png b/companion/src/themes/monochrome/16/clear.png new file mode 100644 index 000000000..b81ae9232 Binary files /dev/null and b/companion/src/themes/monochrome/16/clear.png differ diff --git a/companion/src/themes/monochrome/16/compare.png b/companion/src/themes/monochrome/16/compare.png new file mode 100644 index 000000000..a12be8ad2 Binary files /dev/null and b/companion/src/themes/monochrome/16/compare.png differ diff --git a/companion/src/themes/monochrome/16/configure.png b/companion/src/themes/monochrome/16/configure.png new file mode 100644 index 000000000..6a3295aab Binary files /dev/null and b/companion/src/themes/monochrome/16/configure.png differ diff --git a/companion/src/themes/monochrome/16/contributors.png b/companion/src/themes/monochrome/16/contributors.png new file mode 100644 index 000000000..ca7664737 Binary files /dev/null and b/companion/src/themes/monochrome/16/contributors.png differ diff --git a/companion/src/themes/monochrome/16/copy.png b/companion/src/themes/monochrome/16/copy.png new file mode 100644 index 000000000..0b02d7b12 Binary files /dev/null and b/companion/src/themes/monochrome/16/copy.png differ diff --git a/companion/src/themes/monochrome/16/currentmodel.png b/companion/src/themes/monochrome/16/currentmodel.png new file mode 100644 index 000000000..2f9d72888 Binary files /dev/null and b/companion/src/themes/monochrome/16/currentmodel.png differ diff --git a/companion/src/themes/monochrome/16/customize.png b/companion/src/themes/monochrome/16/customize.png new file mode 100644 index 000000000..078d0af75 Binary files /dev/null and b/companion/src/themes/monochrome/16/customize.png differ diff --git a/companion/src/themes/monochrome/16/cut.png b/companion/src/themes/monochrome/16/cut.png new file mode 100644 index 000000000..b590d2f13 Binary files /dev/null and b/companion/src/themes/monochrome/16/cut.png differ diff --git a/companion/src/themes/monochrome/16/duplicate.png b/companion/src/themes/monochrome/16/duplicate.png new file mode 100644 index 000000000..4e994a70f Binary files /dev/null and b/companion/src/themes/monochrome/16/duplicate.png differ diff --git a/companion/src/themes/monochrome/16/edit.png b/companion/src/themes/monochrome/16/edit.png new file mode 100644 index 000000000..9b7e2f76b Binary files /dev/null and b/companion/src/themes/monochrome/16/edit.png differ diff --git a/companion/src/themes/monochrome/16/exit.png b/companion/src/themes/monochrome/16/exit.png new file mode 100644 index 000000000..fa1be5f77 Binary files /dev/null and b/companion/src/themes/monochrome/16/exit.png differ diff --git a/companion/src/themes/monochrome/16/fuses.png b/companion/src/themes/monochrome/16/fuses.png new file mode 100644 index 000000000..521de6d3a Binary files /dev/null and b/companion/src/themes/monochrome/16/fuses.png differ diff --git a/companion/src/themes/monochrome/16/information.png b/companion/src/themes/monochrome/16/information.png new file mode 100644 index 000000000..d7016086e Binary files /dev/null and b/companion/src/themes/monochrome/16/information.png differ diff --git a/companion/src/themes/monochrome/16/library.png b/companion/src/themes/monochrome/16/library.png new file mode 100644 index 000000000..01240a613 Binary files /dev/null and b/companion/src/themes/monochrome/16/library.png differ diff --git a/companion/src/themes/monochrome/16/list.png b/companion/src/themes/monochrome/16/list.png new file mode 100644 index 000000000..01a4b47d6 Binary files /dev/null and b/companion/src/themes/monochrome/16/list.png differ diff --git a/companion/src/themes/monochrome/16/logs.png b/companion/src/themes/monochrome/16/logs.png new file mode 100644 index 000000000..1d955dfa1 Binary files /dev/null and b/companion/src/themes/monochrome/16/logs.png differ diff --git a/companion/src/themes/monochrome/16/movedown.png b/companion/src/themes/monochrome/16/movedown.png new file mode 100644 index 000000000..5a0abec1f Binary files /dev/null and b/companion/src/themes/monochrome/16/movedown.png differ diff --git a/companion/src/themes/monochrome/16/moveup.png b/companion/src/themes/monochrome/16/moveup.png new file mode 100644 index 000000000..d7ffb1302 Binary files /dev/null and b/companion/src/themes/monochrome/16/moveup.png differ diff --git a/companion/src/themes/monochrome/16/new.png b/companion/src/themes/monochrome/16/new.png new file mode 100644 index 000000000..1f593fe07 Binary files /dev/null and b/companion/src/themes/monochrome/16/new.png differ diff --git a/companion/src/themes/monochrome/16/open.png b/companion/src/themes/monochrome/16/open.png new file mode 100644 index 000000000..ba55851c5 Binary files /dev/null and b/companion/src/themes/monochrome/16/open.png differ diff --git a/companion/src/themes/monochrome/16/paintbrush.png b/companion/src/themes/monochrome/16/paintbrush.png new file mode 100644 index 000000000..b95ec57aa Binary files /dev/null and b/companion/src/themes/monochrome/16/paintbrush.png differ diff --git a/companion/src/themes/monochrome/16/paste.png b/companion/src/themes/monochrome/16/paste.png new file mode 100644 index 000000000..9970502c6 Binary files /dev/null and b/companion/src/themes/monochrome/16/paste.png differ diff --git a/companion/src/themes/monochrome/16/play.png b/companion/src/themes/monochrome/16/play.png new file mode 100644 index 000000000..8501a8b58 Binary files /dev/null and b/companion/src/themes/monochrome/16/play.png differ diff --git a/companion/src/themes/monochrome/16/preferences.png b/companion/src/themes/monochrome/16/preferences.png new file mode 100644 index 000000000..1e0904a08 Binary files /dev/null and b/companion/src/themes/monochrome/16/preferences.png differ diff --git a/companion/src/themes/monochrome/16/print.png b/companion/src/themes/monochrome/16/print.png new file mode 100644 index 000000000..cc8459980 Binary files /dev/null and b/companion/src/themes/monochrome/16/print.png differ diff --git a/companion/src/themes/monochrome/16/profiles.png b/companion/src/themes/monochrome/16/profiles.png new file mode 100644 index 000000000..01b13e3c7 Binary files /dev/null and b/companion/src/themes/monochrome/16/profiles.png differ diff --git a/companion/src/themes/monochrome/16/read_eeprom.png b/companion/src/themes/monochrome/16/read_eeprom.png new file mode 100644 index 000000000..36c0ca8c6 Binary files /dev/null and b/companion/src/themes/monochrome/16/read_eeprom.png differ diff --git a/companion/src/themes/monochrome/16/read_eeprom_file.png b/companion/src/themes/monochrome/16/read_eeprom_file.png new file mode 100644 index 000000000..4f9b4eef7 Binary files /dev/null and b/companion/src/themes/monochrome/16/read_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/16/read_flash.png b/companion/src/themes/monochrome/16/read_flash.png new file mode 100644 index 000000000..8a70d655e Binary files /dev/null and b/companion/src/themes/monochrome/16/read_flash.png differ diff --git a/companion/src/themes/monochrome/16/recentdocument.png b/companion/src/themes/monochrome/16/recentdocument.png new file mode 100644 index 000000000..b7d7eb86b Binary files /dev/null and b/companion/src/themes/monochrome/16/recentdocument.png differ diff --git a/companion/src/themes/monochrome/16/save.png b/companion/src/themes/monochrome/16/save.png new file mode 100644 index 000000000..728de38cd Binary files /dev/null and b/companion/src/themes/monochrome/16/save.png differ diff --git a/companion/src/themes/monochrome/16/saveas.png b/companion/src/themes/monochrome/16/saveas.png new file mode 100644 index 000000000..71de2f887 Binary files /dev/null and b/companion/src/themes/monochrome/16/saveas.png differ diff --git a/companion/src/themes/monochrome/16/simulate.png b/companion/src/themes/monochrome/16/simulate.png new file mode 100644 index 000000000..6ae265ea6 Binary files /dev/null and b/companion/src/themes/monochrome/16/simulate.png differ diff --git a/companion/src/themes/monochrome/16/stop.png b/companion/src/themes/monochrome/16/stop.png new file mode 100644 index 000000000..3bf2af6e9 Binary files /dev/null and b/companion/src/themes/monochrome/16/stop.png differ diff --git a/companion/src/themes/monochrome/16/switch_dir.png b/companion/src/themes/monochrome/16/switch_dir.png new file mode 100644 index 000000000..fbbb2a841 Binary files /dev/null and b/companion/src/themes/monochrome/16/switch_dir.png differ diff --git a/companion/src/themes/monochrome/16/update.png b/companion/src/themes/monochrome/16/update.png new file mode 100644 index 000000000..31b90cf36 Binary files /dev/null and b/companion/src/themes/monochrome/16/update.png differ diff --git a/companion/src/themes/monochrome/16/wizard.png b/companion/src/themes/monochrome/16/wizard.png new file mode 100644 index 000000000..e047a1bf9 Binary files /dev/null and b/companion/src/themes/monochrome/16/wizard.png differ diff --git a/companion/src/themes/monochrome/16/write_eeprom.png b/companion/src/themes/monochrome/16/write_eeprom.png new file mode 100644 index 000000000..6ff3e7a42 Binary files /dev/null and b/companion/src/themes/monochrome/16/write_eeprom.png differ diff --git a/companion/src/themes/monochrome/16/write_eeprom_file.png b/companion/src/themes/monochrome/16/write_eeprom_file.png new file mode 100644 index 000000000..4c78f00c7 Binary files /dev/null and b/companion/src/themes/monochrome/16/write_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/16/write_flash.png b/companion/src/themes/monochrome/16/write_flash.png new file mode 100644 index 000000000..91ae4ee62 Binary files /dev/null and b/companion/src/themes/monochrome/16/write_flash.png differ diff --git a/companion/src/themes/monochrome/24/add.png b/companion/src/themes/monochrome/24/add.png new file mode 100644 index 000000000..fc50fa563 Binary files /dev/null and b/companion/src/themes/monochrome/24/add.png differ diff --git a/companion/src/themes/monochrome/24/arrow-left.png b/companion/src/themes/monochrome/24/arrow-left.png new file mode 100644 index 000000000..3e93c4017 Binary files /dev/null and b/companion/src/themes/monochrome/24/arrow-left.png differ diff --git a/companion/src/themes/monochrome/24/arrow-right.png b/companion/src/themes/monochrome/24/arrow-right.png new file mode 100644 index 000000000..be45fe369 Binary files /dev/null and b/companion/src/themes/monochrome/24/arrow-right.png differ diff --git a/companion/src/themes/monochrome/24/changelog.png b/companion/src/themes/monochrome/24/changelog.png new file mode 100644 index 000000000..c0b9d00a0 Binary files /dev/null and b/companion/src/themes/monochrome/24/changelog.png differ diff --git a/companion/src/themes/monochrome/24/clear.png b/companion/src/themes/monochrome/24/clear.png new file mode 100644 index 000000000..e8eac19c2 Binary files /dev/null and b/companion/src/themes/monochrome/24/clear.png differ diff --git a/companion/src/themes/monochrome/24/compare.png b/companion/src/themes/monochrome/24/compare.png new file mode 100644 index 000000000..72aaf933c Binary files /dev/null and b/companion/src/themes/monochrome/24/compare.png differ diff --git a/companion/src/themes/monochrome/24/configure.png b/companion/src/themes/monochrome/24/configure.png new file mode 100644 index 000000000..9d959229a Binary files /dev/null and b/companion/src/themes/monochrome/24/configure.png differ diff --git a/companion/src/themes/monochrome/24/contributors.png b/companion/src/themes/monochrome/24/contributors.png new file mode 100644 index 000000000..57692d732 Binary files /dev/null and b/companion/src/themes/monochrome/24/contributors.png differ diff --git a/companion/src/themes/monochrome/24/copy.png b/companion/src/themes/monochrome/24/copy.png new file mode 100644 index 000000000..7aab0f96a Binary files /dev/null and b/companion/src/themes/monochrome/24/copy.png differ diff --git a/companion/src/themes/monochrome/24/currentmodel.png b/companion/src/themes/monochrome/24/currentmodel.png new file mode 100644 index 000000000..4bb610c08 Binary files /dev/null and b/companion/src/themes/monochrome/24/currentmodel.png differ diff --git a/companion/src/themes/monochrome/24/customize.png b/companion/src/themes/monochrome/24/customize.png new file mode 100644 index 000000000..078d0af75 Binary files /dev/null and b/companion/src/themes/monochrome/24/customize.png differ diff --git a/companion/src/themes/monochrome/24/cut.png b/companion/src/themes/monochrome/24/cut.png new file mode 100644 index 000000000..1e5e3def3 Binary files /dev/null and b/companion/src/themes/monochrome/24/cut.png differ diff --git a/companion/src/themes/monochrome/24/duplicate.png b/companion/src/themes/monochrome/24/duplicate.png new file mode 100644 index 000000000..d2bdebf91 Binary files /dev/null and b/companion/src/themes/monochrome/24/duplicate.png differ diff --git a/companion/src/themes/monochrome/24/edit.png b/companion/src/themes/monochrome/24/edit.png new file mode 100644 index 000000000..4ea6a9d5d Binary files /dev/null and b/companion/src/themes/monochrome/24/edit.png differ diff --git a/companion/src/themes/monochrome/24/exit.png b/companion/src/themes/monochrome/24/exit.png new file mode 100644 index 000000000..c59387463 Binary files /dev/null and b/companion/src/themes/monochrome/24/exit.png differ diff --git a/companion/src/themes/monochrome/24/fuses.png b/companion/src/themes/monochrome/24/fuses.png new file mode 100644 index 000000000..c73efbb28 Binary files /dev/null and b/companion/src/themes/monochrome/24/fuses.png differ diff --git a/companion/src/themes/monochrome/24/information.png b/companion/src/themes/monochrome/24/information.png new file mode 100644 index 000000000..92b5c038c Binary files /dev/null and b/companion/src/themes/monochrome/24/information.png differ diff --git a/companion/src/themes/monochrome/24/library.png b/companion/src/themes/monochrome/24/library.png new file mode 100644 index 000000000..fd04c52d5 Binary files /dev/null and b/companion/src/themes/monochrome/24/library.png differ diff --git a/companion/src/themes/monochrome/24/list.png b/companion/src/themes/monochrome/24/list.png new file mode 100644 index 000000000..cb8b7d88d Binary files /dev/null and b/companion/src/themes/monochrome/24/list.png differ diff --git a/companion/src/themes/monochrome/24/logs.png b/companion/src/themes/monochrome/24/logs.png new file mode 100644 index 000000000..228951a95 Binary files /dev/null and b/companion/src/themes/monochrome/24/logs.png differ diff --git a/companion/src/themes/monochrome/24/movedown.png b/companion/src/themes/monochrome/24/movedown.png new file mode 100644 index 000000000..1f8c99746 Binary files /dev/null and b/companion/src/themes/monochrome/24/movedown.png differ diff --git a/companion/src/themes/monochrome/24/moveup.png b/companion/src/themes/monochrome/24/moveup.png new file mode 100644 index 000000000..828dc5de2 Binary files /dev/null and b/companion/src/themes/monochrome/24/moveup.png differ diff --git a/companion/src/themes/monochrome/24/new.png b/companion/src/themes/monochrome/24/new.png new file mode 100644 index 000000000..7b834e6e8 Binary files /dev/null and b/companion/src/themes/monochrome/24/new.png differ diff --git a/companion/src/themes/monochrome/24/open.png b/companion/src/themes/monochrome/24/open.png new file mode 100644 index 000000000..9fc1f9441 Binary files /dev/null and b/companion/src/themes/monochrome/24/open.png differ diff --git a/companion/src/themes/monochrome/24/paintbrush.png b/companion/src/themes/monochrome/24/paintbrush.png new file mode 100644 index 000000000..98ae20c4a Binary files /dev/null and b/companion/src/themes/monochrome/24/paintbrush.png differ diff --git a/companion/src/themes/monochrome/24/paste.png b/companion/src/themes/monochrome/24/paste.png new file mode 100644 index 000000000..849d6b790 Binary files /dev/null and b/companion/src/themes/monochrome/24/paste.png differ diff --git a/companion/src/themes/monochrome/24/play.png b/companion/src/themes/monochrome/24/play.png new file mode 100644 index 000000000..8501a8b58 Binary files /dev/null and b/companion/src/themes/monochrome/24/play.png differ diff --git a/companion/src/themes/monochrome/24/preferences.png b/companion/src/themes/monochrome/24/preferences.png new file mode 100644 index 000000000..ad6dfa543 Binary files /dev/null and b/companion/src/themes/monochrome/24/preferences.png differ diff --git a/companion/src/themes/monochrome/24/print.png b/companion/src/themes/monochrome/24/print.png new file mode 100644 index 000000000..ae11c5082 Binary files /dev/null and b/companion/src/themes/monochrome/24/print.png differ diff --git a/companion/src/themes/monochrome/24/profiles.png b/companion/src/themes/monochrome/24/profiles.png new file mode 100644 index 000000000..4725bef43 Binary files /dev/null and b/companion/src/themes/monochrome/24/profiles.png differ diff --git a/companion/src/themes/monochrome/24/read_eeprom.png b/companion/src/themes/monochrome/24/read_eeprom.png new file mode 100644 index 000000000..c701d1104 Binary files /dev/null and b/companion/src/themes/monochrome/24/read_eeprom.png differ diff --git a/companion/src/themes/monochrome/24/read_eeprom_file.png b/companion/src/themes/monochrome/24/read_eeprom_file.png new file mode 100644 index 000000000..4fa26bf07 Binary files /dev/null and b/companion/src/themes/monochrome/24/read_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/24/read_flash.png b/companion/src/themes/monochrome/24/read_flash.png new file mode 100644 index 000000000..49c6312d4 Binary files /dev/null and b/companion/src/themes/monochrome/24/read_flash.png differ diff --git a/companion/src/themes/monochrome/24/recentdocument.png b/companion/src/themes/monochrome/24/recentdocument.png new file mode 100644 index 000000000..a69798ce1 Binary files /dev/null and b/companion/src/themes/monochrome/24/recentdocument.png differ diff --git a/companion/src/themes/monochrome/24/save.png b/companion/src/themes/monochrome/24/save.png new file mode 100644 index 000000000..a2c2cbb95 Binary files /dev/null and b/companion/src/themes/monochrome/24/save.png differ diff --git a/companion/src/themes/monochrome/24/saveas.png b/companion/src/themes/monochrome/24/saveas.png new file mode 100644 index 000000000..f18ad7783 Binary files /dev/null and b/companion/src/themes/monochrome/24/saveas.png differ diff --git a/companion/src/themes/monochrome/24/simulate.png b/companion/src/themes/monochrome/24/simulate.png new file mode 100644 index 000000000..b344c419a Binary files /dev/null and b/companion/src/themes/monochrome/24/simulate.png differ diff --git a/companion/src/themes/monochrome/24/stop.png b/companion/src/themes/monochrome/24/stop.png new file mode 100644 index 000000000..3bf2af6e9 Binary files /dev/null and b/companion/src/themes/monochrome/24/stop.png differ diff --git a/companion/src/themes/monochrome/24/switch_dir.png b/companion/src/themes/monochrome/24/switch_dir.png new file mode 100644 index 000000000..8d6879e2f Binary files /dev/null and b/companion/src/themes/monochrome/24/switch_dir.png differ diff --git a/companion/src/themes/monochrome/24/update.png b/companion/src/themes/monochrome/24/update.png new file mode 100644 index 000000000..9ed1124cc Binary files /dev/null and b/companion/src/themes/monochrome/24/update.png differ diff --git a/companion/src/themes/monochrome/24/wizard.png b/companion/src/themes/monochrome/24/wizard.png new file mode 100644 index 000000000..6185d56c5 Binary files /dev/null and b/companion/src/themes/monochrome/24/wizard.png differ diff --git a/companion/src/themes/monochrome/24/write_eeprom.png b/companion/src/themes/monochrome/24/write_eeprom.png new file mode 100644 index 000000000..d6d540f5b Binary files /dev/null and b/companion/src/themes/monochrome/24/write_eeprom.png differ diff --git a/companion/src/themes/monochrome/24/write_eeprom_file.png b/companion/src/themes/monochrome/24/write_eeprom_file.png new file mode 100644 index 000000000..7291a074c Binary files /dev/null and b/companion/src/themes/monochrome/24/write_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/24/write_flash.png b/companion/src/themes/monochrome/24/write_flash.png new file mode 100644 index 000000000..55305cd3d Binary files /dev/null and b/companion/src/themes/monochrome/24/write_flash.png differ diff --git a/companion/src/images/add.png b/companion/src/themes/monochrome/32/add.png similarity index 100% rename from companion/src/images/add.png rename to companion/src/themes/monochrome/32/add.png diff --git a/companion/src/images/arrow-left.png b/companion/src/themes/monochrome/32/arrow-left.png similarity index 100% rename from companion/src/images/arrow-left.png rename to companion/src/themes/monochrome/32/arrow-left.png diff --git a/companion/src/images/arrow-right.png b/companion/src/themes/monochrome/32/arrow-right.png similarity index 100% rename from companion/src/images/arrow-right.png rename to companion/src/themes/monochrome/32/arrow-right.png diff --git a/companion/src/images/changelog.png b/companion/src/themes/monochrome/32/changelog.png similarity index 100% rename from companion/src/images/changelog.png rename to companion/src/themes/monochrome/32/changelog.png diff --git a/companion/src/images/clear.png b/companion/src/themes/monochrome/32/clear.png similarity index 100% rename from companion/src/images/clear.png rename to companion/src/themes/monochrome/32/clear.png diff --git a/companion/src/images/compare.png b/companion/src/themes/monochrome/32/compare.png similarity index 100% rename from companion/src/images/compare.png rename to companion/src/themes/monochrome/32/compare.png diff --git a/companion/src/images/configure.png b/companion/src/themes/monochrome/32/configure.png similarity index 100% rename from companion/src/images/configure.png rename to companion/src/themes/monochrome/32/configure.png diff --git a/companion/src/images/contributors.png b/companion/src/themes/monochrome/32/contributors.png similarity index 100% rename from companion/src/images/contributors.png rename to companion/src/themes/monochrome/32/contributors.png diff --git a/companion/src/images/copy.png b/companion/src/themes/monochrome/32/copy.png similarity index 100% rename from companion/src/images/copy.png rename to companion/src/themes/monochrome/32/copy.png diff --git a/companion/src/images/currentmodel.png b/companion/src/themes/monochrome/32/currentmodel.png similarity index 100% rename from companion/src/images/currentmodel.png rename to companion/src/themes/monochrome/32/currentmodel.png diff --git a/companion/src/themes/monochrome/32/customize.png b/companion/src/themes/monochrome/32/customize.png new file mode 100644 index 000000000..078d0af75 Binary files /dev/null and b/companion/src/themes/monochrome/32/customize.png differ diff --git a/companion/src/images/cut.png b/companion/src/themes/monochrome/32/cut.png similarity index 100% rename from companion/src/images/cut.png rename to companion/src/themes/monochrome/32/cut.png diff --git a/companion/src/images/duplicate.png b/companion/src/themes/monochrome/32/duplicate.png similarity index 100% rename from companion/src/images/duplicate.png rename to companion/src/themes/monochrome/32/duplicate.png diff --git a/companion/src/images/edit.png b/companion/src/themes/monochrome/32/edit.png similarity index 100% rename from companion/src/images/edit.png rename to companion/src/themes/monochrome/32/edit.png diff --git a/companion/src/images/exit.png b/companion/src/themes/monochrome/32/exit.png similarity index 100% rename from companion/src/images/exit.png rename to companion/src/themes/monochrome/32/exit.png diff --git a/companion/src/images/fuses.png b/companion/src/themes/monochrome/32/fuses.png similarity index 100% rename from companion/src/images/fuses.png rename to companion/src/themes/monochrome/32/fuses.png diff --git a/companion/src/images/information.png b/companion/src/themes/monochrome/32/information.png similarity index 100% rename from companion/src/images/information.png rename to companion/src/themes/monochrome/32/information.png diff --git a/companion/src/images/library.png b/companion/src/themes/monochrome/32/library.png similarity index 100% rename from companion/src/images/library.png rename to companion/src/themes/monochrome/32/library.png diff --git a/companion/src/images/list.png b/companion/src/themes/monochrome/32/list.png similarity index 100% rename from companion/src/images/list.png rename to companion/src/themes/monochrome/32/list.png diff --git a/companion/src/images/logs.png b/companion/src/themes/monochrome/32/logs.png similarity index 100% rename from companion/src/images/logs.png rename to companion/src/themes/monochrome/32/logs.png diff --git a/companion/src/images/movedown.png b/companion/src/themes/monochrome/32/movedown.png similarity index 100% rename from companion/src/images/movedown.png rename to companion/src/themes/monochrome/32/movedown.png diff --git a/companion/src/images/moveup.png b/companion/src/themes/monochrome/32/moveup.png similarity index 100% rename from companion/src/images/moveup.png rename to companion/src/themes/monochrome/32/moveup.png diff --git a/companion/src/images/new.png b/companion/src/themes/monochrome/32/new.png similarity index 100% rename from companion/src/images/new.png rename to companion/src/themes/monochrome/32/new.png diff --git a/companion/src/images/open.png b/companion/src/themes/monochrome/32/open.png similarity index 100% rename from companion/src/images/open.png rename to companion/src/themes/monochrome/32/open.png diff --git a/companion/src/themes/monochrome/32/paintbrush.png b/companion/src/themes/monochrome/32/paintbrush.png new file mode 100644 index 000000000..34e25a170 Binary files /dev/null and b/companion/src/themes/monochrome/32/paintbrush.png differ diff --git a/companion/src/images/paste.png b/companion/src/themes/monochrome/32/paste.png similarity index 100% rename from companion/src/images/paste.png rename to companion/src/themes/monochrome/32/paste.png diff --git a/companion/src/themes/monochrome/32/play.png b/companion/src/themes/monochrome/32/play.png new file mode 100644 index 000000000..8501a8b58 Binary files /dev/null and b/companion/src/themes/monochrome/32/play.png differ diff --git a/companion/src/images/preferences.png b/companion/src/themes/monochrome/32/preferences.png similarity index 100% rename from companion/src/images/preferences.png rename to companion/src/themes/monochrome/32/preferences.png diff --git a/companion/src/images/print.png b/companion/src/themes/monochrome/32/print.png similarity index 100% rename from companion/src/images/print.png rename to companion/src/themes/monochrome/32/print.png diff --git a/companion/src/images/profiles.png b/companion/src/themes/monochrome/32/profiles.png similarity index 100% rename from companion/src/images/profiles.png rename to companion/src/themes/monochrome/32/profiles.png diff --git a/companion/src/images/read_eeprom.png b/companion/src/themes/monochrome/32/read_eeprom.png similarity index 100% rename from companion/src/images/read_eeprom.png rename to companion/src/themes/monochrome/32/read_eeprom.png diff --git a/companion/src/images/read_eeprom_file.png b/companion/src/themes/monochrome/32/read_eeprom_file.png similarity index 100% rename from companion/src/images/read_eeprom_file.png rename to companion/src/themes/monochrome/32/read_eeprom_file.png diff --git a/companion/src/images/read_flash.png b/companion/src/themes/monochrome/32/read_flash.png similarity index 100% rename from companion/src/images/read_flash.png rename to companion/src/themes/monochrome/32/read_flash.png diff --git a/companion/src/images/recentdocument.png b/companion/src/themes/monochrome/32/recentdocument.png similarity index 100% rename from companion/src/images/recentdocument.png rename to companion/src/themes/monochrome/32/recentdocument.png diff --git a/companion/src/images/save.png b/companion/src/themes/monochrome/32/save.png similarity index 100% rename from companion/src/images/save.png rename to companion/src/themes/monochrome/32/save.png diff --git a/companion/src/images/saveas.png b/companion/src/themes/monochrome/32/saveas.png similarity index 100% rename from companion/src/images/saveas.png rename to companion/src/themes/monochrome/32/saveas.png diff --git a/companion/src/images/simulate.png b/companion/src/themes/monochrome/32/simulate.png similarity index 100% rename from companion/src/images/simulate.png rename to companion/src/themes/monochrome/32/simulate.png diff --git a/companion/src/themes/monochrome/32/stop.png b/companion/src/themes/monochrome/32/stop.png new file mode 100644 index 000000000..3bf2af6e9 Binary files /dev/null and b/companion/src/themes/monochrome/32/stop.png differ diff --git a/companion/src/images/switch_dir.png b/companion/src/themes/monochrome/32/switch_dir.png similarity index 100% rename from companion/src/images/switch_dir.png rename to companion/src/themes/monochrome/32/switch_dir.png diff --git a/companion/src/images/update.png b/companion/src/themes/monochrome/32/update.png similarity index 100% rename from companion/src/images/update.png rename to companion/src/themes/monochrome/32/update.png diff --git a/companion/src/images/wizard.png b/companion/src/themes/monochrome/32/wizard.png similarity index 100% rename from companion/src/images/wizard.png rename to companion/src/themes/monochrome/32/wizard.png diff --git a/companion/src/images/write_eeprom.png b/companion/src/themes/monochrome/32/write_eeprom.png similarity index 100% rename from companion/src/images/write_eeprom.png rename to companion/src/themes/monochrome/32/write_eeprom.png diff --git a/companion/src/images/write_eeprom_file.png b/companion/src/themes/monochrome/32/write_eeprom_file.png similarity index 100% rename from companion/src/images/write_eeprom_file.png rename to companion/src/themes/monochrome/32/write_eeprom_file.png diff --git a/companion/src/images/write_flash.png b/companion/src/themes/monochrome/32/write_flash.png similarity index 100% rename from companion/src/images/write_flash.png rename to companion/src/themes/monochrome/32/write_flash.png diff --git a/companion/src/themes/monochrome/48/add.png b/companion/src/themes/monochrome/48/add.png new file mode 100644 index 000000000..023cdc45d Binary files /dev/null and b/companion/src/themes/monochrome/48/add.png differ diff --git a/companion/src/themes/monochrome/48/arrow-left.png b/companion/src/themes/monochrome/48/arrow-left.png new file mode 100644 index 000000000..c48e48c8e Binary files /dev/null and b/companion/src/themes/monochrome/48/arrow-left.png differ diff --git a/companion/src/themes/monochrome/48/arrow-right.png b/companion/src/themes/monochrome/48/arrow-right.png new file mode 100644 index 000000000..5264359aa Binary files /dev/null and b/companion/src/themes/monochrome/48/arrow-right.png differ diff --git a/companion/src/themes/monochrome/48/changelog.png b/companion/src/themes/monochrome/48/changelog.png new file mode 100644 index 000000000..28d60390d Binary files /dev/null and b/companion/src/themes/monochrome/48/changelog.png differ diff --git a/companion/src/themes/monochrome/48/clear.png b/companion/src/themes/monochrome/48/clear.png new file mode 100644 index 000000000..881bd0353 Binary files /dev/null and b/companion/src/themes/monochrome/48/clear.png differ diff --git a/companion/src/themes/monochrome/48/compare.png b/companion/src/themes/monochrome/48/compare.png new file mode 100644 index 000000000..993f6cf3f Binary files /dev/null and b/companion/src/themes/monochrome/48/compare.png differ diff --git a/companion/src/themes/monochrome/48/configure.png b/companion/src/themes/monochrome/48/configure.png new file mode 100644 index 000000000..fc799d600 Binary files /dev/null and b/companion/src/themes/monochrome/48/configure.png differ diff --git a/companion/src/themes/monochrome/48/contributors.png b/companion/src/themes/monochrome/48/contributors.png new file mode 100644 index 000000000..5c14d9e6b Binary files /dev/null and b/companion/src/themes/monochrome/48/contributors.png differ diff --git a/companion/src/themes/monochrome/48/copy.png b/companion/src/themes/monochrome/48/copy.png new file mode 100644 index 000000000..71cd70edc Binary files /dev/null and b/companion/src/themes/monochrome/48/copy.png differ diff --git a/companion/src/themes/monochrome/48/currentmodel.png b/companion/src/themes/monochrome/48/currentmodel.png new file mode 100644 index 000000000..d316a2b7b Binary files /dev/null and b/companion/src/themes/monochrome/48/currentmodel.png differ diff --git a/companion/src/themes/monochrome/48/customize.png b/companion/src/themes/monochrome/48/customize.png new file mode 100644 index 000000000..078d0af75 Binary files /dev/null and b/companion/src/themes/monochrome/48/customize.png differ diff --git a/companion/src/themes/monochrome/48/cut.png b/companion/src/themes/monochrome/48/cut.png new file mode 100644 index 000000000..765a1b82c Binary files /dev/null and b/companion/src/themes/monochrome/48/cut.png differ diff --git a/companion/src/themes/monochrome/48/duplicate.png b/companion/src/themes/monochrome/48/duplicate.png new file mode 100644 index 000000000..0fa780134 Binary files /dev/null and b/companion/src/themes/monochrome/48/duplicate.png differ diff --git a/companion/src/themes/monochrome/48/edit.png b/companion/src/themes/monochrome/48/edit.png new file mode 100644 index 000000000..41975a687 Binary files /dev/null and b/companion/src/themes/monochrome/48/edit.png differ diff --git a/companion/src/themes/monochrome/48/exit.png b/companion/src/themes/monochrome/48/exit.png new file mode 100644 index 000000000..45707ae3e Binary files /dev/null and b/companion/src/themes/monochrome/48/exit.png differ diff --git a/companion/src/themes/monochrome/48/fuses.png b/companion/src/themes/monochrome/48/fuses.png new file mode 100644 index 000000000..b239abd99 Binary files /dev/null and b/companion/src/themes/monochrome/48/fuses.png differ diff --git a/companion/src/themes/monochrome/48/information.png b/companion/src/themes/monochrome/48/information.png new file mode 100644 index 000000000..4c4bea488 Binary files /dev/null and b/companion/src/themes/monochrome/48/information.png differ diff --git a/companion/src/themes/monochrome/48/library.png b/companion/src/themes/monochrome/48/library.png new file mode 100644 index 000000000..9a8e06146 Binary files /dev/null and b/companion/src/themes/monochrome/48/library.png differ diff --git a/companion/src/themes/monochrome/48/list.png b/companion/src/themes/monochrome/48/list.png new file mode 100644 index 000000000..7c0f3b575 Binary files /dev/null and b/companion/src/themes/monochrome/48/list.png differ diff --git a/companion/src/themes/monochrome/48/logs.png b/companion/src/themes/monochrome/48/logs.png new file mode 100644 index 000000000..0817b2f88 Binary files /dev/null and b/companion/src/themes/monochrome/48/logs.png differ diff --git a/companion/src/themes/monochrome/48/movedown.png b/companion/src/themes/monochrome/48/movedown.png new file mode 100644 index 000000000..9200c09c9 Binary files /dev/null and b/companion/src/themes/monochrome/48/movedown.png differ diff --git a/companion/src/themes/monochrome/48/moveup.png b/companion/src/themes/monochrome/48/moveup.png new file mode 100644 index 000000000..eff5c6e8b Binary files /dev/null and b/companion/src/themes/monochrome/48/moveup.png differ diff --git a/companion/src/themes/monochrome/48/new.png b/companion/src/themes/monochrome/48/new.png new file mode 100644 index 000000000..b4a0993ef Binary files /dev/null and b/companion/src/themes/monochrome/48/new.png differ diff --git a/companion/src/themes/monochrome/48/open.png b/companion/src/themes/monochrome/48/open.png new file mode 100644 index 000000000..5a151c74d Binary files /dev/null and b/companion/src/themes/monochrome/48/open.png differ diff --git a/companion/src/themes/monochrome/48/paintbrush.png b/companion/src/themes/monochrome/48/paintbrush.png new file mode 100644 index 000000000..cc15507e6 Binary files /dev/null and b/companion/src/themes/monochrome/48/paintbrush.png differ diff --git a/companion/src/themes/monochrome/48/paste.png b/companion/src/themes/monochrome/48/paste.png new file mode 100644 index 000000000..377ace021 Binary files /dev/null and b/companion/src/themes/monochrome/48/paste.png differ diff --git a/companion/src/themes/monochrome/48/play.png b/companion/src/themes/monochrome/48/play.png new file mode 100644 index 000000000..8501a8b58 Binary files /dev/null and b/companion/src/themes/monochrome/48/play.png differ diff --git a/companion/src/themes/monochrome/48/preferences.png b/companion/src/themes/monochrome/48/preferences.png new file mode 100644 index 000000000..8f1199953 Binary files /dev/null and b/companion/src/themes/monochrome/48/preferences.png differ diff --git a/companion/src/themes/monochrome/48/print.png b/companion/src/themes/monochrome/48/print.png new file mode 100644 index 000000000..c830db3ea Binary files /dev/null and b/companion/src/themes/monochrome/48/print.png differ diff --git a/companion/src/themes/monochrome/48/profiles.png b/companion/src/themes/monochrome/48/profiles.png new file mode 100644 index 000000000..0489ffaa6 Binary files /dev/null and b/companion/src/themes/monochrome/48/profiles.png differ diff --git a/companion/src/themes/monochrome/48/read_eeprom.png b/companion/src/themes/monochrome/48/read_eeprom.png new file mode 100644 index 000000000..c5d3a1167 Binary files /dev/null and b/companion/src/themes/monochrome/48/read_eeprom.png differ diff --git a/companion/src/themes/monochrome/48/read_eeprom_file.png b/companion/src/themes/monochrome/48/read_eeprom_file.png new file mode 100644 index 000000000..48396fbfe Binary files /dev/null and b/companion/src/themes/monochrome/48/read_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/48/read_flash.png b/companion/src/themes/monochrome/48/read_flash.png new file mode 100644 index 000000000..356a6f9ad Binary files /dev/null and b/companion/src/themes/monochrome/48/read_flash.png differ diff --git a/companion/src/themes/monochrome/48/recentdocument.png b/companion/src/themes/monochrome/48/recentdocument.png new file mode 100644 index 000000000..aed0796fe Binary files /dev/null and b/companion/src/themes/monochrome/48/recentdocument.png differ diff --git a/companion/src/themes/monochrome/48/save.png b/companion/src/themes/monochrome/48/save.png new file mode 100644 index 000000000..0b9663106 Binary files /dev/null and b/companion/src/themes/monochrome/48/save.png differ diff --git a/companion/src/themes/monochrome/48/saveas.png b/companion/src/themes/monochrome/48/saveas.png new file mode 100644 index 000000000..496e95e6c Binary files /dev/null and b/companion/src/themes/monochrome/48/saveas.png differ diff --git a/companion/src/themes/monochrome/48/simulate.png b/companion/src/themes/monochrome/48/simulate.png new file mode 100644 index 000000000..7c05d5604 Binary files /dev/null and b/companion/src/themes/monochrome/48/simulate.png differ diff --git a/companion/src/themes/monochrome/48/stop.png b/companion/src/themes/monochrome/48/stop.png new file mode 100644 index 000000000..3bf2af6e9 Binary files /dev/null and b/companion/src/themes/monochrome/48/stop.png differ diff --git a/companion/src/themes/monochrome/48/switch_dir.png b/companion/src/themes/monochrome/48/switch_dir.png new file mode 100644 index 000000000..1039325c4 Binary files /dev/null and b/companion/src/themes/monochrome/48/switch_dir.png differ diff --git a/companion/src/themes/monochrome/48/update.png b/companion/src/themes/monochrome/48/update.png new file mode 100644 index 000000000..6128f49d7 Binary files /dev/null and b/companion/src/themes/monochrome/48/update.png differ diff --git a/companion/src/themes/monochrome/48/wizard.png b/companion/src/themes/monochrome/48/wizard.png new file mode 100644 index 000000000..4d1a67729 Binary files /dev/null and b/companion/src/themes/monochrome/48/wizard.png differ diff --git a/companion/src/themes/monochrome/48/write_eeprom.png b/companion/src/themes/monochrome/48/write_eeprom.png new file mode 100644 index 000000000..0318d748a Binary files /dev/null and b/companion/src/themes/monochrome/48/write_eeprom.png differ diff --git a/companion/src/themes/monochrome/48/write_eeprom_file.png b/companion/src/themes/monochrome/48/write_eeprom_file.png new file mode 100644 index 000000000..2d9d43eaa Binary files /dev/null and b/companion/src/themes/monochrome/48/write_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/48/write_flash.png b/companion/src/themes/monochrome/48/write_flash.png new file mode 100644 index 000000000..d20eb763a Binary files /dev/null and b/companion/src/themes/monochrome/48/write_flash.png differ diff --git a/companion/src/themes/monochrome/add.png b/companion/src/themes/monochrome/add.png new file mode 100644 index 000000000..17697d5eb Binary files /dev/null and b/companion/src/themes/monochrome/add.png differ diff --git a/companion/src/themes/monochrome/arrow-left.png b/companion/src/themes/monochrome/arrow-left.png new file mode 100644 index 000000000..9fb8a885d Binary files /dev/null and b/companion/src/themes/monochrome/arrow-left.png differ diff --git a/companion/src/themes/monochrome/arrow-right.png b/companion/src/themes/monochrome/arrow-right.png new file mode 100644 index 000000000..ba8e1440d Binary files /dev/null and b/companion/src/themes/monochrome/arrow-right.png differ diff --git a/companion/src/themes/monochrome/changelog.png b/companion/src/themes/monochrome/changelog.png new file mode 100644 index 000000000..2e97b00a0 Binary files /dev/null and b/companion/src/themes/monochrome/changelog.png differ diff --git a/companion/src/themes/monochrome/clear.png b/companion/src/themes/monochrome/clear.png new file mode 100644 index 000000000..345e70b62 Binary files /dev/null and b/companion/src/themes/monochrome/clear.png differ diff --git a/companion/src/themes/monochrome/compare.png b/companion/src/themes/monochrome/compare.png new file mode 100644 index 000000000..34e437850 Binary files /dev/null and b/companion/src/themes/monochrome/compare.png differ diff --git a/companion/src/themes/monochrome/configure.png b/companion/src/themes/monochrome/configure.png new file mode 100644 index 000000000..8be5e988f Binary files /dev/null and b/companion/src/themes/monochrome/configure.png differ diff --git a/companion/src/themes/monochrome/contributors.png b/companion/src/themes/monochrome/contributors.png new file mode 100644 index 000000000..a51bc3c56 Binary files /dev/null and b/companion/src/themes/monochrome/contributors.png differ diff --git a/companion/src/themes/monochrome/copy.png b/companion/src/themes/monochrome/copy.png new file mode 100644 index 000000000..aae5f5302 Binary files /dev/null and b/companion/src/themes/monochrome/copy.png differ diff --git a/companion/src/themes/monochrome/currentmodel.png b/companion/src/themes/monochrome/currentmodel.png new file mode 100644 index 000000000..816752faf Binary files /dev/null and b/companion/src/themes/monochrome/currentmodel.png differ diff --git a/companion/src/themes/monochrome/cut.png b/companion/src/themes/monochrome/cut.png new file mode 100644 index 000000000..efbb2cd5d Binary files /dev/null and b/companion/src/themes/monochrome/cut.png differ diff --git a/companion/src/themes/monochrome/duplicate.png b/companion/src/themes/monochrome/duplicate.png new file mode 100644 index 000000000..43041429c Binary files /dev/null and b/companion/src/themes/monochrome/duplicate.png differ diff --git a/companion/src/themes/monochrome/edit.png b/companion/src/themes/monochrome/edit.png new file mode 100644 index 000000000..cebabbd9f Binary files /dev/null and b/companion/src/themes/monochrome/edit.png differ diff --git a/companion/src/themes/monochrome/exit.png b/companion/src/themes/monochrome/exit.png new file mode 100644 index 000000000..8de0aade5 Binary files /dev/null and b/companion/src/themes/monochrome/exit.png differ diff --git a/companion/src/themes/monochrome/fuses.png b/companion/src/themes/monochrome/fuses.png new file mode 100644 index 000000000..fee85de8b Binary files /dev/null and b/companion/src/themes/monochrome/fuses.png differ diff --git a/companion/src/themes/monochrome/information.png b/companion/src/themes/monochrome/information.png new file mode 100644 index 000000000..2e9c398f6 Binary files /dev/null and b/companion/src/themes/monochrome/information.png differ diff --git a/companion/src/themes/monochrome/library.png b/companion/src/themes/monochrome/library.png new file mode 100644 index 000000000..a3d112626 Binary files /dev/null and b/companion/src/themes/monochrome/library.png differ diff --git a/companion/src/themes/monochrome/list.png b/companion/src/themes/monochrome/list.png new file mode 100644 index 000000000..f94bafb12 Binary files /dev/null and b/companion/src/themes/monochrome/list.png differ diff --git a/companion/src/themes/monochrome/logs.png b/companion/src/themes/monochrome/logs.png new file mode 100644 index 000000000..f8f96b505 Binary files /dev/null and b/companion/src/themes/monochrome/logs.png differ diff --git a/companion/src/themes/monochrome/movedown.png b/companion/src/themes/monochrome/movedown.png new file mode 100644 index 000000000..0097679e1 Binary files /dev/null and b/companion/src/themes/monochrome/movedown.png differ diff --git a/companion/src/themes/monochrome/moveup.png b/companion/src/themes/monochrome/moveup.png new file mode 100644 index 000000000..ba68dcaa5 Binary files /dev/null and b/companion/src/themes/monochrome/moveup.png differ diff --git a/companion/src/themes/monochrome/new.png b/companion/src/themes/monochrome/new.png new file mode 100644 index 000000000..e9531c78a Binary files /dev/null and b/companion/src/themes/monochrome/new.png differ diff --git a/companion/src/themes/monochrome/open.png b/companion/src/themes/monochrome/open.png new file mode 100644 index 000000000..6f437856c Binary files /dev/null and b/companion/src/themes/monochrome/open.png differ diff --git a/companion/src/themes/monochrome/paintbrush.png b/companion/src/themes/monochrome/paintbrush.png new file mode 100644 index 000000000..34e25a170 Binary files /dev/null and b/companion/src/themes/monochrome/paintbrush.png differ diff --git a/companion/src/themes/monochrome/paste.png b/companion/src/themes/monochrome/paste.png new file mode 100644 index 000000000..33948a231 Binary files /dev/null and b/companion/src/themes/monochrome/paste.png differ diff --git a/companion/src/themes/monochrome/play.png b/companion/src/themes/monochrome/play.png new file mode 100644 index 000000000..8501a8b58 Binary files /dev/null and b/companion/src/themes/monochrome/play.png differ diff --git a/companion/src/themes/monochrome/preferences.png b/companion/src/themes/monochrome/preferences.png new file mode 100644 index 000000000..d2ba00eaa Binary files /dev/null and b/companion/src/themes/monochrome/preferences.png differ diff --git a/companion/src/themes/monochrome/print.png b/companion/src/themes/monochrome/print.png new file mode 100644 index 000000000..1495a1eac Binary files /dev/null and b/companion/src/themes/monochrome/print.png differ diff --git a/companion/src/themes/monochrome/profiles.png b/companion/src/themes/monochrome/profiles.png new file mode 100644 index 000000000..0d5c86a47 Binary files /dev/null and b/companion/src/themes/monochrome/profiles.png differ diff --git a/companion/src/themes/monochrome/read_eeprom.png b/companion/src/themes/monochrome/read_eeprom.png new file mode 100644 index 000000000..46a4dfd50 Binary files /dev/null and b/companion/src/themes/monochrome/read_eeprom.png differ diff --git a/companion/src/themes/monochrome/read_eeprom_file.png b/companion/src/themes/monochrome/read_eeprom_file.png new file mode 100644 index 000000000..fd6479993 Binary files /dev/null and b/companion/src/themes/monochrome/read_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/read_flash.png b/companion/src/themes/monochrome/read_flash.png new file mode 100644 index 000000000..546400894 Binary files /dev/null and b/companion/src/themes/monochrome/read_flash.png differ diff --git a/companion/src/themes/monochrome/recentdocument.png b/companion/src/themes/monochrome/recentdocument.png new file mode 100644 index 000000000..1dfbadb5d Binary files /dev/null and b/companion/src/themes/monochrome/recentdocument.png differ diff --git a/companion/src/themes/monochrome/save.png b/companion/src/themes/monochrome/save.png new file mode 100644 index 000000000..6466d6528 Binary files /dev/null and b/companion/src/themes/monochrome/save.png differ diff --git a/companion/src/themes/monochrome/saveas.png b/companion/src/themes/monochrome/saveas.png new file mode 100644 index 000000000..9cc2a72ef Binary files /dev/null and b/companion/src/themes/monochrome/saveas.png differ diff --git a/companion/src/themes/monochrome/simulate.png b/companion/src/themes/monochrome/simulate.png new file mode 100644 index 000000000..a7020777f Binary files /dev/null and b/companion/src/themes/monochrome/simulate.png differ diff --git a/companion/src/themes/monochrome/stop.png b/companion/src/themes/monochrome/stop.png new file mode 100644 index 000000000..3bf2af6e9 Binary files /dev/null and b/companion/src/themes/monochrome/stop.png differ diff --git a/companion/src/themes/monochrome/switch_dir.png b/companion/src/themes/monochrome/switch_dir.png new file mode 100644 index 000000000..36253c57e Binary files /dev/null and b/companion/src/themes/monochrome/switch_dir.png differ diff --git a/companion/src/themes/monochrome/update.png b/companion/src/themes/monochrome/update.png new file mode 100644 index 000000000..be4c746b0 Binary files /dev/null and b/companion/src/themes/monochrome/update.png differ diff --git a/companion/src/themes/monochrome/wizard.png b/companion/src/themes/monochrome/wizard.png new file mode 100644 index 000000000..edd01da61 Binary files /dev/null and b/companion/src/themes/monochrome/wizard.png differ diff --git a/companion/src/themes/monochrome/write_eeprom.png b/companion/src/themes/monochrome/write_eeprom.png new file mode 100644 index 000000000..deeec3b48 Binary files /dev/null and b/companion/src/themes/monochrome/write_eeprom.png differ diff --git a/companion/src/themes/monochrome/write_eeprom_file.png b/companion/src/themes/monochrome/write_eeprom_file.png new file mode 100644 index 000000000..925fecf47 Binary files /dev/null and b/companion/src/themes/monochrome/write_eeprom_file.png differ diff --git a/companion/src/themes/monochrome/write_flash.png b/companion/src/themes/monochrome/write_flash.png new file mode 100644 index 000000000..e5943a509 Binary files /dev/null and b/companion/src/themes/monochrome/write_flash.png differ diff --git a/companion/src/xsimulatordialog.ui b/companion/src/xsimulatordialog.ui index d8f7d3f6f..4a5454c5d 100644 --- a/companion/src/xsimulatordialog.ui +++ b/companion/src/xsimulatordialog.ui @@ -27,7 +27,7 @@ - :/images/simulate.png:/images/simulate.png + :/icon.png:/icon.png @@ -2053,8 +2053,6 @@ border-radius: 4px; 16777215 18 - - QSlider::sub-page:horizontal:disabled {