From c7b7cd2ba90337d4fa4c0b42e9edf46d496f4792 Mon Sep 17 00:00:00 2001
From: Kjell Kernen <kjell.kernen@gmail.com>
Date: Thu, 6 Feb 2014 18:54:45 +0100
Subject: [PATCH] Splash Editor modified

---
 companion/src/customizesplashdialog.cpp |  82 ++--
 companion/src/customizesplashdialog.h   |  15 +-
 companion/src/customizesplashdialog.ui  | 619 ++++++++++++++----------
 companion/src/fwpreferencesdialog.ui    |  20 +-
 companion/src/images/customize.png      | Bin 381 -> 477 bytes
 5 files changed, 432 insertions(+), 304 deletions(-)

diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp
index 30762142f..bef28a0dc 100644
--- a/companion/src/customizesplashdialog.cpp
+++ b/companion/src/customizesplashdialog.cpp
@@ -12,7 +12,7 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
   ui(new Ui::customizeSplashDialog)
 {
   ui->setupUi(this);
-  ui->libraryButton->setIcon(CompanionIcon("library.png"));
+  ui->leftLibraryButton->setIcon(CompanionIcon("library.png"));
   ui->HowToLabel->clear();
   ui->HowToLabel->append("<center>" + tr("Select an original firmware file") + "</center>");
 }
@@ -22,40 +22,40 @@ customizeSplashDialog::~customizeSplashDialog()
   delete ui;
 }
 
-void customizeSplashDialog::on_FlashLoadButton_clicked()
+void customizeSplashDialog::on_leftLoadButton_clicked()
 {
   QSettings settings;
   QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER);
   if (!fileName.isEmpty()) {
-    ui->ImageLoadButton->setDisabled(true);
-    ui->libraryButton->setDisabled(true);
-    ui->SaveFlashButton->setDisabled(true);
-    ui->SaveImageButton->setDisabled(true);
-    ui->ImageFileName->clear();
-    ui->imageLabel->clear();
+    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->FWFileName->clear();
+      ui->leftFileName->clear();
       ui->HowToLabel->append("<center>" + tr("Select an original firmware file") + "</center>");
       return;
     }
     if (fileName.isEmpty()) {
-      ui->FWFileName->clear();
+      ui->leftFileName->clear();
       ui->HowToLabel->append("<center>" + tr("Select an original firmware file") + "</center>");
       return;
     }
   
-    ui->FWFileName->setText(fileName);
+    ui->leftFileName->setText(fileName);
     FlashInterface flash(fileName);
     if (flash.hasSplash()) {
       ui->HowToLabel->append("<center>" + tr("Select an image to customize your splash <br />or save actual firmware splash") + "</center>");
-      ui->ImageLoadButton->setEnabled(true);
-      ui->libraryButton->setEnabled(true);
-      ui->SaveImageButton->setEnabled(true);
-      ui->imageLabel->setPixmap(QPixmap::fromImage(flash.getSplash()));
-      ui->imageLabel->setFixedSize(flash.getSplashWidth()*2,flash.getSplashHeight()*2);
+      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 {
       QMessageBox::information(this, tr("Error"), tr("Could not find bitmap to replace in file"));
       return;
@@ -64,7 +64,7 @@ void customizeSplashDialog::on_FlashLoadButton_clicked()
   }
 }
 
-void customizeSplashDialog::on_ImageLoadButton_clicked() {
+void customizeSplashDialog::on_rightLoadButton_clicked() {
   QString supportedImageFormats;
   for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
     supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex];
@@ -82,8 +82,8 @@ void customizeSplashDialog::on_ImageLoadButton_clicked() {
       return;
     }
     ui->HowToLabel->clear();
-    ui->ImageFileName->setText(fileName);    
-    if (ui->imageLabel->width()==424) {
+    ui->rightFileName->setText(fileName);    
+    if (ui->leftImageLabel->width()==424) {
       image=image.convertToFormat(QImage::Format_RGB32);
       QRgb col;
       int gray;
@@ -98,16 +98,19 @@ void customizeSplashDialog::on_ImageLoadButton_clicked() {
               image.setPixel(i, j, qRgb(gray, gray, gray));
           }
       }      
-      ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width()/2, ui->imageLabel->height()/2)));
+      ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2)));
     } else {
-      ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width()/2, ui->imageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
+      ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
     }
