Kaj Wallin [Wed, 16 Jun 2010 05:09:46 +0000 (08:09 +0300)]
Fixed ownLocationItem unit test to reflect recent changes to the
actual item.
Reviewed by: Jussi Laitinen
Sami Rämö [Tue, 15 Jun 2010 13:39:06 +0000 (16:39 +0300)]
Merge branch 'bug_5831_group_release'
Conflicts:
src/map/baselocationitem.h
Sami Rämö [Tue, 15 Jun 2010 13:33:12 +0000 (16:33 +0300)]
Fixed unit test for FriendGroupItem
Reviewed by Pekka Nissinen
- Changed image used in the test to current group item image
- Chanded locations of items used in the tests to match
bounding rects of the current items
Sami Rämö [Tue, 15 Jun 2010 12:57:45 +0000 (15:57 +0300)]
Fixed bug #5831: Friend groups do not always release friends when zooming in
- Reviewed by Jussi Laitinen
Pekka Nissinen [Tue, 15 Jun 2010 08:49:59 +0000 (11:49 +0300)]
Added previously missing icon *sigh*
Pekka Nissinen [Tue, 15 Jun 2010 08:48:27 +0000 (11:48 +0300)]
Added new icon for own location position, changed panel slider button arrow directions automatically
Reviewed by: Kaj Wallin
Pekka Nissinen [Tue, 15 Jun 2010 08:40:13 +0000 (11:40 +0300)]
Merge branch 'master' into scalable_panels
Conflicts:
src/map/baselocationitem.h
Jussi Laitinen [Tue, 15 Jun 2010 07:06:31 +0000 (10:06 +0300)]
Modified MainWindow::automaticUpdateDialogFinished.
Jussi Laitinen [Tue, 15 Jun 2010 06:30:48 +0000 (09:30 +0300)]
Modified automatic location update functional test.
Sami Rämö [Tue, 15 Jun 2010 05:56:25 +0000 (08:56 +0300)]
Merged fix for collision detection over map limits
- Reviewed by Jussi Laitinen
Kaj Wallin [Tue, 15 Jun 2010 05:46:52 +0000 (08:46 +0300)]
Changed version number to 0.6-1b
Reviewed by:
Kaj Wallin [Tue, 15 Jun 2010 05:32:55 +0000 (08:32 +0300)]
Minor style fix on the FuTe documentation
Reviewed by:
Pekka Nissinen [Mon, 14 Jun 2010 14:06:53 +0000 (17:06 +0300)]
Added new bitmaps for scalable panels, made a separate class for side panel base
Pekka Nissinen [Mon, 14 Jun 2010 13:56:54 +0000 (16:56 +0300)]
Added new scalable panels, deleted obsolite bitmaps and made some minor cosmetic changes
Reviewed by: Kaj Wallin
Sami Rämö [Mon, 14 Jun 2010 13:47:15 +0000 (16:47 +0300)]
Fixed map items collision detection over map limits
Pekka Nissinen [Mon, 14 Jun 2010 13:18:45 +0000 (16:18 +0300)]
Merge branch 'master' into scalable_panels
Conflicts:
src/map/baselocationitem.h
src/map/mapengine.h
Pekka Nissinen [Mon, 14 Jun 2010 13:09:12 +0000 (16:09 +0300)]
Some minor cosmetic changes, re-organized src.pro file
Kaj Wallin [Mon, 14 Jun 2010 12:52:42 +0000 (15:52 +0300)]
Updated changelog
Reviewed by: Pekka Nissinen
Sami Rämö [Mon, 14 Jun 2010 10:33:43 +0000 (13:33 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Sami Rämö [Mon, 14 Jun 2010 10:33:03 +0000 (13:33 +0300)]
Added functional tests for map spanning
lampehe-local [Mon, 14 Jun 2010 09:48:13 +0000 (12:48 +0300)]
Fixed situare settings related misbehaviour when GPS is disabled
Reviewed by: Kaj Wallin
Sami Rämö [Mon, 14 Jun 2010 09:36:18 +0000 (12:36 +0300)]
Added some missing comments
lampehe-local [Mon, 14 Jun 2010 09:35:44 +0000 (12:35 +0300)]
Removed login state member variable from engine and added method for mainwindow
to return the login state
Reviewed by: Kaj Wallin
lampehe-local [Mon, 14 Jun 2010 09:28:57 +0000 (12:28 +0300)]
backup
Sami Rämö [Mon, 14 Jun 2010 09:22:28 +0000 (12:22 +0300)]
MapEngine center point not exceeding map limits vertically
lampehe-local [Mon, 14 Jun 2010 09:03:21 +0000 (12:03 +0300)]
Merge branch 'invalid_json'
lampehe-local [Mon, 14 Jun 2010 09:02:04 +0000 (12:02 +0300)]
Added error handling for invalid JSON string
Reviewed by: Kaj Wallin
Sami Rämö [Mon, 14 Jun 2010 08:34:54 +0000 (11:34 +0300)]
Fixed unit test
Sami Rämö [Mon, 14 Jun 2010 07:44:41 +0000 (10:44 +0300)]
Merge branch 'master' into pan_map
Sami Rämö [Mon, 14 Jun 2010 07:43:33 +0000 (10:43 +0300)]
Added optimization flag for map view
Jussi Laitinen [Mon, 14 Jun 2010 07:42:08 +0000 (10:42 +0300)]
Modified gpspositionprivatestub.cpp isRunning and isInitialized methods.
Jussi Laitinen [Mon, 14 Jun 2010 07:25:44 +0000 (10:25 +0300)]
Merge branch 'settings_auto_update'
Jussi Laitinen [Mon, 14 Jun 2010 07:24:57 +0000 (10:24 +0300)]
Modified automatic location update settings.
Reviewed by: Marko Niemelä
Kaj Wallin [Mon, 14 Jun 2010 07:15:08 +0000 (10:15 +0300)]
Updated debian changelog to reflect recent changes
Reviewed by: Pekka Nissinen
lampehe-local [Mon, 14 Jun 2010 07:10:14 +0000 (10:10 +0300)]
Merge branch 'master' into invalid_json
lampehe-local [Mon, 14 Jun 2010 07:01:38 +0000 (10:01 +0300)]
Fixed login bug when trying to login with expired cookies
Reviewed by: Kaj Wallin
lampehe-local [Mon, 14 Jun 2010 05:26:22 +0000 (08:26 +0300)]
backup
Sami Rämö [Fri, 11 Jun 2010 13:36:18 +0000 (16:36 +0300)]
Cleaned debug prints
Sami Rämö [Fri, 11 Jun 2010 13:25:51 +0000 (16:25 +0300)]
Fixed defects found in the review
- Fixes reviewed by Kaj Wallin
lampehe-local [Fri, 11 Jun 2010 12:54:00 +0000 (15:54 +0300)]
Merge branch 'crosshair_bug'
lampehe-local [Fri, 11 Jun 2010 12:48:53 +0000 (15:48 +0300)]
Fixed following things: Crosshair is now visible when GPS is not in use on
login, saved update location message is cleared when logout is made,
notification for location update failed is not re-formatted and is set to
be non-modal, user data is now cleared from UI when session is expired and
re-login is cancelled i.e. it reflects logged out state for UI
Reviewed by: Katri Kaikkonen & Kai Wallin
Jussi Laitinen [Fri, 11 Jun 2010 12:08:37 +0000 (15:08 +0300)]
Changed LiblocationWrapper accuracy's centimetres to metres.
lampehe-local [Fri, 11 Jun 2010 10:47:31 +0000 (13:47 +0300)]
backup
Sami Rämö [Fri, 11 Jun 2010 08:55:03 +0000 (11:55 +0300)]
Merge branch 'master' into pan_map
Conflicts:
src/map/baselocationitem.h
Reviewed by Jussi Laitinen
lampehe-local [Fri, 11 Jun 2010 09:45:41 +0000 (12:45 +0300)]
backup
lampehe-local [Fri, 11 Jun 2010 08:25:10 +0000 (11:25 +0300)]
Merge branch 'error_procedur'
lampehe-local [Fri, 11 Jun 2010 08:22:55 +0000 (11:22 +0300)]
Finalized error handling procedur implementation, localized all error messages
Reviewed by: Jussi Laitinen
Jussi Laitinen [Fri, 11 Jun 2010 08:11:15 +0000 (11:11 +0300)]
Removed -L path from src.pro LIBS.
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
projects / situare / log