From 6ea9b2c26aee9eff9d6d54df2c70e21b241cf28f Mon Sep 17 00:00:00 2001
From: Kjell Kernen <github@kernen.se>
Date: Sun, 23 Feb 2014 01:28:49 +0100
Subject: [PATCH] The two image labels and complicatd logics replaced by a
 simpler 4-way image selection and a single image label that simply shows
 whatever image that will be used as radio splash screen.

---
 companion/src/appdata.h      |   2 +-
 companion/src/burndialog.cpp | 310 ++++++++++++++---------------------
 companion/src/burndialog.h   |  19 ++-
 companion/src/burndialog.ui  | 258 +++++++++--------------------
 4 files changed, 211 insertions(+), 378 deletions(-)

diff --git a/companion/src/appdata.h b/companion/src/appdata.h
index 210b8ae8f..7377bb4f0 100644
--- a/companion/src/appdata.h
+++ b/companion/src/appdata.h
@@ -124,7 +124,7 @@ class Profile: protected CompStoreObj
     QString splashFile() const;
     bool    burnFirmware() const;
     bool    renameFwFiles() const;
-    bool    patchImage() const;
+    bool    patchImage() const;    //TODO This variable is unused and should be removed
     int     channelOrder() const;
     int     defaultMode() const;
 
diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp
index 764f84ab8..05d7ef8ce 100644
--- a/companion/src/burndialog.cpp
+++ b/companion/src/burndialog.cpp
@@ -17,7 +17,18 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
   hexType(Type)
 {
   ui->setupUi(this);
-  ui->libraryButton->setIcon(CompanionIcon("library.png"));
+
+  if(!g.profile[g.id()].splashFile().isEmpty()){
+    imageSource=PROFILE;
+    imageFile=g.profile[g.id()].splashFile();
+  }
+  else{
+    ui->useProfileImageCB->setDisabled(true);
+    imageSource=FIRMWARE;
+    imageFile="";
+  }
+  updateUI();
+
   ui->SplashFrame->hide();
   ui->FramFWInfo->hide();
   ui->EEbackupCB->hide();
@@ -27,7 +38,6 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
     ui->profile_label->hide();
     ui->patchcalib_CB->hide();
     ui->patchhw_CB->hide();
-    ui->InvertColorButton->setDisabled(true);
     setWindowTitle(tr("Write firmware to TX"));
     if (IS_TARANIS(GetEepromInterface()->getBoard())) {
       ui->EEbackupCB->hide();
@@ -39,12 +49,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
     ui->patchcalib_CB->hide();
     ui->patchhw_CB->hide();
     ui->EEpromCB->hide();
-    ui->ImageLoadButton->setDisabled(true);
-    ui->libraryButton->setDisabled(true);
-    ui->InvertColorButton->setDisabled(true);
     ui->BurnFlashButton->setDisabled(true);
-    ui->ImageFileName->clear();
-    ui->FwImage->clear();
     ui->FWFileName->clear();
     ui->DateField->clear();
     ui->SVNField->clear();
@@ -124,12 +129,7 @@ void burnDialog::on_FlashLoadButton_clicked()
 {
   QString fileName;
 
-  ui->ImageLoadButton->setDisabled(true);
-  ui->libraryButton->setDisabled(true);
-  ui->InvertColorButton->setDisabled(true);
   ui->BurnFlashButton->setDisabled(true);
-  ui->ImageFileName->clear();
-  ui->FwImage->clear();
   ui->FWFileName->clear();
   ui->DateField->clear();
   ui->SVNField->clear();
@@ -169,6 +169,7 @@ void burnDialog::on_FlashLoadButton_clicked()
       QTimer::singleShot(0, this, SLOT(shrink()));
     }
   }
+  updateUI();
 }
 
 void burnDialog::checkFw(QString fileName)
@@ -194,48 +195,28 @@ void burnDialog::checkFw(QString fileName)
     ui->BurnFlashButton->setText(tr("Write to TX"));
     if (flash.hasSplash()) {
       ui->SplashFrame->show();
-      ui->ImageLoadButton->setEnabled(true);
-      ui->libraryButton->setEnabled(true);
-      ui->FwImage->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight());
       ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight());
