Use of invoker

diff --git a/.gitignore b/.gitignore
index 73b6d18..7597365 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-LatitudeUpdater.pro.user
+*.pro.user
 debian/
-qtc_packaging/binary_fremantle/
-qtc_packaging/binary_harmattan/
-

diff --git a/LatitudeUpdater-common.pri b/LatitudeUpdater-common.pri
deleted file mode 100644 (file)
index 1f6a2f1..0000000
--- a/LatitudeUpdater-common.pri
+++ /dev/null
@@ -1,58 +0,0 @@
-QT       += network
-CONFIG   += mobility
-MOBILITY += location
-
-SOURCES        += gpscontrol.cpp googlelatitude.cpp
-HEADERS += gpscontrol.h   googlelatitude.h
-
-INCLUDEPATH    += libkqoauth
-SOURCES        += libkqoauth/kqoauthauthreplyserver.cpp \
-        libkqoauth/kqoauthrequest.cpp \
-        libkqoauth/kqoauthmanager.cpp \
-        libkqoauth/kqoauthrequest_xauth.cpp \
-        libkqoauth/kqoauthrequest_1.cpp \
-        libkqoauth/kqoauthutils.cpp
-PUBLIC_HEADERS += libkqoauth/kqoauthmanager.h \
-        libkqoauth/kqoauthrequest.h \
-        libkqoauth/kqoauthrequest_1.h \
-        libkqoauth/kqoauthrequest_xauth.h \
-        libkqoauth/kqoauthglobals.h
-PRIVATE_HEADERS += libkqoauth/kqoauthrequest_p.h \
-        libkqoauth/kqoauthmanager_p.h \
-        libkqoauth/kqoauthauthreplyserver.h \
-        libkqoauth/kqoauthauthreplyserver_p.h \
-        libkqoauth/kqoauthutils.h \
-        libkqoauth/kqoauthrequest_xauth_p.h
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
-
-contains(QT_CONFIG, maemo5): {
-    QT          += maemo5
-    CONFIG      += link_pkgconfig
-    PKGCONFIG   += glib-2.0 liblocation
-    SOURCES    += liblocationmaemo5/gconfitem.cpp \
-        liblocationmaemo5/liblocationwrapper.cpp \
-        liblocationmaemo5/qgeopositioninfosource_maemo5.cpp \
-        liblocationmaemo5/qgeosatelliteinfosource_maemo5.cpp
-    HEADERS    += liblocationmaemo5/gconfitem_p.h \
-        liblocationmaemo5/liblocationwrapper_p.h \
-        liblocationmaemo5/qgeopositioninfosource_maemo5_p.h \
-        liblocationmaemo5/qgeosatelliteinfosource_maemo5_p.h
-}
-
-# Please do not modify the following two lines. Required for deployment.
-include(deployment.pri)
-qtcAddDeployment()
-
-OTHER_FILES += \
-        qtc_packaging/debian_harmattan/rules \
-        qtc_packaging/debian_harmattan/README \
-        qtc_packaging/debian_harmattan/copyright \
-        qtc_packaging/debian_harmattan/control \
-        qtc_packaging/debian_harmattan/compat \
-        qtc_packaging/debian_harmattan/changelog \
-        qtc_packaging/debian_fremantle/rules \
-        qtc_packaging/debian_fremantle/README \
-        qtc_packaging/debian_fremantle/copyright \
-        qtc_packaging/debian_fremantle/control \
-        qtc_packaging/debian_fremantle/compat \
-        qtc_packaging/debian_fremantle/changelog

diff --git a/LatitudeUpdater-daemon.pro b/LatitudeUpdater-daemon.pro
deleted file mode 100644 (file)
index 4048c53..0000000
--- a/LatitudeUpdater-daemon.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = LatitudeUpdaterDaemon
-QT    -= gui
-
-SOURCES += latitudedaemon.cpp main-daemon.cpp
-HEADERS += latitudedaemon.h
-
-include(LatitudeUpdater-common.pri)
-
-unix:!symbian:!maemo5 {
-    desktopfile.files = $${TARGET}.desktop
-    desktopfile.path = /usr/share/applications
-    INSTALLS += desktopfile
-}

