Katri Kaikkonen [Wed, 26 May 2010 11:26:41 +0000 (14:26 +0300)]
Added minor changes to userinfo
Reviewed by: Marko Niemelä
Katri Kaikkonen [Tue, 25 May 2010 12:04:21 +0000 (15:04 +0300)]
Merge branch 'master' into userinfo
Katri Kaikkonen [Tue, 25 May 2010 11:30:08 +0000 (14:30 +0300)]
Minor fixes to userinfo
Pekka Nissinen [Tue, 25 May 2010 11:18:15 +0000 (14:18 +0300)]
Made a few small changes to ImageButton and ZoomButtonPanel classes.
Reviewed by: Marko Niemelä
Jussi Laitinen [Tue, 25 May 2010 09:48:54 +0000 (12:48 +0300)]
Changed friend_group.png in res/images.
Katri Kaikkonen [Tue, 25 May 2010 08:29:34 +0000 (11:29 +0300)]
Merge branch 'master' into userinfo
Conflicts:
images.qrc
src/ui/userinfopanel.cpp
Katri Kaikkonen [Tue, 25 May 2010 08:20:08 +0000 (11:20 +0300)]
Fixed missing members
Katri Kaikkonen [Tue, 25 May 2010 08:09:19 +0000 (11:09 +0300)]
Added new background images to userinfo item
Katri Kaikkonen [Tue, 25 May 2010 08:08:51 +0000 (11:08 +0300)]
Merge branch 'master' into userinfo
Conflicts:
src/ui/userinfopanel.h
src/ui/userpanel.cpp
lampehe-local [Tue, 25 May 2010 07:10:28 +0000 (10:10 +0300)]
Toggled debug messages off.
lampehe-local [Tue, 25 May 2010 07:05:19 +0000 (10:05 +0300)]
Implemented logout feature
Reviewed by: Ville Tiensuu
Bug fix
Reviewed by: Henri Lampela
Jussi Laitinen [Tue, 25 May 2010 06:57:47 +0000 (09:57 +0300)]
Fixed seg fault bug in FriendListView.
lampehe-local [Tue, 25 May 2010 06:46:28 +0000 (09:46 +0300)]
Bugs with master
lampehe-local [Mon, 24 May 2010 12:01:29 +0000 (15:01 +0300)]
Merge branch 'logout_refactored'
Conflicts:
src/ui/mainwindow.h
lampehe-local [Mon, 24 May 2010 11:49:39 +0000 (14:49 +0300)]
Final implementation of logout
Ville Tiensuu [Mon, 24 May 2010 11:41:02 +0000 (14:41 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Mon, 24 May 2010 11:37:16 +0000 (14:37 +0300)]
merged with use_last_location
Jussi Laitinen [Mon, 24 May 2010 11:17:53 +0000 (14:17 +0300)]
Changed profile_pic_border.png in res/images. Changed AvatarImage and
FriendListItem image sizes.
Jussi Laitinen [Mon, 24 May 2010 09:19:24 +0000 (12:19 +0300)]
Modified map item click functional test.
Jussi Laitinen [Mon, 24 May 2010 08:52:17 +0000 (11:52 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Mon, 24 May 2010 08:45:58 +0000 (11:45 +0300)]
Friend list code reviewed.
Reviewed by: Henri Lampela
Kaj Wallin [Mon, 24 May 2010 08:16:12 +0000 (11:16 +0300)]
Changed isOpen data member match naming convention
Reviewed by: Henri Lampela
Jussi Laitinen [Mon, 24 May 2010 06:59:35 +0000 (09:59 +0300)]
Merge branch 'master' into friendlist
Jussi Laitinen [Mon, 24 May 2010 06:59:24 +0000 (09:59 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Mon, 24 May 2010 06:58:32 +0000 (09:58 +0300)]
Added mouse press and release methods to FriendGroupItem and
FriendLocationItem.
Kaj Wallin [Mon, 24 May 2010 05:38:12 +0000 (08:38 +0300)]
Updated valgrind suppress file and .gitignore
Reviewed by:
Jussi Laitinen [Fri, 21 May 2010 13:49:47 +0000 (16:49 +0300)]
Added test case for location item click and friend list filtering.
lampehe-local [Fri, 21 May 2010 13:45:40 +0000 (16:45 +0300)]
Merged logout implementation to new refactored master
Jussi Laitinen [Fri, 21 May 2010 13:36:19 +0000 (16:36 +0300)]
Merge branch 'master' into friendlist
Conflicts:
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
Katri Kaikkonen [Fri, 21 May 2010 13:23:40 +0000 (16:23 +0300)]
Added scrollbar to userinfo
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
Jussi Laitinen [Fri, 21 May 2010 11:46:53 +0000 (14:46 +0300)]
Merge branch 'master' into friendlist
Jussi Laitinen [Fri, 21 May 2010 11:44:22 +0000 (14:44 +0300)]
Added images to res/images.
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
Jussi Laitinen [Fri, 21 May 2010 10:33:46 +0000 (13:33 +0300)]
Added ImageButton::setButtonIcon method. Modified FriendListItem to
use profile image as button.
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:
Jussi Laitinen [Fri, 21 May 2010 05:56:09 +0000 (08:56 +0300)]
Disabled debug prints from src.pro.
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
Jussi Laitinen [Thu, 20 May 2010 11:34:01 +0000 (14:34 +0300)]
Added distance icons to FriendListItem.
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 08:59:02 +0000 (11:59 +0300)]
Added connections from FriendGroupItem to MapEngine. Added
mousePressEvent to FriendGroupItem.
Jussi Laitinen [Thu, 20 May 2010 07:14:11 +0000 (10:14 +0300)]
Merge branch 'master' into friendlist
Jussi Laitinen [Thu, 20 May 2010 07:12:00 +0000 (10:12 +0300)]
Minor fixes to gps classes. Added support to QtSimulator.
Jussi Laitinen [Thu, 20 May 2010 06:29:40 +0000 (09:29 +0300)]
Added methods to filter list in FriendListView.
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