From 4ca9aba4334288b8101d62c2d1269666b9c078cf Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Wed, 12 Feb 2014 13:22:46 +0100 Subject: [PATCH] New icon theme added --- companion/src/companion.qrc | 172 +++++++++++++++++++++++++++++++++++ companion/src/helpers.cpp | 5 +- companion/src/mainwindow.cpp | 8 +- companion/src/mainwindow.h | 6 +- 4 files changed, 186 insertions(+), 5 deletions(-) diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index cdc68d4e0..832e5ef2f 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -981,5 +981,177 @@ themes/monowhite/48/contributors.png themes/monowhite/48/stop.png themes/monowhite/48/write_eeprom.png + themes/new/16/paintbrush.png + themes/new/16/open.png + themes/new/16/edit.png + themes/new/16/information.png + themes/new/16/configure.png + themes/new/16/list.png + themes/new/16/wizard.png + themes/new/16/logs.png + themes/new/16/new.png + themes/new/16/save.png + themes/new/16/recentdocument.png + themes/new/16/simulate.png + themes/new/16/changelog.png + themes/new/16/copy.png + themes/new/16/write_flash.png + themes/new/16/read_eeprom_file.png + themes/new/16/clear.png + themes/new/16/play.png + themes/new/16/fuses.png + themes/new/16/arrow-right.png + themes/new/16/exit.png + themes/new/16/moveup.png + themes/new/16/read_eeprom.png + themes/new/16/cut.png + themes/new/16/arrow-left.png + themes/new/16/write_eeprom_file.png + themes/new/16/library.png + themes/new/16/profiles.png + themes/new/16/paste.png + themes/new/16/print.png + themes/new/16/compare.png + themes/new/16/saveas.png + themes/new/16/apppreferences.png + themes/new/16/fwpreferences.png + themes/new/16/movedown.png + themes/new/16/currentmodel.png + themes/new/16/read_flash.png + themes/new/16/duplicate.png + themes/new/16/add.png + themes/new/16/update.png + themes/new/16/contributors.png + themes/new/16/stop.png + themes/new/16/write_eeprom.png + themes/new/24/paintbrush.png + themes/new/24/open.png + themes/new/24/edit.png + themes/new/24/information.png + themes/new/24/configure.png + themes/new/24/list.png + themes/new/24/wizard.png + themes/new/24/logs.png + themes/new/24/new.png + themes/new/24/save.png + themes/new/24/recentdocument.png + themes/new/24/simulate.png + themes/new/24/changelog.png + themes/new/24/copy.png + themes/new/24/write_flash.png + themes/new/24/read_eeprom_file.png + themes/new/24/clear.png + themes/new/24/play.png + themes/new/24/fuses.png + themes/new/24/arrow-right.png + themes/new/24/exit.png + themes/new/24/moveup.png + themes/new/24/read_eeprom.png + themes/new/24/cut.png + themes/new/24/arrow-left.png + themes/new/24/write_eeprom_file.png + themes/new/24/library.png + themes/new/24/profiles.png + themes/new/24/paste.png + themes/new/24/print.png + themes/new/24/compare.png + themes/new/24/saveas.png + themes/new/24/apppreferences.png + themes/new/24/fwpreferences.png + themes/new/24/movedown.png + themes/new/24/currentmodel.png + themes/new/24/read_flash.png + themes/new/24/duplicate.png + themes/new/24/add.png + themes/new/24/update.png + themes/new/24/contributors.png + themes/new/24/stop.png + themes/new/24/write_eeprom.png + themes/new/32/paintbrush.png + themes/new/32/open.png + themes/new/32/edit.png + themes/new/32/information.png + themes/new/32/configure.png + themes/new/32/list.png + themes/new/32/wizard.png + themes/new/32/logs.png + themes/new/32/new.png + themes/new/32/save.png + themes/new/32/recentdocument.png + themes/new/32/simulate.png + themes/new/32/changelog.png + themes/new/32/copy.png + themes/new/32/write_flash.png + themes/new/32/read_eeprom_file.png + themes/new/32/clear.png + themes/new/32/play.png + themes/new/32/fuses.png + themes/new/32/arrow-right.png + themes/new/32/exit.png + themes/new/32/moveup.png + themes/new/32/read_eeprom.png + themes/new/32/cut.png + themes/new/32/arrow-left.png + themes/new/32/write_eeprom_file.png + themes/new/32/library.png + themes/new/32/profiles.png + themes/new/32/paste.png + themes/new/32/print.png + themes/new/32/compare.png + themes/new/32/saveas.png + themes/new/32/apppreferences.png + themes/new/32/fwpreferences.png + themes/new/32/movedown.png + themes/new/32/currentmodel.png + themes/new/32/read_flash.png + themes/new/32/duplicate.png + themes/new/32/add.png + themes/new/32/update.png + themes/new/32/contributors.png + themes/new/32/stop.png + themes/new/32/write_eeprom.png + themes/new/48/paintbrush.png + themes/new/48/open.png + themes/new/48/edit.png + themes/new/48/information.png + themes/new/48/configure.png + themes/new/48/list.png + themes/new/48/wizard.png + themes/new/48/logs.png + themes/new/48/new.png + themes/new/48/save.png + themes/new/48/recentdocument.png + themes/new/48/simulate.png + themes/new/48/changelog.png + themes/new/48/copy.png + themes/new/48/write_flash.png + themes/new/48/read_eeprom_file.png + themes/new/48/clear.png + themes/new/48/play.png + themes/new/48/fuses.png + themes/new/48/arrow-right.png + themes/new/48/exit.png + themes/new/48/moveup.png + themes/new/48/read_eeprom.png + themes/new/48/cut.png + themes/new/48/arrow-left.png + themes/new/48/write_eeprom_file.png + themes/new/48/library.png + themes/new/48/profiles.png + themes/new/48/paste.png + themes/new/48/print.png + themes/new/48/compare.png + themes/new/48/saveas.png + themes/new/48/apppreferences.png + themes/new/48/fwpreferences.png + themes/new/48/movedown.png + themes/new/48/currentmodel.png + themes/new/48/read_flash.png + themes/new/48/duplicate.png + themes/new/48/add.png + themes/new/48/update.png + themes/new/48/contributors.png + themes/new/48/stop.png + themes/new/48/write_eeprom.png diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index d12d900cf..e3d98d9fa 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -924,10 +924,13 @@ QString getTheme() Theme="monowhite"; break; case 3: + Theme="monochrome"; + break; + case 4: Theme="monoblue"; break; default: - Theme="monochrome"; + Theme="new"; break; } return Theme; diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 2f126e48b..5a9ec02ab 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1776,9 +1776,12 @@ void MainWindow::createActions() createProfileAct->setStatusTip(tr("Create a new Radio Setting Profile")); connect(createProfileAct, SIGNAL(triggered()), this, SLOT(createProfile())); - classicThemeAct = new QAction(tr("Classic"), this); - classicThemeAct->setStatusTip(tr("The multicolor classical Companion icon theme")); + classicThemeAct = new QAction(tr("Classical"), this); + classicThemeAct->setStatusTip(tr("The classical Companion icon theme")); connect(classicThemeAct, SIGNAL(triggered()), this, SLOT(setClassicTheme())); + newThemeAct = new QAction(tr("New"), this); + newThemeAct->setStatusTip(tr("The Companion 2.0 colored icon theme")); + connect(newThemeAct, SIGNAL(triggered()), this, SLOT(setNewTheme())); monoThemeAct = new QAction("Monochrome",this); monoThemeAct->setStatusTip(tr("A monochrome black icon theme")); connect(monoThemeAct, SIGNAL(triggered()), this, SLOT(setMonochromeTheme())); @@ -1903,6 +1906,7 @@ void MainWindow::createMenus() languageMenu->addAction(russianLanguageAct); settingsMenu->addMenu(themeMenu); themeMenu->addAction(classicThemeAct); + themeMenu->addAction(newThemeAct); themeMenu->addAction(monoThemeAct); themeMenu->addAction(monoBlueThemeAct); themeMenu->addAction(monoWhiteThemeAct); diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index d6150b06b..2881d70d0 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -98,9 +98,10 @@ private slots: void setTheme(int index); void setClassicTheme() {setTheme(0);}; - void setMonochromeTheme(){setTheme(1);}; + void setNewTheme() {setTheme(1);}; void setMonoWhiteTheme() {setTheme(2);}; - void setMonoBlueTheme() {setTheme(3);}; + void setMonochromeTheme(){setTheme(3);}; + void setMonoBlueTheme() {setTheme(4);}; void setIconThemeSize(int index); void setSmallIconThemeSize() {setIconThemeSize(0);}; @@ -251,6 +252,7 @@ private: QAction *profileActs[MAX_PROFILES]; QAction *createProfileAct; QAction *classicThemeAct; + QAction *newThemeAct; QAction *monoThemeAct; QAction *monoBlueThemeAct; QAction *monoWhiteThemeAct;