diff --git a/LatitudeUpdater-qml.pro b/LatitudeUpdater-qml.pro
deleted file mode 100644 (file)
index 66d2be9..0000000
--- a/LatitudeUpdater-qml.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TARGET = LatitudeUpdaterQML
-QT    += declarative
-
-SOURCES += latitudeqml.cpp main-qml.cpp
-HEADERS += latitudeqml.h
-
-RESOURCES   += resouses.qrc
-OTHER_FILES += qml/main.qml qml/MainPage.qml
-
-include(LatitudeUpdater-common.pri)

diff --git a/LatitudeUpdater-widget.pro b/LatitudeUpdater-widget.pro
deleted file mode 100644 (file)
index d785005..0000000
--- a/LatitudeUpdater-widget.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET          = LatitudeUpdaterWidget
-
-SOURCES += latitudewidget.cpp main-widget.cpp
-HEADERS += latitudewidget.h
-
-include(LatitudeUpdater-common.pri)
-

diff --git a/LatitudeUpdater.pri b/LatitudeUpdater.pri
new file mode 100644 (file)
index 0000000..469e384
--- /dev/null
+++ b/LatitudeUpdater.pri
@@ -0,0 +1,60 @@
+QT       += network
+CONFIG   += mobility
+MOBILITY += location
+
+SOURCES        += gpscontrol.cpp googlelatitude.cpp
+HEADERS += gpscontrol.h   googlelatitude.h
+
+INCLUDEPATH    += libkqoauth
+SOURCES        += libkqoauth/kqoauthauthreplyserver.cpp \
+        libkqoauth/kqoauthrequest.cpp \
+        libkqoauth/kqoauthmanager.cpp \
+        libkqoauth/kqoauthrequest_xauth.cpp \
+        libkqoauth/kqoauthrequest_1.cpp \
+        libkqoauth/kqoauthutils.cpp
+PUBLIC_HEADERS += libkqoauth/kqoauthmanager.h \
+        libkqoauth/kqoauthrequest.h \
+        libkqoauth/kqoauthrequest_1.h \
+        libkqoauth/kqoauthrequest_xauth.h \
+        libkqoauth/kqoauthglobals.h
+PRIVATE_HEADERS += libkqoauth/kqoauthrequest_p.h \
+        libkqoauth/kqoauthmanager_p.h \
+        libkqoauth/kqoauthauthreplyserver.h \
+        libkqoauth/kqoauthauthreplyserver_p.h \
+        libkqoauth/kqoauthutils.h \
+        libkqoauth/kqoauthrequest_xauth_p.h
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+contains(QT_CONFIG, maemo5): {
+    QT          += maemo5
+    CONFIG      += link_pkgconfig
+    PKGCONFIG   += glib-2.0 liblocation
+    SOURCES    += liblocationmaemo5/gconfitem.cpp \
+        liblocationmaemo5/liblocationwrapper.cpp \
+        liblocationmaemo5/qgeopositioninfosource_maemo5.cpp \
+        liblocationmaemo5/qgeosatelliteinfosource_maemo5.cpp
+    HEADERS    += liblocationmaemo5/gconfitem_p.h \
+        liblocationmaemo5/liblocationwrapper_p.h \
+        liblocationmaemo5/qgeopositioninfosource_maemo5_p.h \
+        liblocationmaemo5/qgeosatelliteinfosource_maemo5_p.h
+}
+
+# Please do not modify the following two lines. Required for deployment.
+include(deployment.pri)
+qtcAddDeployment()
+
+OTHER_FILES += \
+        qtc_packaging/debian_harmattan/rules \
+        qtc_packaging/debian_harmattan/rules.real \
+        qtc_packaging/debian_harmattan/README \
+        qtc_packaging/debian_harmattan/copyright \
+        qtc_packaging/debian_harmattan/control \
+        qtc_packaging/debian_harmattan/compat \
+        qtc_packaging/debian_harmattan/changelog \
+        qtc_packaging/debian_fremantle/rules \
+        qtc_packaging/debian_fremantle/rules.real \
+        qtc_packaging/debian_fremantle/README \
+        qtc_packaging/debian_fremantle/copyright \
+        qtc_packaging/debian_fremantle/control \
+        qtc_packaging/debian_fremantle/compat \
+        qtc_packaging/debian_fremantle/changelog

