Sami Rämö [Fri, 30 Apr 2010 10:04:11 +0000 (13:04 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare into dev
Conflicts:
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/updatelocation/texteditautoresizer.h
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
Kaj Wallin [Thu, 29 Apr 2010 12:12:41 +0000 (15:12 +0300)]
Fixed some issues
Reviewed by:
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*
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:42:55 +0000 (10:42 +0300)]
Fixed an error that caused duplicate instances of FacebookAuthentication, SituareService and QNetworkAccessManager
Kaj Wallin [Thu, 29 Apr 2010 07:12:58 +0000 (10:12 +0300)]
Added two functional test for engine component
Reviewed by: V. Tiensuu
Ville Tiensuu [Wed, 28 Apr 2010 13:56:17 +0000 (16:56 +0300)]
Added Feature to show own location on the map
New files defines OwnLocationItem class, test for the class and images
for own location.
Mapengine is edited to include instance of OwnLocationItem as a data
member. And also to add own location item to the mapscene.
Katri Kaikkonen [Wed, 28 Apr 2010 12:41:39 +0000 (15:41 +0300)]
Made some minor cosmetic changes (due to recently added settingsdialog files) and ignored some unused events
Katri Kaikkonen [Wed, 28 Apr 2010 12:40:29 +0000 (15:40 +0300)]
Added settingsdialog files
Katri Kaikkonen [Wed, 28 Apr 2010 10:21:59 +0000 (13:21 +0300)]
Added missing settingsdialog files
Kaj Wallin [Wed, 28 Apr 2010 09:53:56 +0000 (12:53 +0300)]
Cleaned up obsolete code from the engine
Reviewed by:
Kaj Wallin [Wed, 28 Apr 2010 08:24:17 +0000 (11:24 +0300)]
Merge branch 'engine' into dev
Conflicts:
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
Kaj Wallin [Wed, 28 Apr 2010 08:11:22 +0000 (11:11 +0300)]
Merge branch 'image_fetcher' into engine
Conflicts:
src/engine/engine.cpp
src/engine/engine.h
Katri Kaikkonen [Wed, 28 Apr 2010 08:08:50 +0000 (11:08 +0300)]
Removed old pictures.
Katri Kaikkonen [Wed, 28 Apr 2010 07:52:29 +0000 (10:52 +0300)]
Merge branch 'personalInfo' into dev
Conflicts:
res/images/clock_small.png
res/images/compas_small.png
res/images/facebook_user_64.png
res/images/list_small.png
res/images/personal_infotab_background.png
res/images/reload_icon.png
res/images/sendPosition_icon.png
res/images/separe_line.png
res/images/top_separtor.png
src/images.qrc
src/src.pro
src/ui/infotab.cpp
src/ui/listviewscreen.cpp
Kaj Wallin [Wed, 28 Apr 2010 07:46:54 +0000 (10:46 +0300)]
Merge branch 'image_fetcher' into engine
lampehe-local [Wed, 28 Apr 2010 07:44:51 +0000 (10:44 +0300)]
refactored engine and situareservice
Pekka Nissinen [Wed, 28 Apr 2010 07:19:39 +0000 (10:19 +0300)]
Added new bigger and "better" zoom buttons
Pekka Nissinen [Wed, 28 Apr 2010 07:16:22 +0000 (10:16 +0300)]
Merge branch 'master' into map
Conflicts:
src/images.qrc
src/map/mapfetcher.cpp
Jukka Saastamoinen [Wed, 28 Apr 2010 06:46:58 +0000 (09:46 +0300)]
Updates
Kaj Wallin [Wed, 28 Apr 2010 05:52:25 +0000 (08:52 +0300)]
Fixed unit test for mainWindow. Added object names to map and list views
Reviewed by:
Kaj Wallin [Wed, 28 Apr 2010 05:16:31 +0000 (08:16 +0300)]
Commit description: Removed loginScreeClosed slot as obsolete.
Reviewed by:
Kaj Wallin [Wed, 28 Apr 2010 05:09:43 +0000 (08:09 +0300)]
Merge branch 'engine' of https://vcs.maemo.org/git/situare into engine
Jukka Saastamoinen [Wed, 28 Apr 2010 04:19:44 +0000 (07:19 +0300)]
Personal infotab mods in listviewscreen
lampehe-local [Tue, 27 Apr 2010 11:36:09 +0000 (14:36 +0300)]
Added QPixmap for User class and implemented first version of profile image fetching for user and friends
lampehe-local [Tue, 27 Apr 2010 09:39:25 +0000 (12:39 +0300)]
Refactored class updatelocationdialog
lampehe-local [Tue, 27 Apr 2010 08:58:58 +0000 (11:58 +0300)]
First version of imagefetcher. Added imagefetcher.cpp/.h
lampehe-local [Tue, 27 Apr 2010 06:20:48 +0000 (09:20 +0300)]
Integrated updateLocation, it currently uses hardcoded coordinates.
Fixed facebookcredentials when expire value is 0 (infinite).
Katri Kaikkonen [Mon, 26 Apr 2010 13:01:56 +0000 (16:01 +0300)]
Implemented settings dialog and functionality for automatic location update setting
Reviewed by: Marko Niemelä
Kaj Wallin [Mon, 26 Apr 2010 12:01:54 +0000 (15:01 +0300)]
Merge branch 'master' into engine
Kaj Wallin [Mon, 26 Apr 2010 12:00:54 +0000 (15:00 +0300)]
Commit description: Rewrote the architecture, engine loads first now
Reviewed by:
Pekka Nissinen [Mon, 26 Apr 2010 11:25:04 +0000 (14:25 +0300)]
Fixed application icon sizes and re-organized resource files to another location
Kaj Wallin [Mon, 26 Apr 2010 10:41:44 +0000 (13:41 +0300)]
Commit description: Moved update dialog from listview to mainwindow
Reviewed by:
Kaj Wallin [Mon, 26 Apr 2010 07:26:28 +0000 (10:26 +0300)]
Merge branch 'master' into engine
Conflicts:
src/src.pro
Kaj Wallin [Mon, 26 Apr 2010 07:23:32 +0000 (10:23 +0300)]
Commit description:Changed list and map views to pointers for easy
access.
Reviewed by:
lampehe-local [Mon, 26 Apr 2010 07:12:06 +0000 (10:12 +0300)]
Code clean-up added code blocks for headers and added QJson related lines to src.pro
Reviewed by: Kaj Wallin
Jukka Saastamoinen [Fri, 23 Apr 2010 11:45:21 +0000 (14:45 +0300)]
Started to modify personalinfoarea to "final" version
Kaj Wallin [Fri, 23 Apr 2010 11:36:04 +0000 (14:36 +0300)]
Commit description: facebook and situare services now in engine class
Reviewed by:
lampehe-local [Fri, 23 Apr 2010 05:29:31 +0000 (08:29 +0300)]
Added user class and related unit-tests, implemented user data fetching, re-factored existing code and unit-tests
Jukka Saastamoinen [Fri, 23 Apr 2010 05:15:03 +0000 (08:15 +0300)]
Beautifying of codes
Kaj Wallin [Thu, 22 Apr 2010 13:09:20 +0000 (16:09 +0300)]
Commit description: Renamed engine instance
Reviewed by:
Kaj Wallin [Thu, 22 Apr 2010 12:57:56 +0000 (15:57 +0300)]
Commit description: Created basic for engine class. Loads from
MainWindow
Reviewed by:
Jussi Laitinen [Thu, 22 Apr 2010 12:09:56 +0000 (15:09 +0300)]
Modified src.pro.
Sami Rämö [Thu, 22 Apr 2010 09:41:17 +0000 (12:41 +0300)]
Changed Doxyfile to ignore moc_* files
Sami Rämö [Thu, 22 Apr 2010 09:32:15 +0000 (12:32 +0300)]
Refactored MapScene clean-up code
* Moved MapScene related methods from MapEngine to MapScene
* Set signal to be emitted when zooming in is finished
and use that signal to launch removing of tiles which
are out of the view area
Jukka Saastamoinen [Thu, 22 Apr 2010 08:39:27 +0000 (11:39 +0300)]
Merge branch 'dev' of https://vcs.maemo.org/git/situare into dev
Jukka Saastamoinen [Thu, 22 Apr 2010 08:36:05 +0000 (11:36 +0300)]
Buttonitems added
Jussi Laitinen [Thu, 22 Apr 2010 08:32:10 +0000 (11:32 +0300)]
Modified MapFetcher::loadImageFromCache to check if tile was expired.
Sami Rämö [Thu, 22 Apr 2010 07:21:13 +0000 (10:21 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Thu, 22 Apr 2010 05:42:33 +0000 (08:42 +0300)]
Added tile expiration date check to MapFetcher.
Jussi Laitinen [Thu, 22 Apr 2010 05:17:01 +0000 (08:17 +0300)]
Merged map to dev. Removed map control panel.
Jussi Laitinen [Thu, 22 Apr 2010 05:12:39 +0000 (08:12 +0300)]
Merge branch 'map' into dev
Jukka Saastamoinen [Thu, 22 Apr 2010 03:55:13 +0000 (06:55 +0300)]
Merge branch 'jskia73' into dev
Jukka Saastamoinen [Thu, 22 Apr 2010 03:51:57 +0000 (06:51 +0300)]
Generic button and testbench for it created.
Sami Rämö [Wed, 21 Apr 2010 13:29:59 +0000 (16:29 +0300)]
Fixed a bug in MapEngine::removeStackedTiles() (not tested)
Kaj Wallin [Wed, 21 Apr 2010 11:01:06 +0000 (14:01 +0300)]
Added valgrind suppression file to repository.
Added qrc_images.cpp to .gitignore.
Sami Rämö [Wed, 21 Apr 2010 09:55:32 +0000 (12:55 +0300)]
Restored map_class_diagram.dia
Kaj Wallin [Wed, 21 Apr 2010 09:35:08 +0000 (12:35 +0300)]
Added separators to mainwindow.h, viewmapscreen.h and viewlistscreen.h
as stated by coding convention
Kaj Wallin [Wed, 21 Apr 2010 09:26:55 +0000 (12:26 +0300)]
Finished fixing bug #5577. All doxygen generation warnings are now
fixed. If documentation is generated without make clean, warning are
generated by undocumented moc-files.
Kaj Wallin [Wed, 21 Apr 2010 08:23:31 +0000 (11:23 +0300)]
Fixed bug that causes application to ask for new login even if
credentials already exist
Also fixed partially bug #5577 by commenting data members at
MainWindow class, and renaming abbreviated member.
Pekka Nissinen [Wed, 21 Apr 2010 07:55:49 +0000 (10:55 +0300)]
Made a few changes that enables custom zoom buttons into map view
Pekka Nissinen [Wed, 21 Apr 2010 07:53:59 +0000 (10:53 +0300)]
Added initial version of zoom button panel classes & related gfx
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