Changeset c0559b6

Timestamp:

09/06/11 23:17:01 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

40849d7

Parents:

1006c4f

Message:

Now the progress bar is shown immediately after clicking the refresh conference button. Closes ticket #25.

File:

• src/gui/conferenceeditor.cpp (modified) (2 diffs)

src/gui/conferenceeditor.cpp

@@ -131 +131 @@
 void ConferenceEditor::changeUrlClicked()
 {
-    if (selected_id < 0) {
-        return;
-    }
-    const Conference& selected = Conference::getById(selected_id);
+    if (selected_id < 0) return;
+    const Conference& selectedConf = Conference::getById(selected_id);
 
     bool ok;
-    QString url = QInputDialog::getText(this, "URL Input", "Enter schedule URL", QLineEdit::Normal, selected.url(), &ok);
+    QString url = QInputDialog::getText(this, "URL Input", "Enter schedule URL", QLineEdit::Normal, selectedConf.url(), &ok);
 
     if (ok) {
@@ -146 +144 @@
 void ConferenceEditor::refreshClicked()
 {
-    if (selected_id < 0) {
-        return;
-    }
-    const Conference& selected = Conference::getById(selected_id);
-
-    QString url = selected.url();
-
-    if (!url.isEmpty()) {
-        emit haveConferenceUrl(url);
-    } else {
+    if (selected_id < 0) return;
+    const Conference& selectedConf = Conference::getById(selected_id);
+    QString url = selectedConf.url();
+
+    if (url.isEmpty()) {
         static const QString format("Schedule URL for %1 is not set. Enter the schedule URL:");
         bool ok;
-        QString url = QInputDialog::getText(this, "URL Input", format.arg(selected.title()), QLineEdit::Normal, QString(), &ok);
-
-        if (ok) {
-            // first save it, to remain if fetch fails
-            emit changeUrlRequested(selected_id, url);
-            // then fetch
-            emit haveConferenceUrl(url);
-        }
-    }
+        QString url = QInputDialog::getText(this, "URL Input", format.arg(selectedConf.title()), QLineEdit::Normal, QString(), &ok);
+        if (!ok) return;
+        // first save it, to remain if fetch fails
+        emit changeUrlRequested(selected_id, url);
+    }
+    // fetch
+    importStarted(); // just to show the progress bar
+    emit haveConferenceUrl(url);
 }