summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Sami Rämö [Thu, 1 Apr 2010 11:53:08 +0000 (14:53 +0300)]
Integrated fetching of the maps from OSM server
Sami Rämö [Thu, 1 Apr 2010 11:11:58 +0000 (14:11 +0300)]
Restored missing files mainwindow.h & mainwindow.cpp
Sami Rämö [Thu, 1 Apr 2010 10:57:12 +0000 (13:57 +0300)]
Merge branch 'laitiju' into map
Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
tests/testmap/testmapscene/testmapscene.pro
tests/testmap/testmaptile/testmaptile.pro
tests/testmap/testmapview/testmapview.cpp
tests/testmap/testmapview/testmapview.pro
Sami Rämö [Thu, 1 Apr 2010 10:42:38 +0000 (13:42 +0300)]
Added few lines more
Jussi Laitinen [Thu, 1 Apr 2010 10:41:15 +0000 (13:41 +0300)]
Modified situare.pro and src/src.pro.
Jussi Laitinen [Thu, 1 Apr 2010 10:37:46 +0000 (13:37 +0300)]
Modified src.pro.
Jussi Laitinen [Thu, 1 Apr 2010 10:33:17 +0000 (13:33 +0300)]
Merge branch 'master' into laitiju
Conflicts:
situare.pro
src/map/mapengine.cpp
src/map/mapengine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
tests/testUI/testUI/testUI.pro
tests/testUI/testtabs/testtabs.cpp
Sami Rämö [Thu, 1 Apr 2010 10:28:29 +0000 (13:28 +0300)]
Merged with master
Jussi Laitinen [Thu, 1 Apr 2010 10:09:36 +0000 (13:09 +0300)]
Created testmapfetcher.pro file.
Jussi Laitinen [Thu, 1 Apr 2010 08:50:26 +0000 (11:50 +0300)]
Added situare.pro.
Jussi Laitinen [Thu, 1 Apr 2010 08:49:37 +0000 (11:49 +0300)]
Changed Situare.pro to situare.pro.
Jussi Laitinen [Thu, 1 Apr 2010 08:28:08 +0000 (11:28 +0300)]
Deleted files under tests/testMap and testMap.
Kaj Wallin [Thu, 1 Apr 2010 08:26:09 +0000 (11:26 +0300)]
Created new private utility funtion to handle view changes. Added test
binary to .gitignore.
Jussi Laitinen [Thu, 1 Apr 2010 08:10:34 +0000 (11:10 +0300)]
Modified mainwindow.cpp fetch method.
Sami Rämö [Thu, 1 Apr 2010 08:02:43 +0000 (11:02 +0300)]
Some more code prepared for integration of MapFetcher
Jussi Laitinen [Thu, 1 Apr 2010 07:56:22 +0000 (10:56 +0300)]
Added networkreplydummy.ccp and testuimapfetcher.cpp files.
Sami Rämö [Thu, 1 Apr 2010 07:43:47 +0000 (10:43 +0300)]
Started writing some map fetcher usage code, but the actual map fetcher codebase must be integrated
Jussi Laitinen [Thu, 1 Apr 2010 07:41:56 +0000 (10:41 +0300)]
Modified mapfetcher.ccp and mapfetcher.h.
Sami Rämö [Thu, 1 Apr 2010 07:33:47 +0000 (10:33 +0300)]
Set parents for MapEngine & MapScene
Kaj Wallin [Thu, 1 Apr 2010 07:18:15 +0000 (10:18 +0300)]
Added missing two tr()'s
Kaj Wallin [Thu, 1 Apr 2010 05:39:15 +0000 (08:39 +0300)]
Changed the .pro file to create binary in lower case.
Added the binary to .gitignore
Kaj Wallin [Thu, 1 Apr 2010 05:16:29 +0000 (08:16 +0300)]
Fixed src.pro to include some source and header files
Jukka Saastamoinen [Thu, 1 Apr 2010 04:39:02 +0000 (07:39 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Updates from debianizing.
Conflicts:
Situare.pro
Sami Rämö [Wed, 31 Mar 2010 13:35:34 +0000 (16:35 +0300)]
Removed magic number used for undefined values
Jussi Laitinen [Wed, 31 Mar 2010 13:13:55 +0000 (16:13 +0300)]
Modified test cases.
Sami Rämö [Wed, 31 Mar 2010 13:03:08 +0000 (16:03 +0300)]
Documentation + some little improvements
Added documentation, checks for faulty values when setting map tile position,
doxygen documentation to .gitignore, created Doxygen config file,
more throughout tests for MapScene and MapTile classes.
Kaj Wallin [Wed, 31 Mar 2010 12:46:43 +0000 (15:46 +0300)]
Created new public method to MainWindow to get view index. Currently
this method is used by testtabs unit test.
Kaj Wallin [Wed, 31 Mar 2010 12:20:00 +0000 (15:20 +0300)]
Renamed SituareListView and SituareMapView classes to ListViewScreen
and MapViewScreen. Renamed source and header files similarly to follow
naming convention. Also edited testtabs test to reflect the change.
Kaj Wallin [Wed, 31 Mar 2010 12:04:36 +0000 (15:04 +0300)]
Added some debug traces
Jussi Laitinen [Wed, 31 Mar 2010 11:27:32 +0000 (14:27 +0300)]
Fixed paths to files.
Jussi Laitinen [Wed, 31 Mar 2010 11:22:13 +0000 (14:22 +0300)]
Modified mapfetcher.cpp and mapfetcher.h files.
Jukka Saastamoinen [Wed, 31 Mar 2010 09:55:22 +0000 (12:55 +0300)]
Added INSTALL file to project root.
Jukka Saastamoinen [Wed, 31 Mar 2010 09:53:29 +0000 (12:53 +0300)]
Merge branch 'master' into jskia73
Jukka Saastamoinen [Wed, 31 Mar 2010 09:40:49 +0000 (12:40 +0300)]
Cleaning.
Jukka Saastamoinen [Wed, 31 Mar 2010 09:39:04 +0000 (12:39 +0300)]
Added debianizing scripts.
Kaj Wallin [Wed, 31 Mar 2010 07:56:17 +0000 (10:56 +0300)]
Fixed test case filenames to lower case
Kaj Wallin [Wed, 31 Mar 2010 07:46:56 +0000 (10:46 +0300)]
Added delete's to destructor to get rid of memory leak warnings on
cppcheck
Sami Rämö [Wed, 31 Mar 2010 07:25:06 +0000 (10:25 +0300)]
Changed testcase filenames to lowercase
Kaj Wallin [Wed, 31 Mar 2010 07:15:28 +0000 (10:15 +0300)]
Created a test case to test switching between views
Sami Rämö [Wed, 31 Mar 2010 06:44:30 +0000 (09:44 +0300)]
Fixed license & changed setting map tile offset to position.
Kaj Wallin [Wed, 31 Mar 2010 05:21:28 +0000 (08:21 +0300)]
Cleaned up the code
Sami Rämö [Tue, 30 Mar 2010 13:43:21 +0000 (16:43 +0300)]
Merged with ui. Added .orig files to .gitignore.
Conflicts:
.gitignore
Situare.pro
src/ui/mainwindow.cpp
Jussi Laitinen [Tue, 30 Mar 2010 12:56:36 +0000 (15:56 +0300)]
Added networkaccessmanagermock and networkreplymock files.
Sami Rämö [Tue, 30 Mar 2010 12:08:56 +0000 (15:08 +0300)]
Integrated map view to ui, some modifications to map classes
Kaj Wallin [Tue, 30 Mar 2010 12:08:51 +0000 (15:08 +0300)]
Changed back to Menu-type views, as per given input on UI
Kaj Wallin [Tue, 30 Mar 2010 10:28:48 +0000 (13:28 +0300)]
Moved tab data to separate files to allow easy modification.
Jussi Laitinen [Tue, 30 Mar 2010 10:27:54 +0000 (13:27 +0300)]
Modified mainwindow.cpp and mainwindow.h.
Jussi Laitinen [Tue, 30 Mar 2010 10:22:27 +0000 (13:22 +0300)]
Modified mapfetcher.cpp and mapfetcher.h.
Sami Rämö [Tue, 30 Mar 2010 07:24:24 +0000 (10:24 +0300)]
Merge commit 'origin/ramosam' into wallika-tabbar
Kaj Wallin [Tue, 30 Mar 2010 07:24:17 +0000 (10:24 +0300)]
Merge branch 'master' into wallika
Kaj Wallin [Tue, 30 Mar 2010 07:15:01 +0000 (10:15 +0300)]
Switched to QTabBar to allow bettery layouts
Sami Rämö [Tue, 30 Mar 2010 05:53:08 +0000 (08:53 +0300)]
Changes and new features to map related classes.
MapEngine::convertTileNumberToSceneCoordinate() to static, set dummy map
tiles with MapEngine::setViewLocation, added test for
MapEngine:setViewLocation, added throughout tests for MapScene::addMapTile,
added Situare binary to .gitignore.
Jussi Laitinen [Mon, 29 Mar 2010 12:56:58 +0000 (15:56 +0300)]
Added queued versions of mapfetcher.
Jukka Saastamoinen [Mon, 29 Mar 2010 11:30:31 +0000 (14:30 +0300)]
Merged Sami's cases to own branch, updated test script.
Jukka Saastamoinen [Mon, 29 Mar 2010 11:27:03 +0000 (14:27 +0300)]
Updates master test script to match project directory structure.
Kaj Wallin [Mon, 29 Mar 2010 11:05:13 +0000 (14:05 +0300)]
minor edit
Kaj Wallin [Mon, 29 Mar 2010 11:03:50 +0000 (14:03 +0300)]
Modified menu-selectable UI to tab-selectable UI
Jukka Saastamoinen [Mon, 29 Mar 2010 10:56:10 +0000 (13:56 +0300)]
Merge branch 'ramosam' into juksa_local
Sami Rämö [Mon, 29 Mar 2010 10:24:21 +0000 (13:24 +0300)]
Added .gitignore file
Jukka Saastamoinen [Mon, 29 Mar 2010 10:18:36 +0000 (13:18 +0300)]
Cleanup...
Kaj Wallin [Mon, 29 Mar 2010 10:06:25 +0000 (13:06 +0300)]
Implemented List and Map views as widget stack. Views filled with
dummy widgets.
Jukka Saastamoinen [Mon, 29 Mar 2010 09:56:32 +0000 (12:56 +0300)]
Removed spam.
Jussi Laitinen [Mon, 29 Mar 2010 09:50:25 +0000 (12:50 +0300)]
Modified mapEngine and mapFetcher.
Jukka Saastamoinen [Mon, 29 Mar 2010 09:50:23 +0000 (12:50 +0300)]
Created my own branch, added test script to it.
Sami Rämö [Mon, 29 Mar 2010 09:40:33 +0000 (12:40 +0300)]
Map related classes, initial commit. Also added .gitignore file.
Jussi Laitinen [Mon, 29 Mar 2010 09:23:05 +0000 (12:23 +0300)]
Modified mapEngine and mapFetcher classes.
Jussi Laitinen [Mon, 29 Mar 2010 09:13:40 +0000 (12:13 +0300)]
Added testmapengine.cpp and testmapfetcher.cpp.
Kaj Wallin [Mon, 29 Mar 2010 09:00:50 +0000 (12:00 +0300)]
Created menu key actions and dummy QLabel to proove they work
Kaj Wallin [Mon, 29 Mar 2010 05:49:10 +0000 (08:49 +0300)]
Menu buttons for map and list views, no functionality yet.
Jussi Laitinen [Fri, 26 Mar 2010 13:14:16 +0000 (15:14 +0200)]
Added MapEngine and MapFetcher files.
lampehe-local [Fri, 26 Mar 2010 11:14:58 +0000 (13:14 +0200)]
Removed Makefiles, moc-files and testUI.o
lampehe-local [Fri, 26 Mar 2010 09:45:39 +0000 (11:45 +0200)]
Deleted object files
lampehe-local [Fri, 26 Mar 2010 09:38:47 +0000 (11:38 +0200)]
Fixed earlier commit
lampehe-local [Fri, 26 Mar 2010 09:32:15 +0000 (11:32 +0200)]
Added main.cpp and mainwindow class with unit test
Pekka Nissinen [Fri, 26 Mar 2010 07:42:35 +0000 (09:42 +0200)]
Initial version
root [Tue, 2 Mar 2010 09:00:12 +0000 (11:00 +0200)]
welcome