add buttons for refreshm new url and delete and partly implement corresponding actions

also changed Online -> Refresh
delete action is not implemented yet

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
index e6f3e02c1b491898110f1d3f5cee5aa8055e790b..55830282d0abfe1c38aca98d0c25008f6096e419 100644 (file)
--- a/src/gui/importschedulewidget.cpp
+++ b/src/gui/importschedulewidget.cpp
@@ -54,6 +54,10 @@ ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
     cancel->hide();
     connect(online, SIGNAL(clicked()), SLOT(downloadSchedule()));
 
     cancel->hide();
     connect(online, SIGNAL(clicked()), SLOT(downloadSchedule()));
 

+    connect(changeUrl, SIGNAL(clicked()), SLOT(on_changeUrl()));
+    connect(newConfFromUrl, SIGNAL(clicked()), SLOT(on_newFromUrl()));
+    connect(delConf, SIGNAL(clicked()), SLOT(on_delete()));
+

     mNetworkAccessManager = new QNetworkAccessManager(this);
     connect(mNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkQueryFinished(QNetworkReply*)));
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());
     mNetworkAccessManager = new QNetworkAccessManager(this);
     connect(mNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkQueryFinished(QNetworkReply*)));
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());


@@ -118,7 +122,6 @@ void ImportScheduleWidget::networkQueryFinished(QNetworkReply *aReply)
 
 void ImportScheduleWidget::downloadSchedule()
 {
 
 void ImportScheduleWidget::downloadSchedule()
 {

-    QNetworkRequest request;

 
     // TODO: make a nicer GUI
     // basically, you have to do the following things:
 
     // TODO: make a nicer GUI
     // basically, you have to do the following things:


@@ -130,18 +133,45 @@ void ImportScheduleWidget::downloadSchedule()
     //     So it cannot be done as "do like #4 and rely on REPLACE".
     // 4. allow getting the new conference by URL
 
     //     So it cannot be done as "do like #4 and rely on REPLACE".
     // 4. allow getting the new conference by URL
 

-    QString url_default;
-    try {
-        url_default = Conference::getById(Conference::activeConference()).getUrl();
-    } catch (OrmException& e) {
-        qWarning() << "failed to get default URL:" << e.text();
+    // FIXME: it will throw
+    // GUI should not show this button if there is no active conf
+    importFromNetwork(Conference::getById(Conference::activeConference()).getUrl());
+}
+
+void ImportScheduleWidget::on_changeUrl()
+{
+    // FIXME: it will throw
+    // GUI should not show this button if there is no active conf
+    Conference active_conference = Conference::getById(Conference::activeConference());
+    bool ok = false;
+    QString new_url =
+        QInputDialog::getText(this, "URL request", "Enter the new URL for conference schedule"
+                                , QLineEdit::Normal
+                                , active_conference.getUrl()
+                                , &ok);
+    if (ok) {
+        active_conference.setUrl(new_url);

     }
     }

+}

 
 

+void ImportScheduleWidget::on_newFromUrl()
+{

     bool ok = false;
     bool ok = false;

-    QString url = QInputDialog::getText(this, "URL request", "Put proper schedule URL or let it try with it", QLineEdit::Normal, url_default, &ok);
-    if (!ok) { // cancel pressed
-        return;
+    QString url = QInputDialog::getText(this, "URL request", "Put the schedule URL", QLineEdit::Normal, "", &ok);
+    if (ok) {
+        importFromNetwork(url);

     }
     }

+
+}
+
+void ImportScheduleWidget::on_delete()
+{
+    // TODO: implement
+}
+
+void ImportScheduleWidget::importFromNetwork(const QString& url)
+{
+    QNetworkRequest request;

     request.setUrl(QUrl(url));
 
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());
     request.setUrl(QUrl(url));
 
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());

