Changeset 5d22816 for src

Timestamp:

02/01/10 13:11:34 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

8c4d4f7

Parents:

8896336

Message:

GUI changes for N810 device

Location:

src

Files:

• global.pri (modified) (2 diffs)
• gui/mainwindow.cpp (modified) (2 diffs)
• gui/tabcontainer.cpp (modified) (2 diffs)
• orm/ormrecord.h (modified) (1 diff)

src/global.pri

@@ -7 +7 @@
 # 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
@@ -14 +14 @@
 }
 
+contains( DISTRO, [Ii]nternet ) {
+    contains( DISTRO, [Tt]ablet ) {
+        # Nokia N810 device
+        DEFINES += N810
+    }
+}
+

src/gui/mainwindow.cpp

@@ -31 +31 @@
 {
     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
@@ -141 +146 @@
     Ui::AboutDialog ui;
     ui.setupUi(&dialog);
+#ifdef N810
+    dialog.setFixedWidth(width());
+#endif
     dialog.exec();
 }

src/gui/tabcontainer.cpp

@@ -50 +50 @@
 
     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();
@@ -79 +82 @@
 {
     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();

src/orm/ormrecord.h

@@ -177 +177 @@
 {
     QSqlRecord record;
-    foreach (const QSqlField & col, columnList)
-    {
-        record.append(col);
+    for(int i=0; i< columnList.count(); i++)
+    {
+        record.append(columnList[i]);
     }
     return record;