Removed the .service file, and removed the service line from the .desktop file.

diff --git a/zouba/data/zouba.desktop b/zouba/data/zouba.desktop
index 801ca65..57545da 100644 (file)
--- a/zouba/data/zouba.desktop
+++ b/zouba/data/zouba.desktop
@@ -9,4 +9,3 @@ X-HildonDesk-ShowInToolbar=true
 X-Window-Icon=zouba
 X-Window-Icon-Dimmed=zouba
 X-Osso-Type=application/x-executable
-X-Osso-Service=com.nokia.zouba

diff --git a/zouba/data/zouba.service b/zouba/data/zouba.service
deleted file mode 100644 (file)
index 60c65cf..0000000
--- a/zouba/data/zouba.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.zouba
-Exec=/usr/bin/zouba

diff --git a/zouba/debian/changelog b/zouba/debian/changelog
index 618465d..a43027e 100644 (file)
--- a/zouba/debian/changelog
+++ b/zouba/debian/changelog
@@ -1,5 +1,14 @@
+zouba (0.2) unstable; urgency=low
+
+  * Better xml error string.
+  * Better message table width resizing, though visually the same.
+  * Added missing message when work button becomes valid.
+  * First upload to extras-devel.
+
+ -- Max Waterman <davidmaxwaterman@fastmail.co.uk>  Wed, 24 Mar 2010 21:29:00 +0200
+
 zouba (0.1) unstable; urgency=low
 
   * Initial Release.
 
- -- Max Waterman <davidmaxwaterman@jeeves>  Tue, 23 Mar 2010 20:11:34 +0200
+ -- Max Waterman <davidmaxwaterman@fastmail.co.uk>  Tue, 23 Mar 2010 20:11:34 +0200

diff --git a/zouba/debian/control b/zouba/debian/control
index 3aabca0..e34babd 100644 (file)
--- a/zouba/debian/control
+++ b/zouba/debian/control
@@ -1,16 +1,16 @@
 Source: zouba
 Section: user/Other
 Priority: extra
-Maintainer: Max Waterman <davidmaxwaterman@jeeves>
+Maintainer: Max Waterman <davidmaxwaterman@fastmail.co.uk>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
+Homepage: 
 
 Package: zouba
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtm-location (>=1.0.0-beta1-maemo4), libqtm-bearer (>=1.0.0-beta1-maemo4), libqt4-maemo5-core (>=4.6.2~git20100212-0maemo1) | libqt4-core (>=4.6.2~git20100212-0maemo1), libqt4-maemo5-gui (>=4.6.2~git20100212-0maemo1) | libqt4-gui (>=4.6.2~git20100212-0maemo1), libqt4-maemo5-xml (>=4.6.2~git20100212-0maemo1) | libqt4-xml (>=4.6.2~git20100212-0maemo1), libqt4-maemo5-network (>=4.6.2~git20100212-0maemo1) | libqt4-network (>=4.6.2~git20100212-0maemo1)
+Description: Tells you which bus is next.
+ Allows you to easily find how to get the bus home. Uses HSL Journey Planner API <http://developer.reittiopas.fi/pages/en/home.php>. Uses GPS for current location. Uses Qt and QtMobility.
 # XB-Maemo-Icon-26 field contains the application icon file encoded in
 # base64. This is the icon that is shown in the Application Manager,
 # next to the package name. To perform this encoding use following mad

diff --git a/zouba/debian/files b/zouba/debian/files
index bd9161c..6393c88 100644 (file)
--- a/zouba/debian/files
+++ b/zouba/debian/files
@@ -1,5 +1 @@
-zouba_0.1_armel.deb user/Other extra
-zouba_0.1_armel.deb user/Other extra
-zouba_0.1_armel.deb user/Other extra
-zouba_0.1_armel.deb user/Other extra
-zouba_0.1_armel.deb user/Other extra
+zouba_0.2_armel.deb user/Other extra

diff --git a/zouba/debian/zouba.debhelper.log b/zouba/debian/zouba.debhelper.log
index 6054e08..4597b74 100644 (file)
--- a/zouba/debian/zouba.debhelper.log
+++ b/zouba/debian/zouba.debhelper.log
@@ -116,3 +116,252 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
+dh_installdirs
+dh_installdirs
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb

diff --git a/zouba/debian/zouba/DEBIAN/control b/zouba/debian/zouba/DEBIAN/control
index f42c650..404b6a6 100644 (file)
--- a/zouba/debian/zouba/DEBIAN/control
+++ b/zouba/debian/zouba/DEBIAN/control
@@ -1,13 +1,13 @@
 Package: zouba
-Version: 0.1
+Version: 0.2
 Architecture: armel
-Maintainer: Max Waterman <davidmaxwaterman@jeeves>
-Installed-Size: 212
+Maintainer: Max Waterman <davidmaxwaterman@fastmail.co.uk>
+Installed-Size: 216
+Depends: libqtm-location (>= 1.0.0-beta1-maemo4), libqtm-bearer (>= 1.0.0-beta1-maemo4), libqt4-maemo5-core (>= 4.6.2~git20100212-0maemo1) | libqt4-core (>= 4.6.2~git20100212-0maemo1), libqt4-maemo5-gui (>= 4.6.2~git20100212-0maemo1) | libqt4-gui (>= 4.6.2~git20100212-0maemo1), libqt4-maemo5-xml (>= 4.6.2~git20100212-0maemo1) | libqt4-xml (>= 4.6.2~git20100212-0maemo1), libqt4-maemo5-network (>= 4.6.2~git20100212-0maemo1) | libqt4-network (>= 4.6.2~git20100212-0maemo1)
 Section: user/Other
 Priority: extra
