Kaj Wallin [Tue, 25 May 2010 11:56:25 +0000 (14:56 +0300)]
Finished implementing zoom button drag feature
Reviewed by:
Kaj Wallin [Mon, 24 May 2010 07:59:05 +0000 (10:59 +0300)]
Zoomb button mode is now set to disabled when zoombuttonpanel gets
mouse press event
Reviewed by:
Kaj Wallin [Fri, 21 May 2010 12:58:08 +0000 (15:58 +0300)]
Merged with latest master
Reviewed by:
Kaj Wallin [Fri, 21 May 2010 12:21:03 +0000 (15:21 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Fri, 21 May 2010 12:20:03 +0000 (15:20 +0300)]
minor fix
Reviewed by: Jussi Laitinen
Kaj Wallin [Fri, 21 May 2010 12:17:53 +0000 (15:17 +0300)]
Pre-merge. Also change drawOsmLicense to use QSize
Reviewed by: Jussi Laitinen
Sami Rämö [Fri, 21 May 2010 12:11:55 +0000 (15:11 +0300)]
Removed map_class_diagram.dia
Kaj Wallin [Fri, 21 May 2010 11:32:35 +0000 (14:32 +0300)]
Merge branch 'master' into new_info_panel_inheritance
Sami Rämö [Fri, 21 May 2010 11:29:59 +0000 (14:29 +0300)]
Added manually changes made to master while moving MapEngine
Kaj Wallin [Fri, 21 May 2010 10:39:56 +0000 (13:39 +0300)]
Finished unit test and renamed userpanel.* to userinfopanel.* as per
naming convention. Also had the whole branch reviewed
Reviewed by: Jussi Laitinen
Sami Rämö [Fri, 21 May 2010 10:32:48 +0000 (13:32 +0300)]
Merge branch 'move_map_engine' (NOT FINISHED!)
Conflicted files checkouted from move_map_engine branch.
Still requiring manual merge of master branch changes.
Conflicts:
src/engine/engine.cpp
src/engine/engine.h
src/map/mapengine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/mapviewscreen.cpp
Sami Rämö [Fri, 21 May 2010 10:14:59 +0000 (13:14 +0300)]
Fixed review defects
- Reviewed by Jussi
Kaj Wallin [Fri, 21 May 2010 07:37:27 +0000 (10:37 +0300)]
Added check to SidePanel::setType to disallow multiple type sets
Reviewed by:
Sami Rämö [Fri, 21 May 2010 07:36:38 +0000 (10:36 +0300)]
Default screen size, init order, map not drawing all tiles
- changed window default size in desktop matching N900 screen size
- changed execution order when starting application
- fixed map not drawing all tiles when screen resized
- added some missing debug prints
Kaj Wallin [Fri, 21 May 2010 07:24:39 +0000 (10:24 +0300)]
Fixed naming convention and started writing unit tests
Reviewed by:
Kaj Wallin [Fri, 21 May 2010 07:07:15 +0000 (10:07 +0300)]
Commented new code and fixed some of the old
Reviewed by:
Kaj Wallin [Fri, 21 May 2010 05:52:19 +0000 (08:52 +0300)]
Converted friendlistpanel to comply with new inheritance
Reviewed by:
Sami Rämö [Fri, 21 May 2010 05:48:16 +0000 (08:48 +0300)]
Cleanup & commenting
Sami Rämö [Thu, 20 May 2010 12:17:34 +0000 (15:17 +0300)]
Changed GPS and automatic update buttons slots
- Changed GPS & auto centering signals so that actions are not
dependent on menu button signals anymore, which weren't emitted
at startup when states were set but didn't change from buttons
default states
- changed messages so that they are displayed only at startup
and when automatic centering is disabled because user have
scrolled the map
- some sorting
- changed MapEngine GPS and automatic centering settings change
methods to public
Sami Rämö [Thu, 20 May 2010 10:36:48 +0000 (13:36 +0300)]
Fixing broken things
- Fixed setting GPS & automatic centering states based on settings file
- GPS enabled state is now read from GPS class and not used local datamember in engine anymore
- connected engine slots for GPS & auto centering enabling
- some documentation
- fixed manual location cross hair visibility inversion
Kaj Wallin [Thu, 20 May 2010 10:05:00 +0000 (13:05 +0300)]
Created SidePanel class, which is base class for both panels.
UserInfoPanel is converted to use this inheritance.
Reviewed by:
Sami Rämö [Thu, 20 May 2010 09:21:24 +0000 (12:21 +0300)]
First "working" version after moving MapEngine
- Moved MapEngine under main engine class
- Removed MapViewScreen and moved all stuff to MainWindow
- Still requires much cleaning and documenting and checking
all signals and slots
Jussi Laitinen [Thu, 20 May 2010 07:12:00 +0000 (10:12 +0300)]
Minor fixes to gps classes. Added support to QtSimulator.
Ville Tiensuu [Wed, 19 May 2010 11:13:09 +0000 (14:13 +0300)]
Maked corsshair to be transparent for mouse events.
Reviewed by: Kaj Wallin
lampehe-local [Wed, 19 May 2010 10:43:12 +0000 (13:43 +0300)]
Added functional test case for saved username
Reviewed by: Kaj Wallin
Jussi Laitinen [Wed, 19 May 2010 10:38:12 +0000 (13:38 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Wed, 19 May 2010 10:36:08 +0000 (13:36 +0300)]
Modified GPSPosition class creation. Changed filenames in src/gps.
lampehe-local [Wed, 19 May 2010 10:18:59 +0000 (13:18 +0300)]
Implemented username saving to settings and loading. Saved username
is shown in login dialog when it is needed.
Reviewed by: Kaj Wallin
Kaj Wallin [Wed, 19 May 2010 07:21:35 +0000 (10:21 +0300)]
Fixed unused parameter warning from userinfopanel.cpp and added two
debian packaging generated files to .gitignore
Reviewed by: Ville Tiensuu
Ville Tiensuu [Wed, 19 May 2010 06:57:40 +0000 (09:57 +0300)]
fixed dogygen documentetion on mapEngine.
fixed crosshair bug.
Reviewed by: Kaj Wallin
lampehe-local [Wed, 19 May 2010 06:38:39 +0000 (09:38 +0300)]
Fixed character encoding bug for reverseGeo
Reviewed by: Kaj Wallin
Kaj Wallin [Wed, 19 May 2010 05:01:24 +0000 (08:01 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Wed, 19 May 2010 05:00:25 +0000 (08:00 +0300)]
Fixed scaling bug on userinfopanel when on desktop
Reviewed by: Henri Lampela
Sami Rämö [Tue, 18 May 2010 19:26:33 +0000 (22:26 +0300)]
Fix: application can now be compiled for Nokia Qt SDK Simulator
Pekka Nissinen [Tue, 18 May 2010 08:48:47 +0000 (11:48 +0300)]
Merge branch 'new_zoom_buttons_panel'
Ville Tiensuu [Tue, 18 May 2010 08:47:27 +0000 (11:47 +0300)]
modified conctencts of functional test document
Pekka Nissinen [Tue, 18 May 2010 08:47:06 +0000 (11:47 +0300)]
Added a new method for getting current icon mode (ImageButton).
Reviewed by: Jussi Laitinen
Pekka Nissinen [Tue, 18 May 2010 08:46:14 +0000 (11:46 +0300)]
Added & reviewed remaining unit tests.
Reviewed by: Jussi Laitinen
Ville Tiensuu [Tue, 18 May 2010 07:50:57 +0000 (10:50 +0300)]
added test case for location update. modified test of user info panel.
Kaj Wallin [Tue, 18 May 2010 06:11:26 +0000 (09:11 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Tue, 18 May 2010 06:11:13 +0000 (09:11 +0300)]
Merge branch 'new_info_panels'
Conflicts:
src/ui/userpanel.cpp
src/ui/userpanel.h
Jussi Laitinen [Tue, 18 May 2010 06:01:06 +0000 (09:01 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Tue, 18 May 2010 06:00:37 +0000 (09:00 +0300)]
Fixed segmentation fault from mapviewscreen.
lampehe-local [Tue, 18 May 2010 05:53:51 +0000 (08:53 +0300)]
Added word wrapping for location label in update location dialog
Reviewed by: Kaj Wallin
lampehe-local [Tue, 18 May 2010 05:38:04 +0000 (08:38 +0300)]
Removed warnings and fixed minor bug in publish location message
Kaj Wallin [Tue, 18 May 2010 05:36:14 +0000 (08:36 +0300)]
Sorted header definitions in alphabetical order
Reviewed by: Jussi Laitinen
Kaj Wallin [Tue, 18 May 2010 05:30:52 +0000 (08:30 +0300)]
Merge branch 'master' into new_info_panels
Conflicts:
images.qrc
lampehe-local [Tue, 18 May 2010 05:17:59 +0000 (08:17 +0300)]
Merge branch 'userinfo' of https://vcs.maemo.org/git/situare into userinfo
Conflicts:
src/src.pro
src/ui/mainwindow.cpp
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
Kaj Wallin [Tue, 18 May 2010 04:51:04 +0000 (07:51 +0300)]
Made dirty fix to enlarge the sliding bar buttons. Must be reworked
later
Reviewed by:
Katri Kaikkonen [Mon, 17 May 2010 13:38:06 +0000 (16:38 +0300)]
Added one comment line
Reviwed by: Henri Lampela
Ville Tiensuu [Mon, 17 May 2010 13:34:08 +0000 (16:34 +0300)]
fixed review issues
Reviewed by: Henri Lampela
Katri Kaikkonen [Mon, 17 May 2010 13:34:07 +0000 (16:34 +0300)]
Updated userinfo and userinfopanel classes. Added corresponding signals.
Reviewed by: Marko Niemelä
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
Kaj Wallin [Mon, 17 May 2010 08:48:48 +0000 (11:48 +0300)]
Test version complete. Watis for actual graphics
Reviewed by:
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
Katri Kaikkonen [Mon, 17 May 2010 05:47:49 +0000 (08:47 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into userinfo
Kaj Wallin [Mon, 17 May 2010 05:47:11 +0000 (08:47 +0300)]
Merge branch 'master' into new_info_panels
Jussi Laitinen [Mon, 17 May 2010 05:44:41 +0000 (08:44 +0300)]
Added requestLastPosition method to GPSPositionMockup.
Katri Kaikkonen [Mon, 17 May 2010 05:37:27 +0000 (08:37 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into userinfo
Jussi Laitinen [Mon, 17 May 2010 05:34:25 +0000 (08:34 +0300)]
Added comments to gpsposition.h.
Katri Kaikkonen [Mon, 17 May 2010 05:30:56 +0000 (08:30 +0300)]
Updated some changes to userinfo
Kaj Wallin [Mon, 17 May 2010 05:21:48 +0000 (08:21 +0300)]
First draft of new panel sliderbar
Reviewed by:
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.
Katri Kaikkonen [Fri, 14 May 2010 12:42:11 +0000 (15:42 +0300)]
Merge branch 'master' into userinfo
Conflicts:
src/src.pro
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
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
Katri Kaikkonen [Fri, 14 May 2010 12:24:09 +0000 (15:24 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
src/src.pro
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
lampehe-local [Fri, 14 May 2010 12:10:06 +0000 (15:10 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Katri Kaikkonen [Fri, 14 May 2010 12:09:18 +0000 (15:09 +0300)]
Added new userinfo implementation
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
projects / situare / log