Kaj Wallin [Mon, 19 Apr 2010 13:08:22 +0000 (16:08 +0300)]
Merge branch 'wallika-own'
Conflicts:
src/ui/mapviewscreen.cpp
Kaj Wallin [Mon, 19 Apr 2010 12:55:48 +0000 (15:55 +0300)]
Merged and resolved conflict
Merge branch 'lampehe' into wallika-own
Conflicts:
src/src.pro
Sami Rämö [Mon, 19 Apr 2010 12:36:34 +0000 (15:36 +0300)]
Merged map to master
Reviewed by Sami & Jussi
Sami Rämö [Mon, 19 Apr 2010 12:27:57 +0000 (15:27 +0300)]
Finalised review and removed review comments
Kaj Wallin [Mon, 19 Apr 2010 12:17:36 +0000 (15:17 +0300)]
Merged and resolved conflicts.
Merge branch 'jskia73' into wallika-own
Conflicts:
src/ui/listviewscreen.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h
Sami Rämö [Mon, 19 Apr 2010 12:10:00 +0000 (15:10 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Mon, 19 Apr 2010 12:09:03 +0000 (15:09 +0300)]
Modified reviewed code.
Kaj Wallin [Mon, 19 Apr 2010 12:09:02 +0000 (15:09 +0300)]
Merged with latest version of updatelocationdialog
Signed-off-by: Kaj Wallin <kaj.wallin@ixonos.com>
Kaj Wallin [Mon, 19 Apr 2010 12:04:44 +0000 (15:04 +0300)]
remove tr()' from debug prints
Sami Rämö [Mon, 19 Apr 2010 12:02:21 +0000 (15:02 +0300)]
Removed some review comments
Sami Rämö [Mon, 19 Apr 2010 12:00:14 +0000 (15:00 +0300)]
Review
Jukka Saastamoinen [Mon, 19 Apr 2010 11:52:57 +0000 (14:52 +0300)]
Integrated messageupdate dialog, code reviewed by wallika
Sami Rämö [Mon, 19 Apr 2010 11:48:23 +0000 (14:48 +0300)]
Review fixes
Jussi Laitinen [Mon, 19 Apr 2010 11:47:58 +0000 (14:47 +0300)]
Fixed reviewed code.
Ville Tiensuu [Mon, 19 Apr 2010 11:44:58 +0000 (14:44 +0300)]
changed order of methods and variables to match with common style
lampehe-local [Mon, 19 Apr 2010 11:32:06 +0000 (14:32 +0300)]
Code reviewed by Ville Tiensuu, findings fixed. Removed teststringformations unit-tests
Ville Tiensuu [Mon, 19 Apr 2010 11:15:05 +0000 (14:15 +0300)]
code rewieved by Henri Lampela and final fixes done
Sami Rämö [Mon, 19 Apr 2010 10:59:36 +0000 (13:59 +0300)]
Review todo comments added
Jukka Saastamoinen [Mon, 19 Apr 2010 10:11:23 +0000 (13:11 +0300)]
Routed infotab button signals out
Kaj Wallin [Mon, 19 Apr 2010 09:36:22 +0000 (12:36 +0300)]
something changed
lampehe-local [Mon, 19 Apr 2010 08:52:24 +0000 (11:52 +0300)]
Some cleanup for FacebookServices and SituareServices
Kaj Wallin [Mon, 19 Apr 2010 08:48:11 +0000 (11:48 +0300)]
Sorted header definition to alphabetical order. MainWindow now forces
login window to close after successful login.
Sami Rämö [Mon, 19 Apr 2010 08:44:01 +0000 (11:44 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Sami Rämö [Mon, 19 Apr 2010 08:40:06 +0000 (11:40 +0300)]
Added some missing comments
Jussi Laitinen [Mon, 19 Apr 2010 08:37:56 +0000 (11:37 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Mon, 19 Apr 2010 08:37:07 +0000 (11:37 +0300)]
Added MapEngine::combineTiles method and modified
MapEngine::removeStackedTiles.
Sami Rämö [Mon, 19 Apr 2010 08:28:32 +0000 (11:28 +0300)]
Restored Doxyfile
Sami Rämö [Mon, 19 Apr 2010 08:26:25 +0000 (11:26 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into map
Jukka Saastamoinen [Mon, 19 Apr 2010 08:06:33 +0000 (11:06 +0300)]
Changed the code naming style according to agreed guideline
Ville Tiensuu [Mon, 19 Apr 2010 08:04:49 +0000 (11:04 +0300)]
modified code to obey general namings and style
Sami Rämö [Mon, 19 Apr 2010 07:59:20 +0000 (10:59 +0300)]
Changed header comment block texts
Sami Rämö [Mon, 19 Apr 2010 07:48:25 +0000 (10:48 +0300)]
Changed MapTile datamember initialisations
Jussi Laitinen [Mon, 19 Apr 2010 07:32:17 +0000 (10:32 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Mon, 19 Apr 2010 07:29:51 +0000 (10:29 +0300)]
Modified header files function and member order.
Sami Rämö [Mon, 19 Apr 2010 07:27:33 +0000 (10:27 +0300)]
Fixed some headers to match coding guidelines
Kaj Wallin [Mon, 19 Apr 2010 07:25:09 +0000 (10:25 +0300)]
Edited header files to match coding conventions. Changed member
variable names.
Kaj Wallin [Mon, 19 Apr 2010 05:58:57 +0000 (08:58 +0300)]
Prepared for merge
Jukka Saastamoinen [Mon, 19 Apr 2010 05:43:37 +0000 (08:43 +0300)]
Added missing doxygen comments to listviewscreen.h
Jukka Saastamoinen [Mon, 19 Apr 2010 05:26:34 +0000 (08:26 +0300)]
Added situare icons in different sizes
Jussi Laitinen [Sun, 18 Apr 2010 15:50:45 +0000 (18:50 +0300)]
Added comments to mapengine.h, mapscene.h and mapview.h.
Jupe [Sun, 18 Apr 2010 15:43:46 +0000 (18:43 +0300)]
Modified MapEngine::removeStackedTiles and added MapEngine::removeTile.
Sami Rämö [Fri, 16 Apr 2010 13:33:53 +0000 (16:33 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Sami Rämö [Fri, 16 Apr 2010 13:30:52 +0000 (16:30 +0300)]
Added signal and slot for view scaling level change
Also renamed MapEngine::setZValues to setTilesDrawingLevels
Jussi Laitinen [Fri, 16 Apr 2010 13:10:18 +0000 (16:10 +0300)]
Added comments to mapcommon.h.
Jussi Laitinen [Fri, 16 Apr 2010 13:06:56 +0000 (16:06 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Conflicts:
src/images.qrc
Jussi Laitinen [Fri, 16 Apr 2010 13:05:48 +0000 (16:05 +0300)]
Added src/image.qrc.
Jussi Laitinen [Fri, 16 Apr 2010 13:03:11 +0000 (16:03 +0300)]
Modified MapEngine::removeStackedTiles.
Sami Rämö [Fri, 16 Apr 2010 12:44:22 +0000 (15:44 +0300)]
Cleaned some old comments and modified scene rect size setting.
Ville Tiensuu [Fri, 16 Apr 2010 12:20:13 +0000 (15:20 +0300)]
Merge branch 'master' into lampehe
Conflicts:
src/src.pro
tests/cookiehandler/testcookiehandler.cpp
tests/testUI/testtabs/testtabs.cpp
tests/testmap/testmapview/testmapview.cpp
Sami Rämö [Fri, 16 Apr 2010 12:17:00 +0000 (15:17 +0300)]
Added missing resource file
Ville Tiensuu [Fri, 16 Apr 2010 12:09:10 +0000 (15:09 +0300)]
modified src.pro
Jukka Saastamoinen [Fri, 16 Apr 2010 12:08:34 +0000 (15:08 +0300)]
Merge branch 'jskia73'
Jukka Saastamoinen [Fri, 16 Apr 2010 12:04:44 +0000 (15:04 +0300)]
Cleaned memleaks from listviewscreen.cpp
Sami Rämö [Fri, 16 Apr 2010 12:01:20 +0000 (15:01 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into map
Ville Tiensuu [Fri, 16 Apr 2010 11:29:00 +0000 (14:29 +0300)]
updated facebook classes
Pekka Nissinen [Fri, 16 Apr 2010 11:02:08 +0000 (14:02 +0300)]
Removed unused image from src/resources
lampehe-local [Fri, 16 Apr 2010 10:43:11 +0000 (13:43 +0300)]
Added missing files & folders
lampehe-local [Fri, 16 Apr 2010 10:38:33 +0000 (13:38 +0300)]
First phase of facebookservice and situareservice integration.
Renamed unit test folders and updated some unit tests.
Jussi Laitinen [Fri, 16 Apr 2010 09:58:07 +0000 (12:58 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Fri, 16 Apr 2010 09:57:22 +0000 (12:57 +0300)]
Modified mapviewscreen to remove margins.
Sami Rämö [Fri, 16 Apr 2010 09:53:58 +0000 (12:53 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
removeStackedTiles() was disabled because it breaks zoom in.
Jussi Laitinen [Fri, 16 Apr 2010 09:00:27 +0000 (12:00 +0300)]
Removed magic numbers, added null check to tile removal method.
Changed testmapengine test's QPointF to QPoint.
Sami Rämö [Fri, 16 Apr 2010 08:55:22 +0000 (11:55 +0300)]
Returned back to self made scrolling.
Kinetic scroll caused multiple updates to wrong coordinates
for engine when zooming.
Jussi Laitinen [Thu, 15 Apr 2010 13:48:11 +0000 (16:48 +0300)]
Removed debug messages from MapEngine.
Jussi Laitinen [Thu, 15 Apr 2010 12:28:27 +0000 (15:28 +0300)]
Added mapcommon.h.
Sami Rämö [Thu, 15 Apr 2010 12:26:44 +0000 (15:26 +0300)]
Fixed unit tests, more accurate limits for latitude coordinates.
Jussi Laitinen [Thu, 15 Apr 2010 12:22:49 +0000 (15:22 +0300)]
Renamed common.h to mapcommon.h and moved to src/map.
Kaj Wallin [Thu, 15 Apr 2010 11:57:24 +0000 (14:57 +0300)]
Remove dummy infolabel from MainWindow. No review needed.
Jussi Laitinen [Thu, 15 Apr 2010 11:37:44 +0000 (14:37 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapview.cpp
src/map/mapview.h
Kaj Wallin [Thu, 15 Apr 2010 11:36:55 +0000 (14:36 +0300)]
Added 2 cases to functional test documentation, now at version 0.7.
Reviewed by: H. Lampela
Jussi Laitinen [Thu, 15 Apr 2010 11:05:59 +0000 (14:05 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Conflicts:
src/map/mapview.cpp
tests/testmap/testmapengine/testmapengine.cpp
Jukka Saastamoinen [Thu, 15 Apr 2010 10:52:23 +0000 (13:52 +0300)]
Merge from master
Jukka Saastamoinen [Thu, 15 Apr 2010 10:51:03 +0000 (13:51 +0300)]
Removing document to prepare merge with master
Jukka Saastamoinen [Thu, 15 Apr 2010 10:18:46 +0000 (13:18 +0300)]
Personal infotab contents merged, reviewed by wallika
Jukka Saastamoinen [Thu, 15 Apr 2010 10:09:33 +0000 (13:09 +0300)]
Removed bitmap compare from pixmap unit tests
Jukka Saastamoinen [Thu, 15 Apr 2010 10:07:28 +0000 (13:07 +0300)]
Updated functionality tests doc
Jukka Saastamoinen [Thu, 15 Apr 2010 09:49:24 +0000 (12:49 +0300)]
Cleanup of test cases
Sami Rämö [Thu, 15 Apr 2010 09:47:25 +0000 (12:47 +0300)]
Renamed test case directories
Jukka Saastamoinen [Thu, 15 Apr 2010 09:37:35 +0000 (12:37 +0300)]
Codes reviewed by wallika
Sami Rämö [Thu, 15 Apr 2010 09:37:21 +0000 (12:37 +0300)]
Replaced floating point coordinates with integer ones where possible
Also removed some old stuff from self made scolling.
lampehe-local [Thu, 15 Apr 2010 09:36:35 +0000 (12:36 +0300)]
Added updated unit tests for updateLocation and reverseGeo.
Added functionality for reverseGeo.
Jukka Saastamoinen [Thu, 15 Apr 2010 05:38:59 +0000 (08:38 +0300)]
Infotab clean-up for code review
Jussi Laitinen [Thu, 15 Apr 2010 05:25:50 +0000 (08:25 +0300)]
Added stacked tiles removal method.
Jukka Saastamoinen [Wed, 14 Apr 2010 12:10:30 +0000 (15:10 +0300)]
Results after hard coding day...
Sami Rämö [Wed, 14 Apr 2010 10:39:20 +0000 (13:39 +0300)]
Self made scroll was replaced
* QAbstractKineticScroller is used when built for Maemo5
* QGraphicsView's drag mode is set to ScrollHandDrag
for other devices
Sami Rämö [Wed, 14 Apr 2010 09:24:28 +0000 (12:24 +0300)]
Implemented unit test for MapEngine::convertLatLonToSceneCoordinate
...but the test is currently failing because there is something
wrong in the conversion equations or some rounding error.
Jussi Laitinen [Wed, 14 Apr 2010 09:15:10 +0000 (12:15 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Conflicts:
tests/testmap/testmapengine/testmapengine.cpp
Kaj Wallin [Wed, 14 Apr 2010 08:05:56 +0000 (11:05 +0300)]
Added test cases to functional test decumentation and created more
logical structure for test organization.
Sami Rämö [Wed, 14 Apr 2010 07:43:42 +0000 (10:43 +0300)]
Fixing unit tests for MapEngine partly done.
Also fixed convertLanLonToSceneCoordinate comments
Jussi Laitinen [Wed, 14 Apr 2010 07:43:36 +0000 (10:43 +0300)]
Modified MapView viewportUpdateMode.
Kaj Wallin [Wed, 14 Apr 2010 06:56:53 +0000 (09:56 +0300)]
Added missing tr()'s, commented out non-working menu-item test
Jussi Laitinen [Wed, 14 Apr 2010 05:11:19 +0000 (08:11 +0300)]
Enabled tile removal method in MapEngine::setLocation.
Jukka Saastamoinen [Wed, 14 Apr 2010 05:04:12 +0000 (08:04 +0300)]
PersonalInfotab as separate QWidget
Jussi Laitinen [Tue, 13 Apr 2010 13:16:41 +0000 (16:16 +0300)]
Modified correct name to ZOOM const.
Jussi Laitinen [Tue, 13 Apr 2010 12:42:16 +0000 (15:42 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Conflicts:
src/ui/mapviewscreen.cpp
Jussi Laitinen [Tue, 13 Apr 2010 12:38:02 +0000 (15:38 +0300)]
Added test cases to mapEngine. Modified map tile remove method.
Sami Rämö [Tue, 13 Apr 2010 12:37:02 +0000 (15:37 +0300)]
Added unit test for changing drawing order of MapTiles.
Also added comments to the test class of MapView.
Kaj Wallin [Tue, 13 Apr 2010 12:35:09 +0000 (15:35 +0300)]
Added unit tests. Added object names to some widgets.
Jukka Saastamoinen [Tue, 13 Apr 2010 12:01:56 +0000 (15:01 +0300)]
Updated personal infotab, added icons
Sami Rämö [Tue, 13 Apr 2010 11:56:20 +0000 (14:56 +0300)]
Changed MapView::setZoomLevel to public, updated MapView unit tests