Changeset e493054

Timestamp:

01/21/10 15:41:03 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

e89b296

Parents:

9d8946b

Message:

import/search schedule dialog implemented

Location:

src

Files:

• gui/gui.pro (modified) (3 diffs)
• gui/mainwindow.cpp (modified) (5 diffs)
• gui/mainwindow.h (modified) (3 diffs)
• orm/ormrecord.h (modified) (2 diffs)
• sql/sqlengine.cpp (modified) (2 diffs)

src/gui/gui.pro

@@ -26 +26 @@
 FORMS += mainwindow.ui \
          daynavigatorwidget.ui \
+         importscheduledialog.ui \
          about.ui \
          eventdialog.ui \
@@ -32 +33 @@
 HEADERS += mainwindow.h \
            daynavigatorwidget.h \
+           importscheduledialog.h \
            eventdialog.h \
            mapwindow.h
@@ -37 +39 @@
 SOURCES += mainwindow.cpp \
            daynavigatorwidget.cpp \
+           importscheduledialog.cpp \
            eventdialog.cpp \
            mapwindow.cpp

src/gui/mainwindow.cpp

@@ -5 +5 @@
 
 #include <sqlengine.h>
-#include <schedulexmlparser.h>
 
 #include <track.h>
@@ -17 +16 @@
 #include "eventdialog.h"
 #include "daynavigatorwidget.h"
+#include "importscheduledialog.h"
 #include "mapwindow.h"
 
@@ -35 +35 @@
     mSqlEngine = new SqlEngine(this);
     mSqlEngine->initialize();
-
-    mXmlParser = new ScheduleXmlParser(this);
-    connect(mXmlParser, SIGNAL(progressStatus(int)), this, SLOT(showParsingProgress(int)));
-    statusBar()->showMessage(tr("Ready"));
 
     //update track map
@@ -141 +137 @@
         mSqlEngine = NULL;
     }
-    if(mXmlParser)
-    {
-        delete mXmlParser;
-        mXmlParser = NULL;
-    }
 }
 
 void MainWindow::importSchedule()
 {
-    QFile file(":/schedule.en.xml");
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        qDebug() << "can't open " << file.fileName();
-        return;
-    }
-
-    QByteArray data = file.readAll();
-    mXmlParser->parseData(data,mSqlEngine);
-
+    ImportScheduleDialog dialog(mSqlEngine,this);
+    dialog.exec();
+    
     if(Conference::getAll().count())
     {
@@ -172 +156 @@
 }
 
-void MainWindow::showParsingProgress(int aStatus)
-{
-    QString msg = QString("Parsing completed: %1\%").arg(aStatus);
-    statusBar()->showMessage(msg,1000);
-}
-
 void MainWindow::aboutApp()
 {

src/gui/mainwindow.h

@@ -7 +7 @@
 
 class SqlEngine;
-class ScheduleXmlParser;
 
 class MainWindow : public QMainWindow, private Ui::MainWindow
@@ -19 +18 @@
 private slots:
     void importSchedule();
-    void showParsingProgress(int aStatus);
     void aboutApp();
     void updateDayView(const QDate &aDate);
@@ -31 +29 @@
 private:
     SqlEngine *mSqlEngine;
-    ScheduleXmlParser *mXmlParser;
 };
 

src/orm/ormrecord.h

@@ -135 +135 @@
         else
         {
-            qDebug() << "SQL OK";
+            //qDebug() << "SQL OK";
         }
     }
@@ -144 +144 @@
         objects << hydrate(query.record());
     }
-    qDebug() << "Fetch done";
+    //qDebug() << "Fetch done";
     return objects;
 }

src/sql/sqlengine.cpp

@@ -128 +128 @@
         result.bindValue(3,aEvent["abstract"]);
         result.bindValue(4,aEvent["description"]);
-        qDebug() << result.lastQuery();
         result.exec();
     }
@@ -248 +247 @@
             alarm INTEGER DEFAULT 0, \
             PRIMARY KEY (xid_conference,id), \
-            FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id) \
+            FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), \
             FOREIGN KEY(xid_track) REFERENCES TRACK(id))");