-Homepage: <insert the upstream URL, if relevant>
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Description: Tells you which bus is next.
+ Allows you to easily find how to get the bus home. Uses HSL Journey Planner API <http://developer.reittiopas.fi/pages/en/home.php>. Uses GPS for current location. Uses Qt and QtMobility.
 Maemo-Icon-26: 
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A
  /wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9oBGQ0SFuv48p0AAAAZdEVYdENv

diff --git a/zouba/debian/zouba/DEBIAN/md5sums b/zouba/debian/zouba/DEBIAN/md5sums
index 008c378..2878d4e 100644 (file)
--- a/zouba/debian/zouba/DEBIAN/md5sums
+++ b/zouba/debian/zouba/DEBIAN/md5sums
@@ -1,7 +1,7 @@
 fd259cf3be69375915fdb925257d2233  usr/share/dbus-1/services/zouba.service
-ff174efcc85be1270eb91a671c690feb  usr/share/doc/zouba/changelog.gz
+7582f909f6cf0329729f01e323e6c8a1  usr/share/doc/zouba/changelog.gz
 5a50138045dfccd50e9ec2f5fd769bcf  usr/share/doc/zouba/README.Debian
 b941bd01bcea49cabfc186309d46fb74  usr/share/doc/zouba/copyright
 f327a6f11a43e47223c6bebe5434fd81  usr/share/applications/hildon/zouba.desktop
 85cbb61cacdd967b3e62a6ba0f84f0b2  usr/share/icons/hicolor/64x64/apps/zouba.png
-c7b8cd05b8e151f54efc262bda5f47ad  usr/bin/zouba
+f9869b1dbe0a28a220a48ebad6ae8fd0  usr/bin/zouba

diff --git a/zouba/debian/zouba/usr/bin/zouba b/zouba/debian/zouba/usr/bin/zouba
index 97f709b..f5a22fd 100755 (executable)
Binary files a/zouba/debian/zouba/usr/bin/zouba and b/zouba/debian/zouba/usr/bin/zouba differ

diff --git a/zouba/debian/zouba/usr/share/doc/zouba/changelog.gz b/zouba/debian/zouba/usr/share/doc/zouba/changelog.gz
index a7a2c20..2d5fc20 100644 (file)
Binary files a/zouba/debian/zouba/usr/share/doc/zouba/changelog.gz and b/zouba/debian/zouba/usr/share/doc/zouba/changelog.gz differ

diff --git a/zouba/src/main.cpp b/zouba/src/main.cpp
index 47402c8..3af3f48 100644 (file)
--- a/zouba/src/main.cpp
+++ b/zouba/src/main.cpp
@@ -5,8 +5,8 @@
 #include "location.h"
 #include "gpscontroller.h"
 #include "ytv.h"
-#include "messagehandler.h"
 #include "messagetable.h"
+#include "messagehandler.h"
 
 #include <QDebug>
 #include <QObject>

diff --git a/zouba/src/messagetable.cpp b/zouba/src/messagetable.cpp
index d22c857..032bcd2 100644 (file)
--- a/zouba/src/messagetable.cpp
+++ b/zouba/src/messagetable.cpp
@@ -4,6 +4,7 @@
 #include <QString>
 #include <QStringList>
 #include <QDebug>
+#include <QResizeEvent>
 
 MessageTable::MessageTable( QWidget *parent ) :
   QTableWidget( NumberOfRows, OneColumn, parent )
@@ -15,8 +16,6 @@ MessageTable::MessageTable( QWidget *parent ) :
     QTableWidgetItem *newRow = new QTableWidgetItem();
     setItem( row,0, newRow );
   }
-
-  horizontalHeader()->setStretchLastSection(true);
 }
 
 MessageTable::~MessageTable()
@@ -35,3 +34,11 @@ void MessageTable::displayMessage( const QString &message )
 
   itemAt(0,0)->setText( message );
 }
+
+void MessageTable::resizeEvent( QResizeEvent *event )
+{
+  int width = event->size().width() / columnCount();
+  for ( int i = 0; i < columnCount(); ++i ) {
+    setColumnWidth( i, width );
+  }
+}

diff --git a/zouba/src/messagetable.h b/zouba/src/messagetable.h
index cfd6933..f8b768f 100644 (file)
--- a/zouba/src/messagetable.h
+++ b/zouba/src/messagetable.h
@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <QTableWidget>
+class QResizeEvent;
 
 class MessageTable : public QTableWidget
 {
@@ -18,5 +19,8 @@ public:
   ~MessageTable();
 
   void displayMessage( const QString &message );
+
+protected:
+  void resizeEvent( QResizeEvent *event );
 };
 #endif //MESSAGETABLE_H

diff --git a/zouba/src/route_p.cpp b/zouba/src/route_p.cpp
index a9df50e..1acb276 100644 (file)
--- a/zouba/src/route_p.cpp
+++ b/zouba/src/route_p.cpp
@@ -72,7 +72,7 @@ QList<RouteData> RoutePrivate::parseReply( const QByteArray &reply )
   }
 
   if ( xml.hasError() ) {
-    qDebug() << "xml error";
+    qDebug() << "xml error:" << xml.errorString();
   }
 
   if ( retVal.isEmpty() ) {

diff --git a/zouba/src/uicontroller.cpp b/zouba/src/uicontroller.cpp
index 2f823d2..31d2b9f 100644 (file)
--- a/zouba/src/uicontroller.cpp
+++ b/zouba/src/uicontroller.cpp
@@ -72,6 +72,7 @@ void UiController::setHomeButtonValid()
 
 void UiController::setWorkButtonValid()
 {
+  qDebug() << "setting work button valid";
   setButtonValid( Ui::WorkButtonId );
 }