Added maemo support with debian package files

Signed-off-by: Adriano Rezende <adriano.rezende@openbossa.org>

34 files changed, 166 insertions, 49 deletions

diff --git a/README b/README
index c78e763..fc2dea9 100644
--- a/README
+++ b/README
@@ -7,7 +7,6 @@ Mobile demos are a set of small applications created focusing mobile devices, us
 the Qt S60 port. However, as Qt is everywere, you can also run these demos in your desktop
 (Linux/Windows/MacOSX) or even on Maemo powered devices (e.g. N900).
 
-
 * Are the demos complete applications?
 
 At first, no. They were developed based on concepts of applications with rich user interfaces.
@@ -29,9 +28,3 @@ http://qtlabs.openbossa.org/mobile-demos/
 
 Qt-S60 will be release as part of Qt-4.6. Until the release, you can find the
 information needed here: http://pepper.troll.no/s60prereleases/
-
---------------
-* Known issues:
-
-- MyBudget was developed with the Qt 4.5.2 "Tower", a pre-release of Qt-S60.
-There are some issues with 4.6 and fixes are in progress. It should work fine on Maemo, though.
diff --git a/hyperui/debian/changelog b/hyperui/debian/changelog
new file mode 100644
index 0000000..6204d64
--- /dev/null
+++ b/hyperui/debian/changelog
@@ -0,0 +1,5 @@
+hyperui (0.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>  Wed, 29 Oct 2009 16:47:57 -0300
diff --git a/hyperui/debian/compat b/hyperui/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/hyperui/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/hyperui/debian/control b/hyperui/debian/control
new file mode 100644
index 0000000..6b0540f
--- /dev/null
+++ b/hyperui/debian/control
@@ -0,0 +1,12 @@
+Source: hyperui
+Section: apps
+Priority: optional
+Maintainer: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
+Build-Depends: debhelper (>= 4), libqt4-maemo5-dev
+Standards-Version: 3.8.1
+
+Package: hyperui
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-maemo5-core, libqt4-maemo5-gui, libqt4-maemo5-network
+Description: HyperUI
+  HyperUI
diff --git a/hyperui/debian/hyperui.install b/hyperui/debian/hyperui.install
new file mode 100644
index 0000000..32f1de4
--- /dev/null
+++ b/hyperui/debian/hyperui.install
@@ -0,0 +1,2 @@
+hyperui.desktop usr/share/applications/hildon/
+hyperui.png usr/share/pixmaps/
diff --git a/hyperui/debian/rules b/hyperui/debian/rules
new file mode 100755
index 0000000..9da8cad
--- /dev/null
+++ b/hyperui/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/qmake.mk
+
+DEB_BUILDDIR = debian/builddeb
+DEB_QMAKE_ARGS = $(CURDIR)/hyperui.pro -r PREFIX=/usr USE_RASTER=1
+
+clean::
+	rm  -fr $(DEB_BUILDDIR)
diff --git a/hyperui/hyperui.desktop b/hyperui/hyperui.desktop
new file mode 100644
index 0000000..adff5bc
--- /dev/null
+++ b/hyperui/hyperui.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=HyperUI
+Categories=Applications
+Exec=/usr/bin/hyperui
+Icon=hyperui
+X-Icon-path=/usr/share/pixmaps/
+X-Osso-Type=application/x-executable
diff --git a/mybudget/debian/changelog b/mybudget/debian/changelog
index 026f4aa..430f861 100644
--- a/mybudget/debian/changelog
+++ b/mybudget/debian/changelog
@@ -1,3 +1,9 @@
+mybudget (0.3-1) unstable; urgency=low
+
+  * Minor fixes
+
+ -- Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>  Wed, 28 Sep 2009 14:47:57 -0300
+
 mybudget (0.2-1) unstable; urgency=low
 
   * Several fixes and improvements
diff --git a/mybudget/debian/control b/mybudget/debian/control
index 1e471e3..8340e04 100644
--- a/mybudget/debian/control
+++ b/mybudget/debian/control
@@ -2,11 +2,11 @@ Source: mybudget
 Section: apps
 Priority: optional
 Maintainer: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
-Build-Depends: debhelper (>= 4), libqt4-dev, libxrandr-dev
+Build-Depends: debhelper (>= 4), libqt4-maemo5-dev
 Standards-Version: 3.8.1
 
 Package: mybudget
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core, libqt4-gui, libxrandr2
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-maemo5-core, libqt4-maemo5-gui
 Description: My Budget
   My Budget
diff --git a/mybudget/debian/mybudget.install b/mybudget/debian/mybudget.install
index 8fc5853..64b5917 100644
--- a/mybudget/debian/mybudget.install
+++ b/mybudget/debian/mybudget.install
@@ -1,5 +1,5 @@
 mybudget.conf root/.config/openBossa/
 mybudget.conf home/user/.config/openBossa/
-mybudget.desktop usr/share/applications/hildon/
+maemo/mybudget.desktop usr/share/applications/hildon/
 mybudget-icon.png usr/share/pixmaps/
-start_mybudget.sh usr/bin/
+maemo/start_mybudget.sh usr/bin/
diff --git a/mybudget/debian/rules b/mybudget/debian/rules
index 84e8e5e..3da996e 100755
--- a/mybudget/debian/rules
+++ b/mybudget/debian/rules
@@ -5,6 +5,6 @@ include /usr/share/cdbs/1/class/qmake.mk
 
 DEB_BUILDDIR = debian/builddeb
 DEB_QMAKE_ARGS = $(CURDIR)/mybudget.pro -r PREFIX=/usr
- 
+
 clean::
 	rm  -fr $(DEB_BUILDDIR)
diff --git a/mybudget/src/main.cpp b/mybudget/src/main.cpp
index e5bf685..3075ae5 100644
--- a/mybudget/src/main.cpp
+++ b/mybudget/src/main.cpp
@@ -47,20 +47,10 @@ int main(int argc, char **argv)
     QCoreApplication::setOrganizationDomain("openbossa.org");
     QCoreApplication::setApplicationName("mybudget");
 
+#ifndef Q_OS_SYMBIAN
     QString themeFile(QLatin1String(":/themes/mybudget.ini"));
-
-#ifdef Q_OS_LINUX
-    if (argc < 2)
-        app.setProperty("platform", "x86");
-    else if (argv[1] == QLatin1String("symbian")) {
-        app.setProperty("platform", "symbian");
-        themeFile = QLatin1String(":/themes/symbian.ini");
-    }
-#endif
-
-#ifdef Q_OS_SYMBIAN
-    app.setProperty("platform", "symbian");
-    themeFile = QLatin1String(":/themes/symbian.ini");
+#else
+    QString themeFile(QLatin1String(":/themes/symbian.ini"));
 #endif
 
     Resource::setIniFile(themeFile);
diff --git a/mybudget/src/widgets/coingraphicwidget.cpp b/mybudget/src/widgets/coingraphicwidget.cpp
index 1209e87..937fc63 100644
--- a/mybudget/src/widgets/coingraphicwidget.cpp
+++ b/mybudget/src/widgets/coingraphicwidget.cpp
@@ -40,18 +40,18 @@ CoinGraphicWidget::CoinGraphicWidget(int month, qreal overallSum, qreal maxValue
     : QGraphicsWidget(), graphCache(0)
 {
     nokiaFont.setFamily(QLatin1String("Nokia Sans"));
-    if (qApp->property("platform") == QLatin1String("symbian")) {
-        nokiaFont.setPixelSize(18);
-        labelOffset = 2;
-        maxCoins = 75;
-        marginForCoins = 10;
-    }
-    else {
-        nokiaFont.setPixelSize(22);
-        labelOffset = 5;
-        maxCoins = 100;
-        marginForCoins = 16;
-    }
+
+#ifdef Q_OS_SYMBIAN
+    nokiaFont.setPixelSize(18);
+    labelOffset = 2;
+    maxCoins = 75;
+    marginForCoins = 10;
+#else
+    nokiaFont.setPixelSize(22);
+    labelOffset = 5;
+    maxCoins = 100;
+    marginForCoins = 16;
+#endif
 
     coinPixmap = coinPx;
 
@@ -133,9 +133,11 @@ void CoinGraphicWidget::updateGraphCache(int coins)
         p.drawPixmap(x, y, *coinPixmap);
     }
 
+#ifdef Q_OS_SYMBIAN
+    qreal middleScaleFactor = 1.5;
+#else
     qreal middleScaleFactor = 2.0;
-    if (qApp->property("platform") == QLatin1String("symbian"))
-        middleScaleFactor = 1.5;
+#endif
 
     QSize labelSize(labelLeft.width() + middleScaleFactor * labelMiddle.width()
                     + labelRight.width(), labelHeight);
diff --git a/shoplist/debian/changelog b/shoplist/debian/changelog
new file mode 100644
index 0000000..a825b85
--- /dev/null
+++ b/shoplist/debian/changelog
@@ -0,0 +1,5 @@
+shoplist (0.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>  Wed, 29 Oct 2009 16:47:57 -0300
diff --git a/shoplist/debian/compat b/shoplist/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/shoplist/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/shoplist/debian/control b/shoplist/debian/control
new file mode 100644
index 0000000..07988b3
--- /dev/null
+++ b/shoplist/debian/control
@@ -0,0 +1,12 @@
+Source: shoplist
+Section: apps
+Priority: optional
+Maintainer: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
+Build-Depends: debhelper (>= 4), libqt4-maemo5-dev
+Standards-Version: 3.8.1
+
+Package: shoplist
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-maemo5-core, libqt4-maemo5-gui, libqt4-maemo5-network
+Description: ShopList
+  ShopList
diff --git a/shoplist/debian/rules b/shoplist/debian/rules
new file mode 100755
index 0000000..cc83e7f
--- /dev/null
+++ b/shoplist/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/qmake.mk
+
+DEB_BUILDDIR = debian/builddeb
+DEB_QMAKE_ARGS = $(CURDIR)/shoplist.pro -r PREFIX=/usr
+
+clean::
+	rm  -fr $(DEB_BUILDDIR)
diff --git a/shoplist/debian/shoplist.install b/shoplist/debian/shoplist.install
new file mode 100644
index 0000000..5e3d3f2
--- /dev/null
+++ b/shoplist/debian/shoplist.install
@@ -0,0 +1,2 @@
+images/icon-shoplist.png usr/share/pixmaps/
+shoplist.desktop usr/share/applications/hildon/
diff --git a/shoplist/shoplist.desktop b/shoplist/shoplist.desktop
new file mode 100644
index 0000000..7f0854c
--- /dev/null
+++ b/shoplist/shoplist.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=ShopList
+Categories=Applications
+Exec=/usr/bin/shoplist
+Icon=icon-shoplist
+X-Icon-path=/usr/share/pixmaps/
+X-Osso-Type=application/x-executable
diff --git a/shoplist/shoplist.pro b/shoplist/shoplist.pro
index e5c7018..0522f0c 100644
--- a/shoplist/shoplist.pro
+++ b/shoplist/shoplist.pro
@@ -2,6 +2,7 @@ TEMPLATE = app
 TARGET =
 
 include(src/src.pri)
+include(../shared/shared.pri)
 
 target.path = $$PREFIX/bin
 INSTALLS += target
diff --git a/shoplist/src/gesturebox.cpp b/shoplist/src/gesturebox.cpp
index cd348bf..45acc06 100644
--- a/shoplist/src/gesturebox.cpp
+++ b/shoplist/src/gesturebox.cpp
@@ -45,7 +45,7 @@
 #ifdef QT_ARCH_ARM
 static const int move_threshold = 30;
 #else
-static const int move_threshold = 5;
+static const int move_threshold = 15;
 #endif
 
 GestureData::GestureData(QPoint pos, const QList<GestureBox*> &boxes,
diff --git a/shoplist/src/main.cpp b/shoplist/src/main.cpp
index 69e471e..87a6761 100644
--- a/shoplist/src/main.cpp
+++ b/shoplist/src/main.cpp
@@ -32,11 +32,13 @@
 #include <QtGui>
 #include <QDebug>
 
+#include "system.h"
 #include "maincontainer.h"
 #include "designinformation.h"
 #include "shoppinglistcategoryui.h"
 #include "shoppinglistview.h"
 
+
 static ShoppingListCategoryUI *createList(const QString &category, int itemCount)
 {
     ShoppingListCategoryUI *result = new ShoppingListCategoryUI(category);
@@ -80,10 +82,13 @@ int main(int argc, char *argv[])
 
     scene.addItem(lists);
 
-#ifdef Q_OS_SYMBIAN
+    System::setViewMode(&view, System::PortraitMode);
+
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
     view.showFullScreen();
 #else
     view.show();
 #endif
+
     return app.exec();
 }
diff --git a/shoplist/src/maincontainer.cpp b/shoplist/src/maincontainer.cpp
index 87020f9..3658f0f 100644
--- a/shoplist/src/maincontainer.cpp
+++ b/shoplist/src/maincontainer.cpp
@@ -88,7 +88,11 @@ QPainterPath CloseButton::shape() const
 
 QRectF CloseButton::boundingRect() const
 {
+#ifdef Q_WS_MAEMO_5
+    static const qreal minSize = 120.0;
+#else
     static const qreal minSize = 80.0;
+#endif
     QRectF result(QGraphicsPixmapItem::boundingRect());
     qreal hMargin = minSize < result.width() ? 0 : (minSize - result.width()) / 2;
     qreal vMargin = minSize < result.height() ? 0 : (minSize - result.height()) / 2;
diff --git a/weather/debian/changelog b/weather/debian/changelog
new file mode 100644
index 0000000..ab4e562
--- /dev/null
+++ b/weather/debian/changelog
@@ -0,0 +1,5 @@
+weather (0.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>  Wed, 29 Aug 2009 16:47:57 -0300
diff --git a/weather/debian/compat b/weather/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/weather/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/weather/debian/control b/weather/debian/control
new file mode 100644
index 0000000..ff85b31
--- /dev/null
+++ b/weather/debian/control
@@ -0,0 +1,12 @@
+Source: weather
+Section: apps
+Priority: optional
+Maintainer: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
+Build-Depends: debhelper (>= 4), libqt4-maemo5-dev
+Standards-Version: 3.8.1
+
+Package: weather
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-maemo5-core, libqt4-maemo5-gui, libqt4-maemo5-network
+Description: Weather
+  Weather
diff --git a/weather/debian/rules b/weather/debian/rules
new file mode 100755
index 0000000..b299893
--- /dev/null
+++ b/weather/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/qmake.mk
+
+DEB_BUILDDIR = debian/builddeb
+DEB_QMAKE_ARGS = $(CURDIR)/weather.pro -r PREFIX=/usr
+
+clean::
+	rm  -fr $(DEB_BUILDDIR)
diff --git a/weather/debian/weather.install b/weather/debian/weather.install
new file mode 100644
index 0000000..25a20f4
--- /dev/null
+++ b/weather/debian/weather.install
@@ -0,0 +1,3 @@
+weather.desktop usr/share/applications/hildon/
+weather.ini usr/share/applications/
+images/icon-weather.png usr/share/pixmaps/
diff --git a/weather/main.cpp b/weather/main.cpp
index c98ded2..2b9bcdf 100644
--- a/weather/main.cpp
+++ b/weather/main.cpp
@@ -49,6 +49,7 @@
 #include "symbiannetwork.h"
 #endif
 
+
 int main(int argc, char **argv)
 {
     qRegisterMetaType<ForecastData>("ForecastData");
@@ -61,7 +62,7 @@ int main(int argc, char **argv)
 #ifdef Q_OS_SYMBIAN
     const bool connected = connect();
 #else
-    const bool connected = true;
+    const bool connected = false;
 #endif
 
     if (connected)
diff --git a/weather/settings.cpp b/weather/settings.cpp
index fe1008a..32b3071 100644
--- a/weather/settings.cpp
+++ b/weather/settings.cpp
@@ -35,8 +35,10 @@
 #include <QTimer>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN)
 #define SETTINGS_FILE   "c://data/weather.ini"
+#elif defined(Q_WS_MAEMO_5)
+#define SETTINGS_FILE   "/usr/share/applications/weather.ini"
 #else
 #define SETTINGS_FILE   "weather.ini"
 #endif
@@ -54,7 +56,7 @@ Settings *Settings::instance()
 
 QSize Settings::windowSize()
 {
-#ifdef QT_ARCH_ARM
+#ifdef Q_OS_SYMBIAN
     static const QSize result(QApplication::desktop()->screenGeometry().size());
 #else
     static const QSize result(instance()->m_settings.value("windowSize").toSize());
diff --git a/weather/titlebar.cpp b/weather/titlebar.cpp
index 53b695d..c38377a 100644
--- a/weather/titlebar.cpp
+++ b/weather/titlebar.cpp
@@ -49,8 +49,6 @@ void CloseButton::mousePressEvent(QGraphicsSceneMouseEvent *event)
     QCoreApplication::instance()->quit();
 }
 
-// TitleBar
-
 TitleBar::TitleBar(QGraphicsItem *parent)
     : QGraphicsPixmapItem(PixmapLoader::getPic("title_bar"), parent)
 {
diff --git a/weather/weather.desktop b/weather/weather.desktop
new file mode 100644
index 0000000..b4725d0
--- /dev/null
+++ b/weather/weather.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Weather
+Categories=Applications
+Exec=/usr/bin/weather
+Icon=icon-weather
+X-Icon-path=/usr/share/pixmaps/
+X-Osso-Type=application/x-executable
diff --git a/weather/weather.ini b/weather/weather.ini
index 51bb0a0..9962eb2 100644
--- a/weather/weather.ini
+++ b/weather/weather.ini
@@ -1,5 +1,5 @@
 [General]
-windowSize=@Size(360 640)
+windowSize=@Size(480 800)
 
 [Cities]
 NOXX0029=0
diff --git a/weather/weather.pro b/weather/weather.pro
index 2a16410..4d97afb 100644
--- a/weather/weather.pro
+++ b/weather/weather.pro
@@ -9,7 +9,7 @@ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 
 include(../shared/shared.pri)
 
-symbian { 
+symbian {
     LIBS += -lesock \
         -lconnmon \
         -lcone \
@@ -25,7 +25,7 @@ symbian {
         0x2000000
     TARGET.UID3 = 0xe1234567
 }
-unix { 
+unix {
     OBJECTS_DIR = tmp
     MOC_DIR = tmp
 }