-      ui->FwImage->show();
-      ui->FwImage->setPixmap(QPixmap::fromImage(flash.getSplash()));
       QString ImageStr = g.profile[g.id()].splashFile();
-      bool PatchFwCB = g.profile[g.id()].patchImage();
       if (!ImageStr.isEmpty()) {
         QImage Image;
         Image.load(ImageStr);
         ui->imageLabel->setPixmap(QPixmap::fromImage(Image.convertToFormat(flash.getSplashFormat())));
-        ui->InvertColorButton->setEnabled(true);
-        ui->PreferredImageCB->setChecked(true);
-        ui->PatchFWCB->setChecked(PatchFwCB);
       }
       else {
-        QString fileName=ui->ImageFileName->text();
+        QString fileName=imageFile;
         if (!fileName.isEmpty()) {
           QImage image(fileName);
           if (!image.isNull()) {
-            ui->InvertColorButton->setEnabled(true);
             ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height()).convertToFormat(flash.getSplashFormat())));
-            ui->PatchFWCB->setEnabled(true);
-            ui->PatchFWCB->setChecked(PatchFwCB);
           }
           else {
-            ui->PatchFWCB->setDisabled(true);
-            ui->PatchFWCB->setChecked(false);
-            ui->PreferredImageCB->setDisabled(true);         
           }
         }
         else {
-          ui->PatchFWCB->setDisabled(true);
-          ui->PatchFWCB->setChecked(false);
-          ui->PreferredImageCB->setDisabled(true);
         }
       }
     }
     else {
-      ui->FwImage->hide();
-      ui->ImageFileName->setText("");
       ui->SplashFrame->hide();
     }
   }
@@ -338,87 +319,122 @@ bool burnDialog::checkeEprom(QString fileName)
   return true;
 }
 
-void burnDialog::on_ImageLoadButton_clicked()
+void burnDialog::displaySplash()
+{
+  QImage image;
+  if (imageSource == FIRMWARE){
+    FlashInterface flash(ui->FWFileName->text());
+    image = flash.getSplash();
+  }
+  else{
+    image.load(imageFile);
+  }
+  if (image.isNull()) {
+    return;
+  }
+  if (ui->imageLabel->width()!=128) {
+    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->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height())));
+  } 
+  else {
+    ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height()).convertToFormat(QImage::Format_Mono)));
+  }
+}
+
+void burnDialog::updateUI()
+{
+  ui->useProfileImageCB->setChecked( imageSource == PROFILE );
+  ui->useFwImageCB->setChecked( imageSource == FIRMWARE );
+  ui->useLibraryImageCB->setChecked( imageSource == LIBRARY );
+  ui->useAnotherImageCB->setChecked( imageSource == ANOTHER );
+  
+  displaySplash();
+}
+
+void burnDialog::on_useFwImageCB_clicked()
+{
+  QString fileName = ui->FWFileName->text();
+  FlashInterface flash(fileName);
+  if (!flash.isValid()) {
+    QMessageBox::critical(this, tr("Error"), tr( "The firmware file is not valid." ));
+    return;
+  }
+  if (!flash.hasSplash()) {
+    QMessageBox::critical(this, tr("Error"), tr( "There is no start screen image in the firmware file." ));
+    return;
+  }
+  imageSource = FIRMWARE;
+  imageFile = fileName;
+  updateUI();
+}
+
+void burnDialog::on_useProfileImageCB_clicked()
+{
+  QString fileName = g.profile[g.id()].splashFile();
+  if (fileName.isEmpty()){
+    QMessageBox::critical(this, tr("Error"), tr( "The radio profile has no defined start screen." ));
+    return;
+  }
+  QImage image(fileName);
+  if (image.isNull()) {
+    QMessageBox::critical(this, tr("Error"), tr("The profile image %1 does not seem to contain an image.").arg(fileName));
+    return;
+  }
+  imageSource = PROFILE;
+  imageFile = fileName;
+  updateUI();
+}
+
+void burnDialog::on_useAnotherImageCB_clicked()
 {
   QString supportedImageFormats;
   for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
     supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex];
   }
