Jussi Laitinen [Mon, 31 May 2010 05:50:48 +0000 (08:50 +0300)]
Modified src.pro to include networkhandlerprivatestub when building in
scratchbox.
Jussi Laitinen [Mon, 31 May 2010 05:03:51 +0000 (08:03 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Fri, 28 May 2010 13:00:21 +0000 (16:00 +0300)]
Added comments to networkhandlerprivate.cpp.
Kaj Wallin [Fri, 28 May 2010 11:54:22 +0000 (14:54 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Fri, 28 May 2010 11:53:18 +0000 (14:53 +0300)]
Fixed zoom panel position loading bug.
Reviewed by: Pekka Nissinen
Jussi Laitinen [Fri, 28 May 2010 05:48:20 +0000 (08:48 +0300)]
Added debug prints to classes.
Jussi Laitinen [Thu, 27 May 2010 13:06:07 +0000 (16:06 +0300)]
Merge branch 'network_handler'
Jussi Laitinen [Thu, 27 May 2010 13:05:01 +0000 (16:05 +0300)]
Modified test script. Added networkhandlerprivate and
networkhandlerprivatestub classes.
Pekka Nissinen [Thu, 27 May 2010 11:30:22 +0000 (14:30 +0300)]
Corrected wrong method call in UserInfo::setProfileImage()
Jussi Laitinen [Thu, 27 May 2010 10:37:23 +0000 (13:37 +0300)]
Merge branch 'master' into network_handler
Jussi Laitinen [Thu, 27 May 2010 10:36:00 +0000 (13:36 +0300)]
Network classes reviewed.
Jussi Laitinen [Thu, 27 May 2010 09:51:59 +0000 (12:51 +0300)]
Added no caching attribute to ImageFetcher and SituareService requests.
Jussi Laitinen [Thu, 27 May 2010 09:18:57 +0000 (12:18 +0300)]
Moved network related files from src/engine to src/network.
Pekka Nissinen [Thu, 27 May 2010 07:33:59 +0000 (10:33 +0300)]
Removed obsolete referencies from tests.pro
Pekka Nissinen [Thu, 27 May 2010 07:20:47 +0000 (10:20 +0300)]
Redrawed zoom buttons to follow Fremantle Master Layout Quide size suggestions
and made a few minor cosmetic fixes to zoombuttonpanel.cpp
Ville Tiensuu [Thu, 27 May 2010 06:43:55 +0000 (09:43 +0300)]
moved test from own test class to TestMapEngine class.
moved data const from common.h to engine.cpp
Kaj Wallin [Thu, 27 May 2010 05:10:29 +0000 (08:10 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Thu, 27 May 2010 05:09:52 +0000 (08:09 +0300)]
Fixed test project files so no debug is printed
Reviewed by:
Jussi Laitinen [Thu, 27 May 2010 05:00:51 +0000 (08:00 +0300)]
Merge branch 'master' into network_handler
Sami Rämö [Wed, 26 May 2010 14:20:23 +0000 (17:20 +0300)]
Test script removes unit test binaries after testing
- Binaries are removed so they are not annoying in the list
of untracked files if commit is made without compiling
tests after running the script.
Kaj Wallin [Wed, 26 May 2010 13:51:22 +0000 (16:51 +0300)]
Merge branch 'zoom_button_drag'
Kaj Wallin [Wed, 26 May 2010 13:50:30 +0000 (16:50 +0300)]
Fixed some test cases
Reviewed by:
Kaj Wallin [Wed, 26 May 2010 13:23:52 +0000 (16:23 +0300)]
Merge branch 'master' into zoom_button_drag
Conflicts:
src/common.h
tests/ui/zoombuttonpanel/zoombuttonpanel.pro
Pekka Nissinen [Wed, 26 May 2010 13:21:03 +0000 (16:21 +0300)]
Removed obsolete references to OpenGL
Kaj Wallin [Wed, 26 May 2010 13:19:11 +0000 (16:19 +0300)]
Removed obsolete unittest
Reviewed by:
Kaj Wallin [Wed, 26 May 2010 13:12:25 +0000 (16:12 +0300)]
Finished zoom panel drag feature fixes
Reviewed by: Marko Niemelä
Jussi Laitinen [Wed, 26 May 2010 12:55:34 +0000 (15:55 +0300)]
Changed NetworkAccessManager to use Singleton.
Ville Tiensuu [Wed, 26 May 2010 12:36:11 +0000 (15:36 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
doc/test_cases/functionality-tests.doc
Ville Tiensuu [Wed, 26 May 2010 12:26:21 +0000 (15:26 +0300)]
final fixing after merge
Katri Kaikkonen [Wed, 26 May 2010 12:10:54 +0000 (15:10 +0300)]
Merge branch 'userinfo'
Conflicts:
doc/test_cases/functionality-tests.doc
Jussi Laitinen [Wed, 26 May 2010 11:48:48 +0000 (14:48 +0300)]
Merge branch 'master' into network_handler
Conflicts:
src/engine/engine.h
src/src.pro
Jussi Laitinen [Wed, 26 May 2010 11:32:21 +0000 (14:32 +0300)]
Added method to queue requests if not connected to network.
Katri Kaikkonen [Wed, 26 May 2010 11:26:41 +0000 (14:26 +0300)]
Added minor changes to userinfo
Reviewed by: Marko Niemelä
Ville Tiensuu [Wed, 26 May 2010 11:14:00 +0000 (14:14 +0300)]
Merge branch 'show_gps_location_on_first_start'
Ville Tiensuu [Wed, 26 May 2010 10:45:41 +0000 (13:45 +0300)]
Final fixing.
Reviewed by: Pekka Nissinen
Kaj Wallin [Wed, 26 May 2010 10:30:38 +0000 (13:30 +0300)]
Fixed faulty release logic for ZoomButtonPanel
Reviewed by:
Kaj Wallin [Wed, 26 May 2010 10:11:41 +0000 (13:11 +0300)]
Removed timer from zoombutton, created new signals and fixed some logics
Reviewed by:
Ville Tiensuu [Wed, 26 May 2010 10:07:46 +0000 (13:07 +0300)]
changed implementation of setZoomLevel in mapEngine
Sami Rämö [Wed, 26 May 2010 08:52:39 +0000 (11:52 +0300)]
Merged master with test script modifications
Conflicts:
tests/ui/friendlist/friendlist.pro
Sami Rämö [Wed, 26 May 2010 08:02:29 +0000 (11:02 +0300)]
Use up-to-date tests and run in test directory
- Reviewed by Ville
- delete unit test binaries and run qmake & make for
tests.pro so unit tests run are always up-to-date
- run each unit test in it's directory so test finds
it's test data placed in it's directory
Jussi Laitinen [Wed, 26 May 2010 08:01:43 +0000 (11:01 +0300)]
Deleted friendlist binary from tests.
Jussi Laitinen [Wed, 26 May 2010 07:58:16 +0000 (10:58 +0300)]
Added NetworkReply class.
Kaj Wallin [Wed, 26 May 2010 05:54:41 +0000 (08:54 +0300)]
Had zoom panel drag fetaure reviewed. Updated functional tests.
Reviewed by: Henri Lampela
Kaj Wallin [Wed, 26 May 2010 05:20:24 +0000 (08:20 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Tue, 25 May 2010 12:52:21 +0000 (15:52 +0300)]
final fixing
Pekka Nissinen [Tue, 25 May 2010 12:40:51 +0000 (15:40 +0300)]
Corrected led image dropshadows
Kaj Wallin [Tue, 25 May 2010 12:20:54 +0000 (15:20 +0300)]
Merge branch 'master' into zoom_button_drag
Conflicts:
src/ui/imagebutton.h
src/ui/mainwindow.cpp
src/ui/zoombuttonpanel.cpp
src/ui/zoombuttonpanel.h
Ville Tiensuu [Tue, 25 May 2010 12:12:29 +0000 (15:12 +0300)]
finalising this feature branch
Katri Kaikkonen [Tue, 25 May 2010 12:04:21 +0000 (15:04 +0300)]
Merge branch 'master' into userinfo
Kaj Wallin [Tue, 25 May 2010 11:56:25 +0000 (14:56 +0300)]
Finished implementing zoom button drag feature
Reviewed by:
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ä
Sami Rämö [Tue, 25 May 2010 10:58:50 +0000 (13:58 +0300)]
Fixed unit tests
- removed some garbage unit tests
- fixed some broken unit tests
- added some new tests for FriendLocationItem
- test script modifications
* check if unit test file is executable
* doesn't try to test master tests.pro project
* added some instructional prints if executables
for all unit tests are not found
* check if test report contains any qDebug or
qWarning prints and instruct to disable them
Jussi Laitinen [Tue, 25 May 2010 09:48:54 +0000 (12:48 +0300)]
Changed friend_group.png in res/images.
Ville Tiensuu [Tue, 25 May 2010 09:31:57 +0000 (12:31 +0300)]
backup
Jussi Laitinen [Tue, 25 May 2010 09:27:18 +0000 (12:27 +0300)]
Modified Engine init methods.
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
Jussi Laitinen [Tue, 25 May 2010 08:24:40 +0000 (11:24 +0300)]
Modified Engine::connected.
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
Jussi Laitinen [Tue, 25 May 2010 07:46:38 +0000 (10:46 +0300)]
Modified Engine::connected.
Ville Tiensuu [Tue, 25 May 2010 07:43:24 +0000 (10:43 +0300)]
added functionality to show gps location on first start
Jussi Laitinen [Tue, 25 May 2010 07:19:18 +0000 (10:19 +0300)]
Modified Engine::connected.
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
Jussi Laitinen [Tue, 25 May 2010 06:22:52 +0000 (09:22 +0300)]
Modified NetworkHandler state slot.
Sami Rämö [Tue, 25 May 2010 05:46:07 +0000 (08:46 +0300)]
Added project for building all unit tests
- new unit tests must be added manually to tests/tests.pro
- all unit tests can be built by using tests/tests.pro
- whole project, including actual application and unit tests,
can be built using situare.pro
- actual application can be built using src/src.pro
Sami Rämö [Mon, 24 May 2010 12:41:10 +0000 (15:41 +0300)]
Created new script for running all unit tests
- All .pro files are searched under tests directory and
file with same name (without .pro extension)
is expected to be the actual unit test executable
lampehe-local [Mon, 24 May 2010 12:01:29 +0000 (15:01 +0300)]
Merge branch 'logout_refactored'
Conflicts:
src/ui/mainwindow.h
Jussi Laitinen [Mon, 24 May 2010 11:52:23 +0000 (14:52 +0300)]
Modified licence header in engine.cpp.
Jussi Laitinen [Mon, 24 May 2010 11:50:27 +0000 (14:50 +0300)]
Merge branch 'master' into network_handler
lampehe-local [Mon, 24 May 2010 11:49:39 +0000 (14:49 +0300)]
Final implementation of logout
Jussi Laitinen [Mon, 24 May 2010 11:46:14 +0000 (14:46 +0300)]
Modified MapFetcher to use NetworkAccessManager class.
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:25:12 +0000 (14:25 +0300)]
Merge branch 'master' into network_handler
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 11:03:32 +0000 (14:03 +0300)]
Merge branch 'master' into network_handler
Conflicts:
src/src.pro
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
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:
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: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
Jussi Laitinen [Fri, 21 May 2010 12:06:35 +0000 (15:06 +0300)]
Added network connection slots to Engine.