situare
13 years agoSorted src.pro file, added new signals/slots for showing/opening panels/tabs
Pekka Nissinen [Mon, 16 Aug 2010 10:24:55 +0000 (13:24 +0300)]
Sorted src.pro file, added new signals/slots for showing/opening panels/tabs

13 years agoJust another minor cosmetic code update
Pekka Nissinen [Mon, 16 Aug 2010 07:30:44 +0000 (10:30 +0300)]
Just another minor cosmetic code update

13 years agoAdded missing comment blocks and cleaned up the code a bit
Pekka Nissinen [Mon, 16 Aug 2010 07:22:28 +0000 (10:22 +0300)]
Added missing comment blocks and cleaned up the code a bit

13 years agoRemoved unnecessary if statement and some old code leftovers
Pekka Nissinen [Mon, 16 Aug 2010 07:10:03 +0000 (10:10 +0300)]
Removed unnecessary if statement and some old code leftovers

13 years agoFixed setCurrentIndex slot comment
Pekka Nissinen [Mon, 16 Aug 2010 07:04:39 +0000 (10:04 +0300)]
Fixed setCurrentIndex slot comment

13 years agoModified existing classes to use the new PanelTabBar class and its methods
Pekka Nissinen [Mon, 16 Aug 2010 06:51:22 +0000 (09:51 +0300)]
Modified existing classes to use the new PanelTabBar class and its methods

13 years agoSeparated the tab section into a new class PanelTabBar
Pekka Nissinen [Mon, 16 Aug 2010 06:29:58 +0000 (09:29 +0300)]
Separated the tab section into a new class PanelTabBar

13 years agoMerge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
Pekka Nissinen [Fri, 13 Aug 2010 14:02:31 +0000 (17:02 +0300)]
Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels

Conflicts:
src/ui/indicatorbuttonpanel.cpp

13 years agoJust some small cosmetic chages (spacings and curly brackets)
Pekka Nissinen [Fri, 13 Aug 2010 13:56:01 +0000 (16:56 +0300)]
Just some small cosmetic chages (spacings and curly brackets)

13 years agoSome minor cosmetic changes
Pekka Nissinen [Fri, 13 Aug 2010 10:47:32 +0000 (13:47 +0300)]
Some minor cosmetic changes

13 years agoReviewed old files modified in new_panels branch
Sami Rämö [Fri, 13 Aug 2010 13:34:13 +0000 (16:34 +0300)]
Reviewed old files modified in new_panels branch

 - Reviewed by Sami Rämö

 - New files are not yes reviewed

13 years agoMerge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
Sami Rämö [Fri, 13 Aug 2010 13:36:23 +0000 (16:36 +0300)]
Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels

13 years agoReviewed panels
Sami Rämö [Fri, 13 Aug 2010 13:34:13 +0000 (16:34 +0300)]
Reviewed panels

 - Reviewed by Sami Rämö

13 years agoSome minor cosmetic changes
Pekka Nissinen [Fri, 13 Aug 2010 10:47:32 +0000 (13:47 +0300)]
Some minor cosmetic changes

13 years agoMerge branch 'master' into new_panels
Sami Rämö [Fri, 13 Aug 2010 10:33:04 +0000 (13:33 +0300)]
Merge branch 'master' into new_panels

Conflicts:
src/ui/friendlistpanel.h
src/ui/sidepanel.cpp
src/ui/tabbedpanel.h
src/ui/userinfo.cpp
src/ui/userinfopanel.h

13 years agoRemoved QtGui includes
Sami Rämö [Fri, 13 Aug 2010 08:31:58 +0000 (11:31 +0300)]
Removed QtGui includes

