From b790a844f1436f31f741cf157b010bbba48b2fcf Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 24 Apr 2017 19:33:06 +0200 Subject: [PATCH] Fixes #4806 --- companion/src/customizesplashdialog.cpp | 48 +++++++++---------- companion/src/customizesplashdialog.h | 10 ++-- companion/src/customizesplashdialog.ui | 4 +- companion/src/mainwindow.cpp | 3 +- companion/src/translations/companion_cs.ts | 2 +- companion/src/translations/companion_de.ts | 2 +- companion/src/translations/companion_en.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 +- companion/src/translations/companion_zh_CN.ts | 2 +- 18 files changed, 46 insertions(+), 47 deletions(-) diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 6aaa6c773..751bfe1df 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -150,11 +150,9 @@ bool Side::saveImage() return true; } -//*** customizeSplashDialog Class *** - -customizeSplashDialog::customizeSplashDialog(QWidget *parent) : +CustomizeSplashDialog::CustomizeSplashDialog(QWidget *parent) : QDialog(parent), - ui(new Ui::customizeSplashDialog) + ui(new Ui::CustomizeSplashDialog) { ui->setupUi(this); setWindowIcon(CompanionIcon("paintbrush.png")); @@ -185,22 +183,22 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) : resize(0,0); } -customizeSplashDialog::~customizeSplashDialog() +CustomizeSplashDialog::~CustomizeSplashDialog() { delete ui; } -void customizeSplashDialog::on_copyRightToLeftButton_clicked() { +void CustomizeSplashDialog::on_copyRightToLeftButton_clicked() { left.copyImage(right); } -void customizeSplashDialog::on_copyLeftToRightButton_clicked() { +void CustomizeSplashDialog::on_copyLeftToRightButton_clicked() { right.copyImage(left); } -void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);} -void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);} -void customizeSplashDialog::loadFirmware(Side side) +void CustomizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);} +void CustomizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);} +void CustomizeSplashDialog::loadFirmware(Side side) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER); if (!fileName.isEmpty()) { @@ -212,9 +210,9 @@ void customizeSplashDialog::loadFirmware(Side side) side.markSourceButton(); } -void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);} -void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);} -void customizeSplashDialog::loadPicture(Side side) +void CustomizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);} +void CustomizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);} +void CustomizeSplashDialog::loadPicture(Side side) { QString supportedImageFormats; for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) { @@ -232,9 +230,9 @@ void customizeSplashDialog::loadPicture(Side side) side.markSourceButton(); } -void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);} -void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);} -void customizeSplashDialog::loadProfile(Side side) +void CustomizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);} +void CustomizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);} +void CustomizeSplashDialog::loadProfile(Side side) { QString fileName=g.profile[g.id()].splashFile(); @@ -245,9 +243,9 @@ void customizeSplashDialog::loadProfile(Side side) side.markSourceButton(); } -void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);} -void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);} -void customizeSplashDialog::libraryButton_clicked( Side side ) +void CustomizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);} +void CustomizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);} +void CustomizeSplashDialog::libraryButton_clicked( Side side ) { QString fileName; SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName); @@ -258,9 +256,9 @@ void customizeSplashDialog::libraryButton_clicked( Side side ) } } -void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);} -void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);} -void customizeSplashDialog::saveButton_clicked( Side side ) +void CustomizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);} +void CustomizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);} +void CustomizeSplashDialog::saveButton_clicked( Side side ) { if (side.saveImage()){ QMessageBox::information(this, tr("File Saved"), tr("The image was saved to the file %1").arg(*side.saveToFileName)); @@ -272,9 +270,9 @@ void customizeSplashDialog::saveButton_clicked( Side side ) QMessageBox::critical(this, tr("File Save Error"), tr("Failed to write image to %1").arg(*side.saveToFileName)); } -void customizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);} -void customizeSplashDialog::on_rightInvertButton_clicked(){invertButton_clicked(right);} -void customizeSplashDialog::invertButton_clicked(Side side) +void CustomizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);} +void CustomizeSplashDialog::on_rightInvertButton_clicked(){invertButton_clicked(right);} +void CustomizeSplashDialog::invertButton_clicked(Side side) { QImage image = side.imageLabel->pixmap()->toImage(); image.invertPixels(); diff --git a/companion/src/customizesplashdialog.h b/companion/src/customizesplashdialog.h index be77a8d8b..76419d9f8 100644 --- a/companion/src/customizesplashdialog.h +++ b/companion/src/customizesplashdialog.h @@ -26,7 +26,7 @@ namespace Ui { - class customizeSplashDialog; + class CustomizeSplashDialog; } const int WIDTH_TARANIS = 212; @@ -63,15 +63,15 @@ private: LCDFormat *format; }; -class customizeSplashDialog : public QDialog +class CustomizeSplashDialog : public QDialog { Q_OBJECT Side left; Side right; public: - explicit customizeSplashDialog(QWidget *parent = 0); - ~customizeSplashDialog(); + explicit CustomizeSplashDialog(QWidget *parent = 0); + ~CustomizeSplashDialog(); private slots: void on_leftLoadFwButton_clicked(); @@ -99,7 +99,7 @@ private: void saveButton_clicked( Side ); void invertButton_clicked( Side ); - Ui::customizeSplashDialog *ui; + Ui::CustomizeSplashDialog *ui; enum sideEnum { LEFT, RIGHT }; }; diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui index 9a6971893..b9a4023cc 100644 --- a/companion/src/customizesplashdialog.ui +++ b/companion/src/customizesplashdialog.ui @@ -1,7 +1,7 @@ - customizeSplashDialog - + CustomizeSplashDialog + true diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 443efa8ac..371710e60 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -780,7 +780,7 @@ void MainWindow::fwchangelog() void MainWindow::customizeSplash() { - customizeSplashDialog * dialog = new customizeSplashDialog(this); + CustomizeSplashDialog * dialog = new CustomizeSplashDialog(this); dialog->exec(); dialog->deleteLater(); } @@ -944,6 +944,7 @@ void MainWindow::updateMenus() readEepromAct->setEnabled(true); writeBUToRadioAct->setEnabled(true); readBUToFileAct->setEnabled(true); + editSplashAct->setDisabled(IS_HORUS(getCurrentBoard())); foreach (QAction * act, fileWindowActions) { if (!act) diff --git a/companion/src/translations/companion_cs.ts b/companion/src/translations/companion_cs.ts index 5b790bcbb..76b2edf5e 100644 --- a/companion/src/translations/companion_cs.ts +++ b/companion/src/translations/companion_cs.ts @@ -12337,7 +12337,7 @@ m2560 pro V4 desky - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_de.ts b/companion/src/translations/companion_de.ts index c47361872..4a3809d3e 100644 --- a/companion/src/translations/companion_de.ts +++ b/companion/src/translations/companion_de.ts @@ -12264,7 +12264,7 @@ Please only use this if you know what you are doing. There are no error checks - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_en.ts b/companion/src/translations/companion_en.ts index 86d33fe45..77eee80a3 100644 --- a/companion/src/translations/companion_en.ts +++ b/companion/src/translations/companion_en.ts @@ -12119,7 +12119,7 @@ m2560 for v4.1 boards - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_es.ts b/companion/src/translations/companion_es.ts index 93f12875d..2c962c910 100644 --- a/companion/src/translations/companion_es.ts +++ b/companion/src/translations/companion_es.ts @@ -12284,7 +12284,7 @@ m2560 para las placas v4.1 - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_fi.ts b/companion/src/translations/companion_fi.ts index ed14c66b1..f3c6d828d 100644 --- a/companion/src/translations/companion_fi.ts +++ b/companion/src/translations/companion_fi.ts @@ -12332,7 +12332,7 @@ m2560 joka on v4.1 lähettimessä - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index d2019dd21..a8c5a1e05 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -12248,7 +12248,7 @@ m2560 for v4.1 boards - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_he.ts b/companion/src/translations/companion_he.ts index dbd8e59f2..f9740f5df 100644 --- a/companion/src/translations/companion_he.ts +++ b/companion/src/translations/companion_he.ts @@ -10505,7 +10505,7 @@ m2560 for v4.1 boards - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_it.ts b/companion/src/translations/companion_it.ts index cf8f56fc0..0579e7c1b 100644 --- a/companion/src/translations/companion_it.ts +++ b/companion/src/translations/companion_it.ts @@ -12354,7 +12354,7 @@ m2560 per le schede v4.1 - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_nl.ts b/companion/src/translations/companion_nl.ts index 6df042131..3095fdd06 100644 --- a/companion/src/translations/companion_nl.ts +++ b/companion/src/translations/companion_nl.ts @@ -10499,7 +10499,7 @@ m2560 for v4.1 boards - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index bdc3e2999..0e214bd8e 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -12564,7 +12564,7 @@ m2560 dla platformy V4 - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_pt.ts b/companion/src/translations/companion_pt.ts index 580fca7d7..ef00f62a7 100644 --- a/companion/src/translations/companion_pt.ts +++ b/companion/src/translations/companion_pt.ts @@ -10505,7 +10505,7 @@ m2560 for v4.1 boards - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_ru.ts b/companion/src/translations/companion_ru.ts index 83edec0e9..148edd16c 100644 --- a/companion/src/translations/companion_ru.ts +++ b/companion/src/translations/companion_ru.ts @@ -10549,7 +10549,7 @@ m2560 for v4.1 boards - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index ce8b77d04..f10bc161b 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -9622,7 +9622,7 @@ m2560 för v4.1-kort - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor Startbildsredigerare diff --git a/companion/src/translations/companion_zh_CN.ts b/companion/src/translations/companion_zh_CN.ts index 61a2d4b99..81adbfd3c 100644 --- a/companion/src/translations/companion_zh_CN.ts +++ b/companion/src/translations/companion_zh_CN.ts @@ -12595,7 +12595,7 @@ v4.1版电路板应为m2560 - customizeSplashDialog + CustomizeSplashDialog Transmitter Splash Screen Editor