Sami Rämö [Fri, 11 Jun 2010 08:07:18 +0000 (11:07 +0300)]
Fixed unit tests
Jussi Laitinen [Fri, 11 Jun 2010 07:50:13 +0000 (10:50 +0300)]
Moved PKFCONFIG to armel scope in src.pro.
Jussi Laitinen [Fri, 11 Jun 2010 07:48:04 +0000 (10:48 +0300)]
Modified FriendLocationItem and FriendGroupItem highlight state drawing.
Reviewed by: Marko Niemelä
Sami Rämö [Thu, 10 Jun 2010 13:55:07 +0000 (16:55 +0300)]
Merge branch 'master' into pan_map
Conflicts:
src/map/mapcommon.h
src/map/mapengine.cpp
src/map/mapengine.h
Sami Rämö [Thu, 10 Jun 2010 13:04:03 +0000 (16:04 +0300)]
Fixed MapTile::setPosition() x-value check
Sami Rämö [Thu, 10 Jun 2010 12:51:07 +0000 (15:51 +0300)]
Documentation
Sami Rämö [Thu, 10 Jun 2010 12:07:43 +0000 (15:07 +0300)]
Remove other level tiles when all current level tiles exists
lampehe-local [Thu, 10 Jun 2010 12:07:40 +0000 (15:07 +0300)]
Merge branch 'master' into error_procedur
Conflicts:
src/gps/gpspositionprivate.cpp
src/gps/gpspositionprivateliblocation.cpp
Jussi Laitinen [Thu, 10 Jun 2010 12:01:01 +0000 (15:01 +0300)]
Added GPSPosition::isInitialized method.
Reviewed by: Henri Lampela.
lampehe-local [Thu, 10 Jun 2010 11:27:20 +0000 (14:27 +0300)]
Updated some comments
lampehe-local [Thu, 10 Jun 2010 11:23:24 +0000 (14:23 +0300)]
Added finnish localizations for error messages
lampehe-local [Thu, 10 Jun 2010 11:11:09 +0000 (14:11 +0300)]
Added error message for GPS
lampehe-local [Thu, 10 Jun 2010 10:43:05 +0000 (13:43 +0300)]
Merge branch 'master' into error_procedur
Conflicts:
src/engine/engine.cpp
src/gps/gpsposition.h
src/situareservice/situareservice.cpp
lampehe-local [Thu, 10 Jun 2010 10:35:49 +0000 (13:35 +0300)]
First draft of new error procedure
Jussi Laitinen [Thu, 10 Jun 2010 10:20:46 +0000 (13:20 +0300)]
Removed maximum height from FriendListItem.
Sami Rämö [Thu, 10 Jun 2010 09:50:53 +0000 (12:50 +0300)]
Remove other level tiles after delay
Jussi Laitinen [Thu, 10 Jun 2010 09:31:55 +0000 (12:31 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
src/engine/engine.cpp
Jussi Laitinen [Thu, 10 Jun 2010 09:28:06 +0000 (12:28 +0300)]
Changed GPSPosition::error method's error string to error code.
Ville Tiensuu [Thu, 10 Jun 2010 09:00:58 +0000 (12:00 +0300)]
clened unneeded comments
Jussi Laitinen [Thu, 10 Jun 2010 08:34:45 +0000 (11:34 +0300)]
Modified location item click functionality test.
Jussi Laitinen [Thu, 10 Jun 2010 08:30:26 +0000 (11:30 +0300)]
Added highlight mode to FriendGroupItem and FriendLocationItem.
Katri Kaikkonen [Thu, 10 Jun 2010 07:09:31 +0000 (10:09 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Sami Rämö [Thu, 10 Jun 2010 07:03:02 +0000 (10:03 +0300)]
Cleanup
Katri Kaikkonen [Thu, 10 Jun 2010 07:00:33 +0000 (10:00 +0300)]
Added functional tests for update location dialog
Jussi Laitinen [Thu, 10 Jun 2010 06:41:36 +0000 (09:41 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Thu, 10 Jun 2010 06:40:51 +0000 (09:40 +0300)]
Added missing comments to engine.h, liblocationwrapper.h, mainwindow.h
and settingsdialog.h.
Jussi Laitinen [Thu, 10 Jun 2010 06:32:55 +0000 (09:32 +0300)]
Added readSettings to MainWindow::requestAutomaticUpdateLocation.
Reviewed by: Henri Lampela.
Jussi Laitinen [Thu, 10 Jun 2010 05:58:09 +0000 (08:58 +0300)]
Removed bool return value from
MainWindow::showEnableAutomaticLocationUpdateDialog.
Katri Kaikkonen [Wed, 9 Jun 2010 12:52:12 +0000 (15:52 +0300)]
Merge branch 'master' into charcounter
Reviewed by Marko Niemelä
Katri Kaikkonen [Wed, 9 Jun 2010 12:45:36 +0000 (15:45 +0300)]
Modified update location dialog
Jussi Laitinen [Wed, 9 Jun 2010 12:41:57 +0000 (15:41 +0300)]
Added test case for automatic location update confirmation dialog.
Sami Rämö [Wed, 9 Jun 2010 12:41:36 +0000 (15:41 +0300)]
Try max 4 upper level images from cache
- also some cleanup
Jussi Laitinen [Wed, 9 Jun 2010 12:32:07 +0000 (15:32 +0300)]
Modified automatic location update feature.
Reviewed by: Henri Lampela
Jussi Laitinen [Wed, 9 Jun 2010 12:20:24 +0000 (15:20 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
doc/testing/functionality-tests.doc
Jussi Laitinen [Wed, 9 Jun 2010 10:58:32 +0000 (13:58 +0300)]
Removed qWarning from Engine.
Jussi Laitinen [Wed, 9 Jun 2010 10:43:50 +0000 (13:43 +0300)]
Modified Engine automatic update location feature.
Katri Kaikkonen [Wed, 9 Jun 2010 09:46:04 +0000 (12:46 +0300)]
Merge branch 'master' into charcounter
Conflicts:
src/ui/updatelocation/updatelocationdialog.cpp
src/ui/updatelocation/updatelocationdialog.h
src/ui/userinfo.cpp
Katri Kaikkonen [Wed, 9 Jun 2010 09:33:09 +0000 (12:33 +0300)]
Changed from dialog to stacked widget
Kaj Wallin [Wed, 9 Jun 2010 09:31:26 +0000 (12:31 +0300)]
Removed obsolete signal from mapview and changed rest of the slots to
use alternative signal
Reviewed by: Jussi Laitinen
Jussi Laitinen [Wed, 9 Jun 2010 09:22:53 +0000 (12:22 +0300)]
Changed confirmation dialog to have yes and no buttons.
Kaj Wallin [Wed, 9 Jun 2010 09:06:35 +0000 (12:06 +0300)]
Updated Finnish translation and disable automatic translation loading
Reviewed by:
Kaj Wallin [Wed, 9 Jun 2010 08:59:52 +0000 (11:59 +0300)]
Remove obsolete images.qrc from src/
Reviewed by:
Kaj Wallin [Wed, 9 Jun 2010 08:52:02 +0000 (11:52 +0300)]
Merge branch 'distance_scale'
Conflicts:
src/ui/mainwindow.h
Did minor fixes to documentation. Added functional test for map scale
Reviewed by: Marko Niemelä
Jussi Laitinen [Wed, 9 Jun 2010 07:35:55 +0000 (10:35 +0300)]
Modified SettingsDialog. Added running flag in gpspositionprivatestub.
Kaj Wallin [Wed, 9 Jun 2010 07:34:06 +0000 (10:34 +0300)]
Finished basic map scale feature
Reviewed by: Marko Niemelä
lampehe-local [Wed, 9 Jun 2010 07:05:12 +0000 (10:05 +0300)]
Added functional tests for queued information and error boxes
Reviewed by: Katri Kaikkonen
Sami Rämö [Wed, 9 Jun 2010 06:46:26 +0000 (09:46 +0300)]
Merge branch 'master' into pan_map
Conflicts:
src/map/mapengine.h
Sami Rämö [Wed, 9 Jun 2010 05:49:45 +0000 (08:49 +0300)]
Added documentation
Jussi Laitinen [Wed, 9 Jun 2010 05:06:02 +0000 (08:06 +0300)]
Merge branch 'master' into settings_auto_update
Jussi Laitinen [Tue, 8 Jun 2010 12:54:43 +0000 (15:54 +0300)]
Added debug prints to SettingsDialog.
lampehe-local [Tue, 8 Jun 2010 12:42:14 +0000 (15:42 +0300)]
Merge branch 'note_problem'
lampehe-local [Tue, 8 Jun 2010 12:38:34 +0000 (15:38 +0300)]
Small fix for dialog/note queues
Reviewed by: Jussi Laitinen
Sami Rämö [Tue, 8 Jun 2010 12:28:36 +0000 (15:28 +0300)]
Fixed friends collision detection with spanned items
Sami Rämö [Tue, 8 Jun 2010 12:01:34 +0000 (15:01 +0300)]
Span items also when items are moved
- span items also when friends locations, own Situare location
or GPS location are changed
- some cleaning
Jussi Laitinen [Tue, 8 Jun 2010 11:54:33 +0000 (14:54 +0300)]
Added check if timer timeout value is too small.
lampehe-local [Tue, 8 Jun 2010 11:52:36 +0000 (14:52 +0300)]
Added login conter
Jussi Laitinen [Tue, 8 Jun 2010 11:30:11 +0000 (14:30 +0300)]
Merge branch 'master' into settings_auto_update
Conflicts:
doc/testing/functionality-tests.doc
src/ui/mainwindow.cpp
src/ui/mainwindow.h
Sami Rämö [Tue, 8 Jun 2010 11:13:59 +0000 (14:13 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Sami Rämö [Tue, 8 Jun 2010 11:08:42 +0000 (14:08 +0300)]
Use liblocation GPS only when built with CONFIG+=armel in Scratchbox
lampehe-local [Tue, 8 Jun 2010 10:59:12 +0000 (13:59 +0300)]
Merge branch 'note_queue'
lampehe-local [Tue, 8 Jun 2010 10:56:57 +0000 (13:56 +0300)]
Implemented dialog/information box queue for normal messages and errors
Reviewed by: Marko Niemelä
Jussi Laitinen [Tue, 8 Jun 2010 10:56:37 +0000 (13:56 +0300)]
Added functional test for automatic location update confirmation dialog.
Sami Rämö [Tue, 8 Jun 2010 10:30:06 +0000 (13:30 +0300)]
Span only items which are coming to view
Ville Tiensuu [Tue, 8 Jun 2010 09:37:43 +0000 (12:37 +0300)]
created functial test for message saving
reviewed By: Kaj Wallin
Jussi Laitinen [Tue, 8 Jun 2010 09:14:57 +0000 (12:14 +0300)]
Added confirmation dialog to automatic location update feature.
Sami Rämö [Tue, 8 Jun 2010 08:34:51 +0000 (11:34 +0300)]
Got spanning of items (friends, locations) working
lampehe-local [Tue, 8 Jun 2010 08:06:32 +0000 (11:06 +0300)]
Merge branch 'master' into note_queue
Conflicts:
src/src.pro
lampehe-local [Tue, 8 Jun 2010 08:02:29 +0000 (11:02 +0300)]
backup
Ville Tiensuu [Tue, 8 Jun 2010 07:55:37 +0000 (10:55 +0300)]
Merge branch 'save_message'
Conflicts:
src/src.pro
Ville Tiensuu [Tue, 8 Jun 2010 07:44:11 +0000 (10:44 +0300)]
reviewed and iterated with Marko Niemelä
Ville Tiensuu [Tue, 8 Jun 2010 06:17:44 +0000 (09:17 +0300)]
before review
Ville Tiensuu [Mon, 7 Jun 2010 13:36:37 +0000 (16:36 +0300)]
backup before review
Jussi Laitinen [Mon, 7 Jun 2010 13:14:24 +0000 (16:14 +0300)]
Fixed bug #5867.
Reviewed by: Henri Lampela.
Kaj Wallin [Mon, 7 Jun 2010 13:01:51 +0000 (16:01 +0300)]
First version of the scaling map scale
Reviewed by:
lampehe-local [Mon, 7 Jun 2010 11:56:09 +0000 (14:56 +0300)]
backup
Jussi Laitinen [Mon, 7 Jun 2010 11:37:10 +0000 (14:37 +0300)]
Modified test case for location item click.
Jussi Laitinen [Mon, 7 Jun 2010 11:08:36 +0000 (14:08 +0300)]
Changed header text in friend list panel.
Jussi Laitinen [Mon, 7 Jun 2010 11:02:20 +0000 (14:02 +0300)]
Added friend list panel header.
Reviewed by: Kaj Wallin
Ville Tiensuu [Mon, 7 Jun 2010 10:50:41 +0000 (13:50 +0300)]
basic functionality of error handling ready
Kaj Wallin [Mon, 7 Jun 2010 09:37:03 +0000 (12:37 +0300)]
Merge branch 'master' into distance_scale
Kaj Wallin [Mon, 7 Jun 2010 09:36:33 +0000 (12:36 +0300)]
Initial map scale
Reviewed by:
Jussi Laitinen [Mon, 7 Jun 2010 09:22:40 +0000 (12:22 +0300)]
Added test case for friend list sorting.
Jussi Laitinen [Mon, 7 Jun 2010 09:19:30 +0000 (12:19 +0300)]
Added friend list sorting by timestamp.
Reviewed by: Kaj Wallin
lampehe-local [Mon, 7 Jun 2010 09:06:51 +0000 (12:06 +0300)]
Changed implementation
Sami Rämö [Mon, 7 Jun 2010 08:40:25 +0000 (11:40 +0300)]
Some calculation fixes
- fixed half of the tiles grid vertical size rounding up
- changed mapImageReceived() to calculate when duplicate
tile should be added instead of using constant value
- spanning is now ignoring padding (reserve of tiles which
would never be shown when jumping to opposite side of
the world)
Jussi Laitinen [Mon, 7 Jun 2010 07:58:25 +0000 (10:58 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
src/src.pro
Jussi Laitinen [Mon, 7 Jun 2010 07:50:34 +0000 (10:50 +0300)]
Added comments and debug prints.
Kaj Wallin [Mon, 7 Jun 2010 07:17:30 +0000 (10:17 +0300)]
Removed obsolete image from res/images
Reviewed by: Pekka Nissinen
Sami Rämö [Mon, 7 Jun 2010 07:14:12 +0000 (10:14 +0300)]
Got map spanning working
- Fixed duplicating received tiles in mapImageReceived()
when necessary
- Fixed removeOutOfViewTiles() not to remove duplicated
tiles when view is near world limits
- MapScene::addTile() does now take care of remove old
version of the tile from the scene if it already exists
Kaj Wallin [Mon, 7 Jun 2010 07:07:57 +0000 (10:07 +0300)]
Cleaned some garbage from repository and thus closed bug 5765
Reviewed by: Ville Tiensuu
Kaj Wallin [Mon, 7 Jun 2010 06:43:57 +0000 (09:43 +0300)]
Added functionality test for localization
Reviewed by: Ville Tiensuu
Kaj Wallin [Mon, 7 Jun 2010 06:40:39 +0000 (09:40 +0300)]
Merge branch 'localization'
Kaj Wallin [Mon, 7 Jun 2010 06:36:16 +0000 (09:36 +0300)]
Finished Finnish localization
Reviewed by: Ville Tiensuu
Jussi Laitinen [Mon, 7 Jun 2010 05:50:56 +0000 (08:50 +0300)]
Added error handler to LiblocationWrapper.
Ville Tiensuu [Fri, 4 Jun 2010 13:10:16 +0000 (16:10 +0300)]
backup
Jussi Laitinen [Fri, 4 Jun 2010 11:56:03 +0000 (14:56 +0300)]
Added comments to liblocationwrapper.cpp.
Jussi Laitinen [Fri, 4 Jun 2010 11:06:03 +0000 (14:06 +0300)]
Merged gpspositionprivate.cpp from master branch.
Jussi Laitinen [Fri, 4 Jun 2010 10:58:56 +0000 (13:58 +0300)]
Merge branch 'master' into gps_wrapper
Jussi Laitinen [Fri, 4 Jun 2010 10:58:42 +0000 (13:58 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Fri, 4 Jun 2010 10:57:33 +0000 (13:57 +0300)]
Added GeoCoordinate, GeoPositionInfo, GpsPositionPrivate (liblocation)
and LiblocationWrapper classes.
projects / situare / log