diff --git a/resources/google-groupware/googlesettingsdialog.cpp b/resources/google-groupware/googlesettingsdialog.cpp
index d4f022cefe666cb01d35bfd97ccd45e21f2b5f2d..2edc3654865a3a36f7b61cb5a137b6fcec9e2a17 100644
--- a/resources/google-groupware/googlesettingsdialog.cpp
+++ b/resources/google-groupware/googlesettingsdialog.cpp
@@ -114,9 +114,11 @@ void GoogleSettingsDialog::accountChanged()
{
if (!m_account) {
m_ui->accountLabel->setText(i18n("not configured"));
- m_ui->calendarsBox->setDisabled(true);
+ m_ui->calendarsList->setDisabled(true);
+ m_ui->reloadCalendarsBtn->setDisabled(true);
m_ui->calendarsList->clear();
- m_ui->taskListsBox->setDisabled(true);
+ m_ui->taskListsList->setDisabled(true);
+ m_ui->reloadTaskListsBtn->setDisabled(true);
m_ui->taskListsList->clear();
return;
}
@@ -203,7 +205,8 @@ void GoogleSettingsDialog::slotSaveSettings()
void GoogleSettingsDialog::slotReloadCalendars()
{
- m_ui->calendarsBox->setDisabled(true);
+ m_ui->calendarsList->setDisabled(true);
+ m_ui->reloadCalendarsBtn->setDisabled(true);
m_ui->calendarsList->clear();
if (!m_account) {
@@ -213,7 +216,8 @@ void GoogleSettingsDialog::slotReloadCalendars()
auto fetchJob = new CalendarFetchJob(m_account, this);
connect(fetchJob, &CalendarFetchJob::finished, this, [this](KGAPI2::Job *job) {
if (!handleError(job) || !m_account) {
- m_ui->calendarsBox->setEnabled(false);
+ m_ui->calendarsList->setEnabled(false);
+ m_ui->reloadCalendarsBtn->setEnabled(false);
return;
}
@@ -234,7 +238,8 @@ void GoogleSettingsDialog::slotReloadCalendars()
m_ui->calendarsList->addItem(item);
}
- m_ui->calendarsBox->setEnabled(true);
+ m_ui->calendarsList->setEnabled(true);
+ m_ui->reloadCalendarsBtn->setEnabled(true);
});
}
@@ -244,13 +249,15 @@ void GoogleSettingsDialog::slotReloadTaskLists()
return;
}
- m_ui->taskListsBox->setDisabled(true);
+ m_ui->taskListsList->setDisabled(true);
+ m_ui->reloadTaskListsBtn->setDisabled(true);
m_ui->taskListsList->clear();
auto job = new TaskListFetchJob(m_account, this);
connect(job, &TaskListFetchJob::finished, this, [this](KGAPI2::Job *job) {
if (!handleError(job) || !m_account) {
- m_ui->taskListsBox->setDisabled(true);
+ m_ui->taskListsList->setDisabled(true);
+ m_ui->reloadTaskListsBtn->setDisabled(true);
return;
}
@@ -271,6 +278,7 @@ void GoogleSettingsDialog::slotReloadTaskLists()
m_ui->taskListsList->addItem(item);
}
- m_ui->taskListsBox->setEnabled(true);
+ m_ui->taskListsList->setEnabled(true);
+ m_ui->reloadTaskListsBtn->setEnabled(true);
});
}
diff --git a/resources/google-groupware/googlesettingsdialog.ui b/resources/google-groupware/googlesettingsdialog.ui
index c3bb1a3802dd9951f992adc842ac31eabcf7ea3f..9ff9bc93b434368a82f2beab920b631ec3a61207 100644
--- a/resources/google-groupware/googlesettingsdialog.ui
+++ b/resources/google-groupware/googlesettingsdialog.ui
@@ -6,145 +6,175 @@
0
0
- 584
+ 704
680
-
- -
-
+
+
+ 500
+ 300
+
+
+
+
-
+
+
+ Account:
+
+
+
+ -
+
+
+ <b>not configured</b>
+
+
+
+ -
+
+
+
+
+
+
+
+ Configure...
+
+
+
+ -
+
+
+ Enable interval refresh
+
+
+
+ -
+
+
+ Refresh interval:
+
+
+ refreshSpinBox
+
+
+
+ -
+
+
+ 10
+
+
+ 720
+
+
+ 30
+
+
+
+ -
+
+
+ Fetch only events since:
+
+
+ eventsLimitCombo
+
+
+
+ -
+
+
+ -
+
+
+ Enabled Calendars:
+
+
+ Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ calendarsList
+
+
+
+ -
+
+
+ -
+
-
-
-
- Account:
+
+
+ Qt::Horizontal
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ 40
+ 20
+
-
+
-
-
+
- <b>not configured</b>
+ Reload
-
-
- -
-
-
- Configure...
+
+
+ ..
+
- -
-
-
- Refresh
-
-
- false
-
-
-
-
-
-
- Refresh interval:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- refreshSpinBox
-
-
-
- -
-
-
- 10
-
-
- 720
-
-
- 30
-
-
-
- -
-
-
- Enable interval refresh
-
-
-
-
+ -
+
+
+ Enabled Tasklists:
+
+
+ Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ taskListsList
+
- -
-
-
- Calendars
-
-
-
-
-
-
- -
-
-
- Fetch only events since
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- eventsLimitCombo
-
-
-
- -
-
-
- -
-
-
- Reload
-
-
-
- ..
-
-
-
-
-
+ -
+
- -
-
-
- Tasklists
-
-
-
-
-
-
- -
-
-
- Reload
-
-
-
- ..
-
-
-
-
-
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Reload
+
+
+
+ ..
+
+
+
+
+