From 6dc1c410c7721693b888b47f4378bf4842085b4d Mon Sep 17 00:00:00 2001 From: Benjamin Vedder Date: Tue, 3 Jan 2023 00:35:16 +0100 Subject: [PATCH] Another attempt at image caching for faster loading --- main.cpp | 2 + mainwindow.cpp | 164 ++++++++++++++++----------------- pages/pageappsettings.cpp | 3 +- pages/pagebms.cpp | 15 ++- pages/pagecananalyzer.cpp | 6 +- pages/pageconnection.cpp | 69 +++++++------- pages/pagecontrollers.cpp | 3 +- pages/pagecustomconfig.cpp | 11 +-- pages/pageespprog.cpp | 17 ++-- pages/pageexperiments.cpp | 45 +++++---- pages/pagefirmware.cpp | 21 ++--- pages/pagelisp.cpp | 54 ++++++----- pages/pageloganalysis.cpp | 36 ++++---- pages/pagemotorcomparison.cpp | 49 +++++----- pages/pagemotorsettings.cpp | 3 +- pages/pagertdata.cpp | 27 +++--- pages/pagesampleddata.cpp | 42 ++++----- pages/pagescripting.cpp | 44 +++++---- pages/pageswdprog.cpp | 34 ++++--- pages/pageterminal.cpp | 7 +- pages/pagevescpackage.cpp | 23 +++-- pages/pagewelcome.cpp | 17 ++-- parametereditor.cpp | 89 +++++++++--------- preferences.cpp | 25 +++-- setupwizardapp.cpp | 20 ++-- setupwizardmotor.cpp | 1 - startupwizard.cpp | 3 +- utility.cpp | 15 ++- utility.h | 2 + widgets/adcmap.cpp | 7 +- widgets/adcmap.ui | 16 +--- widgets/batterycalculator.cpp | 6 +- widgets/batterycalculator.ui | 14 +-- widgets/detectallfocdialog.cpp | 28 +++--- widgets/detectallfocdialog.ui | 48 ++-------- widgets/detectbldc.cpp | 5 +- widgets/detectbldc.ui | 18 +--- widgets/detectfoc.cpp | 21 ++--- widgets/detectfoc.ui | 32 +------ widgets/detectfocencoder.cpp | 7 +- widgets/detectfocencoder.ui | 20 +--- widgets/detectfochall.cpp | 7 +- widgets/detectfochall.ui | 20 +--- widgets/experimentplot.cpp | 31 +++---- widgets/experimentplot.ui | 31 +------ widgets/helpdialog.cpp | 5 +- widgets/helpdialog.ui | 3 - widgets/mrichtextedit.cpp | 45 +++++---- widgets/mrichtextedit.ui | 136 +-------------------------- widgets/nrfpair.cpp | 5 +- widgets/nrfpair.ui | 15 +-- widgets/parameditbitfield.cpp | 7 +- widgets/parameditbitfield.ui | 16 +--- widgets/parameditbool.cpp | 7 +- widgets/parameditbool.ui | 16 +--- widgets/parameditdouble.cpp | 7 +- widgets/parameditdouble.ui | 20 +--- widgets/parameditenum.cpp | 7 +- widgets/parameditenum.ui | 16 +--- widgets/parameditint.cpp | 7 +- widgets/parameditint.ui | 20 +--- widgets/parameditstring.cpp | 7 +- widgets/parameditstring.ui | 16 +--- widgets/ppmmap.cpp | 7 +- widgets/ppmmap.ui | 12 +-- widgets/scripteditor.cpp | 9 +- widgets/scripteditor.ui | 20 +--- 67 files changed, 550 insertions(+), 1011 deletions(-) diff --git a/main.cpp b/main.cpp index ad76df4cf..f057ac651 100755 --- a/main.cpp +++ b/main.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include "tcphub.h" @@ -126,6 +127,7 @@ int main(int argc, char *argv[]) QSettings set; bool isDark = set.value("darkMode", true).toBool(); Utility::setDarkMode(isDark); + QPixmapCache::setCacheLimit(256000); if (isDark) { qputenv("QT_QUICK_CONTROLS_CONF", ":/qtquickcontrols2_dark.conf"); diff --git a/mainwindow.cpp b/mainwindow.cpp index d47e44ec0..d1bbd1d51 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -119,89 +119,88 @@ MainWindow::MainWindow(QWidget *parent) : this->setWindowIcon(QIcon(":/res/icon.svg")); - QString theme = Utility::getThemePath(); - ui->actionParameterEditorMcconf->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->actionParameterEditorAppconf->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->actionParameterEditorFW->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->actionParameterEditorCustomConf0->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->actionSaveAppconfXml->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionPreferences->setIcon(QPixmap(theme + "icons/Settings-96.png")); - ui->actionLoadAppconfXml->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->actionSaveMotorConfXml->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionLoadMotorConfXml->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->actionSaveAppConfigurationHeader->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionSaveAppConfigurationHeaderWrap->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionSaveMotorConfigurationHeader->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionSaveMotorConfigurationHeaderWrap->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionExportConfigurationParser->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionTerminalPrintFaults->setIcon(QPixmap(theme + "icons/Console-96.png")); - ui->actionTerminalShowHelp->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->actionTerminalClear->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->actionTerminalPrintThreads->setIcon(QPixmap(theme + "icons/Electronics-96.png")); - ui->actionTerminalDRVResetLatchedFaults->setIcon(QPixmap(theme + "icons/Bug-96.png")); - ui->actionLibrariesUsed->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->actionMotorSetupWizard->setIcon(QPixmap(theme + "icons/Wizard-96.png")); - ui->actionAppSetupWizard->setIcon(QPixmap(theme + "icons/Wizard-96.png")); - ui->actionAutoSetupFOC->setIcon(QPixmap(theme + "icons/Wizard-96.png")); - ui->actionSetupMotorsFOCQuick->setIcon(QPixmap(theme + "icons/Wizard-96.png")); - ui->actionAboutQt->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->actionParameterEditorInfo->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->actionSafetyInformation->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->actionVESCToolChangelog->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->actionFirmwareChangelog->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->actionWarrantyStatement->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->actionLicense->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->actionVESCProjectForums->setIcon(QPixmap(theme + "icons/User Group Man Man-96.png")); - ui->actionLoadFirmwareConfigs->setIcon(QPixmap(theme + "icons/Electronics-96.png")); - ui->actionBackupConfiguration->setIcon(QPixmap(theme + "icons/Save-96.png")); - ui->actionBackupConfigurationsCAN->setIcon(QPixmap(theme + "icons/Save-96.png")); - ui->actionRestoreConfiguration->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->actionRestoreConfigurationsCAN->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->actionClearConfigurationBackups->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->actionBackupConfiguration->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionReboot->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->actionExit->setIcon(QPixmap(theme + "icons/Shutdown-96.png")); - ui->pageLabel->setPixmap(QPixmap(theme + "logo.png")); - ui->actionReconnect->setIcon(QIcon(theme + "icons/Connected-96.png")); - ui->actionDisconnect->setIcon(QIcon(theme + "icons/Disconnected-96.png")); - ui->actionReadMcconf->setIcon(QIcon(theme + "icons/motor_up.png")); - ui->actionReadMcconfDefault->setIcon(QIcon(theme + "icons/motor_default.png")); - ui->actionWriteMcconf->setIcon(QIcon(theme + "icons/motor_down.png")); - ui->actionReadAppconf->setIcon(QIcon(theme + "icons/app_up.png")); - ui->actionReadAppconfDefault->setIcon(QIcon(theme + "icons/app_default.png")); - ui->actionWriteAppconf->setIcon(QIcon(theme + "icons/app_down.png")); - - QIcon mycon = QIcon(theme + "icons/keys_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/keys_on.png"), QIcon::Normal, QIcon::On); + ui->actionParameterEditorMcconf->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->actionParameterEditorAppconf->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->actionParameterEditorFW->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->actionParameterEditorCustomConf0->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->actionSaveAppconfXml->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionPreferences->setIcon(Utility::getIcon("icons/Settings-96.png")); + ui->actionLoadAppconfXml->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->actionSaveMotorConfXml->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionLoadMotorConfXml->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->actionSaveAppConfigurationHeader->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionSaveAppConfigurationHeaderWrap->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionSaveMotorConfigurationHeader->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionSaveMotorConfigurationHeaderWrap->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionExportConfigurationParser->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionTerminalPrintFaults->setIcon(Utility::getIcon("icons/Console-96.png")); + ui->actionTerminalShowHelp->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->actionTerminalClear->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->actionTerminalPrintThreads->setIcon(Utility::getIcon("icons/Electronics-96.png")); + ui->actionTerminalDRVResetLatchedFaults->setIcon(Utility::getIcon("icons/Bug-96.png")); + ui->actionLibrariesUsed->setIcon(Utility::getIcon("icons/About-96.png")); + ui->actionMotorSetupWizard->setIcon(Utility::getIcon("icons/Wizard-96.png")); + ui->actionAppSetupWizard->setIcon(Utility::getIcon("icons/Wizard-96.png")); + ui->actionAutoSetupFOC->setIcon(Utility::getIcon("icons/Wizard-96.png")); + ui->actionSetupMotorsFOCQuick->setIcon(Utility::getIcon("icons/Wizard-96.png")); + ui->actionAboutQt->setIcon(Utility::getIcon("icons/About-96.png")); + ui->actionParameterEditorInfo->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->actionSafetyInformation->setIcon(Utility::getIcon("icons/About-96.png")); + ui->actionVESCToolChangelog->setIcon(Utility::getIcon("icons/About-96.png")); + ui->actionFirmwareChangelog->setIcon(Utility::getIcon("icons/About-96.png")); + ui->actionWarrantyStatement->setIcon(Utility::getIcon("icons/About-96.png")); + ui->actionLicense->setIcon(Utility::getIcon("icons/About-96.png")); + ui->actionVESCProjectForums->setIcon(Utility::getIcon("icons/User Group Man Man-96.png")); + ui->actionLoadFirmwareConfigs->setIcon(Utility::getIcon("icons/Electronics-96.png")); + ui->actionBackupConfiguration->setIcon(Utility::getIcon("icons/Save-96.png")); + ui->actionBackupConfigurationsCAN->setIcon(Utility::getIcon("icons/Save-96.png")); + ui->actionRestoreConfiguration->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->actionRestoreConfigurationsCAN->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->actionClearConfigurationBackups->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->actionBackupConfiguration->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionReboot->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->actionExit->setIcon(Utility::getIcon("icons/Shutdown-96.png")); + ui->pageLabel->setPixmap(Utility::getIcon("logo.png")); + ui->actionReconnect->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->actionDisconnect->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->actionReadMcconf->setIcon(Utility::getIcon("icons/motor_up.png")); + ui->actionReadMcconfDefault->setIcon(Utility::getIcon("icons/motor_default.png")); + ui->actionWriteMcconf->setIcon(Utility::getIcon("icons/motor_down.png")); + ui->actionReadAppconf->setIcon(Utility::getIcon("icons/app_up.png")); + ui->actionReadAppconfDefault->setIcon(Utility::getIcon("icons/app_default.png")); + ui->actionWriteAppconf->setIcon(Utility::getIcon("icons/app_down.png")); + + QIcon mycon = QIcon(Utility::getIcon("icons/keys_off.png")); + mycon.addPixmap(Utility::getIcon("icons/keys_on.png"), QIcon::Normal, QIcon::On); ui->actionKeyboardControl->setIcon(mycon); - ui->actionGamepadControl->setIcon(QIcon(theme + "icons/Controller-96.png")); - mycon = QIcon(theme + "icons/rt_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/rt_on.png"), QIcon::Normal, QIcon::On); + ui->actionGamepadControl->setIcon(Utility::getIcon("icons/Controller-96.png")); + mycon = QIcon(Utility::getIcon("icons/rt_off.png")); + mycon.addPixmap(Utility::getIcon("icons/rt_on.png"), QIcon::Normal, QIcon::On); ui->actionRtData->setIcon(mycon); - mycon = QIcon(theme + "icons/rt_app_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/rt_app_on.png"), QIcon::Normal, QIcon::On); + mycon = QIcon(Utility::getIcon("icons/rt_app_off.png")); + mycon.addPixmap(Utility::getIcon("icons/rt_app_on.png"), QIcon::Normal, QIcon::On); ui->actionRtDataApp->setIcon(mycon); - mycon = QIcon(theme + "icons/imu_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/imu_on.png"), QIcon::Normal, QIcon::On); + mycon = QIcon(Utility::getIcon("icons/imu_off.png")); + mycon.addPixmap(Utility::getIcon("icons/imu_on.png"), QIcon::Normal, QIcon::On); ui->actionIMU->setIcon(mycon); - mycon = QIcon(theme + "icons/bms_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/bms_on.png"), QIcon::Normal, QIcon::On); + mycon = QIcon(Utility::getIcon("icons/bms_off.png")); + mycon.addPixmap(Utility::getIcon("icons/bms_on.png"), QIcon::Normal, QIcon::On); ui->actionrtDataBms->setIcon(mycon); - mycon = QIcon(theme + "icons/alive_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/alive_on.png"), QIcon::Normal, QIcon::On); + mycon = QIcon(Utility::getIcon("icons/alive_off.png")); + mycon.addPixmap(Utility::getIcon("icons/alive_on.png"), QIcon::Normal, QIcon::On); ui->actionSendAlive->setIcon(mycon); - mycon = QIcon(theme + "icons/can_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/can_on.png"), QIcon::Normal, QIcon::On); + mycon = QIcon(Utility::getIcon("icons/can_off.png")); + mycon.addPixmap(Utility::getIcon("icons/can_on.png"), QIcon::Normal, QIcon::On); ui->actionCanFwd->setIcon(mycon); - ui->scanCanButton->setIcon(QIcon(theme + "icons/Refresh-96.png")); + ui->scanCanButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); - ui->dutyButton->setIcon(QIcon(theme + "icons/Circled Play-96.png")); - ui->currentButton->setIcon(QIcon(theme + "icons/Circled Play-96.png")); - ui->speedButton->setIcon(QIcon(theme + "icons/Circled Play-96.png")); - ui->posButton->setIcon(QIcon(theme + "icons/Circled Play-96.png")); - ui->brakeCurrentButton->setIcon(QIcon(theme + "icons/Brake Warning-96.png")); - ui->handbrakeButton->setIcon(QIcon(theme + "icons/Brake Warning-96.png")); - ui->fullBrakeButton->setIcon(QIcon(theme + "icons/Anchor-96.png")); + ui->dutyButton->setIcon(Utility::getIcon( "icons/Circled Play-96.png")); + ui->currentButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->speedButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->posButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->brakeCurrentButton->setIcon(Utility::getIcon("icons/Brake Warning-96.png")); + ui->handbrakeButton->setIcon(Utility::getIcon("icons/Brake Warning-96.png")); + ui->fullBrakeButton->setIcon(Utility::getIcon("icons/Anchor-96.png")); qRegisterMetaType("QtMsgType"); @@ -252,7 +251,7 @@ MainWindow::MainWindow(QWidget *parent) : QMenu *fwMenu = new QMenu(this); fwMenu->setTitle("Load Firmware Configs"); - fwMenu->setIcon(QIcon( theme + "icons/Electronics-96.png")); + fwMenu->setIcon(Utility::getIcon("icons/Electronics-96.png")); for (auto fw: Utility::configSupportedFws()) { QAction *action = new QAction(fwMenu); action->setText(QString("%1.%2").arg(fw.first).arg(fw.second, 2, 10, QChar('0'))); @@ -268,11 +267,10 @@ MainWindow::MainWindow(QWidget *parent) : auto reloadBackupMenu = [this, backupMenu]() { backupMenu->clear(); backupMenu->setTitle("Load Configuration Backups for UUID"); - QString theme = Utility::getThemePath(); - backupMenu->setIcon(QIcon( theme + "icons/Open Folder-96.png")); + backupMenu->setIcon(Utility::getIcon("icons/Open Folder-96.png")); for (auto uuid: mVesc->confListBackups()) { QAction *action = new QAction(backupMenu); - action->setIcon(QIcon( theme + "icons/Electronics-96.png")); + action->setIcon(Utility::getIcon("icons/Electronics-96.png")); QString txt = uuid; QString name = mVesc->confBackupName(uuid); if (!name.isEmpty()) { @@ -516,12 +514,10 @@ MainWindow::MainWindow(QWidget *parent) : mPortTimer.start(1000); connect(&mPortTimer, &QTimer::timeout, [this]() { - QString theme = Utility::getThemePath(); - if (!mVesc->isPortConnected() && mVesc->lastPortAvailable()) { - ui->actionReconnect->setIcon(QIcon(theme + "icons/Connected-hl-96.png")); + ui->actionReconnect->setIcon(Utility::getIcon("icons/Connected-hl-96.png")); } else { - ui->actionReconnect->setIcon(QIcon(theme + "icons/Connected-96.png")); + ui->actionReconnect->setIcon(Utility::getIcon("icons/Connected-96.png")); } ui->actionReconnect->setEnabled(!mVesc->isPortConnected()); @@ -1315,8 +1311,6 @@ void MainWindow::reloadPages() connect(ui->actionSetupMotorsFOCQuick, SIGNAL(triggered(bool)), mPageWelcome, SLOT(startSetupWizardFocSimple())); - - mPageConnection = new PageConnection(this); mPageConnection->setVesc(mVesc); ui->pageWidget->addWidget(mPageConnection); diff --git a/pages/pageappsettings.cpp b/pages/pageappsettings.cpp index 3093c3fc5..9545a91af 100644 --- a/pages/pageappsettings.cpp +++ b/pages/pageappsettings.cpp @@ -27,8 +27,7 @@ PageAppSettings::PageAppSettings(QWidget *parent) : ui(new Ui::PageAppSettings) { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->appWizardButton->setIcon(QPixmap(theme + "icons/Wizard-96.png")); + ui->appWizardButton->setIcon(Utility::getIcon("icons/Wizard-96.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; } diff --git a/pages/pagebms.cpp b/pages/pagebms.cpp index 0594481bb..e590337c5 100644 --- a/pages/pagebms.cpp +++ b/pages/pagebms.cpp @@ -28,14 +28,13 @@ PageBms::PageBms(QWidget *parent) : ui->setupUi(this); mVesc = nullptr; - QString theme = Utility::getThemePath(); - ui->balOnButton->setIcon(QPixmap(theme + "/icons/Circled Play-96.png")); - ui->chgEnButton->setIcon(QPixmap(theme + "/icons/Circled Play-96.png")); - ui->balOffButton->setIcon(QPixmap(theme + "/icons/Stop-96.png")); - ui->chgDisButton->setIcon(QPixmap(theme + "/icons/Stop-96.png")); - ui->resetAhButton->setIcon(QPixmap(theme + "/icons/Restart-96.png")); - ui->resetWhButton->setIcon(QPixmap(theme + "/icons/Restart-96.png")); - ui->zeroCurrentButton->setIcon(QPixmap(theme + "/icons/Refresh-96.png")); + ui->balOnButton->setIcon(Utility::getIcon("/icons/Circled Play-96.png")); + ui->chgEnButton->setIcon(Utility::getIcon("/icons/Circled Play-96.png")); + ui->balOffButton->setIcon(Utility::getIcon("/icons/Stop-96.png")); + ui->chgDisButton->setIcon(Utility::getIcon("/icons/Stop-96.png")); + ui->resetAhButton->setIcon(Utility::getIcon("/icons/Restart-96.png")); + ui->resetWhButton->setIcon(Utility::getIcon("/icons/Restart-96.png")); + ui->zeroCurrentButton->setIcon(Utility::getIcon("/icons/Refresh-96.png")); ui->valTable->setColumnWidth(0, 200); ui->splitter->setSizes(QList({1000, 500})); diff --git a/pages/pagecananalyzer.cpp b/pages/pagecananalyzer.cpp index 3d3177dae..d16625107 100644 --- a/pages/pagecananalyzer.cpp +++ b/pages/pagecananalyzer.cpp @@ -27,10 +27,8 @@ PageCanAnalyzer::PageCanAnalyzer(QWidget *parent) : { ui->setupUi(this); - - QString theme = Utility::getThemePath(); - ui->clearRxButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->sendButton->setIcon(QPixmap(theme + "icons/Send File-96.png")); + ui->clearRxButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->sendButton->setIcon(Utility::getIcon("icons/Send File-96.png")); layout()->setContentsMargins(0, 0, 0, 0); ui->msgTable->setColumnWidth(1, 120); diff --git a/pages/pageconnection.cpp b/pages/pageconnection.cpp index 7dc5396dc..c134545c3 100644 --- a/pages/pageconnection.cpp +++ b/pages/pageconnection.cpp @@ -39,41 +39,40 @@ PageConnection::PageConnection(QWidget *parent) : mTimer->start(20); - QString theme = Utility::getThemePath(); - ui->CANbusScanButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->canRefreshButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->CANbusConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->CANbusDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->tcpConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->tcpDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->udpConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->udpDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->serialRefreshButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->serialConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->serialDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->bleConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->bleDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->bleScanButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->CANbusScanButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->addConnectedButton->setIcon(QPixmap(theme + "icons/Plus Math-96.png")); - ui->addUuidButton->setIcon(QPixmap(theme + "icons/Plus Math-96.png")); - ui->unpairButton->setIcon(QPixmap(theme + "icons/Restart-96.png")); - ui->deletePairedButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->clearPairedButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->canDefaultButton->setIcon(QPixmap(theme + "icons/Bug-96.png")); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->autoConnectButton->setIcon(QPixmap(theme + "icons/Wizard-96.png")); - ui->bleSetNameButton->setIcon(QPixmap(theme + "icons/Ok-96.png")); - ui->pairConnectedButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->tcpHubConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->tcpHubDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->hubDefaultButton->setIcon(QPixmap(theme + "icons/Restart-96.png")); - ui->tcpDetectConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->tcpDetectDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - - QIcon mycon = QIcon(theme + "icons/can_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/can_off.png"), QIcon::Normal, QIcon::Off); - mycon.addPixmap(QPixmap(theme + "icons/can_on.png"), QIcon::Normal, QIcon::On); + ui->CANbusScanButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->canRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->CANbusConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->CANbusDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->tcpConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->tcpDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->udpConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->udpDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->serialRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->serialConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->serialDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->bleConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->bleDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->bleScanButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->CANbusScanButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->addConnectedButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->addUuidButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->unpairButton->setIcon(Utility::getIcon("icons/Restart-96.png")); + ui->deletePairedButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->clearPairedButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->canDefaultButton->setIcon(Utility::getIcon("icons/Bug-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->autoConnectButton->setIcon(Utility::getIcon("icons/Wizard-96.png")); + ui->bleSetNameButton->setIcon(Utility::getIcon("icons/Ok-96.png")); + ui->pairConnectedButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->tcpHubConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->tcpHubDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->hubDefaultButton->setIcon(Utility::getIcon("icons/Restart-96.png")); + ui->tcpDetectConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->tcpDetectDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + + QIcon mycon = QIcon(Utility::getIcon("icons/can_off.png")); + mycon.addPixmap(Utility::getIcon("icons/can_off.png"), QIcon::Normal, QIcon::Off); + mycon.addPixmap(Utility::getIcon("icons/can_on.png"), QIcon::Normal, QIcon::On); ui->canFwdButton->setIcon(mycon); mUdpListen = new UdpServerSimple(this); diff --git a/pages/pagecontrollers.cpp b/pages/pagecontrollers.cpp index 78dbabffd..3d0ddc6d6 100644 --- a/pages/pagecontrollers.cpp +++ b/pages/pagecontrollers.cpp @@ -29,8 +29,7 @@ PageControllers::PageControllers(QWidget *parent) : layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; - QString theme = Utility::getThemePath(); - ui->posOffsetApplyButton->setIcon(QPixmap(theme + "icons/Download-96.png")); + ui->posOffsetApplyButton->setIcon(Utility::getIcon("icons/Download-96.png")); } PageControllers::~PageControllers() diff --git a/pages/pagecustomconfig.cpp b/pages/pagecustomconfig.cpp index 1f5222334..3772062b8 100644 --- a/pages/pagecustomconfig.cpp +++ b/pages/pagecustomconfig.cpp @@ -31,12 +31,11 @@ PageCustomConfig::PageCustomConfig(QWidget *parent) : mVesc = nullptr; mConfNum = 0; - QString theme = Utility::getThemePath(); - ui->readButton->setIcon(QPixmap(theme + "/icons/Upload-96.png")); - ui->readDefaultButton->setIcon(QPixmap(theme + "/icons/Upload-96.png")); - ui->writeButton->setIcon(QPixmap(theme + "/icons/Download-96.png")); - ui->saveXmlButton->setIcon(QPixmap(theme + "/icons/Save as-96.png")); - ui->loadXmlButton->setIcon(QPixmap(theme + "/icons/Open Folder-96.png")); + ui->readButton->setIcon(Utility::getIcon("/icons/Upload-96.png")); + ui->readDefaultButton->setIcon(Utility::getIcon("/icons/Upload-96.png")); + ui->writeButton->setIcon(Utility::getIcon("/icons/Download-96.png")); + ui->saveXmlButton->setIcon(Utility::getIcon("/icons/Save as-96.png")); + ui->loadXmlButton->setIcon(Utility::getIcon("/icons/Open Folder-96.png")); } PageCustomConfig::~PageCustomConfig() diff --git a/pages/pageespprog.cpp b/pages/pageespprog.cpp index cae456768..87c6b121c 100644 --- a/pages/pageespprog.cpp +++ b/pages/pageespprog.cpp @@ -30,15 +30,14 @@ PageEspProg::PageEspProg(QWidget *parent) : layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; - QString theme = Utility::getThemePath(); - ui->blChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->partChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->appChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->flashButton->setIcon(QPixmap(theme + "icons/Download-96.png")); - ui->flashBlButton->setIcon(QPixmap(theme + "icons/Download-96.png")); - ui->serialConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->serialDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->serialRefreshButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); + ui->blChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->partChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->appChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->flashButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->flashBlButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->serialConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->serialDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->serialRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); QSettings set; if (set.contains("pageespprog/lastcustomblfile")) { diff --git a/pages/pageexperiments.cpp b/pages/pageexperiments.cpp index ec325684b..4d4590c9e 100644 --- a/pages/pageexperiments.cpp +++ b/pages/pageexperiments.cpp @@ -40,33 +40,32 @@ PageExperiments::PageExperiments(QWidget *parent) : layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; - QString theme = Utility::getThemePath(); - ui->currentRunButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->dutyRunButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->rpmRunButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->rescaleButton->setIcon(QPixmap(theme + "icons/size_off.png")); - ui->victronRefreshButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->victronConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->victronDisconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->openButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->openCompButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->saveCsvButton->setIcon(QPixmap(theme + "icons/Save-96.png")); - ui->savePngButton->setIcon(QPixmap(theme + "icons/Save-96.png")); - ui->savePdfButton->setIcon(QPixmap(theme + "icons/Save-96.png")); - - QIcon mycon = QIcon(theme + "icons/expand_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_off.png"), QIcon::Normal, QIcon::Off); + ui->currentRunButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->dutyRunButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->rpmRunButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->rescaleButton->setIcon(Utility::getIcon("icons/size_off.png")); + ui->victronRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->victronConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->victronDisconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->openButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->openCompButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->saveCsvButton->setIcon(Utility::getIcon("icons/Save-96.png")); + ui->savePngButton->setIcon(Utility::getIcon("icons/Save-96.png")); + ui->savePdfButton->setIcon(Utility::getIcon("icons/Save-96.png")); + + QIcon mycon = QIcon(Utility::getIcon("icons/expand_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_off.png"), QIcon::Normal, QIcon::Off); ui->zoomHButton->setIcon(mycon); - mycon = QIcon(theme + "icons/expand_v_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/expand_v_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_v_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); ui->zoomVButton->setIcon(mycon); - mycon = QIcon(theme + "icons/size_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/size_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/size_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/size_off.png")); + mycon.addPixmap(Utility::getIcon("icons/size_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/size_off.png"), QIcon::Normal, QIcon::Off); ui->autoscaleButton->setIcon(mycon); diff --git a/pages/pagefirmware.cpp b/pages/pagefirmware.cpp index 4ddaff14c..4091b062f 100755 --- a/pages/pagefirmware.cpp +++ b/pages/pagefirmware.cpp @@ -40,17 +40,16 @@ PageFirmware::PageFirmware(QWidget *parent) : ui->cancelButton->setEnabled(false); mVesc = nullptr; - QString theme = Utility::getThemePath(); - ui->changelogButton->setIcon(QPixmap(theme + "icons/About-96.png")); - ui->chooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->choose2Button->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->choose3Button->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->choose4Button->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->cancelButton->setIcon(QPixmap(theme + "icons/Cancel-96.png")); - ui->uploadButton->setIcon(QPixmap(theme + "icons/Download-96.png")); - ui->uploadAllButton->setIcon(QPixmap(theme + "icons/Download-96.png")); - ui->readVersionButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->dlArchiveButton->setIcon(QPixmap(theme + "icons/Download-96.png")); + ui->changelogButton->setIcon(Utility::getIcon("icons/About-96.png")); + ui->chooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->choose2Button->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->choose3Button->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->choose4Button->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->cancelButton->setIcon(Utility::getIcon("icons/Cancel-96.png")); + ui->uploadButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->uploadAllButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->readVersionButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->dlArchiveButton->setIcon(Utility::getIcon("icons/Download-96.png")); updateHwList(FW_RX_PARAMS()); updateBlList(FW_RX_PARAMS()); diff --git a/pages/pagelisp.cpp b/pages/pagelisp.cpp index cc4a1359b..23ca09551 100644 --- a/pages/pagelisp.cpp +++ b/pages/pagelisp.cpp @@ -38,35 +38,34 @@ PageLisp::PageLisp(QWidget *parent) : makeEditorConnections(ui->mainEdit); QPushButton *plusButton = new QPushButton(); - QString theme = Utility::getThemePath(); - plusButton->setIcon(QIcon(theme +"icons/Plus Math-96.png")); - ui->runButton->setIcon(QIcon(theme +"icons/Circled Play-96.png")); - ui->stopButton->setIcon(QIcon(theme +"icons/Shutdown-96.png")); - ui->helpButton->setIcon(QIcon(theme +"icons/Help-96.png")); - ui->clearConsoleButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->openRecentButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->removeSelectedButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->clearRecentButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->openExampleButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->uploadButton->setIcon(QIcon(theme +"icons/Download-96.png")); - ui->readExistingButton->setIcon(QIcon(theme +"icons/Upload-96.png")); - ui->eraseButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->replHelpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->streamButton->setIcon(QIcon(theme +"icons/Download-96.png")); - - QIcon mycon = QIcon(theme + "icons/expand_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_off.png"), QIcon::Normal, QIcon::Off); + plusButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->runButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->stopButton->setIcon(Utility::getIcon("icons/Shutdown-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->clearConsoleButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->openRecentButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->removeSelectedButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->clearRecentButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->openExampleButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->uploadButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->readExistingButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->eraseButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->replHelpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->streamButton->setIcon(Utility::getIcon("icons/Download-96.png")); + + QIcon mycon = Utility::getIcon( "icons/expand_off.png"); + mycon.addPixmap(Utility::getIcon("icons/expand_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_off.png"), QIcon::Normal, QIcon::Off); ui->zoomHButton->setIcon(mycon); - mycon = QIcon(theme + "icons/expand_v_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); + mycon = Utility::getIcon( "icons/expand_v_off.png"); + mycon.addPixmap(Utility::getIcon("icons/expand_v_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); ui->zoomVButton->setIcon(mycon); - mycon = QIcon(theme + "icons/size_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/size_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/size_off.png"), QIcon::Normal, QIcon::Off); + mycon = Utility::getIcon( "icons/size_off.png"); + mycon.addPixmap(Utility::getIcon("icons/size_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/size_off.png"), QIcon::Normal, QIcon::Off); ui->autoscaleButton->setIcon(mycon); plusButton->setFlat(true); @@ -137,7 +136,7 @@ PageLisp::PageLisp(QWidget *parent) : // Add close button that clears the main editor QPushButton *closeButton = new QPushButton(); - closeButton->setIcon(QIcon(theme +"icons/Delete-96.png")); + closeButton->setIcon(Utility::getIcon("icons/Delete-96.png")); closeButton->setFlat(true); ui->fileTabs->tabBar()->setTabButton(0, QTabBar::RightSide, closeButton); @@ -385,10 +384,9 @@ void PageLisp::createEditorTab(QString fileName, QString content) editor->setFileNow(fileName); editor->codeEditor()->setPlainText(content); - QString theme = Utility::getThemePath(); QPushButton *closeButton = new QPushButton(); - closeButton->setIcon(QIcon(theme +"icons/Cancel-96.png")); + closeButton->setIcon(Utility::getIcon("icons/Cancel-96.png")); closeButton->setFlat(true); ui->fileTabs->tabBar()->setTabButton(tabIndex, QTabBar::RightSide, closeButton); diff --git a/pages/pageloganalysis.cpp b/pages/pageloganalysis.cpp index b50de9130..66012971a 100644 --- a/pages/pageloganalysis.cpp +++ b/pages/pageloganalysis.cpp @@ -35,23 +35,22 @@ PageLogAnalysis::PageLogAnalysis(QWidget *parent) : resetInds(); - QString theme = Utility::getThemePath(); - ui->centerButton->setIcon(QPixmap(theme + "icons/icons8-target-96.png")); - ui->playButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->logListRefreshButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->logListOpenButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->openCurrentButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->openCsvButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->savePlotPdfButton->setIcon(QPixmap(theme + "icons/Line Chart-96.png")); - ui->savePlotPngButton->setIcon(QPixmap(theme + "icons/Line Chart-96.png")); - ui->saveMapPdfButton->setIcon(QPixmap(theme + "icons/Waypoint Map-96.png")); - ui->saveMapPngButton->setIcon(QPixmap(theme + "icons/Waypoint Map-96.png")); - ui->vescLogListRefreshButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->vescLogListOpenButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->vescUpButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->vescSaveAsButton->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->vescLogDeleteButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->saveCsvButton->setIcon(QPixmap(theme + "icons/Line Chart-96.png")); + ui->centerButton->setIcon(Utility::getIcon("icons/icons8-target-96.png")); + ui->playButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->logListRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->logListOpenButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->openCurrentButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->openCsvButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->savePlotPdfButton->setIcon(Utility::getIcon("icons/Line Chart-96.png")); + ui->savePlotPngButton->setIcon(Utility::getIcon("icons/Line Chart-96.png")); + ui->saveMapPdfButton->setIcon(Utility::getIcon("icons/Waypoint Map-96.png")); + ui->saveMapPngButton->setIcon(Utility::getIcon("icons/Waypoint Map-96.png")); + ui->vescLogListRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->vescLogListOpenButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->vescUpButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->vescSaveAsButton->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->vescLogDeleteButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->saveCsvButton->setIcon(Utility::getIcon("icons/Line Chart-96.png")); updateTileServers(); @@ -1389,10 +1388,9 @@ void PageLogAnalysis::on_vescLogListRefreshButton_clicked() continue; } - QString theme = Utility::getThemePath(); QTableWidgetItem *itName = new QTableWidgetItem(fe.name); itName->setData(Qt::UserRole, QVariant::fromValue(fe)); - itName->setIcon(fe.isDir ? QPixmap(theme + "icons/Open Folder-96.png") : QPixmap(theme + "icons/Line Chart-96.png")); + itName->setIcon(fe.isDir ? Utility::getIcon("icons/Open Folder-96.png") : Utility::getIcon("icons/Line Chart-96.png")); ui->vescLogTable->setRowCount(ui->vescLogTable->rowCount() + 1); ui->vescLogTable->setItem(ui->vescLogTable->rowCount() - 1, 0, itName); diff --git a/pages/pagemotorcomparison.cpp b/pages/pagemotorcomparison.cpp index ebc06c428..59f4bf4d3 100644 --- a/pages/pagemotorcomparison.cpp +++ b/pages/pagemotorcomparison.cpp @@ -36,35 +36,34 @@ PageMotorComparison::PageMotorComparison(QWidget *parent) : ui->qmlWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); ui->qmlWidget->setClearColor(Utility::getAppQColor("normalBackground")); - QString theme = Utility::getThemePath(); - ui->testRunButton->setIcon(QPixmap(theme + "icons/Process-96.png")); - ui->rescaleButton->setIcon(QPixmap(theme + "icons/expand_off.png")); - ui->qmlChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->qmlRunButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->savePlotPdfButton->setIcon(QPixmap(theme + "icons/Line Chart-96.png")); - ui->savePlotPngButton->setIcon(QPixmap(theme + "icons/Line Chart-96.png")); - - ui->m1SetupGearingButton->setIcon(QPixmap(theme + "icons/motor_up.png")); - ui->m1LoadConfButton->setIcon(QPixmap(theme + "icons/motor_up.png")); - ui->m1ConfChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - - ui->m2SetupGearingButton->setIcon(QPixmap(theme + "icons/motor_up.png")); - ui->m2LoadConfButton->setIcon(QPixmap(theme + "icons/motor_up.png")); - ui->m2ConfChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - - QIcon mycon = QIcon(theme + "icons/expand_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_off.png"), QIcon::Normal, QIcon::Off); + ui->testRunButton->setIcon(Utility::getIcon("icons/Process-96.png")); + ui->rescaleButton->setIcon(Utility::getIcon("icons/expand_off.png")); + ui->qmlChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->qmlRunButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->savePlotPdfButton->setIcon(Utility::getIcon("icons/Line Chart-96.png")); + ui->savePlotPngButton->setIcon(Utility::getIcon("icons/Line Chart-96.png")); + + ui->m1SetupGearingButton->setIcon(Utility::getIcon("icons/motor_up.png")); + ui->m1LoadConfButton->setIcon(Utility::getIcon("icons/motor_up.png")); + ui->m1ConfChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + + ui->m2SetupGearingButton->setIcon(Utility::getIcon("icons/motor_up.png")); + ui->m2LoadConfButton->setIcon(Utility::getIcon("icons/motor_up.png")); + ui->m2ConfChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + + QIcon mycon = QIcon(Utility::getIcon("icons/expand_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_off.png"), QIcon::Normal, QIcon::Off); ui->zoomHButton->setIcon(mycon); - mycon = QIcon(theme + "icons/expand_v_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/expand_v_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_v_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); ui->zoomVButton->setIcon(mycon); - mycon = QIcon(theme + "icons/size_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/size_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/size_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/size_off.png")); + mycon.addPixmap(Utility::getIcon("icons/size_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/size_off.png"), QIcon::Normal, QIcon::Off); ui->autoscaleButton->setIcon(mycon); diff --git a/pages/pagemotorsettings.cpp b/pages/pagemotorsettings.cpp index 69164873d..19d9699c8 100644 --- a/pages/pagemotorsettings.cpp +++ b/pages/pagemotorsettings.cpp @@ -31,8 +31,7 @@ PageMotorSettings::PageMotorSettings(QWidget *parent) : layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; - QString theme = Utility::getThemePath(); - ui->motorSetupWizardButton->setIcon(QPixmap(theme + "icons/Wizard-96.png")); + ui->motorSetupWizardButton->setIcon(Utility::getIcon("icons/Wizard-96.png")); } PageMotorSettings::~PageMotorSettings() diff --git a/pages/pagertdata.cpp b/pages/pagertdata.cpp index 92bcdb3c2..ca0f220a9 100644 --- a/pages/pagertdata.cpp +++ b/pages/pagertdata.cpp @@ -34,27 +34,26 @@ PageRtData::PageRtData(QWidget *parent) : layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; - QString theme = Utility::getThemePath(); - ui->rescaleButton->setIcon(QPixmap(theme + "icons/expand_off.png")); + ui->rescaleButton->setIcon(Utility::getIcon("icons/expand_off.png")); - QIcon mycon = QIcon(theme + "icons/expand_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_off.png"), QIcon::Normal, QIcon::Off); + QIcon mycon = QIcon(Utility::getIcon("icons/expand_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_off.png"), QIcon::Normal, QIcon::Off); ui->zoomHButton->setIcon(mycon); - mycon = QIcon(theme + "icons/expand_v_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/expand_v_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_v_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); ui->zoomVButton->setIcon(mycon); - mycon = QIcon(theme + "icons/size_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/size_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/size_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/size_off.png")); + mycon.addPixmap(Utility::getIcon("icons/size_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/size_off.png"), QIcon::Normal, QIcon::Off); ui->autoscaleButton->setIcon(mycon); - mycon = QIcon(theme + "icons/rt_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/rt_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/rt_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/rt_off.png")); + mycon.addPixmap(Utility::getIcon("icons/rt_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/rt_off.png"), QIcon::Normal, QIcon::Off); ui->logRtButton->setIcon(mycon); mTimer = new QTimer(this); diff --git a/pages/pagesampleddata.cpp b/pages/pagesampleddata.cpp index 374fd22dc..65e9178c1 100644 --- a/pages/pagesampleddata.cpp +++ b/pages/pagesampleddata.cpp @@ -30,32 +30,30 @@ PageSampledData::PageSampledData(QWidget *parent) : { ui->setupUi(this); - - QString theme = Utility::getThemePath(); - ui->rescaleButton->setIcon(QPixmap(theme + "icons/expand_off.png")); - ui->saveDataButton->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->sampleNowButton->setIcon(QPixmap(theme + "icons/3ph_sine.png")); - ui->sampleStartButton->setIcon(QPixmap(theme + "icons/motor.png")); - ui->sampleStopButton->setIcon(QPixmap(theme + "icons/Cancel-96.png")); - ui->sampleTriggerFaultButton->setIcon(QPixmap(theme + "icons/sample_trigger_fault.png")); - ui->sampleTriggerFaultNosendButton->setIcon(QPixmap(theme + "icons/sample_trigger_fault_nosend.png")); - ui->sampleTriggerStartButton->setIcon(QPixmap(theme + "icons/sampl_trigger_start.png")); - ui->sampleTriggerStartNosendButton->setIcon(QPixmap(theme + "icons/sample_trigger_start_nosend.png")); - ui->sampleLastButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - - QIcon mycon = QIcon(theme + "icons/expand_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_off.png"), QIcon::Normal, QIcon::Off); + ui->rescaleButton->setIcon(Utility::getIcon("icons/expand_off.png")); + ui->saveDataButton->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->sampleNowButton->setIcon(Utility::getIcon("icons/3ph_sine.png")); + ui->sampleStartButton->setIcon(Utility::getIcon("icons/motor.png")); + ui->sampleStopButton->setIcon(Utility::getIcon("icons/Cancel-96.png")); + ui->sampleTriggerFaultButton->setIcon(Utility::getIcon("icons/sample_trigger_fault.png")); + ui->sampleTriggerFaultNosendButton->setIcon(Utility::getIcon("icons/sample_trigger_fault_nosend.png")); + ui->sampleTriggerStartButton->setIcon(Utility::getIcon("icons/sampl_trigger_start.png")); + ui->sampleTriggerStartNosendButton->setIcon(Utility::getIcon("icons/sample_trigger_start_nosend.png")); + ui->sampleLastButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + + QIcon mycon = QIcon(Utility::getIcon("icons/expand_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_off.png"), QIcon::Normal, QIcon::Off); ui->zoomHButton->setIcon(mycon); - mycon = QIcon(theme + "icons/expand_v_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/expand_v_off.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_v_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); ui->zoomVButton->setIcon(mycon); - mycon = QIcon(theme + "icons/size_off.png"); - mycon.addPixmap(QPixmap(theme + "icons/size_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/size_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/size_off.png")); + mycon.addPixmap(Utility::getIcon("icons/size_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/size_off.png"), QIcon::Normal, QIcon::Off); layout()->setContentsMargins(0, 0, 0, 0); diff --git a/pages/pagescripting.cpp b/pages/pagescripting.cpp index 3a5145996..cb43c880c 100755 --- a/pages/pagescripting.cpp +++ b/pages/pagescripting.cpp @@ -45,26 +45,25 @@ PageScripting::PageScripting(QWidget *parent) : makeEditorConnections(ui->mainEdit); QPushButton *plusButton = new QPushButton(); - QString theme = Utility::getThemePath(); - plusButton->setIcon(QIcon(theme +"icons/Plus Math-96.png")); - ui->runButton->setIcon(QIcon(theme +"icons/Circled Play-96.png")); - ui->runWindowButton->setIcon(QIcon(theme +"icons/Circled Play-96.png")); - ui->fullscreenButton->setIcon(QIcon(theme +"icons/size_off.png")); - ui->stopButton->setIcon(QIcon(theme +"icons/Shutdown-96.png")); - ui->helpButton->setIcon(QIcon(theme +"icons/Help-96.png")); - ui->clearConsoleButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->openRecentButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->removeSelectedButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->clearRecentButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->openExampleButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->exportCArrayAppButton->setIcon(QIcon(theme +"icons/Save as-96.png")); - ui->exportCArrayHwButton->setIcon(QIcon(theme +"icons/Save as-96.png")); - ui->calcSizeButton->setIcon(QIcon(theme +"icons/Calculator-96.png")); - ui->openQmluiAppButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->openQmluiHwButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->uploadButton->setIcon(QIcon(theme +"icons/Download-96.png")); - ui->eraseOnlyButton->setIcon(QIcon(theme +"icons/Delete-96.png")); - ui->clearUploadTextButton->setIcon(QIcon(theme +"icons/Delete-96.png")); + plusButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->runButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->runWindowButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->fullscreenButton->setIcon(Utility::getIcon("icons/size_off.png")); + ui->stopButton->setIcon(Utility::getIcon("icons/Shutdown-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->clearConsoleButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->openRecentButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->removeSelectedButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->clearRecentButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->openExampleButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->exportCArrayAppButton->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->exportCArrayHwButton->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->calcSizeButton->setIcon(Utility::getIcon("icons/Calculator-96.png")); + ui->openQmluiAppButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->openQmluiHwButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->uploadButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->eraseOnlyButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->clearUploadTextButton->setIcon(Utility::getIcon("icons/Delete-96.png")); plusButton->setFlat(true); plusButton->setText("New Tab"); @@ -134,7 +133,7 @@ PageScripting::PageScripting(QWidget *parent) : // Add close button that clears the main editor QPushButton *closeButton = new QPushButton(); - closeButton->setIcon(QIcon(theme +"icons/Delete-96.png")); + closeButton->setIcon(Utility::getIcon("icons/Delete-96.png")); closeButton->setFlat(true); ui->fileTabs->tabBar()->setTabButton(0, QTabBar::RightSide, closeButton); @@ -420,10 +419,9 @@ void PageScripting::createEditorTab(QString fileName, QString content) editor->setFileNow(fileName); editor->codeEditor()->setPlainText(content); - QString theme = Utility::getThemePath(); QPushButton *closeButton = new QPushButton(); - closeButton->setIcon(QIcon(theme +"icons/Cancel-96.png")); + closeButton->setIcon(Utility::getIcon("icons/Cancel-96.png")); closeButton->setFlat(true); ui->fileTabs->tabBar()->setTabButton(tabIndex, QTabBar::RightSide, closeButton); diff --git a/pages/pageswdprog.cpp b/pages/pageswdprog.cpp index 36f220a13..59e44669f 100644 --- a/pages/pageswdprog.cpp +++ b/pages/pageswdprog.cpp @@ -35,21 +35,20 @@ PageSwdProg::PageSwdProg(QWidget *parent) : layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; - QString theme = Utility::getThemePath(); - ui->chooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->choose2Button->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->choose3Button->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->choose4Button->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->uicrReadButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->uicrWriteButton->setIcon(QPixmap(theme + "icons/Download-96.png")); - ui->uicrEraseButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->connectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->connectNrf5xButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->disconnectButton->setIcon(QPixmap(theme + "icons/Disconnected-96.png")); - ui->resetButton->setIcon(QPixmap(theme + "icons/Restart-96.png")); - ui->eraseFlashButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->uploadButton->setIcon(QPixmap(theme + "icons/Download-96.png")); - ui->cancelButton->setIcon(QPixmap(theme + "icons/Cancel-96.png")); + ui->chooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->choose2Button->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->choose3Button->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->choose4Button->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->uicrReadButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->uicrWriteButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->uicrEraseButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->connectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->connectNrf5xButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->disconnectButton->setIcon(Utility::getIcon("icons/Disconnected-96.png")); + ui->resetButton->setIcon(Utility::getIcon("icons/Restart-96.png")); + ui->eraseFlashButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->uploadButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->cancelButton->setIcon(Utility::getIcon("icons/Cancel-96.png")); mTimer = new QTimer(this); mTimer->start(500); @@ -87,10 +86,9 @@ PageSwdProg::PageSwdProg(QWidget *parent) : le->setFont(font); ui->uicrTable->setCellWidget(ui->uicrTable->rowCount() - 1, 2, le); - QString theme = Utility::getThemePath(); QPushButton *readButton = new QPushButton; readButton->setText("Read"); - readButton->setIcon(QIcon(theme +"icons/Upload-96.png")); + readButton->setIcon(Utility::getIcon("icons/Upload-96.png")); ui->uicrTable->setCellWidget(ui->uicrTable->rowCount() - 1, 3, readButton); connect(readButton, &QAbstractButton::clicked, [this, offset, le]() { @@ -119,7 +117,7 @@ PageSwdProg::PageSwdProg(QWidget *parent) : QPushButton *writeButton = new QPushButton; writeButton->setText("Write"); - writeButton->setIcon(QIcon(theme +"icons/Download-96.png")); + writeButton->setIcon(Utility::getIcon("icons/Download-96.png")); ui->uicrTable->setCellWidget(ui->uicrTable->rowCount() - 1, 4, writeButton); connect(writeButton, &QAbstractButton::clicked, [this, offset, le, name]() { diff --git a/pages/pageterminal.cpp b/pages/pageterminal.cpp index 0babc1d05..ec9339e61 100644 --- a/pages/pageterminal.cpp +++ b/pages/pageterminal.cpp @@ -27,10 +27,9 @@ PageTerminal::PageTerminal(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->sendButton->setIcon(QPixmap(theme + "icons/Send File-96.png")); - ui->clearButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->sendButton->setIcon(Utility::getIcon("icons/Send File-96.png")); + ui->clearButton->setIcon(Utility::getIcon("icons/Delete-96.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; diff --git a/pages/pagevescpackage.cpp b/pages/pagevescpackage.cpp index 441214397..c730d298e 100644 --- a/pages/pagevescpackage.cpp +++ b/pages/pagevescpackage.cpp @@ -33,18 +33,17 @@ PageVescPackage::PageVescPackage(QWidget *parent) : mVesc = nullptr; layout()->setContentsMargins(0, 0, 0, 0); - QString theme = Utility::getThemePath(); - ui->chooseLoadButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->chooseLispButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->chooseOutputButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->chooseQmlButton->setIcon(QIcon(theme +"icons/Open Folder-96.png")); - ui->writeButton->setIcon(QIcon(theme +"icons/Download-96.png")); - ui->loadRefreshButton->setIcon(QIcon(theme +"icons/Refresh-96.png")); - ui->outputRefreshButton->setIcon(QIcon(theme +"icons/Refresh-96.png")); - ui->saveButton->setIcon(QIcon(theme +"icons/Save-96.png")); - ui->dlArchiveButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->installButton->setIcon(QIcon(theme +"icons/Download-96.png")); - ui->uninstallButton->setIcon(QIcon(theme +"icons/Delete-96.png")); + ui->chooseLoadButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->chooseLispButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->chooseOutputButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->chooseQmlButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->writeButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->loadRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->outputRefreshButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->saveButton->setIcon(Utility::getIcon("icons/Save-96.png")); + ui->dlArchiveButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->installButton->setIcon(Utility::getIcon("icons/Download-96.png")); + ui->uninstallButton->setIcon(Utility::getIcon("icons/Delete-96.png")); QSettings set; ui->loadEdit->setText(set.value("pagevescpackage/lastpkgload", "").toString()); diff --git a/pages/pagewelcome.cpp b/pages/pagewelcome.cpp index 3e40a97a9..042595a72 100755 --- a/pages/pagewelcome.cpp +++ b/pages/pagewelcome.cpp @@ -37,15 +37,14 @@ PageWelcome::PageWelcome(QWidget *parent) : ui->setupUi(this); mUtil = new Utility(this); - QString theme = Utility::getThemePath(); - ui->autoConnectButton->setIcon(QIcon(theme + "icons/Connected-96.png")); - ui->wizardFocSimpleButton->setIcon(QIcon(theme + "icons/Wizard-96.png")); - ui->wizardAppButton->setIcon(QIcon(theme + "icons/Wizard-96.png")); - ui->nrfPairButton->setIcon(QIcon(theme + "icons/icons8-fantasy-96.png")); - ui->multiSettingButton->setIcon(QIcon(theme + "icons/Settings-96.png")); - ui->invertDirButton->setIcon(QIcon(theme + "icons/Process-96.png")); - ui->setupBluetoothButton->setIcon(QIcon(theme + "icons/bluetooth.png")); - ui->wizardIMUButton->setIcon(QIcon(theme + "icons/imu_off.png")); + ui->autoConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->wizardFocSimpleButton->setIcon(Utility::getIcon("icons/Wizard-96.png")); + ui->wizardAppButton->setIcon(Utility::getIcon("icons/Wizard-96.png")); + ui->nrfPairButton->setIcon(Utility::getIcon("icons/icons8-fantasy-96.png")); + ui->multiSettingButton->setIcon(Utility::getIcon("icons/Settings-96.png")); + ui->invertDirButton->setIcon(Utility::getIcon("icons/Process-96.png")); + ui->setupBluetoothButton->setIcon(Utility::getIcon("icons/bluetooth.png")); + ui->wizardIMUButton->setIcon(Utility::getIcon("icons/imu_off.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; diff --git a/parametereditor.cpp b/parametereditor.cpp index de9953810..d71544e49 100644 --- a/parametereditor.cpp +++ b/parametereditor.cpp @@ -34,51 +34,50 @@ ParameterEditor::ParameterEditor(QWidget *parent) : ui->setupUi(this); setEditorValues("new_parameter", ConfigParam()); - QString theme = Utility::getThemePath(); - windowIcon().addPixmap(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->paramRemoveButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->paramDownButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->paramUpButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->paramOpenButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->enumRemoveButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->enumMoveDownButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->enumMoveUpButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->enumAddButton->setIcon(QPixmap(theme + "icons/Plus Math-96.png")); - ui->paramResetButton->setIcon(QPixmap(theme + "icons/Refresh-96.png")); - ui->paramSaveButton->setIcon(QPixmap(theme + "icons/Save-96.png")); - ui->serRemoveButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->serDownButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->serUpButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->serAddButton->setIcon(QPixmap(theme + "icons/Plus Math-96.png")); - - ui->groupRemoveButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->groupDownButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->groupUpButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->groupAddButton->setIcon(QPixmap(theme + "icons/Plus Math-96.png")); - ui->groupEditButton->setIcon(QPixmap(theme + "icons/icons8-edit-96.png")); - - ui->subgroupRemoveButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->subgroupDownButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->subgroupUpButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->subgroupAddButton->setIcon(QPixmap(theme + "icons/Plus Math-96.png")); - ui->subgroupEditButton->setIcon(QPixmap(theme + "icons/icons8-edit-96.png")); - - ui->groupParamRemoveButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); - ui->groupParamDownButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->groupParamUpButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->groupParamAddButton->setIcon(QPixmap(theme + "icons/Plus Math-96.png")); - ui->groupParamEditButton->setIcon(QPixmap(theme + "icons/icons8-edit-96.png")); - - ui->actionCalculatePacketSize->setIcon(QPixmap(theme + "icons/Calculator-96.png")); - ui->actionCalculateCompressedCArraySize->setIcon(QPixmap(theme + "icons/Calculator-96.png")); - ui->actionSave_XML_as->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionExportCompressedCArray->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionSave_Configuration_C_Header_as->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionSave_Configuration_C_Header_ifdef_wrapped_as->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionSave_XML_and_export_config_parser_and_compressed_C_array->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionLoad_XML->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->actionExportConfigurationParser->setIcon(QPixmap(theme + "icons/Save as-96.png")); - ui->actionDeleteAll->setIcon(QPixmap(theme + "icons/Delete-96.png")); + windowIcon().addPixmap(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->paramRemoveButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->paramDownButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->paramUpButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->paramOpenButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->enumRemoveButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->enumMoveDownButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->enumMoveUpButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->enumAddButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->paramResetButton->setIcon(Utility::getIcon("icons/Refresh-96.png")); + ui->paramSaveButton->setIcon(Utility::getIcon("icons/Save-96.png")); + ui->serRemoveButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->serDownButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->serUpButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->serAddButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + + ui->groupRemoveButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->groupDownButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->groupUpButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->groupAddButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->groupEditButton->setIcon(Utility::getIcon("icons/icons8-edit-96.png")); + + ui->subgroupRemoveButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->subgroupDownButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->subgroupUpButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->subgroupAddButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->subgroupEditButton->setIcon(Utility::getIcon("icons/icons8-edit-96.png")); + + ui->groupParamRemoveButton->setIcon(Utility::getIcon("icons/Delete-96.png")); + ui->groupParamDownButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->groupParamUpButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->groupParamAddButton->setIcon(Utility::getIcon("icons/Plus Math-96.png")); + ui->groupParamEditButton->setIcon(Utility::getIcon("icons/icons8-edit-96.png")); + + ui->actionCalculatePacketSize->setIcon(Utility::getIcon("icons/Calculator-96.png")); + ui->actionCalculateCompressedCArraySize->setIcon(Utility::getIcon("icons/Calculator-96.png")); + ui->actionSave_XML_as->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionExportCompressedCArray->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionSave_Configuration_C_Header_as->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionSave_Configuration_C_Header_ifdef_wrapped_as->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionSave_XML_and_export_config_parser_and_compressed_C_array->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionLoad_XML->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->actionExportConfigurationParser->setIcon(Utility::getIcon("icons/Save as-96.png")); + ui->actionDeleteAll->setIcon(Utility::getIcon("icons/Delete-96.png")); mStatusInfoTime = 0; mStatusLabel = new QLabel(this); diff --git a/preferences.cpp b/preferences.cpp index acb876f1d..e106c9b49 100755 --- a/preferences.cpp +++ b/preferences.cpp @@ -41,19 +41,18 @@ Preferences::Preferences(QWidget *parent) : this, SLOT(timerSlot())); ui->setupUi(this); - QString theme = Utility::getThemePath(); - - ui->pollRestoreButton->setIcon(QPixmap(theme + "icons/Restart-96.png")); - ui->pathScriptInputChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->pathRtLogChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->pathScriptOutputChooseButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->jsConf1Button->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->jsConf2Button->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->jsConf3Button->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->jsConf4Button->setIcon(QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->jsConnectButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->jsScanButton->setIcon(QPixmap(theme + "icons/Connected-96.png")); - ui->jsResetConfigButton->setIcon(QPixmap(theme + "icons/Restart-96.png")); + + ui->pollRestoreButton->setIcon(Utility::getIcon("icons/Restart-96.png")); + ui->pathScriptInputChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->pathRtLogChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->pathScriptOutputChooseButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->jsConf1Button->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->jsConf2Button->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->jsConf3Button->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->jsConf4Button->setIcon(Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->jsConnectButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->jsScanButton->setIcon(Utility::getIcon("icons/Connected-96.png")); + ui->jsResetConfigButton->setIcon(Utility::getIcon("icons/Restart-96.png")); ui->uiScaleBox->setValue(mSettings.value("app_scale_factor", 1.0).toDouble()); ui->uiPlotWidthBox->setValue(mSettings.value("plot_line_width",4.0).toDouble()); diff --git a/setupwizardapp.cpp b/setupwizardapp.cpp index 7ffb182a5..addb9c147 100644 --- a/setupwizardapp.cpp +++ b/setupwizardapp.cpp @@ -44,8 +44,7 @@ SetupWizardApp::SetupWizardApp(VescInterface *vesc, QWidget *parent) setStartId(Page_Intro); setWizardStyle(ModernStyle); - QString theme = Utility::getThemePath(); - QPixmap icon_logo = QIcon(":/res/icon.svg").pixmap(QSize(this->devicePixelRatioF() * 48, this->devicePixelRatioF() * 48)); + QPixmap icon_logo = QIcon(Utility::getIcon(":/res/icon.svg")).pixmap(QSize(this->devicePixelRatioF() * 48, this->devicePixelRatioF() * 48)); icon_logo.setDevicePixelRatio(this->devicePixelRatioF()); setPixmap(QWizard::LogoPixmap, icon_logo); resize(800, 450); @@ -53,7 +52,7 @@ SetupWizardApp::SetupWizardApp(VescInterface *vesc, QWidget *parent) setWindowTitle(tr("App Setup Wizard")); mSideLabel = new AspectImgLabel(Qt::Vertical); - mSideLabel->setPixmap(QPixmap(theme +"logo_vertical.png")); + mSideLabel->setPixmap(Utility::getIcon("logo_vertical.png")); mSideLabel->setScaledContents(true); setSideWidget(mSideLabel); @@ -244,13 +243,11 @@ void AppMultiPage::initializePage() FW_RX_PARAMS params; Utility::getFwVersionBlocking(mVesc, ¶ms); - QString theme = Utility::getThemePath(); - if (params.hwType == HW_TYPE_VESC) { QListWidgetItem *item = new QListWidgetItem; item->setText(tr("This VESC (ID: %1)"). arg(mVesc->appConfig()->getParamInt("controller_id"))); - item->setIcon(QIcon(theme +"icons/Connected-96.png")); + item->setIcon(Utility::getIcon("icons/Connected-96.png")); item->setData(Qt::UserRole, -1); mCanFwdList->addItem(item); } @@ -269,7 +266,7 @@ void AppMultiPage::initializePage() QListWidgetItem *item = new QListWidgetItem; item->setText(tr("VESC with ID: %1").arg(dev)); - item->setIcon(QIcon(theme +"icons/can_off.png")); + item->setIcon(Utility::getIcon("icons/can_off.png")); item->setData(Qt::UserRole, dev); mCanFwdList->addItem(item); } @@ -409,8 +406,7 @@ AppNunchukPage::AppNunchukPage(VescInterface *vesc, QWidget *parent) mNrfPair = new NrfPair; mTimer = new QTimer(this); mWriteButton = new QPushButton(tr(" | Write Configuration To Vesc")); - QString theme = Utility::getThemePath(); - mWriteButton->setIcon(QIcon(theme +"icons/app_down.png")); + mWriteButton->setIcon(Utility::getIcon("icons/app_down.png")); mWriteButton->setIconSize(QSize(24, 24)); mNrfPair->setVesc(mVesc); @@ -597,8 +593,7 @@ AppPpmPage::AppPpmPage(VescInterface *vesc, QWidget *parent) mParamTab = new ParamTable; mWriteButton = new QPushButton(tr(" | Write Configuration To Vesc")); - QString theme = Utility::getThemePath(); - mWriteButton->setIcon(QIcon(theme +"icons/app_down.png")); + mWriteButton->setIcon(Utility::getIcon("icons/app_down.png")); mWriteButton->setIconSize(QSize(24, 24)); QVBoxLayout *layout = new QVBoxLayout; @@ -746,8 +741,7 @@ AppAdcPage::AppAdcPage(VescInterface *vesc, QWidget *parent) mParamTab = new ParamTable; mWriteButton = new QPushButton(tr(" | Write Configuration To Vesc")); - QString theme = Utility::getThemePath(); - mWriteButton->setIcon(QIcon(theme +"icons/app_down.png")); + mWriteButton->setIcon(Utility::getIcon("icons/app_down.png")); mWriteButton->setIconSize(QSize(24, 24)); QVBoxLayout *layout = new QVBoxLayout; diff --git a/setupwizardmotor.cpp b/setupwizardmotor.cpp index b3eeec10d..bb5328313 100644 --- a/setupwizardmotor.cpp +++ b/setupwizardmotor.cpp @@ -40,7 +40,6 @@ SetupWizardMotor::SetupWizardMotor(VescInterface *vesc, QWidget *parent) setStartId(Page_Intro); setWizardStyle(ModernStyle); - QString theme = Utility::getThemePath(); QPixmap icon_logo = QIcon(":/res/icon.svg").pixmap(QSize(this->devicePixelRatioF() * 48, this->devicePixelRatioF() * 48)); icon_logo.setDevicePixelRatio(this->devicePixelRatioF()); setPixmap(QWizard::LogoPixmap, icon_logo); diff --git a/startupwizard.cpp b/startupwizard.cpp index 35bc1e197..0dd5516a3 100644 --- a/startupwizard.cpp +++ b/startupwizard.cpp @@ -34,7 +34,6 @@ StartupWizard::StartupWizard(VescInterface *vesc, QWidget *parent) setPage(Page_Warranty, new StartupWarrantyPage(vesc)); setPage(Page_Conclusion, new StartupConclusionPage(vesc)); - QString theme = Utility::getThemePath(); setStartId(Page_Intro); setWizardStyle(ModernStyle); QPixmap icon_logo = QIcon(":/res/icon.svg").pixmap(QSize(this->devicePixelRatioF() * 48, this->devicePixelRatioF() * 48)); @@ -45,7 +44,7 @@ StartupWizard::StartupWizard(VescInterface *vesc, QWidget *parent) setWindowTitle(tr("VESC Tool Introduction")); mSideLabel = new AspectImgLabel(Qt::Vertical); - mSideLabel->setPixmap(QPixmap(theme + "logo_vertical.png")); + mSideLabel->setPixmap(Utility::getIcon("logo_vertical.png")); mSideLabel->setScaledContents(true); setSideWidget(mSideLabel); diff --git a/utility.cpp b/utility.cpp index c9664be6f..ee3cdb36a 100755 --- a/utility.cpp +++ b/utility.cpp @@ -36,7 +36,7 @@ #include #include #include - +#include #ifdef Q_OS_ANDROID #include @@ -2271,6 +2271,17 @@ QString Utility::waitForLine(QTcpSocket *socket, int timeoutMs) return res; } +QPixmap Utility::getIcon(QString path) +{ + QPixmap pm; + if (!QPixmapCache::find(path, &pm)) { + pm.load(getThemePath() + path); + QPixmapCache::insert(path, pm); + } + + return pm; +} + void Utility::setDarkMode(bool isDarkSetting) { isDark = isDarkSetting; @@ -2283,7 +2294,7 @@ bool Utility::isDarkMode() QString Utility::getThemePath() { - if(isDark) { + if (isDark) { return ":/res/"; } else { return ":/res/+theme_light/"; diff --git a/utility.h b/utility.h index 4181eaf57..ef12d43e3 100644 --- a/utility.h +++ b/utility.h @@ -137,6 +137,8 @@ class Utility : public QObject static QString waitForLine(QTcpSocket *socket, int timeoutMs); + static QPixmap getIcon(QString path); + signals: public slots: diff --git a/widgets/adcmap.cpp b/widgets/adcmap.cpp index 55b8e929f..12ef49901 100644 --- a/widgets/adcmap.cpp +++ b/widgets/adcmap.cpp @@ -29,10 +29,9 @@ AdcMap::AdcMap(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->resetButton->setIcon(QPixmap(theme + "icons/Restart-96.png")); - ui->applyButton->setIcon(QPixmap(theme + "icons/Ok-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->resetButton->setIcon(Utility::getIcon("icons/Restart-96.png")); + ui->applyButton->setIcon(Utility::getIcon("icons/Ok-96.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; diff --git a/widgets/adcmap.ui b/widgets/adcmap.ui index b4395c53f..8257decc7 100644 --- a/widgets/adcmap.ui +++ b/widgets/adcmap.ui @@ -51,10 +51,6 @@ Help - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - @@ -71,10 +67,6 @@ Reset - - - :/res/icons/Restart-96.png:/res/icons/Restart-96.png - @@ -91,10 +83,6 @@ Apply - - - :/res/+theme_light/icons/Ok-96.png:/res/+theme_light/icons/Ok-96.png - 45 @@ -305,8 +293,6 @@ 1 - - - + diff --git a/widgets/batterycalculator.cpp b/widgets/batterycalculator.cpp index 4aa567755..eb821fdcc 100644 --- a/widgets/batterycalculator.cpp +++ b/widgets/batterycalculator.cpp @@ -28,10 +28,8 @@ BatteryCalculator::BatteryCalculator(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->batteryCalcButton->setIcon(QPixmap(theme + "icons/apply.png")); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - + ui->batteryCalcButton->setIcon(Utility::getIcon("icons/apply.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; diff --git a/widgets/batterycalculator.ui b/widgets/batterycalculator.ui index c549d21f3..f1e9b1105 100644 --- a/widgets/batterycalculator.ui +++ b/widgets/batterycalculator.ui @@ -7,7 +7,7 @@ 0 0 474 - 125 + 134 @@ -64,10 +64,6 @@ - - - :/res/icons/apply.png:/res/icons/apply.png - 45 @@ -135,10 +131,6 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - @@ -146,8 +138,6 @@ - - - + diff --git a/widgets/detectallfocdialog.cpp b/widgets/detectallfocdialog.cpp index 2f908cff0..156a00a07 100644 --- a/widgets/detectallfocdialog.cpp +++ b/widgets/detectallfocdialog.cpp @@ -31,19 +31,17 @@ DetectAllFocDialog::DetectAllFocDialog(VescInterface *vesc, QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->tabWidget->setTabIcon(0, QPixmap(theme + "icons/Wizard-96.png")); - ui->tabWidget->setTabIcon(1, QPixmap(theme + "icons/Horizontal Settings Mixer-96.png")); - ui->nextMotorButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->prevBattButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->nextBattButton->setIcon(QPixmap(theme + "icons/Down-96.png")); - ui->prevSetupButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->prevDirButton->setIcon(QPixmap(theme + "icons/Up-96.png")); - ui->runButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->runNoCanButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->runAdvancedButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->finishButton->setIcon(QPixmap(theme + "icons/Circled Ok-96.png")); - + ui->tabWidget->setTabIcon(0, Utility::getIcon("icons/Wizard-96.png")); + ui->tabWidget->setTabIcon(1, Utility::getIcon("icons/Horizontal Settings Mixer-96.png")); + ui->nextMotorButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->prevBattButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->nextBattButton->setIcon(Utility::getIcon("icons/Down-96.png")); + ui->prevSetupButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->prevDirButton->setIcon(Utility::getIcon("icons/Up-96.png")); + ui->runButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->runNoCanButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->runAdvancedButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->finishButton->setIcon(Utility::getIcon("icons/Ok-96.png")); mVesc = vesc; mRejectOk = true; @@ -75,7 +73,7 @@ DetectAllFocDialog::DetectAllFocDialog(VescInterface *vesc, QWidget *parent) : item = new QListWidgetItem; item->setText(tr("Large Outrunner (~2000 g)")); - item->setIcon(QIcon(theme +"icons/motor.png")); + item->setIcon(Utility::getIcon("icons/motor.png")); item->setData(Qt::UserRole, QVariant::fromValue(MotorData(400, 700, 4000, 14))); ui->motorList->addItem(item); @@ -93,7 +91,7 @@ DetectAllFocDialog::DetectAllFocDialog(VescInterface *vesc, QWidget *parent) : item = new QListWidgetItem; item->setText(tr("Large Inrunner (~2000 g)")); - item->setIcon(QIcon(theme +"icons/motor.png")); + item->setIcon(Utility::getIcon("icons/motor.png")); item->setData(Qt::UserRole, QVariant::fromValue(MotorData(400, 1000, 4000, 4))); ui->motorList->addItem(item); diff --git a/widgets/detectallfocdialog.ui b/widgets/detectallfocdialog.ui index 65e10d091..977d549be 100644 --- a/widgets/detectallfocdialog.ui +++ b/widgets/detectallfocdialog.ui @@ -47,8 +47,8 @@ 0 0 - 770 - 432 + 796 + 481 @@ -78,10 +78,6 @@ Next - - - :/res/icons/Down-96.png:/res/icons/Down-96.png - @@ -93,8 +89,8 @@ 0 0 - 770 - 432 + 796 + 481 @@ -124,10 +120,6 @@ Previous - - - :/res/icons/Up-96.png:/res/icons/Up-96.png - @@ -135,10 +127,6 @@ Next - - - :/res/icons/Down-96.png:/res/icons/Down-96.png - @@ -150,8 +138,8 @@ 0 0 - 770 - 432 + 796 + 481 @@ -246,10 +234,6 @@ Previous - - - :/res/icons/Up-96.png:/res/icons/Up-96.png - @@ -257,10 +241,6 @@ Run Detection (no CAN) - - - :/res/icons/Circled Play-96.png:/res/icons/Circled Play-96.png - @@ -274,10 +254,6 @@ Run Detection - - - :/res/icons/Circled Play-96.png:/res/icons/Circled Play-96.png - @@ -289,8 +265,8 @@ 0 0 - 770 - 432 + 796 + 481 @@ -327,10 +303,6 @@ Previous - - - :/res/icons/Up-96.png:/res/icons/Up-96.png - @@ -338,10 +310,6 @@ Finish - - - :/res/icons/Ok-96.png:/res/icons/Ok-96.png - diff --git a/widgets/detectbldc.cpp b/widgets/detectbldc.cpp index 598ba8027..15cca772b 100644 --- a/widgets/detectbldc.cpp +++ b/widgets/detectbldc.cpp @@ -30,9 +30,8 @@ DetectBldc::DetectBldc(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->applyButton->setIcon(QPixmap(theme + "icons/apply.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->applyButton->setIcon(Utility::getIcon("icons/apply.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; diff --git a/widgets/detectbldc.ui b/widgets/detectbldc.ui index 5748dd89a..5a000f7ae 100644 --- a/widgets/detectbldc.ui +++ b/widgets/detectbldc.ui @@ -7,7 +7,7 @@ 0 0 509 - 140 + 151 @@ -84,10 +84,6 @@ - - - :/res/icons/apply.png:/res/icons/apply.png - 45 @@ -131,10 +127,6 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - @@ -145,10 +137,6 @@ - - - :/res/icons/Circled Play-96.png:/res/icons/Circled Play-96.png - @@ -168,8 +156,6 @@ - - - + diff --git a/widgets/detectfoc.cpp b/widgets/detectfoc.cpp index 8aa58534e..f8a404fa9 100644 --- a/widgets/detectfoc.cpp +++ b/widgets/detectfoc.cpp @@ -30,17 +30,16 @@ DetectFoc::DetectFoc(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->pushButton->setIcon(QPixmap(theme + "icons/arrow_r.png")); - ui->pushButton_2->setIcon(QPixmap(theme + "icons/arrow_r.png")); - ui->pushButton_3->setIcon(QPixmap(theme + "icons/arrow_r.png")); - ui->rlButton->setIcon(QPixmap(theme + "icons/rl.png")); - ui->lambdaButton->setIcon(QPixmap(theme + "icons/lambda.png")); - ui->applyAllButton->setIcon(QPixmap(theme + "icons/apply.png")); - ui->calcGainButton->setIcon(QPixmap(theme + "icons/Calculator-96.png")); - ui->calcKpKiButton->setIcon(QPixmap(theme + "icons/Calculator-96.png")); - ui->calcApplyLocalButton->setIcon(QPixmap(theme + "icons/Calculator-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->pushButton->setIcon(Utility::getIcon("icons/arrow_r.png")); + ui->pushButton_2->setIcon(Utility::getIcon("icons/arrow_r.png")); + ui->pushButton_3->setIcon(Utility::getIcon("icons/arrow_r.png")); + ui->rlButton->setIcon(Utility::getIcon("icons/rl.png")); + ui->lambdaButton->setIcon(Utility::getIcon("icons/lambda.png")); + ui->applyAllButton->setIcon(Utility::getIcon("icons/apply.png")); + ui->calcGainButton->setIcon(Utility::getIcon("icons/Calculator-96.png")); + ui->calcKpKiButton->setIcon(Utility::getIcon("icons/Calculator-96.png")); + ui->calcApplyLocalButton->setIcon(Utility::getIcon("icons/Calculator-96.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; diff --git a/widgets/detectfoc.ui b/widgets/detectfoc.ui index 2b72bfba3..d82a1b9fa 100644 --- a/widgets/detectfoc.ui +++ b/widgets/detectfoc.ui @@ -6,8 +6,8 @@ 0 0 - 791 - 196 + 769 + 197 @@ -196,10 +196,6 @@ - - - :/res/icons/Calculator-96.png:/res/icons/Calculator-96.png - @@ -216,10 +212,6 @@ - - - :/res/icons/Calculator-96.png:/res/icons/Calculator-96.png - @@ -278,10 +270,6 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - 16 @@ -323,10 +311,6 @@ - - - :/res/icons/rl.png:/res/icons/rl.png - 20 @@ -368,10 +352,6 @@ - - - :/res/icons/lambda.png:/res/icons/lambda.png - 20 @@ -419,10 +399,6 @@ - - - :/res/icons/apply.png:/res/icons/apply.png - 50 @@ -528,10 +504,6 @@ Calc Apply Old - - - :/res/icons/Calculator-96.png:/res/icons/Calculator-96.png - diff --git a/widgets/detectfocencoder.cpp b/widgets/detectfocencoder.cpp index 47a025e0b..e759c585e 100644 --- a/widgets/detectfocencoder.cpp +++ b/widgets/detectfocencoder.cpp @@ -29,10 +29,9 @@ DetectFocEncoder::DetectFocEncoder(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->startButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->applyButton->setIcon(QPixmap(theme + "icons/apply.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->startButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->applyButton->setIcon(Utility::getIcon("icons/apply.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; diff --git a/widgets/detectfocencoder.ui b/widgets/detectfocencoder.ui index ef1c55d53..1cb75895e 100644 --- a/widgets/detectfocencoder.ui +++ b/widgets/detectfocencoder.ui @@ -6,8 +6,8 @@ 0 0 - 605 - 66 + 626 + 70 @@ -46,10 +46,6 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - @@ -82,10 +78,6 @@ - - - :/res/icons/Circled Play-96.png:/res/icons/Circled Play-96.png - @@ -175,10 +167,6 @@ - - - :/res/icons/apply.png:/res/icons/apply.png - 45 @@ -192,8 +180,6 @@ - - - + diff --git a/widgets/detectfochall.cpp b/widgets/detectfochall.cpp index 32660f9ef..64d7a366e 100644 --- a/widgets/detectfochall.cpp +++ b/widgets/detectfochall.cpp @@ -29,10 +29,9 @@ DetectFocHall::DetectFocHall(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->startButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); - ui->applyButton->setIcon(QPixmap(theme + "icons/apply.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->startButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); + ui->applyButton->setIcon(Utility::getIcon("icons/apply.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = nullptr; diff --git a/widgets/detectfochall.ui b/widgets/detectfochall.ui index 4866650f4..99a6b2bac 100644 --- a/widgets/detectfochall.ui +++ b/widgets/detectfochall.ui @@ -6,8 +6,8 @@ 0 0 - 466 - 121 + 456 + 114 @@ -48,10 +48,6 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - @@ -87,10 +83,6 @@ - - - :/res/icons/Circled Play-96.png:/res/icons/Circled Play-96.png - @@ -107,10 +99,6 @@ - - - :/res/icons/apply.png:/res/icons/apply.png - 45 @@ -261,8 +249,6 @@ - - - + diff --git a/widgets/experimentplot.cpp b/widgets/experimentplot.cpp index 3190a0c2d..8e9f37f05 100644 --- a/widgets/experimentplot.cpp +++ b/widgets/experimentplot.cpp @@ -29,20 +29,19 @@ ExperimentPlot::ExperimentPlot(QWidget *parent) : ui->setupUi(this); layout()->setContentsMargins(0, 0, 0, 0); - QString theme = Utility::getThemePath(); - QIcon mycon = QIcon(theme + "icons/expand_on.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_off.png"), QIcon::Normal, QIcon::Off); + QIcon mycon = QIcon(Utility::getIcon("icons/expand_on.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_off.png"), QIcon::Normal, QIcon::Off); ui->experimentHZoomButton->setIcon(mycon); - mycon = QIcon(theme + "icons/expand_v_on.png"); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/expand_v_on.png")); + mycon.addPixmap(Utility::getIcon("icons/expand_v_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/expand_v_off.png"), QIcon::Normal, QIcon::Off); ui->experimentVZoomButton->setIcon(mycon); - mycon = QIcon(theme + "icons/size_on.png"); - mycon.addPixmap(QPixmap(theme + "icons/size_on.png"), QIcon::Normal, QIcon::On); - mycon.addPixmap(QPixmap(theme + "icons/size_off.png"), QIcon::Normal, QIcon::Off); + mycon = QIcon(Utility::getIcon("icons/size_on.png")); + mycon.addPixmap(Utility::getIcon("icons/size_on.png"), QIcon::Normal, QIcon::On); + mycon.addPixmap(Utility::getIcon("icons/size_off.png"), QIcon::Normal, QIcon::Off); ui->experimentAutoScaleButton->setIcon(mycon); auto genPic = [](QString p1, QString p2, QString text) { @@ -55,11 +54,11 @@ ExperimentPlot::ExperimentPlot(QWidget *parent) : p.setRenderHint(QPainter::SmoothPixmapTransform, true); if (!p1.isEmpty()) { - p.drawImage(pix.rect(), QImage(p1)); + p.drawImage(pix.rect(), Utility::getIcon(p1).toImage()); } if (!p2.isEmpty()) { - p.drawImage(pix.rect(), QImage(p2)); + p.drawImage(pix.rect(), Utility::getIcon(p2).toImage()); } if (!text.isEmpty()) { @@ -76,7 +75,7 @@ ExperimentPlot::ExperimentPlot(QWidget *parent) : auto updateIcon = [genPic](QToolButton *btn, QString pic, QString txt) { QIcon mycon = QIcon(genPic(pic, "", txt)); - mycon.addPixmap(genPic(Utility::getThemePath() + "icons/glow.png", pic, txt), QIcon::Normal, QIcon::On); + mycon.addPixmap(genPic("icons/glow.png", pic, txt), QIcon::Normal, QIcon::On); mycon.addPixmap(genPic("", pic, txt), QIcon::Normal, QIcon::Off); btn->setIcon(mycon); }; @@ -87,10 +86,10 @@ ExperimentPlot::ExperimentPlot(QWidget *parent) : updateIcon(ui->experimentGraph4Button, "", "4"); updateIcon(ui->experimentGraph5Button, "", "5"); updateIcon(ui->experimentGraph6Button, "", "6"); - updateIcon(ui->experimentShowLineButton, theme + "icons/3ph_sine.png", ""); - updateIcon(ui->experimentScatterButton, theme + "icons/Polyline-96.png", ""); + updateIcon(ui->experimentShowLineButton, "icons/3ph_sine.png", ""); + updateIcon(ui->experimentScatterButton, "icons/Polyline-96.png", ""); - ui->experimentClearDataButton->setIcon(QPixmap(theme + "icons/Delete-96.png")); + ui->experimentClearDataButton->setIcon(Utility::getIcon("icons/Delete-96.png")); mVesc = 0; mExperimentReplot = false; diff --git a/widgets/experimentplot.ui b/widgets/experimentplot.ui index 47582b88d..c61499b46 100644 --- a/widgets/experimentplot.ui +++ b/widgets/experimentplot.ui @@ -82,11 +82,6 @@ - - - :/res/icons/expand_off.png - :/res/icons/expand_on.png:/res/icons/expand_off.png - true @@ -109,11 +104,6 @@ - - - :/res/icons/expand_v_off.png - :/res/icons/expand_v_on.png:/res/icons/expand_v_off.png - true @@ -136,11 +126,6 @@ - - - :/res/icons/size_off.png - :/res/icons/size_on.png:/res/icons/size_off.png - true @@ -213,10 +198,6 @@ - - - :/res/icons/Polyline-96.png:/res/icons/Polyline-96.png - true @@ -358,10 +339,6 @@ - - - :/res/icons/Delete-96.png:/res/icons/Delete-96.png - @@ -378,10 +355,6 @@ - - - :/res/icons/3ph_sine.png:/res/icons/3ph_sine.png - true @@ -561,8 +534,6 @@ 1 - - - + diff --git a/widgets/helpdialog.cpp b/widgets/helpdialog.cpp index c7626531c..295e6d6db 100644 --- a/widgets/helpdialog.cpp +++ b/widgets/helpdialog.cpp @@ -29,9 +29,8 @@ HelpDialog::HelpDialog(QString title, QString text, QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - this->setWindowIcon(QPixmap(theme + "icons/Help-96.png")); - ui->label->setPixmap(QPixmap(theme + "icons/About-96.png")); + this->setWindowIcon(Utility::getIcon("icons/Help-96.png")); + ui->label->setPixmap(Utility::getIcon("icons/About-96.png")); setAttribute(Qt::WA_DeleteOnClose); setWindowTitle(title); diff --git a/widgets/helpdialog.ui b/widgets/helpdialog.ui index 9f0e8b902..5fb3e612b 100644 --- a/widgets/helpdialog.ui +++ b/widgets/helpdialog.ui @@ -37,9 +37,6 @@ - - :/res/icons/About-96.png - true diff --git a/widgets/mrichtextedit.cpp b/widgets/mrichtextedit.cpp index 9432b3f17..a2b4c191b 100644 --- a/widgets/mrichtextedit.cpp +++ b/widgets/mrichtextedit.cpp @@ -45,29 +45,28 @@ MRichTextEdit::MRichTextEdit(QWidget *parent) : QWidget(parent) { m_lastBlockList = 0; f_textedit->setTabStopDistance(40); - QString theme = Utility::getThemePath(); - f_undo->setIcon(QPixmap(theme + "icons_textedit/Undo-96.png")); - f_redo->setIcon(QPixmap(theme + "icons_textedit/Undo-96.png")); - f_cut->setIcon(QPixmap(theme + "icons_textedit/Cut-96.png")); - f_copy->setIcon(QPixmap(theme + "icons_textedit/Copy-96.png")); - f_paste->setIcon(QPixmap(theme + "icons_textedit/Paste-96.png")); - f_link->setIcon(QPixmap(theme + "icons_textedit/Link-96.png")); - f_image->setIcon(QPixmap(theme + "icons_textedit/Add Image-96.png")); - f_menu->setIcon(QPixmap(theme + "icons_textedit/Menu 2-96.png")); - f_bold->setIcon(QPixmap(theme + "icons_textedit/Bold-96.png")); - f_italic->setIcon(QPixmap(theme + "icons_textedit/Italic-96.png")); - f_underline->setIcon(QPixmap(theme + "icons_textedit/Text Color-96.png")); - f_strikeout->setIcon(QPixmap(theme + "icons_textedit/Strikethrough-96.png")); - f_list_bullet->setIcon(QPixmap(theme + "icons_textedit/Bulleted List-96.png")); - f_list_ordered->setIcon(QPixmap(theme + "icons_textedit/Numbered List-96.png")); - f_indent_dec->setIcon(QPixmap(theme + "icons_textedit/Indent-96.png")); - f_indent_inc->setIcon(QPixmap(theme + "icons_textedit/Outdent-96.png")); - f_bgcolor->setIcon(QPixmap(theme + "icons_textedit/Fill Color-96.png")); - f_fgcolor->setIcon(QPixmap(theme + "icons_textedit/Fill Color-96.png")); - f_align_left->setIcon(QPixmap(theme + "icons_textedit/Align Left-96.png")); - f_align_center->setIcon(QPixmap(theme + "icons_textedit/Align Center-96.png")); - f_align_right->setIcon(QPixmap(theme + "icons_textedit/Align Right-96.png")); - f_align_justify->setIcon(QPixmap(theme + "icons_textedit/Align Justify-96.png")); + f_undo->setIcon(Utility::getIcon("icons_textedit/Undo-96.png")); + f_redo->setIcon(Utility::getIcon("icons_textedit/Undo-96.png")); + f_cut->setIcon(Utility::getIcon("icons_textedit/Cut-96.png")); + f_copy->setIcon(Utility::getIcon("icons_textedit/Copy-96.png")); + f_paste->setIcon(Utility::getIcon("icons_textedit/Paste-96.png")); + f_link->setIcon(Utility::getIcon("icons_textedit/Link-96.png")); + f_image->setIcon(Utility::getIcon("icons_textedit/Add Image-96.png")); + f_menu->setIcon(Utility::getIcon("icons_textedit/Menu 2-96.png")); + f_bold->setIcon(Utility::getIcon("icons_textedit/Bold-96.png")); + f_italic->setIcon(Utility::getIcon("icons_textedit/Italic-96.png")); + f_underline->setIcon(Utility::getIcon("icons_textedit/Text Color-96.png")); + f_strikeout->setIcon(Utility::getIcon("icons_textedit/Strikethrough-96.png")); + f_list_bullet->setIcon(Utility::getIcon("icons_textedit/Bulleted List-96.png")); + f_list_ordered->setIcon(Utility::getIcon("icons_textedit/Numbered List-96.png")); + f_indent_dec->setIcon(Utility::getIcon("icons_textedit/Indent-96.png")); + f_indent_inc->setIcon(Utility::getIcon("icons_textedit/Outdent-96.png")); + f_bgcolor->setIcon(Utility::getIcon("icons_textedit/Fill Color-96.png")); + f_fgcolor->setIcon(Utility::getIcon("icons_textedit/Fill Color-96.png")); + f_align_left->setIcon(Utility::getIcon("icons_textedit/Align Left-96.png")); + f_align_center->setIcon(Utility::getIcon("icons_textedit/Align Center-96.png")); + f_align_right->setIcon(Utility::getIcon("icons_textedit/Align Right-96.png")); + f_align_justify->setIcon(Utility::getIcon("icons_textedit/Align Justify-96.png")); connect(f_textedit, SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(slotCurrentCharFormatChanged(QTextCharFormat))); diff --git a/widgets/mrichtextedit.ui b/widgets/mrichtextedit.ui index febb40db3..99223fc06 100644 --- a/widgets/mrichtextedit.ui +++ b/widgets/mrichtextedit.ui @@ -78,13 +78,6 @@ Undo (CTRL+Z) - - Undo - - - - :/res/icons_textedit/Undo-96.png:/res/icons_textedit/Undo-96.png - 16 @@ -104,13 +97,6 @@ Redo - - Redo - - - - :/res/icons_textedit/Redo-96.png:/res/icons_textedit/Redo-96.png - 16 @@ -127,13 +113,6 @@ Cut (CTRL+X) - - Cut - - - - :/res/icons_textedit/Cut-96.png:/res/icons_textedit/Cut-96.png - 16 @@ -150,13 +129,6 @@ Copy (CTRL+C) - - Copy - - - - :/res/icons_textedit/Copy-96.png:/res/icons_textedit/Copy-96.png - 16 @@ -173,13 +145,6 @@ Paste (CTRL+V) - - Paste - - - - :/res/icons_textedit/Paste-96.png:/res/icons_textedit/Paste-96.png - 16 @@ -203,13 +168,6 @@ Link (CTRL+L) - - Link - - - - :/res/icons_textedit/Link-96.png:/res/icons_textedit/Link-96.png - 16 @@ -259,13 +217,6 @@ Insert image... - - Insert Image - - - - :/res/icons_textedit/Add Image-96.png:/res/icons_textedit/Add Image-96.png - @@ -289,10 +240,6 @@ ... - - - :/res/icons_textedit/Menu 2-96.png:/res/icons_textedit/Menu 2-96.png - @@ -339,11 +286,7 @@ Bold (CTRL+B) - Bold - - - - :/res/icons_textedit/Bold-96.png:/res/icons_textedit/Bold-96.png + @@ -364,13 +307,6 @@ Italic (CTRL+I) - - Italic - - - - :/res/icons_textedit/Italic-96.png:/res/icons_textedit/Italic-96.png - 16 @@ -390,13 +326,6 @@ Underline (CTRL+U) - - Underline - - - - :/res/icons_textedit/Text Color-96.png:/res/icons_textedit/Text Color-96.png - 16 @@ -410,13 +339,6 @@ - - Strike Out - - - - :/res/icons_textedit/Strikethrough-96.png:/res/icons_textedit/Strikethrough-96.png - true @@ -430,13 +352,6 @@ Bullet list (CTRL+-) - - Bullet list - - - - :/res/icons_textedit/Bulleted List-96.png:/res/icons_textedit/Bulleted List-96.png - 16 @@ -456,13 +371,6 @@ Ordered list (CTRL+=) - - Ordered list - - - - :/res/icons_textedit/Numbered List-96.png:/res/icons_textedit/Numbered List-96.png - 16 @@ -489,13 +397,6 @@ Decrease indentation (CTRL+,) - - Decrease indentation - - - - :/res/icons_textedit/Indent-96.png:/res/icons_textedit/Indent-96.png - 16 @@ -512,13 +413,6 @@ Increase indentation (CTRL+.) - - Increase indentation - - - - :/res/icons_textedit/Outdent-96.png:/res/icons_textedit/Outdent-96.png - 16 @@ -545,10 +439,6 @@ - - - :/res/icons_textedit/Fill Color-96.png:/res/icons_textedit/Fill Color-96.png - 16 @@ -571,10 +461,6 @@ - - - :/res/icons_textedit/Fill Color-96.png:/res/icons_textedit/Fill Color-96.png - @@ -592,10 +478,6 @@ - - - :/res/icons_textedit/Align Left-96.png:/res/icons_textedit/Align Left-96.png - true @@ -609,10 +491,6 @@ - - - :/res/icons_textedit/Align Center-96.png:/res/icons_textedit/Align Center-96.png - true @@ -626,10 +504,6 @@ - - - :/res/icons_textedit/Align Right-96.png:/res/icons_textedit/Align Right-96.png - true @@ -643,10 +517,6 @@ - - - :/res/icons_textedit/Align Justify-96.png:/res/icons_textedit/Align Justify-96.png - true @@ -692,8 +562,6 @@ f_image f_menu - - - + diff --git a/widgets/nrfpair.cpp b/widgets/nrfpair.cpp index 74c7ce968..9ce819b89 100644 --- a/widgets/nrfpair.cpp +++ b/widgets/nrfpair.cpp @@ -29,9 +29,8 @@ NrfPair::NrfPair(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->startButton->setIcon(QPixmap(theme + "icons/Circled Play-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->startButton->setIcon(Utility::getIcon("icons/Circled Play-96.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; diff --git a/widgets/nrfpair.ui b/widgets/nrfpair.ui index 408ff6884..68684b141 100644 --- a/widgets/nrfpair.ui +++ b/widgets/nrfpair.ui @@ -7,7 +7,7 @@ 0 0 356 - 84 + 88 @@ -31,10 +31,6 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - @@ -51,10 +47,6 @@ - - - :/res/icons/Circled Play-96.png:/res/icons/Circled Play-96.png - @@ -80,7 +72,6 @@ - 75 true @@ -100,8 +91,6 @@ - - - + diff --git a/widgets/parameditbitfield.cpp b/widgets/parameditbitfield.cpp index d26b0a26a..4727168aa 100644 --- a/widgets/parameditbitfield.cpp +++ b/widgets/parameditbitfield.cpp @@ -28,10 +28,9 @@ ParamEditBitfield::ParamEditBitfield(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->readButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->readDefaultButton->setIcon(QPixmap(theme + "icons/Data Backup-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->readButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->readDefaultButton->setIcon(Utility::getIcon("icons/Data Backup-96.png")); auto updateFun = [this]() { if (mConfig) { diff --git a/widgets/parameditbitfield.ui b/widgets/parameditbitfield.ui index d21ce5283..c4093f068 100644 --- a/widgets/parameditbitfield.ui +++ b/widgets/parameditbitfield.ui @@ -103,10 +103,6 @@ - - - :/res/icons/Upload-96.png:/res/icons/Upload-96.png - @@ -123,10 +119,6 @@ - - - :/res/icons/Data Backup-96.png:/res/icons/Data Backup-96.png - @@ -143,16 +135,10 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - - - - + diff --git a/widgets/parameditbool.cpp b/widgets/parameditbool.cpp index de63781df..354e09506 100644 --- a/widgets/parameditbool.cpp +++ b/widgets/parameditbool.cpp @@ -29,10 +29,9 @@ ParamEditBool::ParamEditBool(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->readButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->readDefaultButton->setIcon(QPixmap(theme + "icons/Data Backup-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->readButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->readDefaultButton->setIcon(Utility::getIcon("icons/Data Backup-96.png")); } ParamEditBool::~ParamEditBool() diff --git a/widgets/parameditbool.ui b/widgets/parameditbool.ui index 5bcca5ac3..1f36810ee 100644 --- a/widgets/parameditbool.ui +++ b/widgets/parameditbool.ui @@ -57,10 +57,6 @@ - - - :/res/icons/Upload-96.png:/res/icons/Upload-96.png - @@ -77,10 +73,6 @@ - - - :/res/icons/Data Backup-96.png:/res/icons/Data Backup-96.png - @@ -97,16 +89,10 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - - - - + diff --git a/widgets/parameditdouble.cpp b/widgets/parameditdouble.cpp index ea350bf84..e7d785e27 100644 --- a/widgets/parameditdouble.cpp +++ b/widgets/parameditdouble.cpp @@ -30,10 +30,9 @@ ParamEditDouble::ParamEditDouble(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->readButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->readDefaultButton->setIcon(QPixmap(theme + "icons/Data Backup-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->readButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->readDefaultButton->setIcon(Utility::getIcon("icons/Data Backup-96.png")); mConfig = 0; mMaxVal = 1.0; diff --git a/widgets/parameditdouble.ui b/widgets/parameditdouble.ui index f4f196d0c..93a55089a 100644 --- a/widgets/parameditdouble.ui +++ b/widgets/parameditdouble.ui @@ -6,8 +6,8 @@ 0 0 - 86 - 26 + 146 + 27 @@ -45,10 +45,6 @@ - - - :/res/icons/Upload-96.png:/res/icons/Upload-96.png - @@ -65,10 +61,6 @@ - - - :/res/icons/Data Backup-96.png:/res/icons/Data Backup-96.png - @@ -85,18 +77,12 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - - - - + diff --git a/widgets/parameditenum.cpp b/widgets/parameditenum.cpp index 4adb714c4..54fc6fd11 100644 --- a/widgets/parameditenum.cpp +++ b/widgets/parameditenum.cpp @@ -30,10 +30,9 @@ ParamEditEnum::ParamEditEnum(QWidget *parent) : ui->setupUi(this); mConfig = 0; - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->readButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->readDefaultButton->setIcon(QPixmap(theme + "icons/Data Backup-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->readButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->readDefaultButton->setIcon(Utility::getIcon("icons/Data Backup-96.png")); } ParamEditEnum::~ParamEditEnum() diff --git a/widgets/parameditenum.ui b/widgets/parameditenum.ui index ebdccf74e..f0af1a413 100644 --- a/widgets/parameditenum.ui +++ b/widgets/parameditenum.ui @@ -46,10 +46,6 @@ - - - :/res/icons/Upload-96.png:/res/icons/Upload-96.png - @@ -66,10 +62,6 @@ - - - :/res/icons/Data Backup-96.png:/res/icons/Data Backup-96.png - @@ -86,16 +78,10 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - - - - + diff --git a/widgets/parameditint.cpp b/widgets/parameditint.cpp index 76a7fa215..01fd0e14a 100644 --- a/widgets/parameditint.cpp +++ b/widgets/parameditint.cpp @@ -32,10 +32,9 @@ ParamEditInt::ParamEditInt(QWidget *parent) : mConfig = 0; mMaxVal = 1; - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->readButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->readDefaultButton->setIcon(QPixmap(theme + "icons/Data Backup-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->readButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->readDefaultButton->setIcon(Utility::getIcon("icons/Data Backup-96.png")); mDisplay = new DisplayPercentage(this); mIntBox = new QSpinBox(this); diff --git a/widgets/parameditint.ui b/widgets/parameditint.ui index e81ef47c5..747641a46 100644 --- a/widgets/parameditint.ui +++ b/widgets/parameditint.ui @@ -6,8 +6,8 @@ 0 0 - 86 - 26 + 146 + 27 @@ -45,10 +45,6 @@ - - - :/res/icons/Upload-96.png:/res/icons/Upload-96.png - @@ -65,10 +61,6 @@ - - - :/res/icons/Data Backup-96.png:/res/icons/Data Backup-96.png - @@ -85,18 +77,12 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - - - - + diff --git a/widgets/parameditstring.cpp b/widgets/parameditstring.cpp index 507f659e7..eeaa9291b 100644 --- a/widgets/parameditstring.cpp +++ b/widgets/parameditstring.cpp @@ -28,10 +28,9 @@ ParamEditString::ParamEditString(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->readButton->setIcon(QPixmap(theme + "icons/Upload-96.png")); - ui->readDefaultButton->setIcon(QPixmap(theme + "icons/Data Backup-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->readButton->setIcon(Utility::getIcon("icons/Upload-96.png")); + ui->readDefaultButton->setIcon(Utility::getIcon("icons/Data Backup-96.png")); } ParamEditString::~ParamEditString() diff --git a/widgets/parameditstring.ui b/widgets/parameditstring.ui index 4694e9cc0..71110ebf9 100644 --- a/widgets/parameditstring.ui +++ b/widgets/parameditstring.ui @@ -46,10 +46,6 @@ - - - :/res/icons/Upload-96.png:/res/icons/Upload-96.png - @@ -66,10 +62,6 @@ - - - :/res/icons/Data Backup-96.png:/res/icons/Data Backup-96.png - @@ -86,16 +78,10 @@ - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - - - - + diff --git a/widgets/ppmmap.cpp b/widgets/ppmmap.cpp index f367ada14..3d67e85e4 100644 --- a/widgets/ppmmap.cpp +++ b/widgets/ppmmap.cpp @@ -29,10 +29,9 @@ PpmMap::PpmMap(QWidget *parent) : { ui->setupUi(this); - QString theme = Utility::getThemePath(); - ui->helpButton->setIcon(QPixmap(theme + "icons/Help-96.png")); - ui->applyButton->setIcon(QPixmap(theme + "icons/apply.png")); - ui->applyButton->setIcon(QPixmap(theme + "icons/Ok-96.png")); + ui->helpButton->setIcon(Utility::getIcon("icons/Help-96.png")); + ui->applyButton->setIcon(Utility::getIcon("icons/apply.png")); + ui->applyButton->setIcon(Utility::getIcon("icons/Ok-96.png")); layout()->setContentsMargins(0, 0, 0, 0); mVesc = 0; diff --git a/widgets/ppmmap.ui b/widgets/ppmmap.ui index 8d2b50e3f..01059b10d 100644 --- a/widgets/ppmmap.ui +++ b/widgets/ppmmap.ui @@ -46,10 +46,6 @@ Help - - - :/res/icons/Help-96.png:/res/icons/Help-96.png - @@ -66,10 +62,6 @@ Reset - - - :/res/icons/Restart-96.png:/res/icons/Restart-96.png - @@ -241,8 +233,6 @@ 1 - - - + diff --git a/widgets/scripteditor.cpp b/widgets/scripteditor.cpp index db5975174..ad7cc561b 100644 --- a/widgets/scripteditor.cpp +++ b/widgets/scripteditor.cpp @@ -35,11 +35,10 @@ ScriptEditor::ScriptEditor(QWidget *parent) : ui->setupUi(this); mIsModeLisp = false; - QString theme = Utility::getThemePath(); - ui->searchHideButton->setIcon(QPixmap(theme + "icons/Cancel-96.png")); - ui->openFileButton->setIcon(QPixmap(theme + "icons/Open Folder-96.png")); - ui->saveButton->setIcon(QPixmap(theme + "icons/Save-96.png")); - ui->saveAsButton->setIcon(QPixmap(theme + "icons/Save as-96.png")); + ui->searchHideButton->setIcon(Utility::getIcon("icons/Cancel-96.png")); + ui->openFileButton->setIcon(Utility::getIcon("icons/Open Folder-96.png")); + ui->saveButton->setIcon(Utility::getIcon("icons/Save-96.png")); + ui->saveAsButton->setIcon(Utility::getIcon("icons/Save as-96.png")); ui->searchWidget->setVisible(false); ui->codeEdit->setTabReplaceSize(4); diff --git a/widgets/scripteditor.ui b/widgets/scripteditor.ui index 20beecf47..1c0d0275b 100644 --- a/widgets/scripteditor.ui +++ b/widgets/scripteditor.ui @@ -106,10 +106,6 @@ - - - :/res/icons/Cancel-96.png:/res/icons/Cancel-96.png - true @@ -141,10 +137,6 @@ Open - - - :/res/icons/Open Folder-96.png:/res/icons/Open Folder-96.png - false @@ -155,10 +147,6 @@ Save - - - :/res/icons/Save-96.png:/res/icons/Save-96.png - false @@ -169,10 +157,6 @@ Save As - - - :/res/icons/Save as-96.png:/res/icons/Save as-96.png - false @@ -189,8 +173,6 @@
QCodeEditor
- - - +