From a5bb41a31bd4ec982192c49a8ecb0bc515175987 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 11 Aug 2015 06:56:02 +0200 Subject: [PATCH] Cosmetics --- companion/src/CMakeLists.txt | 6 ++-- companion/src/customizesplashdialog.cpp | 4 +-- companion/src/flasheepromdialog.cpp | 2 +- companion/src/flashfirmwaredialog.cpp | 4 +-- companion/src/images/library/00021.png | Bin 0 -> 7277 bytes companion/src/imgpreferences.ui | 4 +-- ...ashlibrary.cpp => splashlibrarydialog.cpp} | 32 +++++++++++------- ...{splashlibrary.h => splashlibrarydialog.h} | 10 +++--- ...plashlibrary.ui => splashlibrarydialog.ui} | 4 +-- companion/src/translations/companion_cs.ts | 2 +- companion/src/translations/companion_de.ts | 2 +- companion/src/translations/companion_es.ts | 2 +- companion/src/translations/companion_fi.ts | 2 +- companion/src/translations/companion_fr.ts | 2 +- companion/src/translations/companion_he.ts | 2 +- companion/src/translations/companion_it.ts | 2 +- companion/src/translations/companion_nl.ts | 2 +- companion/src/translations/companion_pl.ts | 2 +- companion/src/translations/companion_pt.ts | 2 +- companion/src/translations/companion_ru.ts | 2 +- companion/src/translations/companion_sv.ts | 2 +- 21 files changed, 49 insertions(+), 41 deletions(-) create mode 100644 companion/src/images/library/00021.png rename companion/src/{splashlibrary.cpp => splashlibrarydialog.cpp} (86%) rename companion/src/{splashlibrary.h => splashlibrarydialog.h} (67%) rename companion/src/{splashlibrary.ui => splashlibrarydialog.ui} (99%) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 58980c721..8e877489c 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -176,7 +176,7 @@ set(companion_SRCS fusesdialog.cpp logsdialog.cpp downloaddialog.cpp - splashlibrary.cpp + splashlibrarydialog.cpp mainwindow.cpp companion.cpp radionotfound.cpp @@ -196,7 +196,7 @@ set(companion_MOC_HDRS releasenotesdialog.h releasenotesfirmwaredialog.h customizesplashdialog.h - splashlibrary.h + splashlibrarydialog.h splashlabel.h progresswidget.h progressdialog.h @@ -226,7 +226,7 @@ set(companion_UIS printdialog.ui htmldialog.ui customizesplashdialog.ui - splashlibrary.ui + splashlibrarydialog.ui progresswidget.ui progressdialog.ui flashfirmwaredialog.ui diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index f1208227e..7db15312a 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -3,8 +3,8 @@ #include "flashfirmwaredialog.h" #include "appdata.h" #include "helpers.h" -#include "splashlibrary.h" #include "firmwareinterface.h" +#include "splashlibrarydialog.h" //*** Side Class *** @@ -233,7 +233,7 @@ void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicke void customizeSplashDialog::libraryButton_clicked( Side side ) { QString fileName; - splashLibrary *ld = new splashLibrary(this,&fileName); + SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName); ld->exec(); if (!fileName.isEmpty()) { if (!side.displayImage( fileName, UNDEFINED )) diff --git a/companion/src/flasheepromdialog.cpp b/companion/src/flasheepromdialog.cpp index 001bb2bc3..67b7d8c1e 100755 --- a/companion/src/flasheepromdialog.cpp +++ b/companion/src/flasheepromdialog.cpp @@ -2,13 +2,13 @@ #include "ui_flasheepromdialog.h" #include "eeprominterface.h" #include "helpers.h" -#include "splashlibrary.h" #include "firmwareinterface.h" #include "hexinterface.h" #include "appdata.h" #include "progressdialog.h" #include "radiointerface.h" #include "converteeprom.h" +#include "splashlibrarydialog.h" FlashEEpromDialog::FlashEEpromDialog(QWidget *parent, const QString &filename): QDialog(parent), diff --git a/companion/src/flashfirmwaredialog.cpp b/companion/src/flashfirmwaredialog.cpp index 98a885a59..c8460180e 100755 --- a/companion/src/flashfirmwaredialog.cpp +++ b/companion/src/flashfirmwaredialog.cpp @@ -9,8 +9,8 @@ #include "hexinterface.h" #include "progressdialog.h" #include "radiointerface.h" -#include "splashlibrary.h" #include "progresswidget.h" +#include "splashlibrarydialog.h" #if defined WIN32 || !defined __GNUC__ #include @@ -185,7 +185,7 @@ void FlashFirmwareDialog::on_useExternalSplash_clicked() void FlashFirmwareDialog::on_useLibrarySplash_clicked() { QString fileName; - splashLibrary *ld = new splashLibrary(this, &fileName); + SplashLibraryDialog *ld = new SplashLibraryDialog(this, &fileName); ld->exec(); if (!fileName.isEmpty()) { QImage image(fileName); diff --git a/companion/src/images/library/00021.png b/companion/src/images/library/00021.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c867df1f20869d6736f9150b5e8c068ad1a7c3 GIT binary patch literal 7277 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 Hu0mjfjD`9% literal 0 HcmV?d00001 diff --git a/companion/src/imgpreferences.ui b/companion/src/imgpreferences.ui index fc92aeb1e..1ba680d4d 100644 --- a/companion/src/imgpreferences.ui +++ b/companion/src/imgpreferences.ui @@ -344,7 +344,7 @@ - + ... @@ -455,7 +455,7 @@ splashincludeCB SplashFileName SplashSelect - splashLibraryButton + SplashLibraryDialogButton clearImageButton InvertPixels buttonBox diff --git a/companion/src/splashlibrary.cpp b/companion/src/splashlibrarydialog.cpp similarity index 86% rename from companion/src/splashlibrary.cpp rename to companion/src/splashlibrarydialog.cpp index 0becf5a27..0e737d261 100644 --- a/companion/src/splashlibrary.cpp +++ b/companion/src/splashlibrarydialog.cpp @@ -1,15 +1,18 @@ -#include "splashlibrary.h" -#include "ui_splashlibrary.h" +#include "splashlibrarydialog.h" +#include "ui_splashlibrarydialog.h" #include "appdata.h" #include #include "helpers.h" #include "firmwareinterface.h" #include "helpers.h" -splashLibrary::splashLibrary(QWidget *parent, QString * fileName) : QDialog(parent), ui(new Ui::splashLibrary) { - splashFileName = fileName; +SplashLibraryDialog::SplashLibraryDialog(QWidget *parent, QString * filename): + QDialog(parent), + ui(new Ui::SplashLibraryDialog), + splashFileName(filename) +{ ui->setupUi(this); - this->setWindowIcon(CompanionIcon("library.png")); + setWindowIcon(CompanionIcon("library.png")); ui->nextPage->setIcon(CompanionIcon("arrow-right.png")); ui->prevPage->setIcon(CompanionIcon("arrow-left.png")); page = 0; @@ -24,11 +27,13 @@ splashLibrary::splashLibrary(QWidget *parent, QString * fileName) : QDialog(pare } } -splashLibrary::~splashLibrary() { +SplashLibraryDialog::~SplashLibraryDialog() +{ delete ui; } -void splashLibrary::setupPage(int page) { +void SplashLibraryDialog::setupPage(int page) +{ splashLabel * sl[] = { ui->FwImage_01, ui->FwImage_02, ui->FwImage_03, ui->FwImage_04 , ui->FwImage_05, ui->FwImage_06, ui->FwImage_07, ui->FwImage_08 , ui->FwImage_09, ui->FwImage_10, ui->FwImage_11, ui->FwImage_12 , @@ -60,7 +65,8 @@ void splashLibrary::setupPage(int page) { setWindowTitle(tr("Splash Library - page %1 of %2").arg(page + 1).arg(ceil((float) imageList.size() / 20.0))); } -void splashLibrary::getFileList() { +void SplashLibraryDialog::getFileList() +{ imageList.clear(); if (g.embedSplashes()) { QDir myRes(":/images/library"); @@ -102,11 +108,13 @@ void splashLibrary::getFileList() { } } -void splashLibrary::dclose() { +void SplashLibraryDialog::dclose() +{ close(); } -void splashLibrary::onButtonPressed(int button) { +void SplashLibraryDialog::onButtonPressed(int button) +{ splashLabel * myLabel = qobject_cast(sender()); foreach(splashLabel *sl, findChildren()) { @@ -123,7 +131,7 @@ void splashLibrary::onButtonPressed(int button) { myLabel->setStyleSheet("border:1px solid; border-color:#00ffff"); } -void splashLibrary::on_nextPage_clicked() { +void SplashLibraryDialog::on_nextPage_clicked() { page++; if (page >= (imageList.size() / 20)) { ui->nextPage->setDisabled(true); @@ -132,7 +140,7 @@ void splashLibrary::on_nextPage_clicked() { setupPage(page); } -void splashLibrary::on_prevPage_clicked() { +void SplashLibraryDialog::on_prevPage_clicked() { page--; if (page == 0) { ui->prevPage->setDisabled(true); diff --git a/companion/src/splashlibrary.h b/companion/src/splashlibrarydialog.h similarity index 67% rename from companion/src/splashlibrary.h rename to companion/src/splashlibrarydialog.h index 0d9123a74..b703e6a23 100644 --- a/companion/src/splashlibrary.h +++ b/companion/src/splashlibrarydialog.h @@ -5,16 +5,16 @@ #include namespace Ui { - class splashLibrary; + class SplashLibraryDialog; } -class splashLibrary : public QDialog +class SplashLibraryDialog : public QDialog { Q_OBJECT public: - explicit splashLibrary(QWidget *parent = 0, QString * fileName=NULL); - ~splashLibrary(); + explicit SplashLibraryDialog(QWidget *parent = 0, QString * fileName=NULL); + ~SplashLibraryDialog(); private slots: void dclose(); @@ -25,7 +25,7 @@ private slots: private: void getFileList(); void setupPage(int page); - Ui::splashLibrary *ui; + Ui::SplashLibraryDialog *ui; QString * splashFileName; QString libraryPath; QStringList imageList; diff --git a/companion/src/splashlibrary.ui b/companion/src/splashlibrarydialog.ui similarity index 99% rename from companion/src/splashlibrary.ui rename to companion/src/splashlibrarydialog.ui index 5ce1e2502..3ecda7d51 100644 --- a/companion/src/splashlibrary.ui +++ b/companion/src/splashlibrarydialog.ui @@ -1,7 +1,7 @@ - splashLibrary - + SplashLibraryDialog + 0 diff --git a/companion/src/translations/companion_cs.ts b/companion/src/translations/companion_cs.ts index 4be9b2150..a5b85e350 100644 --- a/companion/src/translations/companion_cs.ts +++ b/companion/src/translations/companion_cs.ts @@ -14766,7 +14766,7 @@ Mode 4: - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_de.ts b/companion/src/translations/companion_de.ts index cb39e4915..dbb6241ed 100644 --- a/companion/src/translations/companion_de.ts +++ b/companion/src/translations/companion_de.ts @@ -15537,7 +15537,7 @@ Die kann auch unterschiedlch zur Firmwaresprache sein - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_es.ts b/companion/src/translations/companion_es.ts index a790b6902..092d19dc0 100755 --- a/companion/src/translations/companion_es.ts +++ b/companion/src/translations/companion_es.ts @@ -13214,7 +13214,7 @@ Puede ser diferente del lenguaje del firmware - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_fi.ts b/companion/src/translations/companion_fi.ts index 7c0558ad1..3d06ecad7 100644 --- a/companion/src/translations/companion_fi.ts +++ b/companion/src/translations/companion_fi.ts @@ -17161,7 +17161,7 @@ Voi olla eri kun firmwaren kieli - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index cb1362db8..deef09041 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -14015,7 +14015,7 @@ Indique l'affectation voie / numéro de voie par défaut utilisée lors de - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_he.ts b/companion/src/translations/companion_he.ts index ae525812f..08f897059 100644 --- a/companion/src/translations/companion_he.ts +++ b/companion/src/translations/companion_he.ts @@ -11554,7 +11554,7 @@ Press cancel to abort joystick calibration - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_it.ts b/companion/src/translations/companion_it.ts index 5d9400fe2..6d3f6ffa2 100644 --- a/companion/src/translations/companion_it.ts +++ b/companion/src/translations/companion_it.ts @@ -12155,7 +12155,7 @@ Premere annulla per cancellare l'operazione - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_nl.ts b/companion/src/translations/companion_nl.ts index 656d8ab85..456c30eb7 100644 --- a/companion/src/translations/companion_nl.ts +++ b/companion/src/translations/companion_nl.ts @@ -11546,7 +11546,7 @@ Press cancel to abort joystick calibration - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index cc090fbe9..2f36a5270 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -11952,7 +11952,7 @@ Anuluj w celu przerwania kalibracji joysticka - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_pt.ts b/companion/src/translations/companion_pt.ts index 8e631ddbd..d7d50fa1e 100644 --- a/companion/src/translations/companion_pt.ts +++ b/companion/src/translations/companion_pt.ts @@ -12159,7 +12159,7 @@ Press cancel to abort joystick calibration - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_ru.ts b/companion/src/translations/companion_ru.ts index 3826a4a74..a73d8ab0e 100644 --- a/companion/src/translations/companion_ru.ts +++ b/companion/src/translations/companion_ru.ts @@ -12164,7 +12164,7 @@ This is used by the templated to determine which channel goes to what number out - splashLibrary + SplashLibraryDialog diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index e997fcc89..6de88b9a8 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -10325,7 +10325,7 @@ Får skilja från språket för mjukvaran - splashLibrary + SplashLibraryDialog ... ...