Changeset 61346c9 in confclerk_git for src/gui

Timestamp:

09/04/12 23:57:13 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

1f12b6b

Parents:

8d6798d

Message:

Restructured the SqlEngine?. Not yet finished (see "TODO" in the code).

Location:

src/gui

Files:

• mainwindow.cpp (modified) (3 diffs)
• mainwindow.h (modified) (2 diffs)
• searchtabcontainer.cpp (modified) (3 diffs)
• searchtabcontainer.h (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -51 +51 @@
 const QString PROXY_PASSWD;
 
-MainWindow::MainWindow(int aEventId, QWidget *aParent)
-    : QMainWindow(aParent)
-    , conferenceModel(new ConferenceModel(this))
-    , mXmlParser(new ScheduleXmlParser(this))
-    , mNetworkAccessManager(new QNetworkAccessManager(this))
-{
+MainWindow::MainWindow(int aEventId, QWidget *aParent): QMainWindow(aParent) {
     setupUi(this);
+
+    // Open database
+    sqlEngine = new SqlEngine(this);
+    searchTabContainer->setSqlEngine(sqlEngine);
+    connect(sqlEngine, SIGNAL(dbError(QString)), this, SLOT(showError(QString)));
+    sqlEngine->open();
+    sqlEngine->createOrUpdateDbSchema();
+
+    conferenceModel = new ConferenceModel(this);
+    mXmlParser = new ScheduleXmlParser(sqlEngine, this);
+    mNetworkAccessManager = new QNetworkAccessManager(this);
 
     saved_title = windowTitle();
@@ -287 +293 @@
     setWindowTitle(saved_title);
 }
+
+
+void MainWindow::showError(const QString& message) {
+    error_message(message);
+}
+
 
 void MainWindow::on_settingsAction_triggered()
@@ -388 +400 @@
 }
 
-void MainWindow::removeConference(int id)
-{
-    Conference::deleteConference(id);
+
+void MainWindow::removeConference(int id) {
+    sqlEngine->deleteConference(id);
     conferenceModel->conferenceRemoved();
-
     emit conferenceRemoved();
 }
 
-void MainWindow::changeConferenceUrl(int id, const QString& url)
-{
+
+void MainWindow::changeConferenceUrl(int id, const QString& url) {
     Conference::getById(id).setUrl(url);
 }

src/gui/mainwindow.h

@@ -62 +62 @@
     void useConference(int id);
     void unsetConference();
+
+    void showError(const QString& message);
 private:
     void fillAndShowConferenceHeader();
@@ -69 +71 @@
 
     QString saved_title;
+    SqlEngine* sqlEngine;
     ConferenceModel* conferenceModel;
     ScheduleXmlParser *mXmlParser;

src/gui/searchtabcontainer.cpp

@@ -23 +23 @@
 #include <QMessageBox>
 
-SearchTabContainer::SearchTabContainer(QWidget *aParent) : TabContainer( aParent )
-{
+SearchTabContainer::SearchTabContainer(QWidget *aParent): TabContainer(aParent), sqlEngine(0) {
     header = new SearchHead(this);
     header->setObjectName(QString::fromUtf8("header"));
@@ -59 +58 @@
 
 void SearchTabContainer::searchButtonClicked() {
+    if (!sqlEngine) return;
+
     QHash<QString,QString> columns;
 
@@ -79 +80 @@
     Conference conf = Conference::getById(confId);
 
-    SqlEngine::searchEvent( confId, columns, keyword );
+    sqlEngine->searchEvent( confId, columns, keyword );
 
     int nrofFounds = 0;

src/gui/searchtabcontainer.h

@@ -26 +26 @@
 #include "tabcontainer.h"
 #include "searchhead.h"
+#include "sqlengine.h"
 
 class SearchTabContainer: public TabContainer {
     Q_OBJECT
+private:
+    SqlEngine* sqlEngine;
 public:
     SearchTabContainer(QWidget *aParent);
     virtual ~SearchTabContainer() {}
+    void setSqlEngine(SqlEngine* sqlEngine) {this->sqlEngine = sqlEngine;}
     bool searchDialogIsVisible() const;
     int searchResultCount(const QDate& date) const; ///< returns the number of events found on that specific date