-
-  QString fileName = QFileDialog::getOpenFileName(this,
-          tr("Open Image to load"), g.imagesDir(), tr("Images (%1)").arg(supportedImageFormats));
-
-  if (!fileName.isEmpty()) {
-    g.imagesDir( QFileInfo(fileName).dir().absolutePath() );
-    QImage image(fileName);
-    if (image.isNull()) {
-      QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName));
-      ui->PatchFWCB->setDisabled(true);
-      ui->PatchFWCB->setChecked(false);
-      ui->InvertColorButton->setDisabled(true);
-      return;
-    }
-    ui->ImageFileName->setText(fileName);
-    ui->InvertColorButton->setEnabled(true);
-    if (ui->imageLabel->width()!=128) {
-      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->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height())));
-    }
-    else {
-      ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height()).convertToFormat(QImage::Format_Mono)));
-    }
-    ui->PatchFWCB->setEnabled(true);
+  QString fileName = QFileDialog::getOpenFileName(this, tr("Open image file to use as Tx start screen"), g.imagesDir(), tr("Images (%1)").arg(supportedImageFormats));
+  if (fileName.isEmpty()){
+    return;
   }
+  g.imagesDir( QFileInfo(fileName).dir().absolutePath() );
+  QImage image(fileName);
+  if (image.isNull()) {
+    QMessageBox::critical(this, tr("Error"), tr("Image could not be loaded from %1").arg(fileName));
+    return;
+  }
+  imageSource = ANOTHER;
+  imageFile = fileName;
+  updateUI();
 }
 
-void burnDialog::on_libraryButton_clicked()
+void burnDialog::on_useLibraryImageCB_clicked()
 {
   QString fileName;
   splashLibrary *ld = new splashLibrary(this,&fileName);
   ld->exec();
-  if (!fileName.isEmpty()) {
-    QImage image(fileName);
-    if (image.isNull()) {
-      QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName));
-      ui->PatchFWCB->setDisabled(true);
-      ui->PatchFWCB->setChecked(false);
-      ui->InvertColorButton->setDisabled(true);
-      return;
-    }
-    ui->ImageFileName->setText(fileName);
-    ui->InvertColorButton->setEnabled(true);
-    if (ui->imageLabel->width()!=128) {
-      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->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height())));
-    } else {
-      ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height()).convertToFormat(QImage::Format_Mono)));
-    }
-    ui->PatchFWCB->setEnabled(true);
+  if (fileName.isEmpty()) {
+    return;
   }
+  QImage image(fileName);
+  if (image.isNull()) {
+    QMessageBox::critical(this, tr("Error"), tr("The library image could not be loaded"));
+    return;
+  }
+  imageSource = LIBRARY;
+  imageFile = fileName;
+  updateUI();
 }
 
 void burnDialog::on_BurnFlashButton_clicked()
