First draft developed after analyzing technical overview of maemo harmattan ui publis...

git-svn-id: file:///svnroot/qtrapids/branches/draftharmattan@41 42ac0dd5-4c8c-4c71-bb3e-ecdfe252ffda

diff --git a/src/client/gui.pro b/src/client/gui.pro
index 866e0f5..9b0a958 100644 (file)
--- a/src/client/gui.pro
+++ b/src/client/gui.pro
@@ -2,7 +2,7 @@ include (../../includes.pri)
 
 SOURCES += DownloadView.cpp \
        SeedView.cpp \
-       MainWindow.cpp \
+       MainWindowPage.cpp \
        main.cpp \
        PreferencesDialog.cpp \
        proxy.cpp
@@ -10,7 +10,7 @@ SOURCES += DownloadView.cpp \
 
 HEADERS += DownloadView.h \
        SeedView.h \
-       MainWindow.h \
+       MainWindowPage.h \
        PreferencesDialog.h \
        proxy.h \
        ../include/qtrapids/dbus.hpp \
@@ -24,17 +24,18 @@ TARGET = qtrapids
 CONFIG -= release
 
 CONFIG += debug \
- qtestlib
+ qtestlib \
+ dui
 
 QT += dbus
 
 DESTDIR = ../../bin
 
-INCLUDEPATH += ../include
+INCLUDEPATH += ../include /usr/include/dui
 
 LIBS += -L../../bin \
        -L../engine
 
 QMAKE_LFLAGS_DEBUG += -L.
 
-LIBS += -lboost_system-mt
+LIBS += -lboost_system-mt -ldui

diff --git a/src/client/main.cpp b/src/client/main.cpp
index 9198bb1..4b587af 100644 (file)
--- a/src/client/main.cpp
+++ b/src/client/main.cpp
@@ -17,15 +17,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <QApplication>
+#include <DuiApplication>
+#include <DuiApplicationWindow>
 #include <QTest>
 #include <QDebug>
 //#include <QDesktopWidget>
 //#include "DownloadView.h"
 
-#include "MainWindow.h"
+#include "MainWindowPage.h"
 
-using qtrapids::MainWindow;
+using qtrapids::MainWindowPage;
 
 int main(int argc, char *argv[])
 {
@@ -35,12 +36,16 @@ int main(int argc, char *argv[])
        QCoreApplication::setApplicationName("QtRapids");
 
        // Q_INIT_RESOURCE(application);
-       QApplication app(argc, argv);
-       MainWindow mainWindow;
-       mainWindow.connectToServer();
+       DuiApplication app(argc, argv);
+
+       DuiApplicationWindow w;
+       w.show();
+       
+       MainWindowPage mainWindowPage;
+       mainWindowPage.connectToServer();
        // mainWindow->setGeometry(QApplication::desktop()->screenGeometry());
 
-       mainWindow.show();
+       mainWindowPage.show();
 
        /*
        DownloadView* dlw = new DownloadView(NULL);

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 3945159..02794e6 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -2,38 +2,39 @@ include (../../includes.pri)
 include (../../buildconf.pri)
 
 SOURCES += DownloadView.cpp \
-MainWindow.cpp \
+MainWindowPage.cpp \
 SeedView.cpp \
  main.cpp \
  PreferencesDialog.cpp
 HEADERS += DownloadView.h \
-MainWindow.h \
-SeedView.h \
- PreferencesDialog.h
+  MainWindowPage.h \
+  SeedView.h \
+  PreferencesDialog.h
 
 TEMPLATE = app
 
 TARGET = qtrapids
 
-CONFIG += qtestlib
+CONFIG += qtestlib dui
 
 DESTDIR = ../../bin
 
 INCLUDEPATH += ../engine \
-       ../plugins
+       ../plugins \
+       /usr/include/dui
 
-LIBS += -L../../bin \
-  -lqtbittorrent \
-  -L/home/vaatala/Projects/qtrapids/trunk/bin \
-  -L../engine
+LIBS += -ldui -L../../bin \
+       -lqtbittorrent \
+       -L/home/vaatala/Projects/qtrapids/trunk/bin \
+       -L../engine
 
 QMAKE_LFLAGS_DEBUG += -L.
 TARGETDEPS += ../../bin/libqtbittorrent.so
 
 # Check build mode and print to console
 debug {
-  message( "DEBUG" )
+       message( "DEBUG" )
 } else {
-  message( "RELEASE" )
+       message( "RELEASE" )
 }
 

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index ceccaa5..bfdc674 100644 (file)
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -17,12 +17,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <QApplication>
-#include <QDebug>
+#include <DuiApplication>
+#include <DuiApplicationWindow>
 #include <QTest>
+#include <QDebug>
+//#include <QDesktopWidget>
 //#include "DownloadView.h"
 
-#include "MainWindow.h"
+#include "MainWindowPage.h"
+
+//using qtrapids::MainWindowPage;
 
 int main(int argc, char *argv[])
 {
@@ -32,9 +36,16 @@ int main(int argc, char *argv[])
        QCoreApplication::setApplicationName("QtRapids");
 
        // Q_INIT_RESOURCE(application);
-       QApplication app(argc, argv);
-       MainWindow *mainWindow = new MainWindow();
-       mainWindow->show();
+       DuiApplication app(argc, argv);
+
+       DuiApplicationWindow w;
+       w.show();
+       
+       MainWindowPage mainWindowPage;
+       //mainWindowPage.connectToServer();
+       // mainWindow->setGeometry(QApplication::desktop()->screenGeometry());
+
+       mainWindowPage.show();
 
        /*
        DownloadView* dlw = new DownloadView(NULL);