Jussi Laitinen [Mon, 3 May 2010 12:54:19 +0000 (15:54 +0300)]
Added toggleProgressInidicator to engine.cpp.
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
lampehe-local [Mon, 3 May 2010 12:09:00 +0000 (15:09 +0300)]
Updated user and friendslist signals and image fetching
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:
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:
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.
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.
Jussi Laitinen [Fri, 30 Apr 2010 09:20:29 +0000 (12:20 +0300)]
Added friendlist tests.
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.
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:
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
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
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ä
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
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
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.
Jussi Laitinen [Wed, 28 Apr 2010 12:47:52 +0000 (15:47 +0300)]
Modified FriendListItem content.
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
Jussi Laitinen [Tue, 27 Apr 2010 12:58:15 +0000 (15:58 +0300)]
Modified FriendListItem::paint.
Jussi Laitinen [Tue, 27 Apr 2010 12:34:41 +0000 (15:34 +0300)]
Merge branch 'engine' into friendlist
Conflicts:
src/src.pro
src/ui/listviewscreen.h
src/ui/mainwindow.cpp
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
Jussi Laitinen [Tue, 27 Apr 2010 09:34:58 +0000 (12:34 +0300)]
Merge branch 'master' into friendlist
Conflicts:
src/images.qrc
src/src.pro
Jussi Laitinen [Tue, 27 Apr 2010 09:27:04 +0000 (12:27 +0300)]
Modified FriendListItem constructor and paintEvent.
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).
Jussi Laitinen [Mon, 26 Apr 2010 13:24:36 +0000 (16:24 +0300)]
Modified FriendListItemDelegate::paint.
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
Jussi Laitinen [Mon, 26 Apr 2010 11:04:17 +0000 (14:04 +0300)]
Modified friendlistitem.h comments.
Jussi Laitinen [Mon, 26 Apr 2010 10:57:52 +0000 (13:57 +0300)]
Created new branch.
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
Jussi Laitinen [Fri, 23 Apr 2010 12:54:52 +0000 (15:54 +0300)]
Friendlist mockup.
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.