-    ui->SaveFlashButton->setEnabled(true);
+    ui->leftSaveButton->setEnabled(true);
     ui->HowToLabel->append("<center>" + tr("Save your custimized firmware") + "</center>");
   }
 }
 
-void customizeSplashDialog::on_libraryButton_clicked() {
+void customizeSplashDialog::on_rightLibraryButton_clicked() {
+}
+
+void customizeSplashDialog::on_leftLibraryButton_clicked() {
   QString fileName;
   
   splashLibrary *ld = new splashLibrary(this,&fileName);
@@ -119,8 +122,8 @@ void customizeSplashDialog::on_libraryButton_clicked() {
       return;
     }
     ui->HowToLabel->clear();
-    ui->ImageFileName->setText(fileName);
-    if (ui->imageLabel->width()==424) {
+    ui->rightFileName->setText(fileName);
+    if (ui->leftImageLabel->width()==424) {
       image=image.convertToFormat(QImage::Format_RGB32);
       QRgb col;
       int gray;
@@ -135,16 +138,16 @@ void customizeSplashDialog::on_libraryButton_clicked() {
               image.setPixel(i, j, qRgb(gray, gray, gray));
           }
       }      
-      ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width()/2, ui->imageLabel->height()/2)));
+      ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2)));
     } else {
-      ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width()/2, ui->imageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
+      ui->leftImageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->leftImageLabel->width()/2, ui->leftImageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
     }
-    ui->SaveFlashButton->setEnabled(true);
+    ui->leftSaveButton->setEnabled(true);
     ui->HowToLabel->append("<center>" + tr("Save your custimized firmware") + "</center>");
   }
 }
 
-void customizeSplashDialog::on_SaveFlashButton_clicked()
+void customizeSplashDialog::on_leftSaveButton_clicked()
 {
   QString fileName;
   QSettings settings;
@@ -153,13 +156,13 @@ void customizeSplashDialog::on_SaveFlashButton_clicked()
   if (fileName.isEmpty()) {
     return;
   }
-  FlashInterface flash(ui->FWFileName->text());
+  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->imageLabel->pixmap()->toImage().scaled(flash.getSplashWidth(), flash.getSplashHeight());
+  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);");
@@ -170,14 +173,21 @@ void customizeSplashDialog::on_SaveFlashButton_clicked()
   }
 }
 
-void customizeSplashDialog::on_InvertColorButton_clicked()
+void customizeSplashDialog::on_rightInvertButton_clicked()
 {
-  QImage image = ui->imageLabel->pixmap()->toImage();
+  QImage image = ui->rightImageLabel->pixmap()->toImage();
   image.invertPixels();
-  ui->imageLabel->setPixmap(QPixmap::fromImage(image));
+  ui->rightImageLabel->setPixmap(QPixmap::fromImage(image));
 }
 
-void customizeSplashDialog::on_SaveImageButton_clicked()
+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;
@@ -185,7 +195,7 @@ void customizeSplashDialog::on_SaveImageButton_clicked()
   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->imageLabel->pixmap()->toImage().scaled(ui->imageLabel->width()/2, ui->imageLabel->height()/2).convertToFormat(QImage::Format_Indexed8);
+    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 f5a7acd6d..1abdfa62a 100644
--- a/companion/src/customizesplashdialog.h
+++ b/companion/src/customizesplashdialog.h
@@ -19,12 +19,15 @@ public:
   ~customizeSplashDialog();
 
 private slots:
-  void on_FlashLoadButton_clicked();
-  void on_ImageLoadButton_clicked();
-  void on_libraryButton_clicked();
-  void on_SaveFlashButton_clicked();
-  void on_InvertColorButton_clicked();
-  void on_SaveImageButton_clicked();
+  void on_leftLoadButton_clicked();
+  void on_leftLibraryButton_clicked();
+  void on_leftSaveButton_clicked();
+  void on_leftInvertButton_clicked();
+
+  void on_rightLoadButton_clicked();
+  void on_rightLibraryButton_clicked();
+  void on_rightSaveButton_clicked();
+  void on_rightInvertButton_clicked();
 
 private:
   Ui::customizeSplashDialog *ui;
diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui
index 56a043740..75c2b03d1 100644
--- a/companion/src/customizesplashdialog.ui
+++ b/companion/src/customizesplashdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>739</width>
-    <height>238</height>
+    <width>892</width>
+    <height>299</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -17,18 +17,266 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Customize Splash</string>
+   <string>Transmitter Splash Screen Editor</string>
   </property>
   <property name="windowIcon">
    <iconset resource="companion.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
+  <widget class="QLineEdit" name="rightFileName">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>460</x>
+     <y>0</y>
+     <width>424</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>424</width>
+     <height>0</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>424</width>
+     <height>16777215</height>
+    </size>
+   </property>
+   <property name="readOnly">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="leftLoadButton">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>210</y>
+     <width>81</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Load</string>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="leftLibraryButton">
+   <property name="geometry">
+    <rect>
+     <x>90</x>
+     <y>210</y>
+     <width>26</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <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>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="rightLoadButton">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>460</x>
+     <y>210</y>
+     <width>90</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Load</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="leftFileName">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>0</y>
+     <width>424</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>424</width>
+     <height>0</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>424</width>
+     <height>16777215</height>
+    </size>
+   </property>
+   <property name="readOnly">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="leftSaveButton">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>350</x>
+     <y>210</y>
+     <width>81</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Save</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="rightImageLabel">
+   <property name="geometry">
+    <rect>
+     <x>460</x>
+     <y>30</y>
+     <width>424</width>
+     <height>128</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>424</width>
+     <height>128</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>424</width>
+     <height>128</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="pixmap">
+    <pixmap resource="companion.qrc">:/images/customize.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="leftImageLabel">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>30</y>
+     <width>424</width>
+     <height>128</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>424</width>
+     <height>128</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>424</width>
+     <height>128</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="pixmap">
+    <pixmap resource="companion.qrc">:/images/customize.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="rightInvertButton">
+   <property name="geometry">
+    <rect>
+     <x>460</x>
+     <y>160</y>
+     <width>85</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Invert</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="rightSaveButton">
+   <property name="geometry">
+    <rect>
+     <x>790</x>
+     <y>210</y>
+     <width>90</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Save</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="leftInvertButton">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>160</y>
+     <width>81</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Invert</string>
+   </property>
+  </widget>
   <widget class="QTextEdit" name="HowToLabel">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>190</y>
-     <width>541</width>
+     <x>10</x>
+     <y>250</y>
+     <width>871</width>
      <height>40</height>
     </rect>
    </property>
@@ -45,7 +293,7 @@
     </size>
    </property>
    <property name="styleSheet">
-    <string notr="true">background:rgb(255, 255, 0);</string>
+    <string notr="true">background:rgb(235, 235, 235);</string>
    </property>
    <property name="verticalScrollBarPolicy">
     <enum>Qt::ScrollBarAlwaysOff</enum>
@@ -67,82 +315,108 @@ p, li { white-space: pre-wrap; }
     <bool>true</bool>
    </property>
   </widget>
-  <widget class="QPushButton" name="pushButton">
+  <widget class="QToolButton" name="copyLeftToRight">
    <property name="geometry">
     <rect>
-     <x>350</x>
-     <y>30</y>
-     <width>31</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Courier 10 Pitch</family>
-     <pointsize>10</pointsize>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string notr="true">=&gt;</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButton_2">
-   <property name="geometry">
-    <rect>
-     <x>350</x>
-     <y>60</y>
-     <width>31</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Courier 10 Pitch</family>
-     <pointsize>10</pointsize>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string notr="true">&lt;=</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="ImageFileName">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>390</x>
-     <y>130</y>
-     <width>251</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="readOnly">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="FlashLoadButton">
-   <property name="geometry">
-    <rect>
-     <x>90</x>
-     <y>160</y>
-     <width>108</width>
-     <height>27</height>
+     <x>437</x>
+     <y>120</y>
+     <width>20</width>
+     <height>23</height>
     </rect>
    </property>
    <property name="text">