@@ -428,11 +444,10 @@ void burnDialog::on_BurnFlashButton_clicked()
     if (!fileName.isEmpty()) {
       g.flashDir( QFileInfo(fileName).dir().absolutePath() );
       g.lastFw( fileName );
-      if (ui->PatchFWCB->isChecked()) {
-        g.profile[g.id()].patchImage( true );
+      if (!ui->useFwImageCB->isChecked()) {
         QImage image = ui->imageLabel->pixmap()->toImage().scaled(ui->imageLabel->width(), ui->imageLabel->height());
         if (!image.isNull()) {
-          QString tempDir    = QDir::tempPath();
+          QString tempDir = QDir::tempPath();
           QString tempFile;
           if (getFileType(fileName) == FILE_TYPE_HEX)
             tempFile = tempDir + "/flash.hex";
@@ -452,7 +467,6 @@ void burnDialog::on_BurnFlashButton_clicked()
           QMessageBox::critical(this, tr("Warning"), tr("Custom image not found"));
         }
       } else {
-            g.profile[g.id()].patchImage( false );
             hexfileName->clear();
             hexfileName->append(fileName);
       }
@@ -610,15 +624,6 @@ void burnDialog::on_cancelButton_clicked()
   this->close();  
 }
 
-void burnDialog::on_InvertColorButton_clicked()
-{
-  if (ui->imageLabel->pixmap()) {
-    QImage image = ui->imageLabel->pixmap()->toImage();
-    image.invertPixels();
-    ui->imageLabel->setPixmap(QPixmap::fromImage(image));
-  }
-}
-
 void burnDialog::on_EEpromCB_toggled(bool checked)
 {
   if (ui->EEpromCB->isChecked()) {
@@ -628,83 +633,6 @@ void burnDialog::on_EEpromCB_toggled(bool checked)
   }
 }
 
-void burnDialog::on_PreferredImageCB_toggled(bool checked)
-{
-  QString tmpFileName;
-  if (checked) {
-    QString ImageStr = g.profile[g.id()].splashFile();
-    if (!ImageStr.isEmpty()) {
-      QImage Image;
-      Image.load( ImageStr );
-      if (ui->imageLabel->width()!=128) {
-        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));
-            }
-        }
-      } else {
-         Image=Image.convertToFormat(QImage::Format_Mono);
-      }
-      ui->imageLabel->setPixmap(QPixmap::fromImage(Image));
-      ui->InvertColorButton->setEnabled(true);
-      ui->PreferredImageCB->setChecked(true);
-      ui->ImageFileName->setDisabled(true);
-      ui->ImageLoadButton->setDisabled(true);
-      ui->libraryButton->setDisabled(true);
-      ui->PatchFWCB->setEnabled(true);
-    }
-  } else {
-    ui->imageLabel->clear();
-    ui->ImageLoadButton->setEnabled(true);
-    ui->libraryButton->setEnabled(true);
-    tmpFileName = ui->ImageFileName->text();
-    if (!tmpFileName.isEmpty()) {
-      QImage image(tmpFileName);
-      if (!image.isNull()) {
-        if (ui->imageLabel->width()!=128) {
-          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));
-              }
-          }
-        } else {
-           image=image.convertToFormat(QImage::Format_Mono);
-        }        
-        ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height())));
-        ui->InvertColorButton->setEnabled(true);
-        ui->ImageFileName->setEnabled(true);
-        ui->PatchFWCB->setDisabled(false);
-      } else {
-        ui->InvertColorButton->setDisabled(true);
-        ui->PatchFWCB->setDisabled(true);
-        ui->PatchFWCB->setChecked(false);
-      }
-    } else {
-      ui->InvertColorButton->setDisabled(true);
-      ui->PatchFWCB->setDisabled(true);
-      ui->PatchFWCB->setChecked(false);
-    }
-  }
-}
-
 void burnDialog::shrink()
 {
     resize(0,0);
diff --git a/companion/src/burndialog.h b/companion/src/burndialog.h
index 40068f3ac..f56342133 100644
--- a/companion/src/burndialog.h
+++ b/companion/src/burndialog.h
@@ -36,18 +36,22 @@ public:
 
 private slots:
   void on_FlashLoadButton_clicked();
-  void on_ImageLoadButton_clicked();
-  void on_libraryButton_clicked();
   void on_BurnFlashButton_clicked();
   void on_cancelButton_clicked();
-  void on_InvertColorButton_clicked();
   void on_EEbackupCB_clicked();
-  void on_PreferredImageCB_toggled(bool checked);
-  void on_EEpromCB_toggled(bool checked);
-  void checkFw(QString fileName);
+  void on_EEpromCB_toggled(bool checked);  
   bool checkeEprom(QString fileName);
+  void on_useProfileImageCB_clicked();
+  void on_useFwImageCB_clicked();
+  void on_useLibraryImageCB_clicked();
+  void on_useAnotherImageCB_clicked();
+
+  void checkFw(QString fileName);
+  void displaySplash();
+  void updateUI();
   void shrink();
 
+
 private:
   Ui::burnDialog *ui;
   QString * hexfileName;
@@ -55,6 +59,9 @@ private:
   int hexType;
   RadioData radioData;
   bool burnraw;
+  enum ImageSource {FIRMWARE, PROFILE, LIBRARY, ANOTHER};
+  ImageSource imageSource;
+  QString imageFile;
 };
 
 #endif // BURNDIALOG_H