diff --git a/LatitudeUpdater.pro b/LatitudeUpdater.pro
deleted file mode 100644 (file)
index ee9982c..0000000
--- a/LatitudeUpdater.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-TEMPLATE = subdirs
-
-linux-g++-maemo:!contains(MEEGO_EDITION,harmattan): {
-        MEEGO_VERSION_MAJOR     = 1
-        MEEGO_VERSION_MINOR     = 2
-        MEEGO_VERSION_PATCH     = 0
-        MEEGO_EDITION          = harmattan
-        DEFINES               += MEEGO_EDITION_HARMATTAN
-}
-
-contains(QT_CONFIG, maemo5): {
-        SUBDIRS = LatitudeUpdater-daemon.pro LatitudeUpdater-widget.pro
-        DEFINES += GUIFOUND
-        message(Maemo5)
-}
-contains(MEEGO_EDITION,harmattan): {
-        SUBDIRS = LatitudeUpdater-daemon.pro LatitudeUpdater-qml.pro
-        DEFINES += GUIFOUND
-        message(Maemo6)
-}
-contains(CONFIG, simulator): {
-        SUBDIRS = LatitudeUpdater-daemon.pro
-        DEFINES += GUIFOUND
-        message(Simulator)
-}
-
-!contains(DEFINES, GUIFOUND): { {
-        SUBDIRS = LatitudeUpdater-daemon.pro LatitudeUpdater-widget.pro LatitudeUpdater-qml.pro
-        message(All Gui)
-}

diff --git a/LatitudeUpdaterDaemon.pro b/LatitudeUpdaterDaemon.pro
new file mode 100644 (file)
index 0000000..5c2211a
--- /dev/null
+++ b/LatitudeUpdaterDaemon.pro
@@ -0,0 +1,7 @@
+TARGET = LatitudeUpdaterDaemon
+QT    -= gui
+
+SOURCES += latitudedaemon.cpp main-daemon.cpp
+HEADERS += latitudedaemon.h
+
+include(LatitudeUpdater.pri)

diff --git a/LatitudeUpdaterQML.desktop b/LatitudeUpdaterQML.desktop
index af1e730..4648ddc 100644 (file)
--- a/LatitudeUpdaterQML.desktop
+++ b/LatitudeUpdaterQML.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Type=Application
 Terminal=false
 Name=LatitudeQML
-Exec=/opt/linfati.com/bin/LatitudeUpdaterQML
+Exec=/usr/bin/invoker --single-instance --type=e /opt/linfati.com/bin/LatitudeUpdaterQML
 Icon=LatitudeUpdaterQML
 X-Window-Icon=
 X-HildonDesk-ShowInToolbar=true

diff --git a/LatitudeUpdaterQML.pro b/LatitudeUpdaterQML.pro
new file mode 100644 (file)
index 0000000..643d411
--- /dev/null
+++ b/LatitudeUpdaterQML.pro
@@ -0,0 +1,10 @@
+TARGET = LatitudeUpdaterQML
+QT    += declarative
+
+SOURCES += latitudeqml.cpp main-qml.cpp
+HEADERS += latitudeqml.h
+
+RESOURCES   += resouses.qrc
+OTHER_FILES += qml/main.qml qml/MainPage.qml
+
+include(LatitudeUpdater.pri)

diff --git a/LatitudeUpdaterWidget.pro b/LatitudeUpdaterWidget.pro
new file mode 100644 (file)
index 0000000..8dee1bb
--- /dev/null
+++ b/LatitudeUpdaterWidget.pro
@@ -0,0 +1,7 @@
+TARGET          = LatitudeUpdaterWidget
+
+SOURCES += latitudewidget.cpp main-widget.cpp
+HEADERS += latitudewidget.h
+
+include(LatitudeUpdater.pri)
+

diff --git a/latitudeupdater.pro b/latitudeupdater.pro
new file mode 100644 (file)
index 0000000..33d560f
--- /dev/null
+++ b/latitudeupdater.pro
@@ -0,0 +1,30 @@
+# temporal fix
+linux-g++-maemo:!contains(MEEGO_EDITION,harmattan): {
+        MEEGO_VERSION_MAJOR     = 1
+        MEEGO_VERSION_MINOR     = 2
+        MEEGO_VERSION_PATCH     = 0
+        MEEGO_EDITION          = harmattan
+        DEFINES               += MEEGO_EDITION_HARMATTAN
+}
+
+TEMPLATE = subdirs
+
+contains(QT_CONFIG, maemo5): {
+        SUBDIRS = LatitudeUpdaterDaemon.pro LatitudeUpdaterWidget.pro
+        DEFINES += GUIFOUND
+        message(Maemo5)
+}
+contains(MEEGO_EDITION,harmattan): {
+        SUBDIRS = LatitudeUpdaterDaemon.pro LatitudeUpdaterQML.pro
+        DEFINES += GUIFOUND
+        message(Maemo6)
+}
+contains(CONFIG, simulator): {        
+        SUBDIRS = LatitudeUpdaterWidget.pro
+        DEFINES += GUIFOUND
+        message(Simulator)
+}
+!contains(DEFINES, GUIFOUND): {
+        SUBDIRS = LatitudeUpdaterDaemon.pro LatitudeUpdaterWidget.pro LatitudeUpdaterQML.pro
+        message(Plataform not found)
+}

diff --git a/main-daemon.cpp b/main-daemon.cpp
index 2ca44e4..99230d3 100644 (file)
--- a/main-daemon.cpp
+++ b/main-daemon.cpp
@@ -8,8 +8,8 @@ int main(int argc, char *argv[]) {
     QCoreApplication::setApplicationName("latitudeupdater");
 
     QCoreApplication lu(argc, argv);
-
     LatitudeDaemon mygui;
+
     Q_UNUSED(mygui)
 
     return lu.exec();

diff --git a/main-qml.cpp b/main-qml.cpp
index 98828f7..f17ff01 100644 (file)
--- a/main-qml.cpp
+++ b/main-qml.cpp
@@ -9,7 +9,8 @@ int main(int argc, char *argv[]) {
 
     QApplication lu(argc, argv);
     LatitudeQML mygui;
-    mygui.show();
+
+    mygui.showFullScreen();
 
     return lu.exec();
 }

diff --git a/main-widget.cpp b/main-widget.cpp
index b3d2ba9..aca9cf7 100644 (file)
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -9,7 +9,8 @@ int main(int argc, char *argv[]) {
 
     QApplication lu(argc, argv);
     LatitudeGUI mygui;
-    mygui.show();
+
+    mygui.showMaximized();
 
     return lu.exec();
 }

diff --git a/qml/main.qml b/qml/main.qml
index 8ec6b4a..6655bf5 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -8,5 +8,5 @@ PageStackWindow {
         id: mainPage
     }
     showToolBar: false
-    showStatusBar: false
+    showStatusBar: true
 }

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 104c1b2..006c02e 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,3 +1,9 @@
+googlelatitude (0.7-1) unstable; urgency=low
+
+  * Enable invoker
+
+ -- Rodrigo Linfati <rodrigo@linfati.cl>  Wed, 10 Aug 2011 19:48:00 +0200
+
 googlelatitude (0.7-0) unstable; urgency=low
 
   * OAuth Support

diff --git a/qtc_packaging/debian_fremantle/compat b/qtc_packaging/debian_fremantle/compat
index 7f8f011..7ed6ff8 100644 (file)
--- a/qtc_packaging/debian_fremantle/compat
+++ b/qtc_packaging/debian_fremantle/compat
@@ -1 +1 @@
-7
+5

diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules
index bec6627..e1b9481 100755 (executable)
--- a/qtc_packaging/debian_fremantle/rules
+++ b/qtc_packaging/debian_fremantle/rules
@@ -12,7 +12,7 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # qmake LatitudeUpdater.pro PREFIX=/usr
+       # qmake latitudeupdater.pro PREFIX=/usr
        touch configure-stamp
 
 build: build-stamp
@@ -34,7 +34,7 @@ install: build
        dh_testroot
        dh_clean -k 
        dh_installdirs
-       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
+       $(MAKE)  INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/qtc_packaging/debian_fremantle/rules.real b/qtc_packaging/debian_fremantle/rules.real
index a788d97..3b68019 100755 (executable)
--- a/qtc_packaging/debian_fremantle/rules.real
+++ b/qtc_packaging/debian_fremantle/rules.real
@@ -12,7 +12,7 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       qmake LatitudeUpdater.pro
+       qmake latitudeupdater.pro
        touch configure-stamp
 
 build: build-stamp
@@ -34,7 +34,7 @@ install: build
        dh_testroot
        dh_clean -k 
        dh_installdirs
-       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
+       $(MAKE)  INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index 104c1b2..006c02e 100644 (file)
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,3 +1,9 @@
+googlelatitude (0.7-1) unstable; urgency=low
+
+  * Enable invoker
+
+ -- Rodrigo Linfati <rodrigo@linfati.cl>  Wed, 10 Aug 2011 19:48:00 +0200
+
 googlelatitude (0.7-0) unstable; urgency=low
 
   * OAuth Support

diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control
index e001d21..2f69d36 100644 (file)
--- a/qtc_packaging/debian_harmattan/control
+++ b/qtc_packaging/debian_harmattan/control
@@ -2,7 +2,7 @@ Source: googlelatitude
 Section: user/navigation
 Priority: optional
 Maintainer: Rodrigo Linfati <rodrigo@linfati.cl>
-Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-dev, aegis-builder
+Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-dev, applauncherd-dev, aegis-builder
 Standards-Version: 3.7.3
 Homepage: http://googlelatitude.garage.maemo.org/
 XSBC-Bugtracker: mailto:rodrigo@linfati.cl

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index bec6627..e1b9481 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -12,7 +12,7 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # qmake LatitudeUpdater.pro PREFIX=/usr
+       # qmake latitudeupdater.pro PREFIX=/usr
        touch configure-stamp
 
 build: build-stamp
@@ -34,7 +34,7 @@ install: build
        dh_testroot
        dh_clean -k 
        dh_installdirs
-       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
+       $(MAKE)  INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/qtc_packaging/debian_harmattan/rules.real b/qtc_packaging/debian_harmattan/rules.real
index 41efece..bea4b59 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules.real
+++ b/qtc_packaging/debian_harmattan/rules.real
@@ -12,7 +12,7 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       qmake LatitudeUpdater.pro
+       qmake latitudeupdater.pro
        touch configure-stamp
 
 build: build-stamp
@@ -34,7 +34,7 @@ install: build
        dh_testroot
        dh_clean -k 
        dh_installdirs
-       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
+       $(MAKE)  INSTALL_ROOT="$(CURDIR)"/debian/googlelatitude install
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/qtc_packaging/do-deb.sh b/qtc_packaging/do-deb.sh
deleted file mode 100755 (executable)
index e9b642a..0000000
--- a/qtc_packaging/do-deb.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-rm debian/*
-cp qtc_packaging/debian_fremantle/* debian/
-cp qtc_packaging/debian_fremantle/rules.real debian/rules
-~/QtSDK/Maemo/4.6.2/bin/mad dpkg-buildpackage -sa -S -rfakeroot -I.git -I.gitignore -Iqtc_packaging/binary_*
-mv ../googlelatitude* qtc_packaging/binary_fremantle/
-
-rm debian/*
-cp qtc_packaging/debian_harmattan/* debian/
-cp qtc_packaging/debian_harmattan/rules.real debian/rules
-~/QtSDK/Madde/bin/mad dpkg-buildpackage -sa -S -rfakeroot -I.git -I.gitignore -Iqtc_packaging/binary_*
-mv ../googlelatitude* qtc_packaging/binary_harmattan
-