From f8b9bb4b0f8b613f05acee60257f20af8f7740e2 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 19 Jun 2019 22:20:21 +0200
Subject: [PATCH] Remove user id and country code setting

---
 src/settings/tidalsettingspage.cpp |  8 -----
 src/settings/tidalsettingspage.ui  | 56 ++++++++++--------------------
 2 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp
index b9983b476..3d9bb21eb 100644
--- a/src/settings/tidalsettingspage.cpp
+++ b/src/settings/tidalsettingspage.cpp
@@ -73,10 +73,6 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent)
   ui_->oauth->hide();
   ui_->label_client_id->hide();
   ui_->client_id->hide();
-  ui_->label_user_id->hide();
-  ui_->user_id->hide();
-  ui_->label_country_code->hide();
-  ui_->country_code->hide();
 
 }
 
@@ -93,8 +89,6 @@ void TidalSettingsPage::Load() {
 
   ui_->client_id->setText(s.value("client_id").toString());
   ui_->api_token->setText(s.value("api_token").toString());
-  ui_->user_id->setText(s.value("user_id").toString());
-  ui_->country_code->setText(s.value("country_code").toString());
 
   ui_->username->setText(s.value("username").toString());
   QByteArray password = s.value("password").toByteArray();
@@ -129,8 +123,6 @@ void TidalSettingsPage::Save() {
   s.setValue("oauth", ui_->oauth->isChecked());
   s.setValue("client_id", ui_->client_id->text());
   s.setValue("api_token", ui_->api_token->text());
-  s.setValue("user_id", ui_->user_id->text());
-  s.setValue("country_code", ui_->country_code->text());
 
   s.setValue("username", ui_->username->text());
   s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64()));
diff --git a/src/settings/tidalsettingspage.ui b/src/settings/tidalsettingspage.ui
index b2d1733f7..e911a1878 100644
--- a/src/settings/tidalsettingspage.ui
+++ b/src/settings/tidalsettingspage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>715</width>
-    <height>794</height>
+    <height>836</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -40,31 +40,10 @@
       <string>Authentication</string>
      </property>
      <layout class="QFormLayout" name="layout_credential_group">
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_username">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="oauth">
         <property name="text">
-         <string>Username</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLineEdit" name="username"/>
-        </item>
-       </layout>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_password">
-        <property name="text">
-         <string>Password</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="QLineEdit" name="password">
-        <property name="echoMode">
-         <enum>QLineEdit::Password</enum>
+         <string>Use OAuth</string>
         </property>
        </widget>
       </item>
@@ -107,32 +86,33 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="oauth">
-        <property name="text">
-         <string>Use OAuth</string>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="0">
-       <widget class="QLabel" name="label_user_id">
+       <widget class="QLabel" name="label_username">
         <property name="text">
-         <string>User ID</string>
+         <string>Username</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="QLineEdit" name="user_id"/>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLineEdit" name="username"/>
+        </item>
+       </layout>
       </item>
       <item row="4" column="0">
-       <widget class="QLabel" name="label_country_code">
+       <widget class="QLabel" name="label_password">
         <property name="text">
-         <string>Country Code</string>
+         <string>Password</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="QLineEdit" name="country_code"/>
+       <widget class="QLineEdit" name="password">
+        <property name="echoMode">
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>