Fix the Create Account link in the podcasts settings dialog, set a proper icon, and handle errors logging in to gpodder.net
This commit is contained in:
parent
62ea8bd4eb
commit
ec392ea155
@ -37,8 +37,8 @@ PodcastSettingsPage::PodcastSettingsPage(SettingsDialog* dialog)
|
|||||||
connect(ui_->login_state, SIGNAL(LogoutClicked()), SLOT(LogoutClicked()));
|
connect(ui_->login_state, SIGNAL(LogoutClicked()), SLOT(LogoutClicked()));
|
||||||
|
|
||||||
ui_->login_state->AddCredentialField(ui_->username);
|
ui_->login_state->AddCredentialField(ui_->username);
|
||||||
ui_->login_state->AddCredentialField(ui_->password);
|
|
||||||
ui_->login_state->AddCredentialField(ui_->device_name);
|
ui_->login_state->AddCredentialField(ui_->device_name);
|
||||||
|
ui_->login_state->AddCredentialField(ui_->password);
|
||||||
ui_->login_state->AddCredentialGroup(ui_->login_group);
|
ui_->login_state->AddCredentialGroup(ui_->login_group);
|
||||||
|
|
||||||
ui_->check_interval->setItemData(0, 0); // manually
|
ui_->check_interval->setItemData(0, 0); // manually
|
||||||
@ -98,6 +98,12 @@ void PodcastSettingsPage::LoginFinished(QNetworkReply* reply) {
|
|||||||
ui_->login_state->SetLoggedIn(success ? LoginStateWidget::LoggedIn
|
ui_->login_state->SetLoggedIn(success ? LoginStateWidget::LoggedIn
|
||||||
: LoginStateWidget::LoggedOut,
|
: LoginStateWidget::LoggedOut,
|
||||||
ui_->username->text());
|
ui_->username->text());
|
||||||
|
|
||||||
|
ui_->login_state->SetAccountTypeVisible(!success);
|
||||||
|
if (!success) {
|
||||||
|
ui_->login_state->SetAccountTypeText(tr("Login failed") + ": " +
|
||||||
|
reply->errorString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PodcastSettingsPage::LogoutClicked() {
|
void PodcastSettingsPage::LogoutClicked() {
|
||||||
|
@ -13,6 +13,10 @@
|
|||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Podcasts</string>
|
<string>Podcasts</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="windowIcon">
|
||||||
|
<iconset resource="../../data/data.qrc">
|
||||||
|
<normaloff>:/providers/podcast32.png</normaloff>:/providers/podcast32.png</iconset>
|
||||||
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBox">
|
<widget class="QGroupBox" name="groupBox">
|
||||||
@ -97,13 +101,13 @@
|
|||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QSpinBox" name="delete_after">
|
<widget class="QSpinBox" name="delete_after">
|
||||||
<property name="specialValueText">
|
<property name="specialValueText">
|
||||||
<string>manually</string>
|
<string>Manually</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string> days</string>
|
<string> days</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="prefix">
|
<property name="prefix">
|
||||||
<string>after </string>
|
<string>After </string>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>30</number>
|
<number>30</number>
|
||||||
@ -132,11 +136,14 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_3">
|
<widget class="QLabel" name="label_3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Clementine can synchronize your subscription list with your other computers and podcast applications. <a href="https://gpodder.net/register/">Create an account</a></string>
|
<string>Clementine can synchronize your subscription list with your other computers and podcast applications. <a href="https://gpodder.net/register/">Create an account</a>.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -207,7 +214,7 @@
|
|||||||
<property name="sizeHint" stdset="0">
|
<property name="sizeHint" stdset="0">
|
||||||
<size>
|
<size>
|
||||||
<width>20</width>
|
<width>20</width>
|
||||||
<height>217</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
@ -232,6 +239,8 @@
|
|||||||
<tabstop>device_name</tabstop>
|
<tabstop>device_name</tabstop>
|
||||||
<tabstop>login</tabstop>
|
<tabstop>login</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
<resources>
|
||||||
|
<include location="../../data/data.qrc"/>
|
||||||
|
</resources>
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user