Changeset 0bb39f5 for src/gui

Timestamp:

01/27/10 16:31:10 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

a790a90

Parents:

07ae23a

Message:

removed appsettings

• created 'active' column in 'conference' table

Location:

src/gui

Files:

• alarmdialog.cpp (modified) (3 diffs)
• eventdialog.cpp (modified) (4 diffs)
• favtabcontainer.cpp (modified) (2 diffs)
• mainwindow.cpp (modified) (5 diffs)
• searchtabcontainer.cpp (modified) (2 diffs)
• tabcontainer.cpp (modified) (3 diffs)
• tabcontainer.h (modified) (1 diff)

src/gui/alarmdialog.cpp

@@ -1 +1 @@
 #include "alarmdialog.h"
-#include <appsettings.h>
+#include <conference.h>
 
 #include <QApplication>
@@ -47 +47 @@
     try
     {
-        Event event = Event::getById(mEventId,AppSettings::confId());
+        Event event = Event::getById(mEventId,Conference::activeConference());
         titleStr = "Event alarm";
         messageStr = event.title();
@@ -89 +89 @@
     try
     {
-        Event event = Event::getById(mEventId,AppSettings::confId());
+        Event event = Event::getById(mEventId,Conference::activeConference());
         event.setHasAlarm(false);
         event.update("alarm");

src/gui/eventdialog.cpp

@@ -1 +1 @@
 #include "eventdialog.h"
-#include <appsettings.h>
+#include <conference.h>
 
 #include <QScrollBar>
@@ -18 +18 @@
 #endif
 
-    Event event = Event::getById(mEventId,AppSettings::confId());
+    Event event = Event::getById(mEventId,Conference::activeConference());
 
     title->setText(event.title());
@@ -42 +42 @@
 void EventDialog::favouriteClicked()
 {
-    Event event = Event::getById(mEventId,AppSettings::confId());
+    Event event = Event::getById(mEventId,Conference::activeConference());
 
     if(event.isFavourite())
@@ -65 +65 @@
 void EventDialog::alarmClicked()
 {
-    Event event = Event::getById(mEventId,AppSettings::confId());
+    Event event = Event::getById(mEventId,Conference::activeConference());
 
     if(event.hasAlarm())

src/gui/favtabcontainer.cpp

@@ -1 @@
-/*
- * favtabcontainer.cpp
- *
- *  Created on: Jan 27, 2010
- *      Author: maemo
- */
 
 #include "favtabcontainer.h"
@@ -22 +16 @@
     // we need to reload favourites, because some favourite could be deleted
     //static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);
-    QDate aStartDate = Conference::getById(AppSettings::confId()).start();
-    QDate aEndDate = Conference::getById(AppSettings::confId()).end();
-    dayNavigator->setDates(aStartDate, aEndDate);
-    updateTreeView( Conference::getById(AppSettings::confId()).start() );
+    int confId = Conference::activeConference();
+    QDate startDate = Conference::getById(confId).start();
+    QDate endDate = Conference::getById(confId).end();
+    dayNavigator->setDates(startDate, endDate);
+    updateTreeView( Conference::getById(confId).start() );
 }
+

src/gui/mainwindow.cpp

@@ -1 +1 @@
 #include "mainwindow.h"
-#include <appsettings.h>
 
 #include <QTreeView>
@@ -28 +27 @@
     setupUi(this);
 
-    // Sanity check for existence of any Conference in the DB
-    // it AppSettings::confId() is 0, but there are any Conference(s) in the DB
-    // set the confId in the AppSettings for the ID of the first conference in the DB
+    int confId = Conference::activeConference();
+
     QList<Conference> confs = Conference::getAll();
-    if(!confs.count()) // no conference(s) in the DB
+    if(confs.count())
     {
-        AppSettings::setConfId(0); // no conference in the DB
-    }
-    else
-    {
-        if(AppSettings::confId() == 0)
-            AppSettings::setConfId(confs[0].id());
-
         setWindowTitle(confs[0].title());
     }
@@ -62 +53 @@
     if(Conference::getAll().count()) // no conference(s) in the DB
     {
-        QDate startDate = Conference::getById(AppSettings::confId()).start();
-        QDate endDate = Conference::getById(AppSettings::confId()).end();
+        QDate startDate = Conference::getById(confId).start();
+        QDate endDate = Conference::getById(confId).end();
         //
         dayTabContainer->setDates(startDate, endDate);
@@ -71 +62 @@
         searchTabContainer->setDates(startDate, endDate);
         //
-        conferenceTitle->setText(Conference::getById(AppSettings::confId()).title());
-        conferenceSubtitle->setText(Conference::getById(AppSettings::confId()).subtitle());
-        conferenceWhere->setText(Conference::getById(AppSettings::confId()).city() + ", " + Conference::getById(AppSettings::confId()).venue());
+        conferenceTitle->setText(Conference::getById(confId).title());
+        conferenceSubtitle->setText(Conference::getById(confId).subtitle());
+        conferenceWhere->setText(Conference::getById(confId).city() + ", " + Conference::getById(confId).venue());
         conferenceWhen->setText(
-                Conference::getById(AppSettings::confId()).start().toString("dd-MM-yyyy")
+                Conference::getById(confId).start().toString("dd-MM-yyyy")
                 + ", " +
-                Conference::getById(AppSettings::confId()).end().toString("dd-MM-yyyy"));
+                Conference::getById(confId).end().toString("dd-MM-yyyy"));
     }
 
@@ -99 +90 @@
 
     QList<Conference> confs = Conference::getAll();
-    if(!confs.count()) // no conference(s) in the DB
+    if(confs.count())
     {
-        AppSettings::setConfId(0); // no conference in the DB
-    }
-    else
-    {
-        if(AppSettings::confId() == 0)
-            AppSettings::setConfId(confs[0].id());
-
         // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
-        QDate startDate = Conference::getById(AppSettings::confId()).start();
-        QDate endDate = Conference::getById(AppSettings::confId()).end();
+        QDate startDate = Conference::getById(Conference::activeConference()).start();
+        QDate endDate = Conference::getById(Conference::activeConference()).end();
         dayTabContainer->setDates(startDate, endDate);
         tracksTabContainer->setDates(startDate, endDate);

src/gui/searchtabcontainer.cpp

@@ -1 @@
-
-#include <appsettings.h>
 
 #include "searchtabcontainer.h"
@@ -65 +63 @@
     QString keyword = searchHeader->searchEdit->text().replace( QString("%"), QString("\\%") );
     qDebug() << "\nKeyword to search: " << keyword;
-    SqlEngine::searchEvent( AppSettings::confId(), columns, keyword );
 
-    QDate startDate = Conference::getById(AppSettings::confId()).start();
-    QDate endDate = Conference::getById(AppSettings::confId()).end();
+    int confId = Conference::activeConference();
+    SqlEngine::searchEvent( confId, columns, keyword );
+
+    QDate startDate = Conference::getById(confId).start();
+    QDate endDate = Conference::getById(confId).end();
     dayNavigator->setDates(startDate, endDate);
-    updateTreeView( Conference::getById(AppSettings::confId()).start() );
+    updateTreeView( Conference::getById(confId).start() );
 }
 

src/gui/tabcontainer.cpp

@@ -36 +36 @@
     else
     {
-        QDate aStartDate = Conference::getById(AppSettings::confId()).start();
-        QDate aEndDate = Conference::getById(AppSettings::confId()).end();
+        QDate aStartDate = Conference::getById(Conference::activeConference()).start();
+        QDate aEndDate = Conference::getById(Conference::activeConference()).end();
         dayNavigator->setDates(aStartDate, aEndDate);
     }
@@ -45 +45 @@
 {
     dayNavigator->show();
-    loadEvents( aDate, AppSettings::confId() );
+    loadEvents( aDate, Conference::activeConference() );
     treeView->reset();
 }
@@ -102 +102 @@
 }
 
-
-

src/gui/tabcontainer.h

@@ -5 +5 @@
 #include "ui_tabcontainer.h"
 
-#include <appsettings.h>
+#include <conference.h>
 #include <sqlengine.h>
 #include <conference.h>