From 6c4e89a35a46673641a0295610829b65ccc3067e Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Wed, 22 Jan 2014 17:05:16 +0100 Subject: [PATCH] Two icons got mixed up in the icon theme work - Fixed --- companion/src/companion.qrc | 17 +++++++++++++++++ companion/src/mainwindow.cpp | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 7ef4edb27..34831d7c6 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -293,6 +293,7 @@ images/library/30002.png images/library/30003.png images/library/30004.png + themes/monochrome/16/paintbrush.png themes/monochrome/16/open.png themes/monochrome/16/edit.png themes/monochrome/16/information.png @@ -336,6 +337,7 @@ themes/monochrome/16/contributors.png themes/monochrome/16/stop.png themes/monochrome/16/write_eeprom.png + themes/monochrome/24/paintbrush.png themes/monochrome/24/open.png themes/monochrome/24/edit.png themes/monochrome/24/information.png @@ -379,6 +381,7 @@ themes/monochrome/24/contributors.png themes/monochrome/24/stop.png themes/monochrome/24/write_eeprom.png + themes/monochrome/32/paintbrush.png themes/monochrome/32/open.png themes/monochrome/32/edit.png themes/monochrome/32/information.png @@ -422,6 +425,7 @@ themes/monochrome/32/contributors.png themes/monochrome/32/stop.png themes/monochrome/32/write_eeprom.png + themes/monochrome/48/paintbrush.png themes/monochrome/48/open.png themes/monochrome/48/edit.png themes/monochrome/48/information.png @@ -465,6 +469,7 @@ themes/monochrome/48/contributors.png themes/monochrome/48/stop.png themes/monochrome/48/write_eeprom.png + themes/classic/16/paintbrush.png themes/classic/16/open.png themes/classic/16/edit.png themes/classic/16/information.png @@ -508,6 +513,7 @@ themes/classic/16/contributors.png themes/classic/16/stop.png themes/classic/16/write_eeprom.png + themes/classic/24/paintbrush.png themes/classic/24/open.png themes/classic/24/edit.png themes/classic/24/information.png @@ -551,6 +557,7 @@ themes/classic/24/contributors.png themes/classic/24/stop.png themes/classic/24/write_eeprom.png + themes/classic/32/paintbrush.png themes/classic/32/open.png themes/classic/32/edit.png themes/classic/32/information.png @@ -594,6 +601,7 @@ themes/classic/32/contributors.png themes/classic/32/stop.png themes/classic/32/write_eeprom.png + themes/classic/48/paintbrush.png themes/classic/48/open.png themes/classic/48/edit.png themes/classic/48/information.png @@ -637,6 +645,7 @@ themes/classic/48/contributors.png themes/classic/48/stop.png themes/classic/48/write_eeprom.png + themes/monoblue/16/paintbrush.png themes/monoblue/16/open.png themes/monoblue/16/edit.png themes/monoblue/16/information.png @@ -680,6 +689,7 @@ themes/monoblue/16/contributors.png themes/monoblue/16/stop.png themes/monoblue/16/write_eeprom.png + themes/monoblue/24/paintbrush.png themes/monoblue/24/open.png themes/monoblue/24/edit.png themes/monoblue/24/information.png @@ -723,6 +733,7 @@ themes/monoblue/24/contributors.png themes/monoblue/24/stop.png themes/monoblue/24/write_eeprom.png + themes/monoblue/32/paintbrush.png themes/monoblue/32/open.png themes/monoblue/32/edit.png themes/monoblue/32/information.png @@ -766,6 +777,7 @@ themes/monoblue/32/contributors.png themes/monoblue/32/stop.png themes/monoblue/32/write_eeprom.png + themes/monoblue/48/paintbrush.png themes/monoblue/48/open.png themes/monoblue/48/edit.png themes/monoblue/48/information.png @@ -809,6 +821,8 @@ themes/monoblue/48/contributors.png themes/monoblue/48/stop.png themes/monoblue/48/write_eeprom.png + themes/monowhite/16/paintbrush.png + themes/monowhite/16/open.png themes/monowhite/16/edit.png themes/monowhite/16/information.png themes/monowhite/16/configure.png @@ -851,6 +865,7 @@ themes/monowhite/16/contributors.png themes/monowhite/16/stop.png themes/monowhite/16/write_eeprom.png + themes/monowhite/24/paintbrush.png themes/monowhite/24/open.png themes/monowhite/24/edit.png themes/monowhite/24/information.png @@ -894,6 +909,7 @@ themes/monowhite/24/contributors.png themes/monowhite/24/stop.png themes/monowhite/24/write_eeprom.png + themes/monowhite/32/paintbrush.png themes/monowhite/32/open.png themes/monowhite/32/edit.png themes/monowhite/32/information.png @@ -937,6 +953,7 @@ themes/monowhite/32/contributors.png themes/monowhite/32/stop.png themes/monowhite/32/write_eeprom.png + themes/monowhite/48/paintbrush.png themes/monowhite/48/open.png themes/monowhite/48/edit.png themes/monowhite/48/information.png diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index b9cad2b8d..72a7d0c11 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1689,12 +1689,12 @@ void MainWindow::createActions() fwchangelogAct->setStatusTip(tr("Show firmware changelog")); connect(fwchangelogAct, SIGNAL(triggered()), this, SLOT(fwchangelog())); - compareAct = new QAction(CompanionIcon("customize.png"), tr("Compare..."), this); + compareAct = new QAction(CompanionIcon("compare.png"), tr("Compare..."), this); compareAct->setStatusTip(tr("Compare models")); compareAct->setEnabled(false); connect(compareAct, SIGNAL(triggered()), this, SLOT(compare())); - customizeSplashAct = new QAction(CompanionIcon("customize.png"), tr("Customize your &TX..."), this); + customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Customize your &TX..."), this); customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX")); connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash()));