GUI changes for N810 device

diff --git a/src/global.pri b/src/global.pri
index b7f7f93e6cae8ace704dc36a987fee748e36320d..468a0280a7d852c9cc70aaaff1b74d9cf6d1df29 100644 (file)
--- a/src/global.pri
+++ b/src/global.pri
@@ -6,10 +6,17 @@
 # Define 'MAEMO' specific CONFIG/DEFINE
 # To handle 'MAEMO' specific soruces/code
 DISTRO = $$system(cat /etc/issue)
 # Define 'MAEMO' specific CONFIG/DEFINE
 # To handle 'MAEMO' specific soruces/code
 DISTRO = $$system(cat /etc/issue)

-contains( DISTRO, [Mm]aemo) {
+contains( DISTRO, [Mm]aemo ) {

     # for 'MAEMO' specific source code parts
     DEFINES += MAEMO
     # for eg. including 'MAEMO' specific files
     CONFIG += maemo
 }
 
     # for 'MAEMO' specific source code parts
     DEFINES += MAEMO
     # for eg. including 'MAEMO' specific files
     CONFIG += maemo
 }
 

+contains( DISTRO, [Ii]nternet ) {
+    contains( DISTRO, [Tt]ablet ) {
+        # Nokia N810 device
+        DEFINES += N810
+    }
+}
+

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index cd6042995e110dd3fc9095554e79b395db562c28..50065b85753fc7d129e26fe26118eb2bbc321aea 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -31,6 +31,11 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
 {
     setupUi(this);
 
 {
     setupUi(this);
 

+#ifdef N810
+    tabWidget->setTabText(1,"Favs");
+    //tabWidget->setTabText(2,"Day");
+#endif
+

     // first time run aplication: -> let's have it direct connection in this case
     if(!AppSettings::contains("proxyIsDirectConnection"))
         AppSettings::setDirectConnection(true);
     // first time run aplication: -> let's have it direct connection in this case
     if(!AppSettings::contains("proxyIsDirectConnection"))
         AppSettings::setDirectConnection(true);


@@ -140,6 +145,9 @@ void MainWindow::aboutApp()
     QDialog dialog(this);
     Ui::AboutDialog ui;
     ui.setupUi(&dialog);
     QDialog dialog(this);
     Ui::AboutDialog ui;
     ui.setupUi(&dialog);

+#ifdef N810
+    dialog.setFixedWidth(width());
+#endif

     dialog.exec();
 }
 
     dialog.exec();
 }
 

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 6e71ba22029c9908bc6b6f426098865c7497d522..68d7d64822819c5df724609b50b987a7a84989d7 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -49,6 +49,9 @@ void TabContainer::itemClicked(const QModelIndex &aIndex)
         return;
 
     EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
         return;
 
     EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);

+#ifdef N810
+    dialog.setFixedWidth(static_cast<QWidget*>(parent())->width());
+#endif

     connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     dialog.exec();
     disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     dialog.exec();
     disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));


@@ -78,6 +81,9 @@ void TabContainer::displayMap(const QModelIndex &aIndex)
 void TabContainer::displayConflicts(const QModelIndex &aIndex)
 {
     ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
 void TabContainer::displayConflicts(const QModelIndex &aIndex)
 {
     ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);

+#ifdef N810
+    dialog.setFixedWidth(static_cast<QWidget*>(parent())->width());
+#endif

     connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     dialog.exec();
     disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     dialog.exec();
     disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index c8344948fde7972c362f92a02ed23e899678f311..c1841f12be3ae7927511e822074100a533714d0d 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -176,9 +176,9 @@ template <typename T>
 QSqlRecord OrmRecord<T>::toRecord(const QList<QSqlField> & columnList)
 {
     QSqlRecord record;
 QSqlRecord OrmRecord<T>::toRecord(const QList<QSqlField> & columnList)
 {
     QSqlRecord record;

-    foreach (const QSqlField & col, columnList)
+    for(int i=0; i< columnList.count(); i++)

     {
     {

-        record.append(col);
+        record.append(columnList[i]);

     }
     return record;
 }
     }
     return record;
 }