dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move checkboxes into preferences groupbox in Subsonic settings

Browse Source
This commit is contained in:
Jonas Kvinge
2019-06-22 08:38:50 +02:00
parent 10dc725942
commit f12b82b5ce
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/settings/subsonicsettingspage.cpp
View File

@@ -61,7 +61,7 @@ void SubsonicSettingsPage::Load() {
s.beginGroup(kSettingsGroup); s.beginGroup(kSettingsGroup);
ui_->enable->setChecked(s.value("enabled", false).toBool()); ui_->enable->setChecked(s.value("enabled", false).toBool());
ui_->url->setText(s.value("url").toString()); ui_->server_url->setText(s.value("url").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();
if (password.isEmpty()) ui_->password->clear(); if (password.isEmpty()) ui_->password->clear();
@@ -77,7 +77,7 @@ void SubsonicSettingsPage::Save() {
QSettings s; QSettings s;
s.beginGroup(kSettingsGroup); s.beginGroup(kSettingsGroup);
s.setValue("enabled", ui_->enable->isChecked()); s.setValue("enabled", ui_->enable->isChecked());
s.setValue("url", QUrl(ui_->url->text())); s.setValue("url", QUrl(ui_->server_url->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()));
s.setValue("verifycertificate", ui_->checkbox_verify_certificate->isChecked()); s.setValue("verifycertificate", ui_->checkbox_verify_certificate->isChecked());
@@ -90,18 +90,18 @@ void SubsonicSettingsPage::Save() {
void SubsonicSettingsPage::TestClicked() { void SubsonicSettingsPage::TestClicked() {
if (ui_->url->text().isEmpty() || ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) { if (ui_->server_url->text().isEmpty() || ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) {
QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing url, username or password.")); QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing server url, username or password."));
return; return;
} }
QUrl url(ui_->url->text()); QUrl server_url(ui_->server_url->text());
if (!url.isValid()) { if (!server_url.isValid() || server_url.scheme().isEmpty() || server_url.host().isEmpty()) {
QMessageBox::critical(this, tr("Configuration incorrect"), tr("URL is invalid.")); QMessageBox::critical(this, tr("Configuration incorrect"), tr("Server URL is invalid."));
return; return;
} }
emit Test(url, ui_->username->text(), ui_->password->text()); emit Test(server_url, ui_->username->text(), ui_->password->text());
ui_->button_test->setEnabled(false); ui_->button_test->setEnabled(false);
} }

33
src/settings/subsonicsettingspage.ui
View File

@@ -37,7 +37,7 @@
<item> <item>
<layout class="QHBoxLayout" name="layout_server"> <layout class="QHBoxLayout" name="layout_server">
<item> <item>
<widget class="QLineEdit" name="url"/> <widget class="QLineEdit" name="server_url"/>
</item> </item>
<item> <item>
<spacer name="spacer_server"> <spacer name="spacer_server">
@@ -119,21 +119,22 @@
<property name="title"> <property name="title">
<string>Preferences</string> <string>Preferences</string>
</property> </property>
<layout class="QFormLayout" name="layout_preferences"/> <layout class="QFormLayout" name="layout_preferences">
</widget> <item row="0" column="0">
</item> <widget class="QCheckBox" name="checkbox_verify_certificate">
<item> <property name="text">
<widget class="QCheckBox" name="checkbox_verify_certificate"> <string>Verify server certificate</string>
<property name="text"> </property>
<string>Verify server certificate</string> </widget>
</property> </item>
</widget> <item row="1" column="0">
</item> <widget class="QCheckBox" name="checkbox_cache_album_covers">
<item> <property name="text">
<widget class="QCheckBox" name="checkbox_cache_album_covers"> <string>Cache album covers</string>
<property name="text"> </property>
<string>Cache album covers</string> </widget>
</property> </item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>