-    <string>Load Firmware</string>
+    <string>...</string>
+   </property>
+   <property name="arrowType">
+    <enum>Qt::RightArrow</enum>
    </property>
   </widget>
-  <widget class="QToolButton" name="libraryButton">
+  <widget class="QToolButton" name="copyRightToLeft">
    <property name="geometry">
     <rect>
-     <x>200</x>
-     <y>160</y>
+     <x>437</x>
+     <y>40</y>
+     <width>20</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>...</string>
+   </property>
+   <property name="arrowType">
+    <enum>Qt::LeftArrow</enum>
+   </property>
+  </widget>
+  <widget class="Line" name="line">
+   <property name="geometry">
+    <rect>
+     <x>442</x>
+     <y>5</y>
+     <width>10</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Vertical</enum>
+   </property>
+  </widget>
+  <widget class="Line" name="line_2">
+   <property name="geometry">
+    <rect>
+     <x>442</x>
+     <y>70</y>
+     <width>10</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Vertical</enum>
+   </property>
+  </widget>
+  <widget class="Line" name="line_3">
+   <property name="geometry">
+    <rect>
+     <x>442</x>
+     <y>150</y>
+     <width>10</width>
+     <height>91</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Vertical</enum>
+   </property>
+  </widget>
+  <widget class="Line" name="line_4">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>190</y>
+     <width>421</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+  </widget>
+  <widget class="Line" name="line_5">
+   <property name="geometry">
+    <rect>
+     <x>460</x>
+     <y>190</y>
+     <width>421</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="rightLibraryButton">
+   <property name="geometry">
+    <rect>
+     <x>550</x>
+     <y>210</y>
      <width>26</width>
      <height>23</height>
     </rect>
@@ -160,185 +434,26 @@ p, li { white-space: pre-wrap; }
     </size>
    </property>
   </widget>
-  <widget class="QPushButton" name="ImageLoadButton">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>390</x>
-     <y>160</y>
-     <width>90</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Load Image</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="FWFileName">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>90</x>
-     <y>130</y>
-     <width>251</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="readOnly">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="SaveFlashButton">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>230</x>
-     <y>160</y>
-     <width>108</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Save Firmware</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="imageLabel_2">
-   <property name="geometry">
-    <rect>
-     <x>390</x>
-     <y>0</y>
-     <width>256</width>
-     <height>128</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>256</width>
-     <height>128</height>
-    </size>
-   </property>
-   <property name="maximumSize">
-    <size>
-     <width>424</width>
-     <height>128</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="pixmap">
-    <pixmap resource="companion.qrc">:/images/customize.png</pixmap>
-   </property>
-   <property name="scaledContents">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="imageLabel">
-   <property name="geometry">
-    <rect>
-     <x>91</x>
-     <y>1</y>
-     <width>256</width>
-     <height>128</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>256</width>
-     <height>128</height>
-    </size>
-   </property>
-   <property name="maximumSize">
-    <size>
-     <width>424</width>
-     <height>128</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="pixmap">
-    <pixmap resource="companion.qrc">:/images/customize.png</pixmap>
-   </property>
-   <property name="scaledContents">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="InvertColorButton_2">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>90</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Invert</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="SaveImageButton">
-   <property name="geometry">
-    <rect>
-     <x>550</x>
-     <y>160</y>
-     <width>90</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Save Image</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="InvertColorButton">
-   <property name="geometry">
-    <rect>
-     <x>650</x>
-     <y>0</y>
-     <width>90</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Invert</string>
-   </property>
-  </widget>
+  <zorder>rightFileName</zorder>
+  <zorder>leftLoadButton</zorder>
+  <zorder>leftLibraryButton</zorder>
+  <zorder>rightLoadButton</zorder>
+  <zorder>leftFileName</zorder>
+  <zorder>leftSaveButton</zorder>
+  <zorder>rightImageLabel</zorder>
+  <zorder>rightInvertButton</zorder>
+  <zorder>rightSaveButton</zorder>
+  <zorder>leftInvertButton</zorder>
+  <zorder>leftImageLabel</zorder>
   <zorder>HowToLabel</zorder>
