Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove user id and country code setting

This commit is contained in:
Jonas Kvinge 2019-06-19 22:20:21 +02:00
parent 8ce8e320c3
commit f8b9bb4b0f
2 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings/tidalsettingspage.cpp
View File

@ -73,10 +73,6 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent)
ui_->oauth->hide(); ui_->oauth->hide();
ui_->label_client_id->hide(); ui_->label_client_id->hide();
ui_->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_->client_id->setText(s.value("client_id").toString());
ui_->api_token->setText(s.value("api_token").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()); ui_->username->setText(s.value("username").toString());
QByteArray password = s.value("password").toByteArray(); QByteArray password = s.value("password").toByteArray();
@ -129,8 +123,6 @@ void TidalSettingsPage::Save() {
s.setValue("oauth", ui_->oauth->isChecked()); s.setValue("oauth", ui_->oauth->isChecked());
s.setValue("client_id", ui_->client_id->text()); s.setValue("client_id", ui_->client_id->text());
s.setValue("api_token", ui_->api_token->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("username", ui_->username->text());
s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64())); s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64()));

56
src/settings/tidalsettingspage.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>715</width> <width>715</width>
<height>794</height> <height>836</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -40,31 +40,10 @@
<string>Authentication</string> <string>Authentication</string>
</property> </property>
<layout class="QFormLayout" name="layout_credential_group"> <layout class="QFormLayout" name="layout_credential_group">
<item row="5" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_username"> <widget class="QCheckBox" name="oauth">
<property name="text"> <property name="text">
<string>Username</string> <string>Use OAuth</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>
</property> </property>
</widget> </widget>
</item> </item>
@ -107,32 +86,33 @@
</property> </property>
</widget> </widget>
</item> </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"> <item row="3" column="0">
<widget class="QLabel" name="label_user_id"> <widget class="QLabel" name="label_username">
<property name="text"> <property name="text">
<string>User ID</string> <string>Username</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <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>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_country_code"> <widget class="QLabel" name="label_password">
<property name="text"> <property name="text">
<string>Country Code</string> <string>Password</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <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> </item>
</layout> </layout>
</widget> </widget>