Generate TaskJugglerView with QtCreator

and setCentralWidget()

diff --git a/TaskJugglerUIQt4/TaskJugglerUIQt4.pro b/TaskJugglerUIQt4/TaskJugglerUIQt4.pro
index aa21f1d..7dcb587 100644 (file)
--- a/TaskJugglerUIQt4/TaskJugglerUIQt4.pro
+++ b/TaskJugglerUIQt4/TaskJugglerUIQt4.pro
@@ -1,18 +1,16 @@
-#-------------------------------------------------
-#
+# -------------------------------------------------
 # Project created by QtCreator 2009-10-18T21:30:32
-#
-#-------------------------------------------------
-
-QT       += network script svg xml
-
+# -------------------------------------------------
+QT += network \
+    script \
+    svg \
+    xml
 TARGET = TaskJugglerUIQt4
 TEMPLATE = app
-
-
-SOURCES += main.cpp\
-        mainwindow.cpp
-
-HEADERS  += mainwindow.h
-
-FORMS    += mainwindow.ui
+SOURCES += main.cpp \
+    mainwindow.cpp \
+    taskjugglerview.cpp
+HEADERS += mainwindow.h \
+    taskjugglerview.h
+FORMS += mainwindow.ui \
+    taskjugglerview.ui

diff --git a/TaskJugglerUIQt4/mainwindow.cpp b/TaskJugglerUIQt4/mainwindow.cpp
index d5841f4..20620af 100644 (file)
--- a/TaskJugglerUIQt4/mainwindow.cpp
+++ b/TaskJugglerUIQt4/mainwindow.cpp
@@ -2,9 +2,11 @@
 #include "ui_mainwindow.h"
 
 MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent), ui(new Ui::MainWindow)
+    : QMainWindow(parent), ui(new Ui::MainWindow),
+    m_view(new TaskJugglerView(this))
 {
     ui->setupUi(this);
+    setCentralWidget(m_view);
 }
 
 MainWindow::~MainWindow()

diff --git a/TaskJugglerUIQt4/mainwindow.h b/TaskJugglerUIQt4/mainwindow.h
index c86b51a..8ceaedb 100644 (file)
--- a/TaskJugglerUIQt4/mainwindow.h
+++ b/TaskJugglerUIQt4/mainwindow.h
@@ -2,6 +2,9 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
+#include <QUrl>
+
+#include "taskjugglerview.h"
 
 namespace Ui
 {
@@ -16,8 +19,25 @@ public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
+#if 0
+private slots:
+    /* Taken from TaskJugglerUI/taskjuggler.h */
+    void fileNew();
+    void fileNewInclude();
+    void fileOpen();
+    void fileClose();
+    void filePrint();
+    void optionsPreferences();
+    void showTipOnStart();
+    void showTip();
+
+    void changeStatusbar(const QString& text);
+    void addRecentURL(const QUrl& text);
+#endif
+
 private:
     Ui::MainWindow *ui;
+    TaskJugglerView *m_view;
 };
 
 #endif // MAINWINDOW_H

diff --git a/TaskJugglerUIQt4/taskjugglerview.cpp b/TaskJugglerUIQt4/taskjugglerview.cpp
new file mode 100644 (file)
index 0000000..1f5ab60
--- /dev/null
+++ b/TaskJugglerUIQt4/taskjugglerview.cpp
@@ -0,0 +1,26 @@
+#include "taskjugglerview.h"
+#include "ui_taskjugglerview.h"
+
+TaskJugglerView::TaskJugglerView(QWidget *parent) :
+    QWidget(parent),
+    m_ui(new Ui::TaskJugglerView)
+{
+    m_ui->setupUi(this);
+}
+
+TaskJugglerView::~TaskJugglerView()
+{
+    delete m_ui;
+}
+
+void TaskJugglerView::changeEvent(QEvent *e)
+{
+    QWidget::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        m_ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}

diff --git a/TaskJugglerUIQt4/taskjugglerview.h b/TaskJugglerUIQt4/taskjugglerview.h
new file mode 100644 (file)
index 0000000..4f54486
--- /dev/null
+++ b/TaskJugglerUIQt4/taskjugglerview.h
@@ -0,0 +1,23 @@
+#ifndef TASKJUGGLERVIEW_H
+#define TASKJUGGLERVIEW_H
+
+#include <QtGui/QWidget>
+
+namespace Ui {
+    class TaskJugglerView;
+}
+
+class TaskJugglerView : public QWidget {
+    Q_OBJECT
+public:
+    TaskJugglerView(QWidget *parent = 0);
+    ~TaskJugglerView();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::TaskJugglerView *m_ui;
+};
+
+#endif // TASKJUGGLERVIEW_H

diff --git a/TaskJugglerUIQt4/taskjugglerview.ui b/TaskJugglerUIQt4/taskjugglerview.ui
new file mode 100644 (file)
index 0000000..9852fa2
--- /dev/null
+++ b/TaskJugglerUIQt4/taskjugglerview.ui
@@ -0,0 +1,21 @@
+<ui version="4.0" >
+ <author/>
+ <comment/>
+ <exportmacro/>
+ <class>TaskJugglerView</class>
+ <widget class="QWidget" name="TaskJugglerView" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+ </widget>
+ <pixmapfunction/>
+ <connections/>
+</ui>