-  <zorder>layoutWidget</zorder>
-  <zorder>layoutWidget_2</zorder>
-  <zorder>imageLabel</zorder>
-  <zorder>pushButton</zorder>
-  <zorder>pushButton_2</zorder>
+  <zorder>copyLeftToRight</zorder>
+  <zorder>copyRightToLeft</zorder>
+  <zorder>line</zorder>
+  <zorder>line_2</zorder>
+  <zorder>line_3</zorder>
+  <zorder>line_4</zorder>
+  <zorder>line_5</zorder>
+  <zorder>rightLibraryButton</zorder>
  </widget>
  <resources>
   <include location="companion.qrc"/>
diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui
index 9cb406bc7..97b89b481 100644
--- a/companion/src/fwpreferencesdialog.ui
+++ b/companion/src/fwpreferencesdialog.ui
@@ -301,7 +301,7 @@ Mode 4:
       </sizepolicy>
      </property>
      <property name="text">
-      <string> Firmware Type</string>
+      <string>Firmware Type</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -1017,7 +1017,7 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="33" column="3" colspan="3">
+   <item row="4" column="3">
     <widget class="QLabel" name="FwInfo">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -1030,14 +1030,7 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="33" column="6">
-    <widget class="QPushButton" name="fw_dnld">
-     <property name="text">
-      <string>Download FW</string>
-     </property>
-    </widget>
-   </item>
-   <item row="32" column="6">
+   <item row="31" column="6">
     <widget class="QPushButton" name="checkFWUpdates">
      <property name="minimumSize">
       <size>
@@ -1050,6 +1043,13 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
+   <item row="32" column="6">
+    <widget class="QPushButton" name="fw_dnld">
+     <property name="text">
+      <string>Download FW</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
diff --git a/companion/src/images/customize.png b/companion/src/images/customize.png
index 078d0af75638cd472e47a5ff15d3e72407d5f23b..7bec20a70bc0a8bb593f0d031249d191b578822e 100644
GIT binary patch
literal 477
zcmeAS@N?(olHy`uVBq!ia0y~yU|a!YH*hck$%_$L6+ntD$=lt9;Xep2*t>i(P=vF<
zBeIx*f$s<iGfvg!lLiX1mw5WRvfpE36E=|lp87WjXjGP`i(^Q|t+!VKIT;iLTpUgN
zShxJ|PiHur%=<7+N{4&>It$g+mQ{^wlJ0N0J^MG~LuLUx20}y&zrzm(LIe@!2-p!}
s4p0dp_kgV;<Q|w+)H4j(hYkO2Ti>vy7(2H~0V9IJ)78&qol`;+0F?=lGynhq

literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq004jh002M%0{{R3=osxh00006P)t-s|Ns90
z0033O(|!N|010qNS#tmY4#WTe4#WYKD-Ig~000McNliru-T?*-EjAiqmw^BP0SZY(
zK~y-)?b0zz!$1@V@QVjmhpSny7(741I~-iZY<`Z2plintVw8ZHG;1J(Lq9^n`Qkxc
z@+|^&tz^l8RNo~PyNZKL|KpGM{=?%DvdwSv8Qzt~f84vWt2n$x5UMN<WCxLkNNERP
z&TH^HfNz+d44;2M&DBgkIEed|@Lm;zYT+i<rRjU&^`JU{YLt=cY@@UqrH2*UfXOfo
zxq}#@|2xoWXcD_3t$ccItU-8TGzoz2j`Ice9B9T22TCGwNxd3j*@M;&rU*BTUj*Q_
zTD&!Oh9D7IAlF*XsaGHjm|qJZffj3^OdN3_yerKRk`8wGI7dhkJ{asXpi7w_H#XgV
b^563Xm<VXXJf?~K00000NkvXXu0mjfT^W~{