diff --git a/companion/src/burndialog.ui b/companion/src/burndialog.ui
index e86634e9a..89107b672 100644
--- a/companion/src/burndialog.ui
+++ b/companion/src/burndialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>440</width>
-    <height>418</height>
+    <height>423</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -30,21 +30,8 @@
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_7">
-   <item row="1" column="0">
+   <item row="2" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <spacer name="hs2">
        <property name="orientation">
@@ -71,19 +58,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QPushButton" name="BurnFlashButton">
        <property name="enabled">
@@ -100,19 +74,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="hs2_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>48</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
    <item row="0" column="0">
@@ -152,56 +113,22 @@
         <enum>QFrame::Raised</enum>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
-        <item row="0" column="2" rowspan="3">
-         <widget class="QLabel" name="FwImage">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>128</width>
-            <height>64</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>212</width>
-            <height>64</height>
-           </size>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::Panel</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="scaledContents">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="DateField">
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="SVNField">
           <property name="readOnly">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="dateLabel">
+        <item row="2" column="0">
+         <widget class="QLabel" name="buildLabel">
           <property name="text">
-           <string>Date &amp; Time</string>
+           <string>Variant</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="SVNField">
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="ModField">
           <property name="readOnly">
            <bool>true</bool>
           </property>
@@ -214,17 +141,17 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
-         <widget class="QLineEdit" name="ModField">
-          <property name="readOnly">
-           <bool>true</bool>
+        <item row="0" column="0">
+         <widget class="QLabel" name="dateLabel">
+          <property name="text">
+           <string>Date &amp; Time</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="buildLabel">
-          <property name="text">
-           <string>Variant</string>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="DateField">
+          <property name="readOnly">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
@@ -325,17 +252,10 @@
        </property>
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
-         <layout class="QGridLayout" name="SplashLayout" rowstretch="0,0,0,1">
-          <item row="0" column="1" rowspan="4">
-           <layout class="QGridLayout" name="gridLayout_2" rowstretch="1,0">
-            <item row="1" column="0">
-             <widget class="QPushButton" name="InvertColorButton">
-              <property name="text">
-               <string>Invert Color</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
+         <layout class="QGridLayout" name="SplashLayout" rowstretch="0,0,0,0,0,0,0">
+          <item row="0" column="1" rowspan="7">
+           <layout class="QGridLayout" name="gridLayout_2" rowstretch="1">
+            <item row="0" column="1">
              <widget class="QLabel" name="imageLabel">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -369,10 +289,50 @@
               </property>
              </widget>
             </item>
+            <item row="0" column="2">
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="0" column="0">
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </item>
           <item row="2" column="0">
-           <widget class="QCheckBox" name="PreferredImageCB">
+           <widget class="QCheckBox" name="useFwImageCB">
+            <property name="text">
+             <string>Use firmware start screen</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="useAnotherImageCB">
+            <property name="text">
+             <string>Use another start screen</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="useProfileImageCB">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -380,86 +340,14 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Use image in settings</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="PatchFWCB">
-            <property name="text">
-             <string>Substitute image in firmware</string>
+             <string>Use profile start screen</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
-           <spacer name="verticalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>13</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="1" column="0">
-           <spacer name="verticalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>13</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-        <item row="1" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QLineEdit" name="ImageFileName">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="ImageLoadButton">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
+           <widget class="QCheckBox" name="useLibraryImageCB">
             <property name="text">
-             <string>Load Image</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="libraryButton">
-            <property name="toolTip">
-             <string>Open Splash Library</string>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>16</width>
-              <height>16</height>
-             </size>
+             <string>Use library start screen</string>
             </property>
            </widget>
           </item>
@@ -470,14 +358,24 @@
      </item>
     </layout>
    </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>FWFileName</tabstop>
   <tabstop>FlashLoadButton</tabstop>
-  <tabstop>ImageFileName</tabstop>
-  <tabstop>ImageLoadButton</tabstop>
-  <tabstop>libraryButton</tabstop>
   <tabstop>EEbackupCB</tabstop>
   <tabstop>EEpromCB</tabstop>
   <tabstop>cancelButton</tabstop>