diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp index e43cef1c3..4b425a61b 100644 --- a/companion/src/apppreferencesdialog.cpp +++ b/companion/src/apppreferencesdialog.cpp @@ -42,7 +42,9 @@ void appPreferencesDialog::writeValues() settings.setValue("simuSW", ui->simuSW->isChecked()); settings.setValue("history_size", ui->historySize->value()); settings.setValue("backLight", ui->backLightColor->currentIndex()); + settings.setValue("libraryPath", ui->libraryPath->text()); settings.setValue("gePath", ui->ge_lineedit->text()); + settings.setValue("embedded_splashes", ui->splashincludeCB->currentIndex()); settings.setValue("backupEnable", ui->backupEnable->isChecked()); if (ui->joystickChkB ->isChecked() && ui->joystickCB->isEnabled()) { @@ -91,6 +93,10 @@ void appPreferencesDialog::initSettings() ui->backLightColor->setCurrentIndex(settings.value("backLight", 0).toInt()); ui->simuSW->setChecked(settings.value("simuSW", false).toBool()); + Path=settings.value("libraryPath", "").toString(); + if (QDir(Path).exists()) { + ui->libraryPath->setText(Path); + } Path=settings.value("gePath", "").toString(); if (QFile(Path).exists()) { ui->ge_lineedit->setText(Path); @@ -107,6 +113,8 @@ void appPreferencesDialog::initSettings() } else { ui->backupEnable->setDisabled(true); } + ui->splashincludeCB->setCurrentIndex(settings.value("embedded_splashes", 0).toInt()); + #ifdef JOYSTICKS ui->joystickChkB->setChecked(settings.value("js_support", false).toBool()); if (ui->joystickChkB->isChecked()) { @@ -136,6 +144,16 @@ void appPreferencesDialog::initSettings() #endif } +void appPreferencesDialog::on_libraryPathButton_clicked() +{ + QSettings settings; + QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your library folder"), settings.value("libraryPath").toString()); + if (!fileName.isEmpty()) { + settings.setValue("libraryPath", fileName); + ui->libraryPath->setText(fileName); + } +} + void appPreferencesDialog::on_snapshotClipboardCKB_clicked() { QSettings settings; @@ -199,8 +217,6 @@ void appPreferencesDialog::on_joystickChkB_clicked() { } void appPreferencesDialog::on_joystickcalButton_clicked() { - //QSettings settings; - //settings.setValue("joystick-name",ui->joystickCB->currentText()); joystickDialog * jd=new joystickDialog(this, ui->joystickCB->currentIndex()); jd->exec(); } diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h index 09bda9bfb..d47682512 100644 --- a/companion/src/apppreferencesdialog.h +++ b/companion/src/apppreferencesdialog.h @@ -26,6 +26,7 @@ private: private slots: void writeValues(); + void on_libraryPathButton_clicked(); void on_snapshotPathButton_clicked(); void on_snapshotClipboardCKB_clicked(); void on_backupPathButton_clicked(); diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index 5dc0a3388..bc1f734f3 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -7,7 +7,7 @@ 0 0 685 - 473 + 456 @@ -26,10 +26,23 @@ Application Preferences - - + + 2 + + + 6 + + + - Simulator capture folder + Open Folder + + + + + + + Qt::Horizontal @@ -40,6 +53,26 @@ + + + + + 0 + 0 + + + + Joystick + + + + + + + Simulator capture folder + + + @@ -47,25 +80,44 @@ - - - - Qt::Horizontal + + + + + 0 + 0 + - - - - - Open Folder - - - false + User Splash Screens - - + + + + + 0 + 0 + + + + Files to keep + + + + + + + Offer to use wizard for new models + + + true + + + + + Qt::Horizontal @@ -73,6 +125,12 @@ + + + 100 + 16777215 + + Blue @@ -100,16 +158,73 @@ - - + + + + Automatic check for Companion updates + + + true + + + + + + + Qt::Horizontal + + + + + + + true + + + true + + + + + + + Only capture to clipboard + + + + + - - 0 + + 40 0 - - Files to keep + + + 50 + 16777215 + + + + 15 + + + 10 + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal @@ -126,6 +241,57 @@ + + + + Calibrate + + + + + + + Automatic Backup Folder + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Open Folder + + + false + + + + + + + true + + + + + + + + 0 + 0 + + + + @@ -142,132 +308,10 @@ - - - - Qt::Horizontal - - - - - + + - Automatic Backup Folder - - - - - - - true - - - - - - - Open Folder - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - Only capture to clipboard - - - - - - - Qt::Horizontal - - - - - - - true - - - true - - - - - - - - 0 - 0 - - - - Joystick - - - - - - - Find Executable - - - - - - - Google Earth Executable - - - - - - - Calibrate - - - - - - - Enable - - - - - - - - 40 - 0 - - - - 15 - - - 10 + Enable automatic backup before writing firmware @@ -281,6 +325,34 @@ + + + + Find Executable + + + + + + + Open Folder + + + + + + + Enable + + + + + + + Google Earth Executable + + + @@ -291,30 +363,46 @@ - - - - Automatic check for Companion updates + + + + + 0 + 0 + - - true + + + Include companion splashes + + + + + Only user defined splashes + + + + + + + + + 0 + 0 + + + + Splash Screen Library - - - - Offer to use wizard for new models - - + + + true - - - - - - Enable automatic backup before writing firmware + + true @@ -349,6 +437,12 @@ label_17 label_19 historySize + label_9 + libraryPath + libraryPathButton + line_6 + splashincludeCB + label_10 buttonBox diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index bef28a0dc..11954bc9c 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -7,14 +7,39 @@ #include "splashlibrary.h" #include "flashinterface.h" +Side::Side(){ + imageLabel = 0; + fileNameEdit = 0; + saveButton = 0; + source=new Source; + *source = UNDEFINED; +} + +void Side::copyImage( Side side ){ + if ((*source!=UNDEFINED) && (*side.source!=UNDEFINED)) + imageLabel->setPixmap(*side.imageLabel->pixmap()); +} + customizeSplashDialog::customizeSplashDialog(QWidget *parent) : QDialog(parent), ui(new Ui::customizeSplashDialog) { ui->setupUi(this); ui->leftLibraryButton->setIcon(CompanionIcon("library.png")); - ui->HowToLabel->clear(); - ui->HowToLabel->append("
" + tr("Select an original firmware file") + "
"); + ui->rightLibraryButton->setIcon(CompanionIcon("library.png")); + + left.imageLabel = ui->leftImageLabel; + right.imageLabel = ui->rightImageLabel; + left.fileNameEdit = ui->leftFileNameEdit; + right.fileNameEdit = ui->rightFileNameEdit; + left.saveButton = ui->leftSaveButton; + right.saveButton = ui->rightSaveButton; + left.libraryButton = ui->leftLibraryButton; + right.libraryButton = ui->rightLibraryButton; + left.invertButton = ui->leftInvertButton; + right.invertButton = ui->rightInvertButton; + + resize(0,0); } customizeSplashDialog::~customizeSplashDialog() @@ -22,95 +47,95 @@ customizeSplashDialog::~customizeSplashDialog() delete ui; } -void customizeSplashDialog::on_leftLoadButton_clicked() +void customizeSplashDialog::on_copyRightToLeftButton_clicked() { + left.copyImage(right); +} +void customizeSplashDialog::on_copyLeftToRightButton_clicked() { +right.copyImage(left); +} + + +void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFwButton_clicked(left);} +void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFwButton_clicked(right);} +void customizeSplashDialog::loadFwButton_clicked(Side side) { QSettings settings; QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER); if (!fileName.isEmpty()) { - ui->rightLoadButton->setDisabled(true); - ui->leftLibraryButton->setDisabled(true); - ui->leftSaveButton->setDisabled(true); - ui->rightSaveButton->setDisabled(true); - ui->rightFileName->clear(); - ui->leftImageLabel->clear(); - ui->HowToLabel->clear(); - ui->HowToLabel->setStyleSheet("background:rgb(255, 255, 0)"); QFile file(fileName); - if (!file.exists()) { - ui->leftFileName->clear(); - ui->HowToLabel->append("
" + tr("Select an original firmware file") + "
"); + if (fileName.isEmpty() || !file.exists()) return; - } - if (fileName.isEmpty()) { - ui->leftFileName->clear(); - ui->HowToLabel->append("
" + tr("Select an original firmware file") + "
"); - return; - } - - ui->leftFileName->setText(fileName); + FlashInterface flash(fileName); - if (flash.hasSplash()) { - ui->HowToLabel->append("
" + tr("Select an image to customize your splash
or save actual firmware splash") + "
"); - ui->rightLoadButton->setEnabled(true); - ui->leftLibraryButton->setEnabled(true); - ui->rightSaveButton->setEnabled(true); - ui->leftImageLabel->setPixmap(QPixmap::fromImage(flash.getSplash())); - ui->leftImageLabel->setFixedSize(flash.getSplashWidth()*2,flash.getSplashHeight()*2); - } else { + if (!flash.hasSplash()) { QMessageBox::information(this, tr("Error"), tr("Could not find bitmap to replace in file")); return; } + + side.saveButton->setEnabled(true); + side.imageLabel->setPixmap(QPixmap::fromImage(flash.getSplash())); + side.imageLabel->setFixedSize(flash.getSplashWidth()*2,flash.getSplashHeight()*2); + side.fileNameEdit->setText(fileName); settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); + *side.source=FW; + side.saveButton->setEnabled(true); + side.libraryButton->setEnabled(true); + side.invertButton->setEnabled(true); } } -void customizeSplashDialog::on_rightLoadButton_clicked() { +void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPictButton_clicked(left);} +void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPictButton_clicked(right);} +void customizeSplashDialog::loadPictButton_clicked(Side side) +{ QString supportedImageFormats; for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) { supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex]; } - QSettings settings; QString fileName = QFileDialog::getOpenFileName(this, tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats)); - if (!fileName.isEmpty()) { - settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); - QImage image(fileName); - if (image.isNull()) { - QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName)); - return; - } - ui->HowToLabel->clear(); - ui->rightFileName->setText(fileName); - if (ui->leftImageLabel->width()==424) { - image=image.convertToFormat(QImage::Format_RGB32); - QRgb col; - int gray; - int width = image.width(); - int height = image.height(); - for (int i = 0; i < width; ++i) - { - for (int j = 0; j < height; ++j) - { - col = image.pixel(i, j); - gray = qGray(col); - image.setPixel(i, j, qRgb(gray, gray, gray)); - } - } - ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2))); - } else { - ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2).convertToFormat(QImage::Format_Mono))); - } - ui->leftSaveButton->setEnabled(true); - ui->HowToLabel->append("
" + tr("Save your custimized firmware") + "
"); + if (fileName.isEmpty()){ + return; } + QImage image(fileName); + if (image.isNull()) { + QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName)); + return; + } + if (side.imageLabel->width()==424) { + image=image.convertToFormat(QImage::Format_RGB32); + QRgb col; + int gray; + int width = image.width(); + int height = image.height(); + for (int i = 0; i < width; ++i) + { + for (int j = 0; j < height; ++j) + { + col = image.pixel(i, j); + gray = qGray(col); + image.setPixel(i, j, qRgb(gray, gray, gray)); + } + } + side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2))); + } else { + side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2).convertToFormat(QImage::Format_Mono))); + } + + settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); + side.fileNameEdit->setText(fileName); + *side.source=PICT; + side.saveButton->setEnabled(true); + side.libraryButton->setEnabled(true); + side.invertButton->setEnabled(true); } -void customizeSplashDialog::on_rightLibraryButton_clicked() { -} - -void customizeSplashDialog::on_leftLibraryButton_clicked() { +void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);} +void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);} +void customizeSplashDialog::libraryButton_clicked( Side side ) +{ QString fileName; splashLibrary *ld = new splashLibrary(this,&fileName); @@ -121,9 +146,7 @@ void customizeSplashDialog::on_leftLibraryButton_clicked() { QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName)); return; } - ui->HowToLabel->clear(); - ui->rightFileName->setText(fileName); - if (ui->leftImageLabel->width()==424) { + if (side.imageLabel->width()==424) { image=image.convertToFormat(QImage::Format_RGB32); QRgb col; int gray; @@ -138,64 +161,52 @@ void customizeSplashDialog::on_leftLibraryButton_clicked() { image.setPixel(i, j, qRgb(gray, gray, gray)); } } - ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2))); + side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2))); } else { - ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2).convertToFormat(QImage::Format_Mono))); + side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2).convertToFormat(QImage::Format_Mono))); } - ui->leftSaveButton->setEnabled(true); - ui->HowToLabel->append("
" + tr("Save your custimized firmware") + "
"); } } -void customizeSplashDialog::on_leftSaveButton_clicked() +void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);} +void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);} +void customizeSplashDialog::saveButton_clicked(Side side) { - QString fileName; QSettings settings; - ui->HowToLabel->clear(); - fileName = QFileDialog::getSaveFileName(this, tr("Write to file"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER, 0, QFileDialog::DontConfirmOverwrite); - if (fileName.isEmpty()) { - return; + QString fileName = side.fileNameEdit->text(); + + if (*side.source == FW) + { + FlashInterface flash(fileName); + if (!flash.hasSplash()) { + QMessageBox::critical(this, tr("Error"), tr("Could not store image in firmware file %1").arg(fileName)); + return; + } + QImage image = side.imageLabel->pixmap()->toImage().scaled(flash.getSplashWidth(), flash.getSplashHeight()); + if (flash.setSplash(image) && (flash.saveFlash(fileName) > 0)) + settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); + else + QMessageBox::critical(this, tr("Error"), tr("Could not store image in firmware file %1").arg(fileName)); } - FlashInterface flash(ui->leftFileName->text()); - if (!flash.hasSplash()) { - QMessageBox::critical(this, tr("Error"), tr("Error reading file %1").arg(fileName)); - return; - } - settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); - QImage image = ui->leftImageLabel->pixmap()->toImage().scaled(flash.getSplashWidth(), flash.getSplashHeight()); - flash.setSplash(image); - if (flash.saveFlash(fileName) > 0) { - ui->HowToLabel->setStyleSheet("background:rgb(0,255.0);"); - ui->HowToLabel->append("
" + tr("Firmware correctly saved.") + "
"); - } else { - ui->HowToLabel->setStyleSheet("background:rgb(255.0.0);"); - ui->HowToLabel->append("
" + tr("Firmware not saved.") + "
"); + else if (*side.source == PICT) + { + if (!fileName.isEmpty()) { + QImage image = side.imageLabel->pixmap()->toImage().scaled(side.imageLabel->width()/2, side.imageLabel->height()/2).convertToFormat(QImage::Format_Indexed8); + if (image.save(fileName)) + settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); + else + QMessageBox::critical(this, tr("Error"), tr("The image file %1 could not be stored").arg(fileName)); + } } } -void customizeSplashDialog::on_rightInvertButton_clicked() +void customizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);} +void customizeSplashDialog::on_rightInvertButton_clicked(){invertButton_clicked(right);} +void customizeSplashDialog::invertButton_clicked(Side side) { - QImage image = ui->rightImageLabel->pixmap()->toImage(); + QImage image = side.imageLabel->pixmap()->toImage(); image.invertPixels(); - ui->rightImageLabel->setPixmap(QPixmap::fromImage(image)); + side.imageLabel->setPixmap(QPixmap::fromImage(image)); } -void customizeSplashDialog::on_leftInvertButton_clicked() -{ - QImage image = ui->leftImageLabel->pixmap()->toImage(); - image.invertPixels(); - ui->leftImageLabel->setPixmap(QPixmap::fromImage(image)); -} -void customizeSplashDialog::on_rightSaveButton_clicked() -{ - QString fileName; - QSettings settings; - - fileName = QFileDialog::getSaveFileName(this, tr("Write to file"), settings.value("lastImagesDir").toString(), tr("PNG images (*.png);;"), 0, QFileDialog::DontConfirmOverwrite); - if (!fileName.isEmpty()) { - settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); - QImage image = ui->leftImageLabel->pixmap()->toImage().scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2).convertToFormat(QImage::Format_Indexed8); - image.save(fileName, "PNG"); - } -} diff --git a/companion/src/customizesplashdialog.h b/companion/src/customizesplashdialog.h index 1abdfa62a..16141e1ae 100644 --- a/companion/src/customizesplashdialog.h +++ b/companion/src/customizesplashdialog.h @@ -10,27 +10,58 @@ namespace Ui class customizeSplashDialog; } +enum Source {FW, PICT, UNDEFINED}; + +class Side +{ +public: + Side(); + void copyImage( Side ); + + QLabel *imageLabel; + QLineEdit *fileNameEdit; + QPushButton *saveButton; + QPushButton *invertButton; + QToolButton *libraryButton; + + Source *source; +}; + class customizeSplashDialog : public QDialog { Q_OBJECT + Side left; + Side right; public: explicit customizeSplashDialog(QWidget *parent = 0); ~customizeSplashDialog(); private slots: - void on_leftLoadButton_clicked(); + void on_leftLoadFwButton_clicked(); + void on_leftLoadPictButton_clicked(); void on_leftLibraryButton_clicked(); void on_leftSaveButton_clicked(); void on_leftInvertButton_clicked(); - void on_rightLoadButton_clicked(); + void on_rightLoadFwButton_clicked(); + void on_rightLoadPictButton_clicked(); void on_rightLibraryButton_clicked(); void on_rightSaveButton_clicked(); void on_rightInvertButton_clicked(); + void on_copyRightToLeftButton_clicked(); + void on_copyLeftToRightButton_clicked(); + private: + void loadFwButton_clicked( Side ); + void loadPictButton_clicked( Side ); + void libraryButton_clicked( Side ); + void saveButton_clicked( Side ); + void invertButton_clicked( Side ); + Ui::customizeSplashDialog *ui; + enum sideEnum { LEFT, RIGHT }; }; #endif // CUSTOMIZESPLASHDIALOG_H diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui index 75c2b03d1..4931052d1 100644 --- a/companion/src/customizesplashdialog.ui +++ b/companion/src/customizesplashdialog.ui @@ -2,16 +2,19 @@ customizeSplashDialog + + true + 0 0 - 892 - 299 + 1086 + 285 - + 0 0 @@ -23,438 +26,596 @@ :/icon.png:/icon.png - - - true - - - - 460 - 0 - 424 - 25 - - - - - 424 - 0 - - - - - 424 - 16777215 - - - - true - - - - - - 10 - 210 - 81 - 27 - - - - Load - - - - - - 90 - 210 - 26 - 23 - - - - Open Splash Library - - - ... - - - - 16 - 16 - - - - - - false - - - - 460 - 210 - 90 - 27 - - - - Load - - - - - true - - - - 10 - 0 - 424 - 25 - - - - - 424 - 0 - - - - - 424 - 16777215 - - - - true - - - - - false - - - - 350 - 210 - 81 - 27 - - - - Save - - - - - - 460 - 30 - 424 - 128 - - - - - 0 - 0 - - - - - 424 - 128 - - - - - 424 - 128 - - - - QFrame::Panel - - - QFrame::Raised - - - - - - :/images/customize.png - - - true - - - - - - 10 - 30 - 424 - 128 - - - - - 0 - 0 - - - - - 424 - 128 - - - - - 424 - 128 - - - - QFrame::Panel - - - QFrame::Raised - - - - - - :/images/customize.png - - - true - - - - - - 460 - 160 - 85 - 27 - - - - Invert - - - - - - 790 - 210 - 90 - 27 - - - - Save - - - - - - 10 - 160 - 81 - 27 - - - - Invert - - - - - - 10 - 250 - 871 - 40 - - - - - 0 - 0 - - - - - 16777215 - 40 - - - - background:rgb(235, 235, 235); - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';"><br /></span></p></body></html> - - - true - - - - - - 437 - 120 - 20 - 23 - - - - ... - - - Qt::RightArrow - - - - - - 437 - 40 - 20 - 23 - - - - ... - - - Qt::LeftArrow - - - - - - 442 - 5 - 10 - 31 - - - - Qt::Vertical - - - - - - 442 - 70 - 10 - 41 - - - - Qt::Vertical - - - - - - 442 - 150 - 10 - 91 - - - - Qt::Vertical - - - - - - 10 - 190 - 421 - 16 - - - - Qt::Horizontal - - - - - - 460 - 190 - 421 - 16 - - - - Qt::Horizontal - - - - - - 550 - 210 - 26 - 23 - - - - Open Splash Library - - - ... - - - - 16 - 16 - - - - rightFileName - leftLoadButton - leftLibraryButton - rightLoadButton - leftFileName - leftSaveButton - rightImageLabel - rightInvertButton - rightSaveButton - leftInvertButton - leftImageLabel - HowToLabel - copyLeftToRight - copyRightToLeft - line - line_2 - line_3 - line_4 - line_5 - rightLibraryButton + + + 6 + + + 3 + + + 0 + + + 3 + + + 3 + + + + + 0 + + + + + Qt::Vertical + + + + + + + + + Qt::Horizontal + + + + + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + + 424 + 0 + + + + + 426 + 16777215 + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 424 + 128 + + + + + 424 + 128 + + + + QFrame::Panel + + + QFrame::Plain + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + + + + + + false + + + Invert + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Open Splash Library + + + ... + + + + 24 + 24 + + + + + + + + + + Qt::Horizontal + + + + + + + + + Load FW + + + + + + + Load Pict + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Save + + + + + + + + + Qt::Horizontal + + + + + + + + + Qt::Vertical + + + + + + + + + ... + + + Qt::LeftArrow + + + + + + + ... + + + Qt::RightArrow + + + + + + + + + Qt::Vertical + + + + + + + + + Qt::Horizontal + + + + + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + + 426 + 0 + + + + + 424 + 16777215 + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 424 + 128 + + + + + 424 + 128 + + + + QFrame::Panel + + + QFrame::Plain + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + + + + + + false + + + Invert + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Open Splash Library + + + ... + + + + 24 + 24 + + + + + + + + + + Qt::Horizontal + + + + + + + + + true + + + Load FW + + + + + + + Load Pict + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Save + + + + + + + + + Qt::Horizontal + + + + + + + + + Qt::Vertical + + + + + + + + leftFileNameEdit + leftInvertButton + leftLoadFwButton + leftLoadPictButton + leftSaveButton + copyLeftToRightButton + copyRightToLeftButton + rightFileNameEdit + rightInvertButton + rightLoadFwButton + rightLoadPictButton + rightSaveButton + diff --git a/companion/src/fwpreferencesdialog.cpp b/companion/src/fwpreferencesdialog.cpp index 011da2ff7..c4c2a820b 100644 --- a/companion/src/fwpreferencesdialog.cpp +++ b/companion/src/fwpreferencesdialog.cpp @@ -242,6 +242,10 @@ void fwPreferencesDialog::writeValues() settings.setValue("firmware", current_firmware_variant.id); settings.setValue("profileId", ui->ProfSlot_SB->value()); settings.setValue("sdPath", ui->sdPath->text()); + settings.setValue("SplashFileName", ui->SplashFileName->text()); + if (!ui->SplashFileName->text().isEmpty()) + settings.setValue("SplashImage", ""); + MainWindow * mw = (MainWindow *)this->parent(); mw->unloadProfile(); } @@ -347,10 +351,16 @@ void fwPreferencesDialog::initSettings() } baseFirmwareChanged(); + ui->ProfSlot_SB->setValue(settings.value("profileId", 1).toInt()); on_ProfSlot_SB_valueChanged(); - QString ImageStr = settings.value("SplashImage", "").toString(); - + QString fileName=settings.value("SplashFileName","").toString(); + if (!fileName.isEmpty()) { + QFile file(fileName); + if (file.exists()){ + ui->SplashFileName->setText(fileName); + } + } firmwareChanged(); } @@ -442,6 +452,7 @@ void fwPreferencesDialog::on_ProfSave_PB_clicked() settings.setValue("burnFirmware", ui->burnFirmware->isChecked()); settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked()); settings.setValue("sdPath", ui->sdPath->text()); + settings.setValue("SplashFileName", ui->SplashFileName->text()); current_firmware_variant = getFirmwareVariant(); settings.setValue("firmware", current_firmware_variant.id); settings.endGroup(); @@ -498,6 +509,34 @@ void fwPreferencesDialog::on_import_PB_clicked() on_ProfSlot_SB_valueChanged(); } + +void fwPreferencesDialog::on_SplashSelect_clicked() +{ + QString supportedImageFormats; + for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) { + supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex]; + } + + QSettings settings; + QString fileName = QFileDialog::getOpenFileName(this, + tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats)); + + if (!fileName.isEmpty()) { + settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); + QImage image(fileName); + if (image.isNull()) { + QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName)); + return; + } + ui->SplashFileName->setText(fileName); + } +} + + +void fwPreferencesDialog::on_clearImageButton_clicked() { + ui->SplashFileName->clear(); +} + void fwPreferencesDialog::on_checkFWUpdates_clicked() { FirmwareVariant variant = getFirmwareVariant(); diff --git a/companion/src/fwpreferencesdialog.h b/companion/src/fwpreferencesdialog.h index 09a8b6113..6a3b165d7 100644 --- a/companion/src/fwpreferencesdialog.h +++ b/companion/src/fwpreferencesdialog.h @@ -45,6 +45,8 @@ private slots: void on_ProfSave_PB_clicked(); void on_export_PB_clicked(); void on_import_PB_clicked(); + void on_SplashSelect_clicked(); + void on_clearImageButton_clicked(); }; #endif // FWPREFERENCESDIALOG_H diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui index 97b89b481..88d876e63 100644 --- a/companion/src/fwpreferencesdialog.ui +++ b/companion/src/fwpreferencesdialog.ui @@ -6,8 +6,8 @@ 0 0 - 634 - 800 + 632 + 695 @@ -26,6 +26,26 @@ Download Firmware and Voice + + 2 + + + 6 + + + + + Options + + + + + + + Save Profile + + + @@ -78,16 +98,6 @@ - - - - Hardware Profile Name - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - @@ -103,6 +113,12 @@ + + + 50 + 16777215 + + Set language of voice. May be different from firmware language @@ -135,7 +151,7 @@ May be different from firmware language - Language + Menu Language Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -158,7 +174,7 @@ May be different from firmware language - Voice + Voice Language @@ -191,8 +207,27 @@ May be different from firmware language + + + + + 0 + 0 + + + + CheckBox + + + + + + 190 + 16777215 + + Mode selection: @@ -239,10 +274,10 @@ Mode 4: - + - Storage Position + Profile Number Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -262,10 +297,16 @@ Mode 4: - - + + + + + 0 + 0 + + - Options + CheckBox @@ -277,18 +318,11 @@ Mode 4: 0 - - - - - - - 0 - 0 - - - - CheckBox + + + 50 + 16777215 + @@ -322,6 +356,12 @@ Mode 4: 0 + + + 75 + 16777215 + + Channel order @@ -484,9 +524,6 @@ This is used by the templated to determine which channel goes to what number out - - - @@ -526,19 +563,6 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - CheckBox - - - @@ -887,8 +911,14 @@ This is used by the templated to determine which channel goes to what number out - + + + + 50 + 16777215 + + 1 @@ -911,37 +941,6 @@ This is used by the templated to determine which channel goes to what number out - - - - Import - - - - - - - Export - - - - - - - Save Profile - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - @@ -956,6 +955,16 @@ This is used by the templated to determine which channel goes to what number out + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + @@ -963,7 +972,7 @@ This is used by the templated to determine which channel goes to what number out - + Qt::Horizontal @@ -1004,6 +1013,13 @@ This is used by the templated to determine which channel goes to what number out + + + + Download FW + + + @@ -1017,7 +1033,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -1030,7 +1046,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -1043,10 +1059,67 @@ This is used by the templated to determine which channel goes to what number out - - + + + + + 0 + 0 + + - Download FW + Profile Splash Screen + + + + + + + Profile Name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + true + + + true + + + + + + + + + + Export + + + + + + + Import + + + + + + + Open Image + + + + + + + Clear Image @@ -1107,11 +1180,7 @@ This is used by the templated to determine which channel goes to what number out burnFirmware voiceCombo voice_dnld - ProfName_LE - import_PB ProfSlot_SB - export_PB - ProfSave_PB diff --git a/companion/src/images/originals/classical icons/add.png b/companion/src/images/originals/classical icons/add.png index 24cc027da..9a1ec67d0 100644 Binary files a/companion/src/images/originals/classical icons/add.png and b/companion/src/images/originals/classical icons/add.png differ diff --git a/companion/src/images/originals/classical icons/clear.png b/companion/src/images/originals/classical icons/clear.png index a599c0332..ef8f304e4 100644 Binary files a/companion/src/images/originals/classical icons/clear.png and b/companion/src/images/originals/classical icons/clear.png differ diff --git a/companion/src/images/originals/classical icons/contributors.png b/companion/src/images/originals/classical icons/contributors.png index 276949198..be8840906 100644 Binary files a/companion/src/images/originals/classical icons/contributors.png and b/companion/src/images/originals/classical icons/contributors.png differ diff --git a/companion/src/images/originals/classical icons/copy.png b/companion/src/images/originals/classical icons/copy.png index 2aeb28288..c3bd1a2cc 100644 Binary files a/companion/src/images/originals/classical icons/copy.png and b/companion/src/images/originals/classical icons/copy.png differ diff --git a/companion/src/images/originals/classical icons/currentmodel.png b/companion/src/images/originals/classical icons/currentmodel.png index 35a37b766..a37b9e341 100644 Binary files a/companion/src/images/originals/classical icons/currentmodel.png and b/companion/src/images/originals/classical icons/currentmodel.png differ diff --git a/companion/src/images/originals/classical icons/cut.png b/companion/src/images/originals/classical icons/cut.png index 54638e938..910dff020 100644 Binary files a/companion/src/images/originals/classical icons/cut.png and b/companion/src/images/originals/classical icons/cut.png differ diff --git a/companion/src/images/originals/classical icons/exit.png b/companion/src/images/originals/classical icons/exit.png index 5319a9480..dcd5cafbe 100644 Binary files a/companion/src/images/originals/classical icons/exit.png and b/companion/src/images/originals/classical icons/exit.png differ diff --git a/companion/src/images/originals/classical icons/information.png b/companion/src/images/originals/classical icons/information.png index 76b6d5966..44c08b858 100644 Binary files a/companion/src/images/originals/classical icons/information.png and b/companion/src/images/originals/classical icons/information.png differ diff --git a/companion/src/images/originals/classical icons/library.png b/companion/src/images/originals/classical icons/library.png index 16bfde4b9..13b537590 100644 Binary files a/companion/src/images/originals/classical icons/library.png and b/companion/src/images/originals/classical icons/library.png differ diff --git a/companion/src/images/originals/classical icons/movedown.png b/companion/src/images/originals/classical icons/movedown.png index 2632877c1..be856ff29 100644 Binary files a/companion/src/images/originals/classical icons/movedown.png and b/companion/src/images/originals/classical icons/movedown.png differ diff --git a/companion/src/images/originals/classical icons/moveup.png b/companion/src/images/originals/classical icons/moveup.png index 447f087cc..c2668e845 100644 Binary files a/companion/src/images/originals/classical icons/moveup.png and b/companion/src/images/originals/classical icons/moveup.png differ diff --git a/companion/src/images/originals/classical icons/new.png b/companion/src/images/originals/classical icons/new.png index 12131b010..f15f28a4a 100644 Binary files a/companion/src/images/originals/classical icons/new.png and b/companion/src/images/originals/classical icons/new.png differ diff --git a/companion/src/images/originals/classical icons/paste.png b/companion/src/images/originals/classical icons/paste.png index c14425cad..bdec2e65e 100644 Binary files a/companion/src/images/originals/classical icons/paste.png and b/companion/src/images/originals/classical icons/paste.png differ diff --git a/companion/src/images/originals/classical icons/play.png b/companion/src/images/originals/classical icons/play.png index 8501a8b58..4593525f2 100644 Binary files a/companion/src/images/originals/classical icons/play.png and b/companion/src/images/originals/classical icons/play.png differ diff --git a/companion/src/images/originals/classical icons/print.png b/companion/src/images/originals/classical icons/print.png index 578980db7..62d994f9e 100644 Binary files a/companion/src/images/originals/classical icons/print.png and b/companion/src/images/originals/classical icons/print.png differ diff --git a/companion/src/images/originals/classical icons/wizard.png b/companion/src/images/originals/classical icons/wizard.png index ccd964e1d..b444693d0 100644 Binary files a/companion/src/images/originals/classical icons/wizard.png and b/companion/src/images/originals/classical icons/wizard.png differ diff --git a/companion/src/themes/classic/16/add.png b/companion/src/themes/classic/16/add.png index 7976174fd..6cb5042f2 100644 Binary files a/companion/src/themes/classic/16/add.png and b/companion/src/themes/classic/16/add.png differ diff --git a/companion/src/themes/classic/16/clear.png b/companion/src/themes/classic/16/clear.png index 12c465218..8c7ca75c5 100644 Binary files a/companion/src/themes/classic/16/clear.png and b/companion/src/themes/classic/16/clear.png differ diff --git a/companion/src/themes/classic/16/contributors.png b/companion/src/themes/classic/16/contributors.png index 439d2bcb8..d9091a350 100644 Binary files a/companion/src/themes/classic/16/contributors.png and b/companion/src/themes/classic/16/contributors.png differ diff --git a/companion/src/themes/classic/16/copy.png b/companion/src/themes/classic/16/copy.png index 0d016ee10..f34860433 100644 Binary files a/companion/src/themes/classic/16/copy.png and b/companion/src/themes/classic/16/copy.png differ diff --git a/companion/src/themes/classic/16/currentmodel.png b/companion/src/themes/classic/16/currentmodel.png index 691f8f92d..6ea21cb4c 100644 Binary files a/companion/src/themes/classic/16/currentmodel.png and b/companion/src/themes/classic/16/currentmodel.png differ diff --git a/companion/src/themes/classic/16/cut.png b/companion/src/themes/classic/16/cut.png index 600e320c6..2701f6896 100644 Binary files a/companion/src/themes/classic/16/cut.png and b/companion/src/themes/classic/16/cut.png differ diff --git a/companion/src/themes/classic/16/exit.png b/companion/src/themes/classic/16/exit.png index c188d80d8..47f127f76 100644 Binary files a/companion/src/themes/classic/16/exit.png and b/companion/src/themes/classic/16/exit.png differ diff --git a/companion/src/themes/classic/16/information.png b/companion/src/themes/classic/16/information.png index aca1565dd..1a3cfc535 100644 Binary files a/companion/src/themes/classic/16/information.png and b/companion/src/themes/classic/16/information.png differ diff --git a/companion/src/themes/classic/16/library.png b/companion/src/themes/classic/16/library.png index 2a4df7457..2d8fd6f59 100644 Binary files a/companion/src/themes/classic/16/library.png and b/companion/src/themes/classic/16/library.png differ diff --git a/companion/src/themes/classic/16/movedown.png b/companion/src/themes/classic/16/movedown.png index f609f5581..0c1e7b2bb 100644 Binary files a/companion/src/themes/classic/16/movedown.png and b/companion/src/themes/classic/16/movedown.png differ diff --git a/companion/src/themes/classic/16/moveup.png b/companion/src/themes/classic/16/moveup.png index f44bf8b64..322ed7606 100644 Binary files a/companion/src/themes/classic/16/moveup.png and b/companion/src/themes/classic/16/moveup.png differ diff --git a/companion/src/themes/classic/16/new.png b/companion/src/themes/classic/16/new.png index b40281b64..bf1195557 100644 Binary files a/companion/src/themes/classic/16/new.png and b/companion/src/themes/classic/16/new.png differ diff --git a/companion/src/themes/classic/16/paste.png b/companion/src/themes/classic/16/paste.png index 7f1b0a7a8..91bf4afd6 100644 Binary files a/companion/src/themes/classic/16/paste.png and b/companion/src/themes/classic/16/paste.png differ diff --git a/companion/src/themes/classic/16/play.png b/companion/src/themes/classic/16/play.png index d4720f2d8..fdefe966b 100644 Binary files a/companion/src/themes/classic/16/play.png and b/companion/src/themes/classic/16/play.png differ diff --git a/companion/src/themes/classic/16/print.png b/companion/src/themes/classic/16/print.png index 9f1d39eee..7041c1d4b 100644 Binary files a/companion/src/themes/classic/16/print.png and b/companion/src/themes/classic/16/print.png differ diff --git a/companion/src/themes/classic/16/stop.png b/companion/src/themes/classic/16/stop.png index f2bb8792b..5c1c8a7df 100644 Binary files a/companion/src/themes/classic/16/stop.png and b/companion/src/themes/classic/16/stop.png differ diff --git a/companion/src/themes/classic/16/wizard.png b/companion/src/themes/classic/16/wizard.png index 6bb4d070b..9608315b6 100644 Binary files a/companion/src/themes/classic/16/wizard.png and b/companion/src/themes/classic/16/wizard.png differ diff --git a/companion/src/themes/classic/24/add.png b/companion/src/themes/classic/24/add.png index 073c0b2f1..39c3bb546 100644 Binary files a/companion/src/themes/classic/24/add.png and b/companion/src/themes/classic/24/add.png differ diff --git a/companion/src/themes/classic/24/clear.png b/companion/src/themes/classic/24/clear.png index 5a2f16f23..8414751d5 100644 Binary files a/companion/src/themes/classic/24/clear.png and b/companion/src/themes/classic/24/clear.png differ diff --git a/companion/src/themes/classic/24/contributors.png b/companion/src/themes/classic/24/contributors.png index c35d8737e..0ba8ecfa5 100644 Binary files a/companion/src/themes/classic/24/contributors.png and b/companion/src/themes/classic/24/contributors.png differ diff --git a/companion/src/themes/classic/24/copy.png b/companion/src/themes/classic/24/copy.png index 714a0d590..3f2072268 100644 Binary files a/companion/src/themes/classic/24/copy.png and b/companion/src/themes/classic/24/copy.png differ diff --git a/companion/src/themes/classic/24/currentmodel.png b/companion/src/themes/classic/24/currentmodel.png index 192a227fe..91658fa44 100644 Binary files a/companion/src/themes/classic/24/currentmodel.png and b/companion/src/themes/classic/24/currentmodel.png differ diff --git a/companion/src/themes/classic/24/cut.png b/companion/src/themes/classic/24/cut.png index 33b947198..29ca2122f 100644 Binary files a/companion/src/themes/classic/24/cut.png and b/companion/src/themes/classic/24/cut.png differ diff --git a/companion/src/themes/classic/24/exit.png b/companion/src/themes/classic/24/exit.png index ba91c7bfc..3884d2a7d 100644 Binary files a/companion/src/themes/classic/24/exit.png and b/companion/src/themes/classic/24/exit.png differ diff --git a/companion/src/themes/classic/24/information.png b/companion/src/themes/classic/24/information.png index ccf17132b..f94c8d7c1 100644 Binary files a/companion/src/themes/classic/24/information.png and b/companion/src/themes/classic/24/information.png differ diff --git a/companion/src/themes/classic/24/library.png b/companion/src/themes/classic/24/library.png index 97e9bf596..cbd6c1461 100644 Binary files a/companion/src/themes/classic/24/library.png and b/companion/src/themes/classic/24/library.png differ diff --git a/companion/src/themes/classic/24/movedown.png b/companion/src/themes/classic/24/movedown.png index 47f210256..1b2395232 100644 Binary files a/companion/src/themes/classic/24/movedown.png and b/companion/src/themes/classic/24/movedown.png differ diff --git a/companion/src/themes/classic/24/moveup.png b/companion/src/themes/classic/24/moveup.png index 1bf02bdff..6eb96ec1b 100644 Binary files a/companion/src/themes/classic/24/moveup.png and b/companion/src/themes/classic/24/moveup.png differ diff --git a/companion/src/themes/classic/24/new.png b/companion/src/themes/classic/24/new.png index 0181a1ca2..192f3a238 100644 Binary files a/companion/src/themes/classic/24/new.png and b/companion/src/themes/classic/24/new.png differ diff --git a/companion/src/themes/classic/24/paste.png b/companion/src/themes/classic/24/paste.png index 2a762fbfb..c726c08d4 100644 Binary files a/companion/src/themes/classic/24/paste.png and b/companion/src/themes/classic/24/paste.png differ diff --git a/companion/src/themes/classic/24/play.png b/companion/src/themes/classic/24/play.png index 7e1b547d9..3ec82b975 100644 Binary files a/companion/src/themes/classic/24/play.png and b/companion/src/themes/classic/24/play.png differ diff --git a/companion/src/themes/classic/24/print.png b/companion/src/themes/classic/24/print.png index edb7bcfb1..d7e15e59c 100644 Binary files a/companion/src/themes/classic/24/print.png and b/companion/src/themes/classic/24/print.png differ diff --git a/companion/src/themes/classic/24/stop.png b/companion/src/themes/classic/24/stop.png index 00f4ab1c1..9c1258365 100644 Binary files a/companion/src/themes/classic/24/stop.png and b/companion/src/themes/classic/24/stop.png differ diff --git a/companion/src/themes/classic/24/wizard.png b/companion/src/themes/classic/24/wizard.png index 63879342f..cab6ae467 100644 Binary files a/companion/src/themes/classic/24/wizard.png and b/companion/src/themes/classic/24/wizard.png differ diff --git a/companion/src/themes/classic/32/add.png b/companion/src/themes/classic/32/add.png index 9b1e2ebf3..e83f4c1a0 100644 Binary files a/companion/src/themes/classic/32/add.png and b/companion/src/themes/classic/32/add.png differ diff --git a/companion/src/themes/classic/32/clear.png b/companion/src/themes/classic/32/clear.png index e1d481f35..9f63a08c2 100644 Binary files a/companion/src/themes/classic/32/clear.png and b/companion/src/themes/classic/32/clear.png differ diff --git a/companion/src/themes/classic/32/contributors.png b/companion/src/themes/classic/32/contributors.png index d90cc70de..5793b3e21 100644 Binary files a/companion/src/themes/classic/32/contributors.png and b/companion/src/themes/classic/32/contributors.png differ diff --git a/companion/src/themes/classic/32/copy.png b/companion/src/themes/classic/32/copy.png index a24bb4b1d..4f4ca1f70 100644 Binary files a/companion/src/themes/classic/32/copy.png and b/companion/src/themes/classic/32/copy.png differ diff --git a/companion/src/themes/classic/32/currentmodel.png b/companion/src/themes/classic/32/currentmodel.png index 6fde618ef..c52a1595f 100644 Binary files a/companion/src/themes/classic/32/currentmodel.png and b/companion/src/themes/classic/32/currentmodel.png differ diff --git a/companion/src/themes/classic/32/cut.png b/companion/src/themes/classic/32/cut.png index d68161089..89ce23045 100644 Binary files a/companion/src/themes/classic/32/cut.png and b/companion/src/themes/classic/32/cut.png differ diff --git a/companion/src/themes/classic/32/exit.png b/companion/src/themes/classic/32/exit.png index 7eb24a666..bc9e301bd 100644 Binary files a/companion/src/themes/classic/32/exit.png and b/companion/src/themes/classic/32/exit.png differ diff --git a/companion/src/themes/classic/32/information.png b/companion/src/themes/classic/32/information.png index 47fa8f3fe..48bf9f6f3 100644 Binary files a/companion/src/themes/classic/32/information.png and b/companion/src/themes/classic/32/information.png differ diff --git a/companion/src/themes/classic/32/library.png b/companion/src/themes/classic/32/library.png index 763983830..ea07f460e 100644 Binary files a/companion/src/themes/classic/32/library.png and b/companion/src/themes/classic/32/library.png differ diff --git a/companion/src/themes/classic/32/movedown.png b/companion/src/themes/classic/32/movedown.png index 8d2671cc1..03df82943 100644 Binary files a/companion/src/themes/classic/32/movedown.png and b/companion/src/themes/classic/32/movedown.png differ diff --git a/companion/src/themes/classic/32/moveup.png b/companion/src/themes/classic/32/moveup.png index 7d52059e2..7bc850ea0 100644 Binary files a/companion/src/themes/classic/32/moveup.png and b/companion/src/themes/classic/32/moveup.png differ diff --git a/companion/src/themes/classic/32/new.png b/companion/src/themes/classic/32/new.png index 3c79b7994..b8b01bdee 100644 Binary files a/companion/src/themes/classic/32/new.png and b/companion/src/themes/classic/32/new.png differ diff --git a/companion/src/themes/classic/32/paste.png b/companion/src/themes/classic/32/paste.png index 17c82102a..d5c13a9b6 100644 Binary files a/companion/src/themes/classic/32/paste.png and b/companion/src/themes/classic/32/paste.png differ diff --git a/companion/src/themes/classic/32/play.png b/companion/src/themes/classic/32/play.png index d47a3040e..fc0f9506f 100644 Binary files a/companion/src/themes/classic/32/play.png and b/companion/src/themes/classic/32/play.png differ diff --git a/companion/src/themes/classic/32/print.png b/companion/src/themes/classic/32/print.png index 6c27107b5..ad2b82844 100644 Binary files a/companion/src/themes/classic/32/print.png and b/companion/src/themes/classic/32/print.png differ diff --git a/companion/src/themes/classic/32/stop.png b/companion/src/themes/classic/32/stop.png index a0338d139..c055e548c 100644 Binary files a/companion/src/themes/classic/32/stop.png and b/companion/src/themes/classic/32/stop.png differ diff --git a/companion/src/themes/classic/32/wizard.png b/companion/src/themes/classic/32/wizard.png index ff5161498..4ec873ee9 100644 Binary files a/companion/src/themes/classic/32/wizard.png and b/companion/src/themes/classic/32/wizard.png differ diff --git a/companion/src/themes/classic/48/add.png b/companion/src/themes/classic/48/add.png index fe8a28097..31e4124cd 100644 Binary files a/companion/src/themes/classic/48/add.png and b/companion/src/themes/classic/48/add.png differ diff --git a/companion/src/themes/classic/48/clear.png b/companion/src/themes/classic/48/clear.png index 4cc914074..6c10e1150 100644 Binary files a/companion/src/themes/classic/48/clear.png and b/companion/src/themes/classic/48/clear.png differ diff --git a/companion/src/themes/classic/48/contributors.png b/companion/src/themes/classic/48/contributors.png index 98bc58202..be8840906 100644 Binary files a/companion/src/themes/classic/48/contributors.png and b/companion/src/themes/classic/48/contributors.png differ diff --git a/companion/src/themes/classic/48/copy.png b/companion/src/themes/classic/48/copy.png index 9bc5c654c..91f0647e7 100644 Binary files a/companion/src/themes/classic/48/copy.png and b/companion/src/themes/classic/48/copy.png differ diff --git a/companion/src/themes/classic/48/currentmodel.png b/companion/src/themes/classic/48/currentmodel.png index 860941f75..12d23c31a 100644 Binary files a/companion/src/themes/classic/48/currentmodel.png and b/companion/src/themes/classic/48/currentmodel.png differ diff --git a/companion/src/themes/classic/48/cut.png b/companion/src/themes/classic/48/cut.png index 45d111adf..e8c987802 100644 Binary files a/companion/src/themes/classic/48/cut.png and b/companion/src/themes/classic/48/cut.png differ diff --git a/companion/src/themes/classic/48/exit.png b/companion/src/themes/classic/48/exit.png index 159dccb93..cd779a402 100644 Binary files a/companion/src/themes/classic/48/exit.png and b/companion/src/themes/classic/48/exit.png differ diff --git a/companion/src/themes/classic/48/information.png b/companion/src/themes/classic/48/information.png index e62f8ee19..d7cb2c224 100644 Binary files a/companion/src/themes/classic/48/information.png and b/companion/src/themes/classic/48/information.png differ diff --git a/companion/src/themes/classic/48/library.png b/companion/src/themes/classic/48/library.png index df4cf1e0c..59122cf0e 100644 Binary files a/companion/src/themes/classic/48/library.png and b/companion/src/themes/classic/48/library.png differ diff --git a/companion/src/themes/classic/48/movedown.png b/companion/src/themes/classic/48/movedown.png index 7f6cb094d..be856ff29 100644 Binary files a/companion/src/themes/classic/48/movedown.png and b/companion/src/themes/classic/48/movedown.png differ diff --git a/companion/src/themes/classic/48/moveup.png b/companion/src/themes/classic/48/moveup.png index 62f818d20..c2668e845 100644 Binary files a/companion/src/themes/classic/48/moveup.png and b/companion/src/themes/classic/48/moveup.png differ diff --git a/companion/src/themes/classic/48/new.png b/companion/src/themes/classic/48/new.png index 35ba8e361..3315820ae 100644 Binary files a/companion/src/themes/classic/48/new.png and b/companion/src/themes/classic/48/new.png differ diff --git a/companion/src/themes/classic/48/paste.png b/companion/src/themes/classic/48/paste.png index bbc349158..b475c74fe 100644 Binary files a/companion/src/themes/classic/48/paste.png and b/companion/src/themes/classic/48/paste.png differ diff --git a/companion/src/themes/classic/48/play.png b/companion/src/themes/classic/48/play.png index 740f36842..0cdda36c6 100644 Binary files a/companion/src/themes/classic/48/play.png and b/companion/src/themes/classic/48/play.png differ diff --git a/companion/src/themes/classic/48/print.png b/companion/src/themes/classic/48/print.png index 5bafa08d8..5586786e2 100644 Binary files a/companion/src/themes/classic/48/print.png and b/companion/src/themes/classic/48/print.png differ diff --git a/companion/src/themes/classic/48/stop.png b/companion/src/themes/classic/48/stop.png index c513babaa..34bde6e33 100644 Binary files a/companion/src/themes/classic/48/stop.png and b/companion/src/themes/classic/48/stop.png differ diff --git a/companion/src/themes/classic/48/wizard.png b/companion/src/themes/classic/48/wizard.png index 3fbd7d780..058dbb536 100644 Binary files a/companion/src/themes/classic/48/wizard.png and b/companion/src/themes/classic/48/wizard.png differ