support for creating GUI via QtCreator added

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f8f6988df18764d0051f6d6e216ca7acf524ab4a..976ec6846b8a2f409ea684fc8c38d10e5373bb51 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -15,6 +15,7 @@ TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmodel.a
 # Please note that resources MUST be added to the app module
 # (which means they need to be added to the test module as well,
 # but I am sure you can live with that for the time being).
+FORMS += mainwindow.ui
 SOURCES += mainwindow.cpp
 HEADERS += mainwindow.h
 

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index e0f20d49847b5b2c56d6bd3558f32250b582dc03..bf48d91a4a338669eb91dedb1626cf816d08c858 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -1,6 +1,7 @@
 #include "mainwindow.h"
 
 #include <QTreeView>
+#include <QDirModel>
 
 #include <eventmodel.h>
 
@@ -12,8 +13,8 @@ MainWindow::MainWindow(QWidget *parent)
     db.setDatabaseName("fosdem-test.sqlite");
     db.open();
 
-    QTreeView * view = new QTreeView(parent);
-    this->setCentralWidget(view);
-
-    view->setModel(new EventModel());
+    setupUi(this);
+    //TODO Palo: continue
+    //treeView->setModel(new QDirModel);
+    treeView->setModel(new EventModel());
 }

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 94aa77a4894fa4a0d48de90d1d2f0b668808815d..1828fd3cecff7d3fc5e41cfab65fb960f9f2cd41 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -3,7 +3,9 @@
 
 #include <QtGui/QMainWindow>
 
-class MainWindow : public QMainWindow
+#include <ui_mainwindow.h>
+
+class MainWindow : public QMainWindow, private Ui::MainWindow
 {
     Q_OBJECT
 

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
new file mode 100644 (file)
index 0000000..bdce5c7
--- /dev/null
+++ b/src/gui/mainwindow.ui
@@ -0,0 +1,64 @@
+<ui version="4.0" >
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <widget class="QTabWidget" name="tabWidget" >
+    <property name="geometry" >
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>791</width>
+      <height>551</height>
+     </rect>
+    </property>
+    <property name="currentIndex" >
+     <number>0</number>
+    </property>
+    <widget class="QWidget" name="tab" >
+     <attribute name="title" >
+      <string>Tab 1</string>
+     </attribute>
+     <widget class="QTreeView" name="treeView" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>781</width>
+        <height>521</height>
+       </rect>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="tab_2" >
+     <attribute name="title" >
+      <string>Tab 2</string>
+     </attribute>
+    </widget>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>25</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+ </widget>
+ <resources/>
+ <connections/>
+</ui>