Ville Tiensuu [Tue, 18 May 2010 05:06:43 +0000 (08:06 +0300)]
Merge branch 'crosshair2'
Conflicts:
images.qrc
src/engine/engine.h
src/map/mapengine.cpp
src/map/mapview.cpp
src/map/mapview.h
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
Ville Tiensuu [Mon, 17 May 2010 13:34:08 +0000 (16:34 +0300)]
fixed review issues
Reviewed by: Henri Lampela
Jussi Laitinen [Mon, 17 May 2010 13:09:51 +0000 (16:09 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Mon, 17 May 2010 13:08:25 +0000 (16:08 +0300)]
Changed magic numbers to constant in AvatarImage.
Sami Rämö [Mon, 17 May 2010 12:48:59 +0000 (15:48 +0300)]
Merge branch 'current_position_marker'
Conflicts:
images.qrc
Sami Rämö [Mon, 17 May 2010 11:50:11 +0000 (14:50 +0300)]
Merge branch 'master' into current_position_marker
- Reviewed by Jussi
Conflicts:
images.qrc
src/gps/gpsposition.h
src/map/mapengine.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
Ville Tiensuu [Mon, 17 May 2010 12:15:23 +0000 (15:15 +0300)]
added comments
Pekka Nissinen [Mon, 17 May 2010 12:14:18 +0000 (15:14 +0300)]
Reviewed code and made a few changes to functional tests descriptions.
Reviewed by: Jussi Laitinen
Ville Tiensuu [Mon, 17 May 2010 11:54:23 +0000 (14:54 +0300)]
backup
Pekka Nissinen [Mon, 17 May 2010 11:33:30 +0000 (14:33 +0300)]
Added new signals for min/max zoom levels and methods for disabling zoom in/out buttons
Ville Tiensuu [Mon, 17 May 2010 11:24:20 +0000 (14:24 +0300)]
Merge branch 'crosshair2' of https://vcs.maemo.org/git/situare into crosshair2
Ville Tiensuu [Mon, 17 May 2010 11:23:16 +0000 (14:23 +0300)]
fixed coordinate problem
lampehe-local [Mon, 17 May 2010 11:21:07 +0000 (14:21 +0300)]
Added functionality to get the latest own location from handset values
or from GPS
Pekka Nissinen [Mon, 17 May 2010 11:20:54 +0000 (14:20 +0300)]
Merge branch 'master' into new_zoom_buttons_panel
Sami Rämö [Mon, 17 May 2010 11:03:09 +0000 (14:03 +0300)]
Added unit tests
lampehe-local [Mon, 17 May 2010 10:37:42 +0000 (13:37 +0300)]
Merged to master
Jussi Laitinen [Mon, 17 May 2010 10:37:23 +0000 (13:37 +0300)]
Modified FriendGroupItem paint event. Changed friend_group.png image.
Sami Rämö [Mon, 17 May 2010 08:58:56 +0000 (11:58 +0300)]
Change image color based on if got coordinates from GPS
lampehe-local [Mon, 17 May 2010 08:02:10 +0000 (11:02 +0300)]
Renamed /src/situarecommon.h to /src/common.h
Reviewed by: Kaj Wallin
Sami Rämö [Mon, 17 May 2010 07:15:21 +0000 (10:15 +0300)]
Changed accuracy to include only horizontal accuracy
Jussi Laitinen [Mon, 17 May 2010 05:44:41 +0000 (08:44 +0300)]
Added requestLastPosition method to GPSPositionMockup.
Jussi Laitinen [Mon, 17 May 2010 05:34:25 +0000 (08:34 +0300)]
Added comments to gpsposition.h.
Sami Rämö [Fri, 14 May 2010 13:39:25 +0000 (16:39 +0300)]
Enable / disable GPS location item when GPS mode changes
Jussi Laitinen [Fri, 14 May 2010 13:09:34 +0000 (16:09 +0300)]
Moved AvatarImage::create from FriendListitem to SituareService.
Jussi Laitinen [Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Fri, 14 May 2010 12:42:13 +0000 (15:42 +0300)]
Moved gps settings from situarecommon.h to engine.cpp.
Sami Rämö [Fri, 14 May 2010 12:42:02 +0000 (15:42 +0300)]
Modified GPS & map related signals and slots
- Also added some more logic to GPSLocationItem
lampehe-local [Fri, 14 May 2010 12:10:06 +0000 (15:10 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Pekka Nissinen [Fri, 14 May 2010 12:01:34 +0000 (15:01 +0300)]
Cleaned up code and moved the new ZoomButtonPanel into master branch.
Reviewed by: Kaj Wallin
Pekka Nissinen [Fri, 14 May 2010 11:45:02 +0000 (14:45 +0300)]
Merge branch 'master' into new_zoom_buttons_panel
Pekka Nissinen [Fri, 14 May 2010 11:43:56 +0000 (14:43 +0300)]
Cleaned up code and added a few missing comments
Pekka Nissinen [Fri, 14 May 2010 10:42:10 +0000 (13:42 +0300)]
Made a few cosmetic changes
lampehe-local [Fri, 14 May 2010 10:38:24 +0000 (13:38 +0300)]
Small fix on facebookauthentication's credential handling method,
since qjson parser cannot handle 64-bit integers.
Also added Q_UNUSED for grab patrameter in mainwindow's grabZoomKeys method
Reviewed by: Kaj Wallin
Jussi Laitinen [Fri, 14 May 2010 10:26:11 +0000 (13:26 +0300)]
Moved settings saving from mainwindow to engine.
Pekka Nissinen [Fri, 14 May 2010 10:10:00 +0000 (13:10 +0300)]
Some minor cosmetic changes
Pekka Nissinen [Fri, 14 May 2010 09:53:31 +0000 (12:53 +0300)]
Fixed a few merge problems
Pekka Nissinen [Fri, 14 May 2010 09:53:18 +0000 (12:53 +0300)]
Merge branch 'master' into new_zoom_buttons_panel
Conflicts:
src/src.pro
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
Sami Rämö [Fri, 14 May 2010 09:36:41 +0000 (12:36 +0300)]
Merge branch 'master' into current_position_marker
Conflicts:
images.qrc
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
Sami Rämö [Fri, 14 May 2010 09:25:46 +0000 (12:25 +0300)]
Added forgotten mapengine.h
Sami Rämö [Fri, 14 May 2010 09:21:53 +0000 (12:21 +0300)]
Added GPSLocationItem class
- added class
- added slots for setting auto centering and for updating
current position from GPS to MapEngine
Jussi Laitinen [Fri, 14 May 2010 09:14:14 +0000 (12:14 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
src/ui/mapviewscreen.h
Jussi Laitinen [Fri, 14 May 2010 09:07:46 +0000 (12:07 +0300)]
Merge branch 'list_panel'
Conflicts:
src/engine/engine.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h
Sami Rämö [Fri, 14 May 2010 08:11:04 +0000 (11:11 +0300)]
Zoom map using HW increase and decrease keys
- Reviewed by Kaj
Jussi Laitinen [Fri, 14 May 2010 08:06:11 +0000 (11:06 +0300)]
Added unit tests to gps.
Pekka Nissinen [Fri, 14 May 2010 06:44:33 +0000 (09:44 +0300)]
Merge branch 'master' into new_zoom_buttons_panel
lampehe-local [Fri, 14 May 2010 06:27:16 +0000 (09:27 +0300)]
Removed one un-needed signal connect from facebookauthentication
Reviewed by: Kaj Wallin
Pekka Nissinen [Thu, 13 May 2010 20:46:05 +0000 (23:46 +0300)]
Changed the way how ZoomButtonPanel determines its size
Pekka Nissinen [Thu, 13 May 2010 20:44:41 +0000 (23:44 +0300)]
Added a new method "setMode" to ImageButton class
Pekka Nissinen [Thu, 13 May 2010 20:43:37 +0000 (23:43 +0300)]
Merge branch 'master' into new_zoom_buttons_panel
Conflicts:
src/ui/mainwindow.cpp
Jussi Laitinen [Wed, 12 May 2010 13:51:36 +0000 (16:51 +0300)]
Added settings load and save methods to Engine and MainWindow.
Pekka Nissinen [Wed, 12 May 2010 13:51:34 +0000 (16:51 +0300)]
Removed old MapZoomPanel/MapButton classes and fixed dependencies. Did some other minor cosmetic changes as well.
Pekka Nissinen [Wed, 12 May 2010 13:49:30 +0000 (16:49 +0300)]
Added the new ZoomButtonPanel class
lampehe-local [Wed, 12 May 2010 13:19:36 +0000 (16:19 +0300)]
Removed UI properties from FacebookAuthentication class and moved them to MainWindow
Reviewed by: Kaj Wallin
lampehe-local [Wed, 12 May 2010 12:53:04 +0000 (15:53 +0300)]
Merge branch 'master' into fb_auth_window_removal
Conflicts:
src/ui/mainwindow.cpp
Kaj Wallin [Wed, 12 May 2010 11:37:06 +0000 (14:37 +0300)]
Merge branch 'debian_packaging'
Kaj Wallin [Wed, 12 May 2010 11:35:03 +0000 (14:35 +0300)]
Updated debian packaging scripts to support lastest dependencies
Reviewed by: Jussi Laitinen
Pekka Nissinen [Wed, 12 May 2010 11:34:21 +0000 (14:34 +0300)]
Added images for current gps position
lampehe-local [Wed, 12 May 2010 10:51:50 +0000 (13:51 +0300)]
FacebookAuthentication window removal
Sami Rämö [Wed, 12 May 2010 10:41:42 +0000 (13:41 +0300)]
Merge branch 'bug_friend_item_update'
Sami Rämö [Wed, 12 May 2010 10:32:58 +0000 (13:32 +0300)]
Fixed review defects
- Originally reviewed by Marko
- Fixes reviewed by Pekka
Jussi Laitinen [Wed, 12 May 2010 09:33:29 +0000 (12:33 +0300)]
Added friend find button to FriendListItem.
Kaj Wallin [Wed, 12 May 2010 09:26:15 +0000 (12:26 +0300)]
Merge branch 'master' into debian_packaging
Kaj Wallin [Wed, 12 May 2010 09:25:24 +0000 (12:25 +0300)]
Fixed packaging rules to match current dependencies
Reviewed by:
Jussi Laitinen [Wed, 12 May 2010 07:35:48 +0000 (10:35 +0300)]
Modified menu buttons texts.
Sami Rämö [Wed, 12 May 2010 07:29:50 +0000 (10:29 +0300)]
Fixed bug #5688 New friends are not shown on the map
- refactored whole friend items updating code
- BaseLocationItem: removed position() and setPosition methods,
class is not depending from MapEngine anymore
- TestFriendLocationItem: removed position related tests
- FriendGroupItem::dropFriend() changed to public
Pekka Nissinen [Wed, 12 May 2010 07:15:54 +0000 (10:15 +0300)]
Fixed a mysterious login error that occured on some machines
Jussi Laitinen [Wed, 12 May 2010 06:59:07 +0000 (09:59 +0300)]
Added comments to gps classes.
Jussi Laitinen [Wed, 12 May 2010 06:38:07 +0000 (09:38 +0300)]
Added GPSPositionInterface and GPSPositionMockup classes.
Jussi Laitinen [Tue, 11 May 2010 13:09:35 +0000 (16:09 +0300)]
Modified src.pro
Jussi Laitinen [Tue, 11 May 2010 12:44:49 +0000 (15:44 +0300)]
Added nmealog file to res/dummy.
Jussi Laitinen [Tue, 11 May 2010 12:41:34 +0000 (15:41 +0300)]
Merge branch 'gps'
Conflicts:
src/ui/mainwindow.cpp
src/ui/mainwindow.h
Jussi Laitinen [Tue, 11 May 2010 12:33:48 +0000 (15:33 +0300)]
Added gps functional tests.
Jussi Laitinen [Tue, 11 May 2010 12:27:56 +0000 (15:27 +0300)]
Modified MainWindow auto centering toggling.
lampehe-local [Tue, 11 May 2010 12:22:23 +0000 (15:22 +0300)]
Refactored fabookauthentication class and moved cookiehandler to situaraeservice
removed cookiehandler related unit test
Reviewed by: Ville Tiensuu
Jussi Laitinen [Tue, 11 May 2010 11:47:35 +0000 (14:47 +0300)]
Added comments to mainwindow.h
Jussi Laitinen [Tue, 11 May 2010 11:32:13 +0000 (14:32 +0300)]
Modified mainwindow auto centering toggling.
Kaj Wallin [Tue, 11 May 2010 11:07:38 +0000 (14:07 +0300)]
Added functional test case and marked obsolete tests. Also changed
version numbering to 0.sprint.number format
Reviewed by: Ville Tiensuu
Jussi Laitinen [Tue, 11 May 2010 11:01:26 +0000 (14:01 +0300)]
Moved autoCentering method call from MainWindow to Engine.
Jussi Laitinen [Tue, 11 May 2010 10:47:48 +0000 (13:47 +0300)]
Merge branch 'master' into gps
Conflicts:
images.qrc
src/engine/engine.cpp
src/engine/engine.h
src/src.pro
src/ui/mapviewscreen.h
Kaj Wallin [Tue, 11 May 2010 10:14:15 +0000 (13:14 +0300)]
Merge branch 'remove_list_view'
Conflicts:
src/ui/mainwindow.cpp
Jussi Laitinen [Tue, 11 May 2010 10:12:35 +0000 (13:12 +0300)]
Modified gpsposition.cpp.
Kaj Wallin [Tue, 11 May 2010 10:06:11 +0000 (13:06 +0300)]
Removed extra files related to listviewscreen
Reviewed by: Sami Rämö
Jussi Laitinen [Tue, 11 May 2010 10:06:01 +0000 (13:06 +0300)]
Integrated GPSPosition to MainWindow, MapViewScreen and Engine.
Sami Rämö [Tue, 11 May 2010 09:21:28 +0000 (12:21 +0300)]
Fixed bug #5718 Own location marker in the map leaks memory
Sami Rämö [Tue, 11 May 2010 08:04:54 +0000 (11:04 +0300)]
Restored SituareService files which were accidentally removed
Kaj Wallin [Tue, 11 May 2010 08:03:05 +0000 (11:03 +0300)]
Removed list view from the Mainwindow
Reviewed by:
Sami Rämö [Tue, 11 May 2010 07:56:29 +0000 (10:56 +0300)]
Fixed functionality-tests.doc
Sami Rämö [Tue, 11 May 2010 07:46:44 +0000 (10:46 +0300)]
Merge branch 'stacked_friends'
Conflicts:
doc/test_cases/functionality-tests.doc
src/src.pro
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
Jussi Laitinen [Mon, 10 May 2010 13:27:11 +0000 (16:27 +0300)]
Modified images.qrc.
Jussi Laitinen [Mon, 10 May 2010 13:22:10 +0000 (16:22 +0300)]
Added show_position images to res/images and images.qrc.
Sami Rämö [Mon, 10 May 2010 12:55:42 +0000 (15:55 +0300)]
Fixed defects found in review
- Code reviewed by Henri
- Unit & functional tests reviewed by Jussi
Jussi Laitinen [Mon, 10 May 2010 12:45:39 +0000 (15:45 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into list_panel
Jussi Laitinen [Mon, 10 May 2010 12:45:27 +0000 (15:45 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into list_panel
Conflicts:
src/situareservice/situareservice.cpp
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/panelcommon.h
Kaj Wallin [Mon, 10 May 2010 12:24:43 +0000 (15:24 +0300)]
Fixed zoom panel position
Reviewed by:
Jussi Laitinen [Mon, 10 May 2010 12:08:20 +0000 (15:08 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into list_panel
Conflicts:
src/src.pro
Kaj Wallin [Mon, 10 May 2010 12:07:04 +0000 (15:07 +0300)]
Merge branch 'new_info_panels'
Conflicts:
src/src.pro
Kaj Wallin [Mon, 10 May 2010 11:54:14 +0000 (14:54 +0300)]
Finalised the classes for panels
Reviewed by: Jussi Laitinen
lampehe-local [Mon, 10 May 2010 10:34:33 +0000 (13:34 +0300)]
Implemented custom login and created functional tests for it
Reviewed by: Kaj Wallin
Sami Rämö [Mon, 10 May 2010 10:17:29 +0000 (13:17 +0300)]
Merge branch 'master' into stacked_friends
Conflicts:
images.qrc
src/src.pro
Sami Rämö [Mon, 10 May 2010 09:54:16 +0000 (12:54 +0300)]
Functional tests for friend icon grouping