From da28f8ff631e83d5706be41ae46ff70ceef912da Mon Sep 17 00:00:00 2001 From: Luciano Montanaro Date: Sat, 28 Jul 2012 23:03:42 +0200 Subject: [PATCH] Fix single instance, use meegotouch icon --- application/application.pro | 21 +++++++++++++++----- application/icons/80x80/quandoparte.png | Bin 0 -> 5966 bytes .../harmattan/applications/quandoparte.desktop | 4 ++-- qtc_packaging/debian_harmattan/changelog | 5 +++++ qtc_packaging/debian_harmattan/rules | 2 +- www/index.html | 2 +- www/screenshots.html | 3 ++- 7 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 application/icons/80x80/quandoparte.png diff --git a/application/application.pro b/application/application.pro index 39088da..45bbf23 100644 --- a/application/application.pro +++ b/application/application.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -VERSION = 0.5.0 +VERSION = 0.5.1 USE_RESOURCES = 0 QT += webkit network @@ -126,6 +126,7 @@ OTHER_FILES += \ resources/fremantle/applications/quandoparte.desktop \ icons/48x48/quandoparte.png \ icons/64x64/quandoparte.png \ + icons/80x80/quandoparte.png \ icons/scalable/quandoparte.svg \ icons/quandoparte.png \ resources/quandoparte.css \ @@ -182,12 +183,10 @@ unix:!symbian { } unix:!symbian { - css.files = resources/$${TARGET}.css resources/arrivals.css resources/departures.css i18n.files = $$replace(TRANSLATIONS, .ts, .qm) stations.files = resources/stations/stations.qpl i18n.path = $$DATADIR/i18n - css.path = $$DATADIR/css stations.path = $$DATADIR/stations icon48.files = icons/48x48/$${TARGET}.png @@ -199,15 +198,27 @@ unix:!symbian { iconscalable.path = /usr/share/icons/hicolor/scalable/apps INSTALLS += icon48 - INSTALLS += icon64 INSTALLS += iconscalable !contains(USE_RESOURCES,1) { - INSTALLS += css INSTALLS += i18n INSTALLS += stations } } +maemo5 { + css.files = resources/$${TARGET}.css resources/arrivals.css resources/departures.css + css.path = $$DATADIR/css + !contains(USE_RESOURCES,1) { + INSTALLS += css + } +} + +harmattan { + icon80.files = icons/80x80/$${TARGET}.png + icon80.path = /usr/share/icons/hicolor/meegotouch/apps + INSTALLS += icon80 +} + !contains(USE_RESOURCES,1) { harmattan { qml.files = resources/harmattan/qml/*.qml resources/harmattan/qml/*.js diff --git a/application/icons/80x80/quandoparte.png b/application/icons/80x80/quandoparte.png new file mode 100644 index 0000000000000000000000000000000000000000..7f4faced99bea74ac6783f98b1c0bcd93216f13f GIT binary patch literal 5966 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 literal 0 HcmV?d00001 diff --git a/application/resources/harmattan/applications/quandoparte.desktop b/application/resources/harmattan/applications/quandoparte.desktop index f2e44c3..f3bcdcb 100644 --- a/application/resources/harmattan/applications/quandoparte.desktop +++ b/application/resources/harmattan/applications/quandoparte.desktop @@ -4,8 +4,8 @@ Version=1.0 Type=Application Terminal=false Name=Quando Parte -Exec=/usr/bin/invoker --type=d -s /opt/quandoparte/bin/quandoparte -Icon=/usr/share/icons/hicolor/scalable/apps/quandoparte.svg +Exec=/usr/bin/invoker --single-instance --type=d -s /opt/quandoparte/bin/quandoparte +Icon=/usr/share/icons/hicolor/meegotouch/apps/quandoparte.png X-Window-Icon= X-HildonDesk-ShowInToolbar=true X-Osso-Type=application/x-executable diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog index 5df0df4..f3baedc 100644 --- a/qtc_packaging/debian_harmattan/changelog +++ b/qtc_packaging/debian_harmattan/changelog @@ -1,3 +1,8 @@ +quandoparte (0.5.1) unstable; urgency=low + * Fix single instance startup + + -- Luciano Montanaro Sat, 28 Jul 2012 20:18:47 +0200 + quandoparte (0.5.0) unstable; urgency=low * Public release * Fixed the searchbar hiding/unhiding animation diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules index 8ba4152..19ece88 100755 --- a/qtc_packaging/debian_harmattan/rules +++ b/qtc_packaging/debian_harmattan/rules @@ -40,7 +40,7 @@ install: build dh_clean -k dh_installdirs # Add here commands to install the package into debian/quandoparte. - $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/quandoparte install + $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/quandoparte install # Build architecture-independent files here. diff --git a/www/index.html b/www/index.html index 4bb4adb..207c996 100644 --- a/www/index.html +++ b/www/index.html @@ -46,7 +46,7 @@ diff --git a/www/screenshots.html b/www/screenshots.html index 9c18eab..54180b7 100644 --- a/www/screenshots.html +++ b/www/screenshots.html @@ -25,7 +25,8 @@
-- 1.7.9.5