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
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
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 05:21:49 +0000 (08:21 +0300)]
Added couple more suppressions to the valgrind suppress file
Reviewed by:
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:
Jussi Laitinen [Thu, 6 May 2010 12:09:40 +0000 (15:09 +0300)]
Changed friend list item label order.
Jussi Laitinen [Thu, 6 May 2010 10:40:09 +0000 (13:40 +0300)]
Removed unused image from images.qrc.
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.
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
Kaj Wallin [Mon, 3 May 2010 10:38:47 +0000 (13:38 +0300)]
Changed doxyfile to create graphs
Reviewed by:
Sami Rämö [Mon, 3 May 2010 10:32:07 +0000 (13:32 +0300)]
Fixed some review defects
- Fixed defects found in MapFetcher & MapEngine
- Created MapTileRequest class
- Added missing debug messages to map related classes
Ville Tiensuu [Mon, 3 May 2010 10:15:57 +0000 (13:15 +0300)]
updated doxygen comment
Ville Tiensuu [Mon, 3 May 2010 10:11:06 +0000 (13:11 +0300)]
bug fixing
Kaj Wallin [Mon, 3 May 2010 09:34:22 +0000 (12:34 +0300)]
Preliminary merge. Integration is brancehd from fresh
Merge branch 'own_location' into integration
Conflicts:
src/engine/engine.cpp
src/engine/engine.h
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
Ville Tiensuu [Mon, 3 May 2010 08:45:58 +0000 (11:45 +0300)]
updates to doxygen commentation and removal of one unneeded method
Ville Tiensuu [Mon, 3 May 2010 07:17:30 +0000 (10:17 +0300)]
final fixing
Kaj Wallin [Mon, 3 May 2010 06:42:50 +0000 (09:42 +0300)]
Fixed mainwindow unit test
Reviewed by:
Sami Rämö [Mon, 3 May 2010 06:42:49 +0000 (09:42 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into map
Conflicts:
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/updatelocation/texteditautoresizer.h
lampehe-local [Mon, 3 May 2010 05:49:55 +0000 (08:49 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
lampehe-local [Mon, 3 May 2010 05:48:40 +0000 (08:48 +0300)]
Refactored situareservice related unit-tests
Jussi Laitinen [Mon, 3 May 2010 05:48:18 +0000 (08:48 +0300)]
Added functional tests for friendlist.
Sami Rämö [Fri, 30 Apr 2010 12:41:14 +0000 (15:41 +0300)]
Load upper level map images from the cache
Ville Tiensuu [Fri, 30 Apr 2010 12:25:39 +0000 (15:25 +0300)]
added base class for own and friend locations. added new class for
friendlocation. made some new features to other classes to get updated
data for the location indicators from situare PHP server.
Sami Rämö [Fri, 30 Apr 2010 10:52:09 +0000 (13:52 +0300)]
Moved URL builder and parser to MapFetcher
Jussi Laitinen [Fri, 30 Apr 2010 09:20:29 +0000 (12:20 +0300)]
Added friendlist tests.
Sami Rämö [Fri, 30 Apr 2010 09:09:59 +0000 (12:09 +0300)]
Updated unit tests
Sami Rämö [Fri, 30 Apr 2010 08:19:39 +0000 (11:19 +0300)]
Stacked tile removal zValue check, doxygen generating class diagrams
- Doxyfile modifications, enabled drawing UML class diagrams
by using Graphviz
- some cleanup
- check that new tile is above tile to be removed when removing
stacked tiles
Jussi Laitinen [Fri, 30 Apr 2010 08:11:18 +0000 (11:11 +0300)]
Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist
Jussi Laitinen [Fri, 30 Apr 2010 08:09:53 +0000 (11:09 +0300)]
Merge branch 'friendlist' of https://vcs.maemo.org/git/situare into friendlist
Conflicts:
src/ui/listviewscreen.h
Jussi Laitinen [Fri, 30 Apr 2010 07:41:27 +0000 (10:41 +0300)]
Added comments to friendlistitem, friendlistview and listviewscreen.
Sami Rämö [Fri, 30 Apr 2010 07:11:07 +0000 (10:11 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Kaj Wallin [Fri, 30 Apr 2010 06:55:23 +0000 (09:55 +0300)]
Changed InfoTab from public to private and made proper changes to
signals
Reviewed by:
Sami Rämö [Fri, 30 Apr 2010 06:35:37 +0000 (09:35 +0300)]
MapFetcher queuing refactoring
- set MapFetcher queue size based on amount of tiles in the grid
- re-factored MapFetcher queuing system
Jussi Laitinen [Fri, 30 Apr 2010 06:35:35 +0000 (09:35 +0300)]
Modified listviewscreen.
lampehe-local [Fri, 30 Apr 2010 06:34:17 +0000 (09:34 +0300)]
Added signal for successful update
Kaj Wallin [Thu, 29 Apr 2010 13:16:43 +0000 (16:16 +0300)]
Added/Fixed commentation blocks to meed DoD requirements
Reviewed by:
Kaj Wallin [Thu, 29 Apr 2010 13:03:02 +0000 (16:03 +0300)]
Added engine to master
Reviewed by: Marko Niemelä
Merge branch 'engine'
Conflicts:
src/engine/engine.cpp
Jussi Laitinen [Thu, 29 Apr 2010 13:00:58 +0000 (16:00 +0300)]
Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist
Conflicts:
src/situareservice/situareservice.cpp
Kaj Wallin [Thu, 29 Apr 2010 12:12:41 +0000 (15:12 +0300)]
Fixed some issues
Reviewed by:
Jussi Laitinen [Thu, 29 Apr 2010 12:04:29 +0000 (15:04 +0300)]
Integrated infotab to listviewscreen.
lampehe-local [Thu, 29 Apr 2010 11:53:50 +0000 (14:53 +0300)]
Added error signals to engine from ImageFetcher and SituareService.
Fixed image retrieval and reduced net traffic when retrieving images
Jussi Laitinen [Thu, 29 Apr 2010 11:48:50 +0000 (14:48 +0300)]
Modified FriendListView::clear method.
Jussi Laitinen [Thu, 29 Apr 2010 10:24:39 +0000 (13:24 +0300)]
Merge branch 'dev' into friendlist
Jussi Laitinen [Thu, 29 Apr 2010 10:18:40 +0000 (13:18 +0300)]
Integrated friendlistview with dev.
lampehe-local [Thu, 29 Apr 2010 09:52:14 +0000 (12:52 +0300)]
Merge branch 'image_fetcher'
Conflicts:
src/ui/updatelocation/updatelocationdialog.cpp
src/ui/updatelocation/updatelocationdialog.h
lampehe-local [Thu, 29 Apr 2010 09:22:44 +0000 (12:22 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
src/src.pro
src/ui/mainwindow.cpp
Pekka Nissinen [Thu, 29 Apr 2010 09:03:24 +0000 (12:03 +0300)]
Fixed (yet) another merge screw-up *sigh*
Ville Tiensuu [Thu, 29 Apr 2010 08:50:52 +0000 (11:50 +0300)]
small updates to own location feature
Jussi Laitinen [Thu, 29 Apr 2010 08:48:58 +0000 (11:48 +0300)]
Merge branch 'dev' into friendlist
Conflicts:
images.qrc
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
src/ui/situareuser.cpp
src/user/user.cpp
Pekka Nissinen [Thu, 29 Apr 2010 08:42:32 +0000 (11:42 +0300)]
Yet another minor cosmetic changes
Pekka Nissinen [Thu, 29 Apr 2010 08:32:38 +0000 (11:32 +0300)]
Merge branch 'dev' into map
Jussi Laitinen [Thu, 29 Apr 2010 08:32:27 +0000 (11:32 +0300)]
Merge branch 'personalinfo' into friendlist
Conflicts:
images.qrc
res/images/compass.png
src/images.qrc
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
Pekka Nissinen [Thu, 29 Apr 2010 08:23:52 +0000 (11:23 +0300)]
Some minor cosmetic changes
lampehe-local [Thu, 29 Apr 2010 08:23:45 +0000 (11:23 +0300)]
Merge branch 'image_fetcher' into dev
lampehe-local [Thu, 29 Apr 2010 08:01:18 +0000 (11:01 +0300)]
Integrated imagefetcher and iterated imagefetcher related codes
Reviewed by: Marko Niemelä
Pekka Nissinen [Thu, 29 Apr 2010 07:59:25 +0000 (10:59 +0300)]
Merge branch 'dev' into map
Conflicts:
src/map/mapview.cpp
src/src.pro
src/ui/mainwindow.cpp
Jussi Laitinen [Thu, 29 Apr 2010 07:56:01 +0000 (10:56 +0300)]
Added dummy_image.png and list_item.png to res.
Jussi Laitinen [Thu, 29 Apr 2010 07:54:28 +0000 (10:54 +0300)]
Modified FriendListItem constructor.
Pekka Nissinen [Thu, 29 Apr 2010 07:42:55 +0000 (10:42 +0300)]
Fixed an error that caused duplicate instances of FacebookAuthentication, SituareService and QNetworkAccessManager
Sami Rämö [Thu, 29 Apr 2010 07:32:29 +0000 (10:32 +0300)]
Enabled map related debug messages, some cleanup
Sami Rämö [Thu, 29 Apr 2010 07:15:15 +0000 (10:15 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Conflicts:
src/src.pro
Kaj Wallin [Thu, 29 Apr 2010 07:12:58 +0000 (10:12 +0300)]
Added two functional test for engine component
Reviewed by: V. Tiensuu
Jukka Saastamoinen [Thu, 29 Apr 2010 07:11:55 +0000 (10:11 +0300)]
Polishing
projects / situare / log