diff --git a/src/gui/importschedulewidget.h b/src/gui/importschedulewidget.h
index f0679214721ff0551d97272ed2a87984a169d955..236e1fdb6fafdac5f3d02f1bbc56fd7c0b46fa5c 100644 (file)
--- a/src/gui/importschedulewidget.h
+++ b/src/gui/importschedulewidget.h
@@ -38,9 +38,13 @@ class ImportScheduleWidget : public QWidget, Ui::ImportScheduleWidget
         void showParsingProgress(int progress);
         void networkQueryFinished(QNetworkReply *aReply);
         void downloadSchedule();
         void showParsingProgress(int progress);
         void networkQueryFinished(QNetworkReply *aReply);
         void downloadSchedule();

+        void on_changeUrl();
+        void on_delete();
+        void on_newFromUrl();

     signals:
         void scheduleImported(int confId);
     private:
     signals:
         void scheduleImported(int confId);
     private:

+        void importFromNetwork(const QString& url);

         void importData(const QByteArray &aData, const QString& url);
     private:
         ScheduleXmlParser *mXmlParser;
         void importData(const QByteArray &aData, const QString& url);
     private:
         ScheduleXmlParser *mXmlParser;

diff --git a/src/gui/importschedulewidget.ui b/src/gui/importschedulewidget.ui
index 7f504313604cc2853a10543a427bdfd8289e1874..e0212ed298ea9d1c84d1b1b67af3369b7932f92c 100644 (file)
--- a/src/gui/importschedulewidget.ui
+++ b/src/gui/importschedulewidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>699</width>
+    <width>710</width>

     <height>79</height>
    </rect>
   </property>
     <height>79</height>
    </rect>
   </property>


@@ -35,10 +35,33 @@
        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>

+     <item>
+      <widget class="QPushButton" name="changeUrl">
+       <property name="text">
+        <string>Change Url</string>
+       </property>
+      </widget>
+     </item>

      <item>
       <widget class="QPushButton" name="online">
      <item>
       <widget class="QPushButton" name="online">

+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>10</width>
+         <height>0</height>
+        </size>
+       </property>

        <property name="text">
        <property name="text">

-        <string>Online</string>
+        <string>Reresh</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="newConfFromUrl">
+       <property name="text">
+        <string>From Url</string>

        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>


@@ -51,7 +74,14 @@
         </sizepolicy>
        </property>
        <property name="text">
         </sizepolicy>
        </property>
        <property name="text">

-        <string>Browse</string>
+        <string>From File</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="delConf">
+       <property name="text">
+        <string>Delete</string>

        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>

diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index 26ea87bdcf7783e20f89ab2a1504ebcea711b15d..c16ac747023a916a568e7496a7c774f2e0b2e48d 100644 (file)
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -59,6 +59,7 @@ public:
         }
     }
 
         }
     }
 

+    #if 0

     void setId(int id) { setValue("id", id); }
     void setTitle(const QString& title) { setValue("title", title); }
     void setSubtitle(const QString& subtitle) { setValue("subtitle", subtitle); }
     void setId(int id) { setValue("id", id); }
     void setTitle(const QString& title) { setValue("title", title); }
     void setSubtitle(const QString& subtitle) { setValue("subtitle", subtitle); }


@@ -70,7 +71,12 @@ public:
     void setDayChange(int dayChange) { setValue("day_change", dayChange); }
     void setTimeslotDuration(int timeslotDuration) { setValue("timeslot_duration", timeslotDuration); }
     void setActive(bool active) { setValue("active", (int)((active))); }
     void setDayChange(int dayChange) { setValue("day_change", dayChange); }
     void setTimeslotDuration(int timeslotDuration) { setValue("timeslot_duration", timeslotDuration); }
     void setActive(bool active) { setValue("active", (int)((active))); }

-    void setUrl(const QString& url) { setValue("url", url.isNull() ? QVariant() : url); }
+    #endif
+    void setUrl(const QString& url)
+    {
+        setValue("url", url.isNull() ? QVariant() : url);
+        update("url");
+    }

 };
 
 #endif /* CONFERENCE_H */
 };
 
 #endif /* CONFERENCE_H */