Changeset f5b68a4

Timestamp:

04/15/10 14:06:07 (12 years ago)

Author:

kirilma <kirilma@…>

Branches:

master, qt5

Children:

d97bcab

Parents:

d06ae27

Message:

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

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

Location:

src

Files:

• gui/importschedulewidget.cpp (modified) (3 diffs)
• gui/importschedulewidget.h (modified) (1 diff)
• gui/importschedulewidget.ui (modified) (3 diffs)
• mvc/conference.h (modified) (2 diffs)

src/gui/importschedulewidget.cpp

@@ -54 +54 @@
     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);
@@ -119 +123 @@
 void ImportScheduleWidget::downloadSchedule()
 {
-    QNetworkRequest request;
 
     // TODO: make a nicer GUI
@@ -131 +134 @@
     // 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;
+    QString url = QInputDialog::getText(this, "URL request", "Put the schedule URL", QLineEdit::Normal, "", &ok);
+    if (ok) {
+        importFromNetwork(url);
     }
 
-    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;
-    }
+}
+
+void ImportScheduleWidget::on_delete()
+{
+    // TODO: implement
+}
+
+void ImportScheduleWidget::importFromNetwork(const QString& url)
+{
+    QNetworkRequest request;
     request.setUrl(QUrl(url));
 

src/gui/importschedulewidget.h

@@ -39 +39 @@
         void networkQueryFinished(QNetworkReply *aReply);
         void downloadSchedule();
+        void on_changeUrl();
+        void on_delete();
+        void on_newFromUrl();
     signals:
         void scheduleImported(int confId);
     private:
+        void importFromNetwork(const QString& url);
         void importData(const QByteArray &aData, const QString& url);
     private:

src/gui/importschedulewidget.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>699</width>
+    <width>710</width>
     <height>79</height>
    </rect>
@@ -37 +37 @@
      </item>
      <item>
+      <widget class="QPushButton" name="changeUrl">
+       <property name="text">
+        <string>Change Url</string>
+       </property>
+      </widget>
+     </item>
+     <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">
-        <string>Online</string>
+        <string>Reresh</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="newConfFromUrl">
+       <property name="text">
+        <string>From Url</string>
        </property>
       </widget>
@@ -52 +75 @@
        </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>

src/mvc/conference.h

@@ -60 +60 @@
     }
 
+    #if 0
     void setId(int id) { setValue("id", id); }
     void setTitle(const QString& title) { setValue("title", title); }
@@ -71 +72 @@
     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");
+    }
 };