From 5d228166c667e2deaa6294071bf2935cb01b302f Mon Sep 17 00:00:00 2001
From: pavelpa <pavelpa@localhost>
Date: Mon, 1 Feb 2010 12:11:34 +0000
Subject: [PATCH] GUI changes for N810 device

---
 src/global.pri           | 9 ++++++++-
 src/gui/mainwindow.cpp   | 8 ++++++++
 src/gui/tabcontainer.cpp | 6 ++++++
 src/orm/ormrecord.h      | 4 ++--
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/global.pri b/src/global.pri
index b7f7f93..468a028 100644
--- 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)
-contains( DISTRO, [Mm]aemo) {
+contains( DISTRO, [Mm]aemo ) {
     # 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 cd60429..50065b8 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -31,6 +31,11 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
 {
     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);
@@ -140,6 +145,9 @@ void MainWindow::aboutApp()
     QDialog dialog(this);
     Ui::AboutDialog ui;
     ui.setupUi(&dialog);
+#ifdef N810
+    dialog.setFixedWidth(width());
+#endif
     dialog.exec();
 }
 
diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 6e71ba2..68d7d64 100644
--- 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);
+#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)));
@@ -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);
+#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)));
diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index c834494..c1841f1 100644
--- 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;
-    foreach (const QSqlField & col, columnList)
+    for(int i=0; i< columnList.count(); i++)
     {
-        record.append(col);
+        record.append(columnList[i]);
     }
     return record;
 }
-- 
2.30.2