From 2ac79a77919b8d9866942920c15a0d84f3c6d560 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Thu, 20 Feb 2014 15:34:13 +0100 Subject: [PATCH] Most icons set correctly. Icons only seen in Windows (perhaps Mac). I have not figured out how to set icons of daughter-windows, only dialogs. --- companion/src/comparedialog.cpp | 1 + companion/src/comparedialog.ui | 6 +----- companion/src/contributorsdialog.cpp | 4 ++++ companion/src/contributorsdialog.ui | 4 ---- companion/src/customizesplashdialog.cpp | 1 + companion/src/customizesplashdialog.ui | 6 +----- companion/src/downloaddialog.cpp | 3 ++- companion/src/downloaddialog.ui | 4 ---- companion/src/fusesdialog.cpp | 3 ++- companion/src/fusesdialog.ui | 4 ---- companion/src/generaledit.cpp | 2 +- companion/src/generaledit.ui | 8 ++------ companion/src/logsdialog.cpp | 2 ++ companion/src/logsdialog.ui | 17 +++++++++++------ companion/src/mainwindow.cpp | 3 ++- companion/src/mdichild.cpp | 1 + companion/src/mdichild.ui | 4 ---- companion/src/modelconfigdialog.cpp | 4 ++++ companion/src/modelconfigdialog.ui | 8 ++------ companion/src/printdialog.cpp | 1 + companion/src/printdialog.ui | 4 ---- companion/src/splashlibrary.cpp | 2 ++ companion/src/splashlibrary.ui | 4 ---- 23 files changed, 40 insertions(+), 56 deletions(-) diff --git a/companion/src/comparedialog.cpp b/companion/src/comparedialog.cpp index 1309857c4..3465037e8 100644 --- a/companion/src/comparedialog.cpp +++ b/companion/src/comparedialog.cpp @@ -29,6 +29,7 @@ compareDialog::compareDialog(QWidget *parent, GeneralSettings *gg) : ui(new Ui::compareDialog) { ui->setupUi(this); + this->setWindowIcon(CompanionIcon("compare.png")); g_eeGeneral = gg; eepromInterface = GetEepromInterface(); te = ui->textEdit; diff --git a/companion/src/comparedialog.ui b/companion/src/comparedialog.ui index 6f11bf138..4a26482b0 100644 --- a/companion/src/comparedialog.ui +++ b/companion/src/comparedialog.ui @@ -26,11 +26,7 @@ false - Dialog - - - - :/icon.png:/icon.png + Compare Models diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp index 54d32f9f7..8aefa222b 100644 --- a/companion/src/contributorsdialog.cpp +++ b/companion/src/contributorsdialog.cpp @@ -1,6 +1,7 @@ #include "contributorsdialog.h" #include "ui_contributorsdialog.h" #include +#include "helpers.h" contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnurl) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), @@ -10,6 +11,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu switch (contest) { case 0: { + this->setWindowIcon(CompanionIcon("contributors.png")); QFile file(":/DONATIONS.txt"); QString str; str.append(""); @@ -79,6 +81,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu case 1: { + this->setWindowIcon(CompanionIcon("changelog.png")); QFile file(":/releasenotes.txt"); if(file.open( QIODevice::ReadOnly | QIODevice::Text ) ) { ui->textEditor->setHtml(file.readAll()); @@ -91,6 +94,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu case 2: { if (!rnurl.isEmpty()) { + this->setWindowIcon(CompanionIcon("changelog.png")); this->setWindowTitle(tr("OpenTX Release Notes")); manager = new QNetworkAccessManager(this); connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*))); diff --git a/companion/src/contributorsdialog.ui b/companion/src/contributorsdialog.ui index 6ae7866c8..5d7d670c1 100644 --- a/companion/src/contributorsdialog.ui +++ b/companion/src/contributorsdialog.ui @@ -13,10 +13,6 @@ Dialog - - - :/icon.png:/icon.png - diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 420266b7a..bd284a3d6 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -143,6 +143,7 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) : ui(new Ui::customizeSplashDialog) { ui->setupUi(this); + this->setWindowIcon(CompanionIcon("paint.png")); ui->leftLibraryButton->setIcon(CompanionIcon("library.png")); ui->rightLibraryButton->setIcon(CompanionIcon("library.png")); diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui index fa6c57d9f..de4d68f24 100644 --- a/companion/src/customizesplashdialog.ui +++ b/companion/src/customizesplashdialog.ui @@ -9,7 +9,7 @@ 0 0 - 1086 + 1087 285 @@ -22,10 +22,6 @@ Transmitter Splash Screen Editor - - - :/icon.png:/icon.png - 6 diff --git a/companion/src/downloaddialog.cpp b/companion/src/downloaddialog.cpp index bfd425619..794dbbcd1 100644 --- a/companion/src/downloaddialog.cpp +++ b/companion/src/downloaddialog.cpp @@ -2,13 +2,14 @@ #include "ui_downloaddialog.h" #include #include +#include "helpers.h" downloadDialog::downloadDialog(QWidget *parent, QString src, QString tgt) : QDialog(parent), ui(new Ui::downloadDialog) { ui->setupUi(this); - + this->setWindowIcon(CompanionIcon("fwpreferences.png")); ui->progressBar->setValue(1); ui->progressBar->setMinimum(0); ui->progressBar->setMaximum(0); diff --git a/companion/src/downloaddialog.ui b/companion/src/downloaddialog.ui index dcd05c405..f51dfd085 100644 --- a/companion/src/downloaddialog.ui +++ b/companion/src/downloaddialog.ui @@ -13,10 +13,6 @@ Downloading: - - - :/icon.png:/icon.png - diff --git a/companion/src/fusesdialog.cpp b/companion/src/fusesdialog.cpp index 106bc0b85..aad4bdad5 100644 --- a/companion/src/fusesdialog.cpp +++ b/companion/src/fusesdialog.cpp @@ -1,13 +1,14 @@ #include "fusesdialog.h" #include "ui_fusesdialog.h" - #include "burnconfigdialog.h" +#include "helpers.h" fusesDialog::fusesDialog(QWidget *parent) : QDialog(parent), ui(new Ui::fusesDialog) { ui->setupUi(this); + this->setWindowIcon(CompanionIcon("fuses.png")); } fusesDialog::~fusesDialog() diff --git a/companion/src/fusesdialog.ui b/companion/src/fusesdialog.ui index 1a32ff96c..f4ffe20bb 100644 --- a/companion/src/fusesdialog.ui +++ b/companion/src/fusesdialog.ui @@ -13,10 +13,6 @@ Fuses - - - :/icon.png:/icon.png - diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp index f197eb7b1..ebd443e6b 100644 --- a/companion/src/generaledit.cpp +++ b/companion/src/generaledit.cpp @@ -18,7 +18,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : g_eeGeneral(radioData.generalSettings) { ui->setupUi(this); - this->setWindowIcon(QIcon(":/icon.png")); + this->setWindowIcon(CompanionIcon("open.png")); QSettings settings; QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString(); diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui index 5de0449aa..8f66dcab1 100644 --- a/companion/src/generaledit.ui +++ b/companion/src/generaledit.ui @@ -19,10 +19,6 @@ General Edit - - - :/icon.png:/icon.png - true @@ -1559,10 +1555,10 @@ Acceptable values are 5v..10v QLayout::SetMinimumSize - + 0 - + 0 diff --git a/companion/src/logsdialog.cpp b/companion/src/logsdialog.cpp index 0c9702239..fe7137506 100644 --- a/companion/src/logsdialog.cpp +++ b/companion/src/logsdialog.cpp @@ -1,6 +1,7 @@ #include "logsdialog.h" #include "ui_logsdialog.h" #include "qcustomplot.h" +#include "helpers.h" #if defined WIN32 || !defined __GNUC__ #include #else @@ -14,6 +15,7 @@ logsDialog::logsDialog(QWidget *parent) : csvlog.clear(); srand(QDateTime::currentDateTime().toTime_t()); ui->setupUi(this); + this->setWindowIcon(CompanionIcon("logs.png")); palette.clear(); plotLock=false; for (int i=0; i< 60; i++) diff --git a/companion/src/logsdialog.ui b/companion/src/logsdialog.ui index c645110d0..0ea51523e 100644 --- a/companion/src/logsdialog.ui +++ b/companion/src/logsdialog.ui @@ -13,10 +13,6 @@ Companion Log Viewer - - - :/icon.png:/icon.png - true @@ -70,7 +66,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -188,7 +193,7 @@ 0 - true + false 18 diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 404a275ec..b553bdb8a 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -672,7 +672,7 @@ void MainWindow::openDocURL() void MainWindow::openFile() { QSettings settings; - QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastDir").toString(),tr(EEPROM_FILES_FILTER)); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open Models and Settings file"), settings.value("lastDir").toString(),tr(EEPROM_FILES_FILTER)); if (!fileName.isEmpty()) { settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); @@ -1551,6 +1551,7 @@ void MainWindow::about() aboutStr.append("

"); aboutStr.append(tr("Copyright") + " Bertrand Songis & Romolo Manfredini
© 2011-2014
"); QMessageBox msgBox(this); + msgBox.setWindowIcon(CompanionIcon("information.png")); msgBox.setWindowTitle(tr("About Companion")); msgBox.setText(aboutStr); msgBox.exec(); diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 97d737d09..fc1cc9af0 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -69,6 +69,7 @@ MdiChild::MdiChild(): fileChanged(false) { ui->setupUi(this); + this->setWindowIcon(CompanionIcon("open.png")); ui->SimulateTxButton->setIcon(CompanionIcon("simulate.png")); setAttribute(Qt::WA_DeleteOnClose); diff --git a/companion/src/mdichild.ui b/companion/src/mdichild.ui index b2fb21e2f..538e36b74 100644 --- a/companion/src/mdichild.ui +++ b/companion/src/mdichild.ui @@ -13,10 +13,6 @@ - - - :/icon.png:/icon.png - diff --git a/companion/src/modelconfigdialog.cpp b/companion/src/modelconfigdialog.cpp index 49c4a8df0..4badaa906 100644 --- a/companion/src/modelconfigdialog.cpp +++ b/companion/src/modelconfigdialog.cpp @@ -3,7 +3,10 @@ #include "helpers.h" #include "eeprominterface.h" #include +#include "helpers.h" + #define NUM_CH 10 + modelConfigDialog::modelConfigDialog(RadioData &radioData, uint64_t * result, QWidget *parent) : QDialog(parent), ui(new Ui::modelConfigDialog), @@ -12,6 +15,7 @@ modelConfigDialog::modelConfigDialog(RadioData &radioData, uint64_t * result, QW generalSettings(radioData.generalSettings) { ui->setupUi(this); + this->setWindowIcon(CompanionIcon("wizard.png")); rxLock=false; ruddercolor << "#ffd100" << "#ffff00"; throttlecolor << "#e40000"; diff --git a/companion/src/modelconfigdialog.ui b/companion/src/modelconfigdialog.ui index f9c7abba6..afa4dd0bd 100644 --- a/companion/src/modelconfigdialog.ui +++ b/companion/src/modelconfigdialog.ui @@ -6,8 +6,8 @@ 0 0 - 773 - 591 + 793 + 599 @@ -25,10 +25,6 @@ Model Configuration Wizard - - - :/icon.png:/icon.png - diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp index aecd4c088..215771347 100644 --- a/companion/src/printdialog.cpp +++ b/companion/src/printdialog.cpp @@ -19,6 +19,7 @@ printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QS ui(new Ui::printDialog) { ui->setupUi(this); + this->setWindowIcon(CompanionIcon("print.png")); g_model = gm; g_eeGeneral = gg; printfilename=filename; diff --git a/companion/src/printdialog.ui b/companion/src/printdialog.ui index 169c33103..c041efd7c 100644 --- a/companion/src/printdialog.ui +++ b/companion/src/printdialog.ui @@ -25,10 +25,6 @@ Dialog - - - :/icon.png:/icon.png - diff --git a/companion/src/splashlibrary.cpp b/companion/src/splashlibrary.cpp index 49aef10e4..fe1585236 100644 --- a/companion/src/splashlibrary.cpp +++ b/companion/src/splashlibrary.cpp @@ -5,10 +5,12 @@ #include "helpers.h" //#include "splashlabel.h" #include "flashinterface.h" +#include "helpers.h" splashLibrary::splashLibrary(QWidget *parent, QString * fileName) : QDialog(parent), ui(new Ui::splashLibrary) { splashFileName = fileName; ui->setupUi(this); + this->setWindowIcon(CompanionIcon("library.png")); ui->nextPage->setIcon(CompanionIcon("arrow-right.png")); ui->prevPage->setIcon(CompanionIcon("arrow-left.png")); page = 0; diff --git a/companion/src/splashlibrary.ui b/companion/src/splashlibrary.ui index 9507a2d08..15e1b54a0 100644 --- a/companion/src/splashlibrary.ui +++ b/companion/src/splashlibrary.ui @@ -25,10 +25,6 @@ - - - :/icon.png:/icon.png -