From 22217e8e222afa436daa54d48ec370a2bf8d7fc1 Mon Sep 17 00:00:00 2001
From: Andre Bernet <kilrah@andrebernet.ch>
Date: Mon, 20 Mar 2017 10:24:43 +0100
Subject: [PATCH] [companion] Replace voice download by SD download, new URL
 for 2.2 (sd-22.open-tx.org, needs to be created)

---
 companion/src/fwpreferencesdialog.cpp |  12 +--
 companion/src/fwpreferencesdialog.h   |   2 +-
 companion/src/fwpreferencesdialog.ui  | 145 +++++++++++---------------
 3 files changed, 63 insertions(+), 96 deletions(-)

diff --git a/companion/src/fwpreferencesdialog.cpp b/companion/src/fwpreferencesdialog.cpp
index 5d7a67d15..651ef06c5 100644
--- a/companion/src/fwpreferencesdialog.cpp
+++ b/companion/src/fwpreferencesdialog.cpp
@@ -34,12 +34,6 @@ FirmwarePreferencesDialog::FirmwarePreferencesDialog(QWidget *parent) :
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("fwpreferences.png"));
   initSettings();
-
-  foreach(const char *lang, getCurrentFirmware()->getFirmwareBase()->ttslanguages) {
-    ui->voiceCombo->addItem(lang);
-    if (current_firmware_variant->getId().contains(QString("-tts%1").arg(lang)))
-      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
-  }
 }
 
 FirmwarePreferencesDialog::~FirmwarePreferencesDialog()
@@ -70,13 +64,13 @@ void FirmwarePreferencesDialog::on_fw_dnld_clicked()
   initSettings();
 }
 
-void FirmwarePreferencesDialog::on_voice_dnld_clicked()
+void FirmwarePreferencesDialog::on_sd_dnld_clicked()
 {
-  QString url = "http://voices-21.open-tx.org/";
+  QString url = "http://sd-22.open-tx.org/";
   QString fwType = g.profile[g.id()].fwType();
   QStringList list = fwType.split("-");
   QString firmware = QString("%1-%2").arg(list[0]).arg(list[1]);
-  url.append(QString("%1/%2/").arg(firmware).arg(ui->voiceCombo->currentText().toLower()));
+  url.append(QString("%1/").arg(firmware));
   QDesktopServices::openUrl(url);
 }
 
diff --git a/companion/src/fwpreferencesdialog.h b/companion/src/fwpreferencesdialog.h
index 70fcd439b..16ab5823f 100644
--- a/companion/src/fwpreferencesdialog.h
+++ b/companion/src/fwpreferencesdialog.h
@@ -45,7 +45,7 @@ class FirmwarePreferencesDialog : public QDialog
 
   private slots:
     void on_fw_dnld_clicked();
-    void on_voice_dnld_clicked();
+    void on_sd_dnld_clicked();
     void on_checkFWUpdates_clicked();
 };
 
diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui
index 0f21b6592..b8b7935f2 100644
--- a/companion/src/fwpreferencesdialog.ui
+++ b/companion/src/fwpreferencesdialog.ui
@@ -26,13 +26,22 @@
    <string>Downloads</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
    <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <property name="margin">
-    <number>6</number>
-   </property>
-   <item row="24" column="5">
+   <item row="23" column="3">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -42,7 +51,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="5">
+   <item row="3" column="3">
     <widget class="QPushButton" name="checkFWUpdates">
      <property name="minimumSize">
       <size>
@@ -55,75 +64,6 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="voiceLabel">
-     <property name="font">
-      <font>
-       <family>Sans Serif</family>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Voice</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="2">
-    <widget class="QComboBox" name="voiceCombo">
-     <property name="maximumSize">
-      <size>
-       <width>50</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="toolTip">
-      <string>Set voice language.
-May be different from firmware language</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="5">
-    <widget class="QPushButton" name="voice_dnld">
-     <property name="text">
-      <string>Download Voice</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="5">
-    <widget class="QPushButton" name="fw_dnld">
-     <property name="text">
-      <string>Download FW</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <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>
-   <item row="6" column="0" colspan="6">
-    <widget class="Line" name="voiceLine">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="23" column="0" colspan="6">
-    <widget class="Line" name="line_6">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label_6">
      <property name="sizePolicy">
@@ -147,20 +87,28 @@ May be different from firmware language</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" colspan="4">
-    <widget class="QLabel" name="fwTypeLbl">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="5" column="3">
+    <widget class="QPushButton" name="fw_dnld">
      <property name="text">
-      <string notr="true">FwType</string>
+      <string>Download FW</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" colspan="2">
+   <item row="22" column="0" colspan="4">
+    <widget class="Line" name="line_6">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3">
+    <widget class="QPushButton" name="sd_dnld">
+     <property name="text">
+      <string>Download SD contents</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2">
     <widget class="QLabel" name="lastRevisionLbl">
      <property name="text">
       <string notr="true">-</string>
@@ -174,13 +122,38 @@ May be different from firmware language</string>
      </property>
     </widget>
    </item>
+   <item row="0" column="1" colspan="3">
+    <widget class="QLabel" name="fwTypeLbl">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string notr="true">FwType</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <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>
  </widget>
  <tabstops>
   <tabstop>checkFWUpdates</tabstop>
   <tabstop>fw_dnld</tabstop>
-  <tabstop>voiceCombo</tabstop>
-  <tabstop>voice_dnld</tabstop>
+  <tabstop>sd_dnld</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>