13 years agoChanged setActiveTab slot into private slot
Pekka Nissinen [Thu, 12 Aug 2010 09:08:24 +0000 (12:08 +0300)]
Changed setActiveTab slot into private slot

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Thu, 12 Aug 2010 09:04:34 +0000 (12:04 +0300)]
Merge branch 'master' into new_panels

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Katri Kaikkonen [Thu, 12 Aug 2010 08:53:17 +0000 (11:53 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agoAdded focus to QTextEdit in update location dialog
Katri Kaikkonen [Thu, 12 Aug 2010 08:50:39 +0000 (11:50 +0300)]
Added focus to QTextEdit in update location dialog

13 years agoAdded a new signal for TabbedPanel (tabChanged) that can be used to (for example...
Pekka Nissinen [Thu, 12 Aug 2010 08:39:25 +0000 (11:39 +0300)]
Added a new signal for TabbedPanel (tabChanged) that can be used to (for example) clear the friend list filtering when tab is changed

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Thu, 12 Aug 2010 08:03:20 +0000 (11:03 +0300)]
Merge branch 'master' into new_panels

13 years agoTabbedPanel now emits panelOpened/Closed signals after the animation has stopped.
Pekka Nissinen [Thu, 12 Aug 2010 07:56:38 +0000 (10:56 +0300)]
TabbedPanel now emits panelOpened/Closed signals after the animation has stopped.
Forced the panel tabs to return into non-selected state when panel is closed.

13 years agoFixed comments
Sami Rämö [Thu, 12 Aug 2010 07:49:57 +0000 (10:49 +0300)]
Fixed comments

13 years agoUpdates to unit test script
Sami Rämö [Thu, 12 Aug 2010 07:05:31 +0000 (10:05 +0300)]
Updates to unit test script

 - Output filtering patterns are now in separate file, so adding
   more of them is easy

 - Output is more clear in scratchbox

 - Added some parameters for make; running 3 threads and not so verbose
   output

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Sami Rämö [Thu, 12 Aug 2010 06:22:51 +0000 (09:22 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agoFixed bug in MapEngine unit tests
Sami Rämö [Thu, 12 Aug 2010 06:20:51 +0000 (09:20 +0300)]
Fixed bug in MapEngine unit tests

 - MapEngine must have view attached before using the map,
   and the tests didn't have, so the test segfaulted

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Wed, 11 Aug 2010 14:25:54 +0000 (17:25 +0300)]
Merge branch 'master' into new_panels

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Pekka Nissinen [Wed, 11 Aug 2010 14:23:14 +0000 (17:23 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agoAdded missing files from the previous commit *sigh*
Pekka Nissinen [Wed, 11 Aug 2010 14:20:39 +0000 (17:20 +0300)]
Added missing files from the previous commit *sigh*

13 years agoRenamed and (temporary) fixed the old SidePanel test to work with the new TabbedPanel...
Pekka Nissinen [Wed, 11 Aug 2010 14:17:16 +0000 (17:17 +0300)]
Renamed and (temporary) fixed the old SidePanel test to work with the new TabbedPanel class

13 years agoMerge branch 'fullscreen_button_hide'
Sami Rämö [Wed, 11 Aug 2010 14:07:35 +0000 (17:07 +0300)]
Merge branch 'fullscreen_button_hide'

13 years agoFixed a bug in indicator button panel which caused infinite loop in paint event
Katri Kaikkonen [Wed, 11 Aug 2010 13:22:13 +0000 (16:22 +0300)]
Fixed a bug in indicator button panel which caused infinite loop in paint event

13 years agoFunctional test for full screen button hiding fullscreen_button_hide
Sami Rämö [Wed, 11 Aug 2010 13:55:56 +0000 (16:55 +0300)]
Functional test for full screen button hiding

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Wed, 11 Aug 2010 13:28:14 +0000 (16:28 +0300)]
Merge branch 'master' into new_panels

13 years agoMerge branch 'master' into fullscreen_button_hide
Sami Rämö [Wed, 11 Aug 2010 13:22:17 +0000 (16:22 +0300)]
Merge branch 'master' into fullscreen_button_hide

13 years agoFixed a bug in indicator button panel which caused infinity loop in paint event
Katri Kaikkonen [Wed, 11 Aug 2010 13:22:13 +0000 (16:22 +0300)]
Fixed a bug in indicator button panel which caused infinity loop in paint event

13 years agoFixed a minor merge screw-up and corrected IndicatorButtonPanel dragging to work...
Pekka Nissinen [Wed, 11 Aug 2010 12:24:08 +0000 (15:24 +0300)]
Fixed a minor merge screw-up and corrected IndicatorButtonPanel dragging to work properly with new (single) panels

13 years agoYet another minor cosmetic fix
Pekka Nissinen [Wed, 11 Aug 2010 12:03:15 +0000 (15:03 +0300)]
Yet another minor cosmetic fix

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Wed, 11 Aug 2010 11:49:16 +0000 (14:49 +0300)]
Merge branch 'master' into new_panels

Conflicts:
src/src.pro
src/ui/indicatorbutton.cpp
src/ui/mainwindow.cpp
src/ui/panelcommon.h

13 years agoAdded missing default values to PanelBar, PanelBase and TabbedPanel constructors
Pekka Nissinen [Wed, 11 Aug 2010 11:30:41 +0000 (14:30 +0300)]
Added missing default values to PanelBar, PanelBase and TabbedPanel constructors

13 years agoRestored Doxyfile
Sami Rämö [Wed, 11 Aug 2010 11:23:56 +0000 (14:23 +0300)]
Restored Doxyfile

13 years agoAdded functional tests for distance indication button indicator
Katri Kaikkonen [Wed, 11 Aug 2010 11:05:25 +0000 (14:05 +0300)]
Added functional tests for distance indication button
Reviewed by Sami Rämö

13 years agoImplemented full screen button hiding after a delay
Sami Rämö [Wed, 11 Aug 2010 09:54:14 +0000 (12:54 +0300)]
Implemented full screen button hiding after a delay

 - Revieved by Katri Kaikkonen

 - Some clean-up for Application

13 years agoJust a minor cosmetic fix
Pekka Nissinen [Wed, 11 Aug 2010 08:02:12 +0000 (11:02 +0300)]
Just a minor cosmetic fix

13 years agoRemoved a bunch of unnecessary constants
Pekka Nissinen [Wed, 11 Aug 2010 08:00:26 +0000 (11:00 +0300)]
Removed a bunch of unnecessary constants

13 years agoAdded a new method (buildPanels) for building tabbed panels
Pekka Nissinen [Wed, 11 Aug 2010 07:36:14 +0000 (10:36 +0300)]
Added a new method (buildPanels) for building tabbed panels

13 years agoAdded a few missing comment blocks and cleaned up code a bit
Pekka Nissinen [Wed, 11 Aug 2010 07:34:30 +0000 (10:34 +0300)]
Added a few missing comment blocks and cleaned up code a bit

13 years agoMinor cosmetic and other kind of changes to UserInfoPanel & FriendListPanel classes
Pekka Nissinen [Wed, 11 Aug 2010 07:32:00 +0000 (10:32 +0300)]
Minor cosmetic and other kind of changes to UserInfoPanel & FriendListPanel classes

13 years agoFixing defects found in the review
Katri Kaikkonen [Wed, 11 Aug 2010 06:35:57 +0000 (09:35 +0300)]
Fixing defects found in the review
Reviewed by Sami Rämö

13 years agoThe first "kind of" working version of the new panels
Pekka Nissinen [Tue, 10 Aug 2010 12:50:04 +0000 (15:50 +0300)]
The first "kind of" working version of the new panels

13 years agoChanged the names of a few constants and modified the files/classes that use them...
Pekka Nissinen [Tue, 10 Aug 2010 12:42:07 +0000 (15:42 +0300)]
Changed the names of a few constants and modified the files/classes that use them accordingly

13 years agoRenamed some of the old panel classes and re-organized the whole panel structure
Pekka Nissinen [Tue, 10 Aug 2010 12:35:08 +0000 (15:35 +0300)]
Renamed some of the old panel classes and re-organized the whole panel structure

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Tue, 10 Aug 2010 12:21:19 +0000 (15:21 +0300)]
Merge branch 'master' into new_panels

13 years agoMerge branch 'master' into indicator
Katri Kaikkonen [Tue, 10 Aug 2010 09:26:31 +0000 (12:26 +0300)]
Merge branch 'master' into indicator

Conflicts:
src/src.pro

13 years agoAdded signals, distance counter, text label to panel and distance text.
Katri Kaikkonen [Tue, 10 Aug 2010 09:14:48 +0000 (12:14 +0300)]
Added signals, distance counter, text label to panel and distance text.
Also added draggability to the panel.

13 years agoFixed defects found in the review of MapRouteItem
Sami Rämö [Mon, 9 Aug 2010 12:47:43 +0000 (15:47 +0300)]
Fixed defects found in the review of MapRouteItem

 - Reviewed by Jussi Laitinen

 - Created enum for MapScene item zValues

13 years agoRe-factoring GeocodingService parser and Location class
Sami Rämö [Mon, 9 Aug 2010 10:29:04 +0000 (13:29 +0300)]
Re-factoring GeocodingService parser and Location class

 - Reviewed by Jussi Laitinen

 - Changed GeocodingService to parse and save recommended viewport
   instead of bounds

 - Re-factored Location class interface to use GeoCoordinate
   parameters instead of separate latitude and longitude
   double parameters

13 years agoRe-factored location search into separate GeocodingService class
Sami Rämö [Mon, 9 Aug 2010 08:07:12 +0000 (11:07 +0300)]
Re-factored location search into separate GeocodingService class

 - Reviewed by Jussi Laitinen

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Mon, 9 Aug 2010 07:56:57 +0000 (10:56 +0300)]
Merge branch 'master' into new_panels

13 years agoRe-factoring, created error.h, clean-up
Sami Rämö [Mon, 9 Aug 2010 06:13:46 +0000 (09:13 +0300)]
Re-factoring, created error.h, clean-up

 - Reviewed by Pekka Nissinen

 - created error.h and moved all error related constants there from common.h

 - removed list of current network requests from RoutingService

 - some clean-up

13 years agoMerge branch 'master' into new_panels
Pekka Nissinen [Thu, 5 Aug 2010 13:36:35 +0000 (16:36 +0300)]
Merge branch 'master' into new_panels

13 years agoFixing defects found in the review of Route, RouteSegment & RoutingService
Sami Rämö [Thu, 5 Aug 2010 12:30:23 +0000 (15:30 +0300)]
Fixing defects found in the review of Route, RouteSegment & RoutingService

 - Reviewed by Pekka Nissinen

13 years agoRemoved yet another unused image files and modified images.qrc accordingly
Pekka Nissinen [Thu, 5 Aug 2010 12:29:44 +0000 (15:29 +0300)]
Removed yet another unused image files and modified images.qrc accordingly

13 years agoModified dragging area restrictions for IndicatorButton and ZoomButtonPanel
Pekka Nissinen [Thu, 5 Aug 2010 12:06:40 +0000 (15:06 +0300)]
Modified dragging area restrictions for IndicatorButton and ZoomButtonPanel

13 years agoUpdated images.qrc file to reflect recent changes
Pekka Nissinen [Thu, 5 Aug 2010 09:45:31 +0000 (12:45 +0300)]
Updated images.qrc file to reflect recent changes

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Sami Rämö [Thu, 5 Aug 2010 09:39:50 +0000 (12:39 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agoAdded corner case tests for networking
Sami Rämö [Wed, 4 Aug 2010 07:47:48 +0000 (10:47 +0300)]
Added corner case tests for networking

13 years agoRemoved unused PanelSideBar classes and added new PanelTab classes for tabbed panels
Pekka Nissinen [Thu, 5 Aug 2010 08:38:20 +0000 (11:38 +0300)]
Removed unused PanelSideBar classes and added new PanelTab classes for tabbed panels

13 years agoRemoved unnecessary image files (needed by old panels) and added new images for tabbe...
Pekka Nissinen [Thu, 5 Aug 2010 08:22:05 +0000 (11:22 +0300)]
Removed unnecessary image files (needed by old panels) and added new images for tabbed panels

13 years agoMerge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator
Katri Kaikkonen [Wed, 4 Aug 2010 07:37:33 +0000 (10:37 +0300)]
Merge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator

13 years agoFixed signals
Katri Kaikkonen [Wed, 4 Aug 2010 07:28:11 +0000 (10:28 +0300)]
Fixed signals

13 years agoMinor modifications to two debug prints
Sami Rämö [Tue, 3 Aug 2010 12:19:38 +0000 (15:19 +0300)]
Minor modifications to two debug prints

13 years agoMade some minor cosmetic changes and sorted images.grc alphabetically
Pekka Nissinen [Tue, 3 Aug 2010 11:31:59 +0000 (14:31 +0300)]
Made some minor cosmetic changes and sorted images.grc alphabetically

13 years agoMerge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator
Sami Rämö [Tue, 3 Aug 2010 07:49:38 +0000 (10:49 +0300)]
Merge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator

13 years agoFixed distance calculate
Katri Kaikkonen [Tue, 3 Aug 2010 07:48:00 +0000 (10:48 +0300)]
Fixed distance calculate

13 years agoMerge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator
Sami Rämö [Tue, 3 Aug 2010 07:40:44 +0000 (10:40 +0300)]
Merge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator

13 years agoFixed SceneCoordinate::azimuthTo() angle calculation
Sami Rämö [Tue, 3 Aug 2010 07:39:25 +0000 (10:39 +0300)]
Fixed SceneCoordinate::azimuthTo() angle calculation

 - Implemented also a unit test for the method

13 years agoMerge branch 'master' into indicator
Katri Kaikkonen [Mon, 2 Aug 2010 13:46:46 +0000 (16:46 +0300)]
Merge branch 'master' into indicator

Conflicts:
src/map/mapengine.cpp
src/ui/indicatorbutton.cpp
src/ui/mainwindow.cpp

13 years agoAdded indicatorbuttonpanel.cpp and indicatorbuttonpanel.h
Katri Kaikkonen [Mon, 2 Aug 2010 13:15:21 +0000 (16:15 +0300)]
Added indicatorbuttonpanel.cpp and indicatorbuttonpanel.h

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Sami Rämö [Mon, 2 Aug 2010 12:59:14 +0000 (15:59 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
tests/coordinates/geocoordinate/testgeocoordinate.cpp

13 years agoUnit tests for SceneCoordinate operators
Sami Rämö [Mon, 2 Aug 2010 12:55:09 +0000 (15:55 +0300)]
Unit tests for SceneCoordinate operators

 - Reviewed by Pekka Nissinen

13 years agoUnit tests for GeoCoordinate operator- and distanceTo()
Sami Rämö [Mon, 2 Aug 2010 12:10:32 +0000 (15:10 +0300)]
Unit tests for GeoCoordinate operator- and distanceTo()

 - Reviewed by Pekka Nissinen

13 years agoUnit tests for GeoCoordinate operator- and distanceTo()
Sami Rämö [Mon, 2 Aug 2010 12:10:32 +0000 (15:10 +0300)]
Unit tests for GeoCoordinate operator- and distanceTo()

 - Reviewed by Pekka Nissinen

13 years agoAdded functional test for GPS accuracy ring gps_accuracy_ring
Sami Rämö [Mon, 2 Aug 2010 10:34:08 +0000 (13:34 +0300)]
Added functional test for GPS accuracy ring

13 years agoReview, re-factored GPSLocationItem unit test
Sami Rämö [Mon, 2 Aug 2010 09:55:09 +0000 (12:55 +0300)]
Review, re-factored GPSLocationItem unit test

 - Reviewed by Jussi Laitinen

13 years agoMerge branch 'master' into gps_accuracy_ring
Sami Rämö [Mon, 2 Aug 2010 08:24:22 +0000 (11:24 +0300)]
Merge branch 'master' into gps_accuracy_ring

13 years agoFixed unit tests, GPSLocationItem disabled by default
Sami Rämö [Mon, 2 Aug 2010 07:54:01 +0000 (10:54 +0300)]
Fixed unit tests, GPSLocationItem disabled by default

 - Fixed unit test of GPSLocationItem to match the new functionality
  and implementation

 - GPSLocationItem is disabled by default

13 years agoDrawing the red location dot, documenting, clean-up
Sami Rämö [Fri, 30 Jul 2010 13:58:54 +0000 (16:58 +0300)]
Drawing the red location dot, documenting, clean-up

 - Implemented drawing the red location dot by using a child item.

 - Added missing documentation

 - Clean-up

13 years agoUpdates to accuracy ring radius and item's bounding rect.
Sami Rämö [Fri, 30 Jul 2010 13:09:19 +0000 (16:09 +0300)]
Updates to accuracy ring radius and item's bounding rect.

 - Accuracy ring radius is calculated from the accuracy got from
   the GPS.

 - Item's bounding rect is updated when accuracy ring radius
   changes, so there should not be any drawing artifacts anymore.

 - Removed SceneCoordinate dependency from GPSLocationItem.

13 years agoRe-factoring
Sami Rämö [Fri, 30 Jul 2010 10:43:33 +0000 (13:43 +0300)]
Re-factoring

 - Replaced MapEngine::sceneResolution() with
   MapScene::horizontalResolutionAtLatitude() and
   MapEngine::viewResolution()

13 years agoAdded vibration feedback test case.
Jussi Laitinen [Fri, 30 Jul 2010 10:22:08 +0000 (13:22 +0300)]
Added vibration feedback test case.

13 years agoRe-factoring: Removed MapEngine dependency from MapScene and Maptile
Sami Rämö [Fri, 30 Jul 2010 10:15:39 +0000 (13:15 +0300)]
Re-factoring: Removed MapEngine dependency from MapScene and Maptile

13 years agoModified vibration feedback to read settings every time.
Jussi Laitinen [Fri, 30 Jul 2010 10:03:57 +0000 (13:03 +0300)]
Modified vibration feedback to read settings every time.

13 years agoRemoved vibration enabling and disabling.
Jussi Laitinen [Fri, 30 Jul 2010 09:33:27 +0000 (12:33 +0300)]
Removed vibration enabling and disabling.

13 years agoAdded missing comments.
Jussi Laitinen [Fri, 30 Jul 2010 09:09:04 +0000 (12:09 +0300)]
Added missing comments.

13 years agoRe-factoring
Sami Rämö [Fri, 30 Jul 2010 09:08:52 +0000 (12:08 +0300)]
Re-factoring

 - Re-factored / moved MapEngine::greatCircleDistance()
   to GeoCoordinate::distanceTo()

 - Implemented operator- for GeoCoordinate

 - Changed GPSPositionPrivate implementation to return always the
   accuracy got from the GeoPositionInfo, and not the
   GPS_ACCURACY_UNDEFINED value in case of network positioning.

 - Changed the GPSLocationItem inherit from QGraphicsItem instead of
   QGraphicsPixmapItem. Implemented GPSLocationItem::boundingRect()

13 years agoAdded touchscreen enabled flag.
Jussi Laitinen [Fri, 30 Jul 2010 08:59:42 +0000 (11:59 +0300)]
Added touchscreen enabled flag.

13 years agoAdded touchscreen enabled settings read.
Jussi Laitinen [Fri, 30 Jul 2010 08:47:41 +0000 (11:47 +0300)]
Added touchscreen enabled settings read.

13 years agoMerge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator
Katri Kaikkonen [Fri, 30 Jul 2010 07:36:29 +0000 (10:36 +0300)]
Merge branch 'indicator' of https://vcs.maemo.org/git/situare into indicator