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.
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
Jussi Laitinen [Tue, 11 May 2010 10:12:35 +0000 (13:12 +0300)]
Modified gpsposition.cpp.
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
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
Kaj Wallin [Mon, 10 May 2010 09:26:27 +0000 (12:26 +0300)]
Added sliding bars to the panels
Reviewed by:
Sami Rämö [Mon, 10 May 2010 08:27:51 +0000 (11:27 +0300)]
Added forgotten FriendGroupItem unit test files
Jussi Laitinen [Mon, 10 May 2010 08:26:18 +0000 (11:26 +0300)]
Added new class AvatarImage.
Pekka Nissinen [Mon, 10 May 2010 08:21:34 +0000 (11:21 +0300)]
Deleted old ButtonItem class (+ unit tests) and changed infotab to utilize the new ImageButton class
Pekka Nissinen [Mon, 10 May 2010 08:20:52 +0000 (11:20 +0300)]
Added a new all-purpose image button class
Sami Rämö [Mon, 10 May 2010 08:14:25 +0000 (11:14 +0300)]
Added unit test for FriendGroupItem and fixed others
- Fixed map related test cases (added new files to projects)
- Fixed FriendLocationItem test case (test picture was missing)
Pekka Nissinen [Mon, 10 May 2010 08:06:43 +0000 (11:06 +0300)]
Deleted unnecessary image files
Pekka Nissinen [Mon, 10 May 2010 08:04:15 +0000 (11:04 +0300)]
Added/modified a few images and fixed references to them
Kaj Wallin [Mon, 10 May 2010 06:00:42 +0000 (09:00 +0300)]
Fixed couple bugs and memory leaks from panels
Reviewed by:
Kaj Wallin [Mon, 10 May 2010 05:23:03 +0000 (08:23 +0300)]
Merge branch 'master' into new_info_panels
Kaj Wallin [Mon, 10 May 2010 05:21:49 +0000 (08:21 +0300)]
Added couple more suppressions to the valgrind suppress file
Reviewed by:
Sami Rämö [Fri, 7 May 2010 13:18:27 +0000 (16:18 +0300)]
Clean-up
Jussi Laitinen [Fri, 7 May 2010 13:05:31 +0000 (16:05 +0300)]
Modified FriendListItem::paintEvent and UserPanel background.
Sami Rämö [Fri, 7 May 2010 12:45:13 +0000 (15:45 +0300)]
Fixed SEGFAULT when shutting down the application
- FriendLocationItems must not be removed in destructor
because they are owned by MapScene
Jussi Laitinen [Fri, 7 May 2010 12:38:29 +0000 (15:38 +0300)]
Updated list_item images with new ones.
Sami Rämö [Fri, 7 May 2010 12:35:19 +0000 (15:35 +0300)]
Added forgotten FriendGroupItem class files
Sami Rämö [Fri, 7 May 2010 12:25:36 +0000 (15:25 +0300)]
Added comments
Kaj Wallin [Fri, 7 May 2010 10:52:32 +0000 (13:52 +0300)]
Added some graphics to the panels. Very rudimentary implementation at
this point.
Reviewed by:
Sami Rämö [Fri, 7 May 2010 10:45:54 +0000 (13:45 +0300)]
Implemented remaining grouping algorithms
Kaj Wallin [Fri, 7 May 2010 09:19:38 +0000 (12:19 +0300)]
Fixed OSM license placing so it is fully visible when friends list
panel is closed.
Reviewed by:
Jussi Laitinen [Fri, 7 May 2010 08:48:50 +0000 (11:48 +0300)]
Integrated gps to map view.
Kaj Wallin [Fri, 7 May 2010 08:12:52 +0000 (11:12 +0300)]
Commented information panels code to comply with DoD doxygen check
Reviewed by:
Jussi Laitinen [Fri, 7 May 2010 06:18:19 +0000 (09:18 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into gps
Jussi Laitinen [Fri, 7 May 2010 06:17:32 +0000 (09:17 +0300)]
Updated.
Kaj Wallin [Fri, 7 May 2010 05:59:49 +0000 (08:59 +0300)]
Merge branch 'master' into new_info_panels
Kaj Wallin [Fri, 7 May 2010 05:58:07 +0000 (08:58 +0300)]
Set event in FriendListItem::paintEvent as UNUSED to avoid compile warning
Reviewed by:
Kaj Wallin [Fri, 7 May 2010 05:54:10 +0000 (08:54 +0300)]
Merge branch 'master' into new_info_panels
Kaj Wallin [Fri, 7 May 2010 05:53:07 +0000 (08:53 +0300)]
Created implemented resize slots for the panels
Reviewed by:
Sami Rämö [Fri, 7 May 2010 05:48:52 +0000 (08:48 +0300)]
Re-factoring, some grouping algorithms
- Re-factored, using QLinkedList instead of QList
- implemented some grouping algorithms
* check friends for colliding friends
* check groups for colliding groups
* drop out of groups friends
Jussi Laitinen [Thu, 6 May 2010 13:00:49 +0000 (16:00 +0300)]
Added GPSPosition class.
Kaj Wallin [Thu, 6 May 2010 12:43:35 +0000 (15:43 +0300)]
And actually added the files for the user panel
Reviewed by:
Kaj Wallin [Thu, 6 May 2010 12:42:52 +0000 (15:42 +0300)]
Created a sliding user information panel
Reviewed by:
Jussi Laitinen [Thu, 6 May 2010 12:09:40 +0000 (15:09 +0300)]
Changed friend list item label order.
Sami Rämö [Thu, 6 May 2010 11:30:23 +0000 (14:30 +0300)]
Implemented FriendItemsHandler::dropOutOfGroupFriends()
Kaj Wallin [Thu, 6 May 2010 10:58:39 +0000 (13:58 +0300)]
Added actual friends list inside the panel
Reviewed by:
Sami Rämö [Thu, 6 May 2010 10:57:08 +0000 (13:57 +0300)]
Fixed last merge broken stuff and re-factored
Jussi Laitinen [Thu, 6 May 2010 10:40:09 +0000 (13:40 +0300)]
Removed unused image from images.qrc.
Kaj Wallin [Thu, 6 May 2010 10:24:38 +0000 (13:24 +0300)]
Merge branch 'master' into new_info_panels
Kaj Wallin [Thu, 6 May 2010 10:23:37 +0000 (13:23 +0300)]
Created sliding friends list panel
Reviewed by:
Jussi Laitinen [Thu, 6 May 2010 10:11:45 +0000 (13:11 +0300)]
Added info tab to view.
Jussi Laitinen [Thu, 6 May 2010 09:24:42 +0000 (12:24 +0300)]
Merge branch 'friendlist'
Jussi Laitinen [Thu, 6 May 2010 09:23:51 +0000 (12:23 +0300)]
Added testfriendlist.pro file.
Jussi Laitinen [Thu, 6 May 2010 09:22:10 +0000 (12:22 +0300)]
Fixed bugs in FriendListItem::mouseReleaseEvent.
Sami Rämö [Thu, 6 May 2010 09:21:19 +0000 (12:21 +0300)]
Merge branch 'master' into stacked_friends
Conflicts:
src/map/mapengine.cpp
Sami Rämö [Thu, 6 May 2010 09:11:09 +0000 (12:11 +0300)]
Added FriendGroupItem and FriendItemsHandler classes
- Added FriendGroupItem & FriendItemsHandler classes
and some basic functionality for grouping friend items
- Added friend_group.png
- Modified SituareService to read some debug data from file
- Moved ItemIgnoresTransformations flag to BaseLocationItem
constructor
Ville Tiensuu [Thu, 6 May 2010 07:29:57 +0000 (10:29 +0300)]
Merge branch 'tiensvi'
Ville Tiensuu [Thu, 6 May 2010 07:29:07 +0000 (10:29 +0300)]
disabled comments from pro file
Ville Tiensuu [Thu, 6 May 2010 07:24:12 +0000 (10:24 +0300)]
Added functional test cases for own and friend location drawing.
Reviewed by: Kaj Wallin
Ville Tiensuu [Thu, 6 May 2010 07:10:16 +0000 (10:10 +0300)]
Reviewed by: Kaj Wallin
Jussi Laitinen [Wed, 5 May 2010 12:56:38 +0000 (15:56 +0300)]
Modified friendlistitem mouse events.
Kaj Wallin [Wed, 5 May 2010 12:36:01 +0000 (15:36 +0300)]
Added OpenStreetMaps license text feature
Reviewed by: J. Laitinen
Ville Tiensuu [Wed, 5 May 2010 12:00:39 +0000 (15:00 +0300)]
developed location update functionality
Ville Tiensuu [Wed, 5 May 2010 09:32:22 +0000 (12:32 +0300)]
Basic Functionality ready for updating own and friends location on the
map
Kaj Wallin [Wed, 5 May 2010 07:40:11 +0000 (10:40 +0300)]
Created preliminary text item for OSM license.
Reviewed by:
Ville Tiensuu [Wed, 5 May 2010 06:17:29 +0000 (09:17 +0300)]
enabled debug texts from pro-file.
commented pretty functions from mapengine.cpp
improved friends location update in mapengine.cpp
Kaj Wallin [Tue, 4 May 2010 05:58:35 +0000 (08:58 +0300)]
Fixed comments
Reviewed by:
lampehe-local [Tue, 4 May 2010 05:38:02 +0000 (08:38 +0300)]
Fixed memory leak and unused variable (roundness in situareuser.cpp)
Ville Tiensuu [Tue, 4 May 2010 05:28:58 +0000 (08:28 +0300)]
Merge branch 'own_location'
Jussi Laitinen [Mon, 3 May 2010 14:13:17 +0000 (17:13 +0300)]
Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
Conflicts:
images.qrc
Jussi Laitinen [Mon, 3 May 2010 14:10:18 +0000 (17:10 +0300)]
Modified images.qrc.
Pekka Nissinen [Mon, 3 May 2010 14:03:20 +0000 (17:03 +0300)]
Merge branch 'map' to integration
Jussi Laitinen [Mon, 3 May 2010 13:45:16 +0000 (16:45 +0300)]
Modified images.qrc.
Jussi Laitinen [Mon, 3 May 2010 13:17:16 +0000 (16:17 +0300)]
Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
Jussi Laitinen [Mon, 3 May 2010 13:15:15 +0000 (16:15 +0300)]
Removed unused signal from mainwindow.
Sami Rämö [Mon, 3 May 2010 13:13:28 +0000 (16:13 +0300)]
Merge branch 'map' into integration
Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapfetcher.cpp
src/map/mapfetcher.h
src/map/mapscene.cpp
src/map/maptile.cpp
src/map/mapview.cpp
src/src.pro
Jussi Laitinen [Mon, 3 May 2010 12:54:19 +0000 (15:54 +0300)]
Added toggleProgressInidicator to engine.cpp.
Ville Tiensuu [Mon, 3 May 2010 12:41:48 +0000 (15:41 +0300)]
added missing test files
Jussi Laitinen [Mon, 3 May 2010 12:32:01 +0000 (15:32 +0300)]
Added SituareEngine::refreshUserData slot.
Jussi Laitinen [Mon, 3 May 2010 12:27:11 +0000 (15:27 +0300)]
Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
Conflicts:
src/engine/engine.h
Jussi Laitinen [Mon, 3 May 2010 12:20:40 +0000 (15:20 +0300)]
Merge branch 'friendlist' into integration
Conflicts:
src/engine/engine.cpp
src/engine/engine.h
src/map/mapview.h
src/situareservice/situareservice.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
Sami Rämö [Mon, 3 May 2010 12:16:22 +0000 (15:16 +0300)]
Added MapTileRequest files
lampehe-local [Mon, 3 May 2010 12:09:00 +0000 (15:09 +0300)]
Updated user and friendslist signals and image fetching
Sami Rämö [Mon, 3 May 2010 12:02:47 +0000 (15:02 +0300)]
Fixed unit tests
Sami Rämö [Mon, 3 May 2010 11:47:55 +0000 (14:47 +0300)]
Fixed remaining review defects
Kaj Wallin [Mon, 3 May 2010 11:44:00 +0000 (14:44 +0300)]
Merge branch 'own_location' into integration
Jussi Laitinen [Mon, 3 May 2010 11:43:57 +0000 (14:43 +0300)]
Modified friendlistitem and friendlistview after review.
Ville Tiensuu [Mon, 3 May 2010 11:39:33 +0000 (14:39 +0300)]
Reviewed by: Jussi Laitinen and Marko Niemelä
Kaj Wallin [Mon, 3 May 2010 11:37:25 +0000 (14:37 +0300)]
Merge branch 'own_location' into integration
Conflicts:
src/ui/mainwindow.cpp
src/ui/mainwindow.h
projects / situare / log