situare
14 years agoChanged doxyfile to create graphs
Kaj Wallin [Mon, 3 May 2010 10:38:47 +0000 (13:38 +0300)]
Changed doxyfile to create graphs

Reviewed by:

14 years agoFixed some review defects
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

14 years agoupdated doxygen comment
Ville Tiensuu [Mon, 3 May 2010 10:15:57 +0000 (13:15 +0300)]
updated doxygen comment

14 years agobug fixing
Ville Tiensuu [Mon, 3 May 2010 10:11:06 +0000 (13:11 +0300)]
bug fixing

14 years agoPreliminary merge. Integration is brancehd from fresh master.
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

14 years agoupdates to doxygen commentation and removal of one unneeded method
Ville Tiensuu [Mon, 3 May 2010 08:45:58 +0000 (11:45 +0300)]
updates to doxygen commentation and removal of one unneeded method

14 years agofinal fixing
Ville Tiensuu [Mon, 3 May 2010 07:17:30 +0000 (10:17 +0300)]
final fixing

14 years agoFixed mainwindow unit test
Kaj Wallin [Mon, 3 May 2010 06:42:50 +0000 (09:42 +0300)]
Fixed mainwindow unit test

Reviewed by:

14 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare into map
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

14 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
lampehe-local [Mon, 3 May 2010 05:49:55 +0000 (08:49 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

14 years agoRefactored situareservice related unit-tests
lampehe-local [Mon, 3 May 2010 05:48:40 +0000 (08:48 +0300)]
Refactored situareservice related unit-tests

14 years agoAdded functional tests for friendlist.
Jussi Laitinen [Mon, 3 May 2010 05:48:18 +0000 (08:48 +0300)]
Added functional tests for friendlist.

14 years agoLoad upper level map images from the cache
Sami Rämö [Fri, 30 Apr 2010 12:41:14 +0000 (15:41 +0300)]
Load upper level map images from the cache

14 years agoadded base class for own and friend locations. added new class for
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.

14 years agoMoved URL builder and parser to MapFetcher
Sami Rämö [Fri, 30 Apr 2010 10:52:09 +0000 (13:52 +0300)]
Moved URL builder and parser to MapFetcher

14 years agoAdded friendlist tests.
Jussi Laitinen [Fri, 30 Apr 2010 09:20:29 +0000 (12:20 +0300)]
Added friendlist tests.

14 years agoUpdated unit tests
Sami Rämö [Fri, 30 Apr 2010 09:09:59 +0000 (12:09 +0300)]
Updated unit tests

14 years agoStacked tile removal zValue check, doxygen generating class diagrams
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

14 years agoMerge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist
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

14 years agoMerge branch 'friendlist' 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

14 years agoAdded comments to friendlistitem, friendlistview and listviewscreen.
Jussi Laitinen [Fri, 30 Apr 2010 07:41:27 +0000 (10:41 +0300)]
Added comments to friendlistitem, friendlistview and listviewscreen.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
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

14 years agoChanged InfoTab from public to private and made proper changes to
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:

14 years agoMapFetcher queuing refactoring
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

14 years agoModified listviewscreen.
Jussi Laitinen [Fri, 30 Apr 2010 06:35:35 +0000 (09:35 +0300)]
Modified listviewscreen.

14 years agoAdded signal for successful update image_fetcher
lampehe-local [Fri, 30 Apr 2010 06:34:17 +0000 (09:34 +0300)]
Added signal for successful update

14 years agoAdded/Fixed commentation blocks to meed DoD requirements
Kaj Wallin [Thu, 29 Apr 2010 13:16:43 +0000 (16:16 +0300)]
Added/Fixed commentation blocks to meed DoD requirements

Reviewed by:

14 years agoAdded engine to master
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

14 years agoMerge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist
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

14 years agoFixed some issues
Kaj Wallin [Thu, 29 Apr 2010 12:12:41 +0000 (15:12 +0300)]
Fixed some issues

Reviewed by:

14 years agoIntegrated infotab to listviewscreen.
Jussi Laitinen [Thu, 29 Apr 2010 12:04:29 +0000 (15:04 +0300)]
Integrated infotab to listviewscreen.

14 years agoAdded error signals to engine from ImageFetcher and SituareService.
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

14 years agoModified FriendListView::clear method.
Jussi Laitinen [Thu, 29 Apr 2010 11:48:50 +0000 (14:48 +0300)]
Modified FriendListView::clear method.

14 years agoMerge branch 'dev' into friendlist
Jussi Laitinen [Thu, 29 Apr 2010 10:24:39 +0000 (13:24 +0300)]
Merge branch 'dev' into friendlist

14 years agoIntegrated friendlistview with dev.
Jussi Laitinen [Thu, 29 Apr 2010 10:18:40 +0000 (13:18 +0300)]
Integrated friendlistview with dev.

14 years agoMerge branch 'image_fetcher'
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

14 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
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

14 years agoFixed (yet) another merge screw-up *sigh*
Pekka Nissinen [Thu, 29 Apr 2010 09:03:24 +0000 (12:03 +0300)]
Fixed (yet) another merge screw-up *sigh*

14 years agosmall updates to own location feature
Ville Tiensuu [Thu, 29 Apr 2010 08:50:52 +0000 (11:50 +0300)]
small updates to own location feature

14 years agoMerge branch 'dev' into friendlist
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

14 years agoYet another minor cosmetic changes
Pekka Nissinen [Thu, 29 Apr 2010 08:42:32 +0000 (11:42 +0300)]
Yet another minor cosmetic changes

14 years agoMerge branch 'dev' into map
Pekka Nissinen [Thu, 29 Apr 2010 08:32:38 +0000 (11:32 +0300)]
Merge branch 'dev' into map

14 years agoMerge branch 'personalinfo' into friendlist
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

14 years agoSome minor cosmetic changes
Pekka Nissinen [Thu, 29 Apr 2010 08:23:52 +0000 (11:23 +0300)]
Some minor cosmetic changes

14 years agoMerge branch 'image_fetcher' into dev
lampehe-local [Thu, 29 Apr 2010 08:23:45 +0000 (11:23 +0300)]
Merge branch 'image_fetcher' into dev

14 years agoIntegrated imagefetcher and iterated imagefetcher related codes
lampehe-local [Thu, 29 Apr 2010 08:01:18 +0000 (11:01 +0300)]
Integrated imagefetcher and iterated imagefetcher related codes
Reviewed by: Marko Niemelä

14 years agoMerge branch 'dev' into map
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

14 years agoAdded dummy_image.png and list_item.png to res.
Jussi Laitinen [Thu, 29 Apr 2010 07:56:01 +0000 (10:56 +0300)]
Added dummy_image.png and list_item.png to res.

14 years agoModified FriendListItem constructor.
Jussi Laitinen [Thu, 29 Apr 2010 07:54:28 +0000 (10:54 +0300)]
Modified FriendListItem constructor.

14 years agoFixed an error that caused duplicate instances of FacebookAuthentication, SituareServ...
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

14 years agoEnabled map related debug messages, some cleanup
Sami Rämö [Thu, 29 Apr 2010 07:32:29 +0000 (10:32 +0300)]
Enabled map related debug messages, some cleanup

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
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

14 years agoAdded two functional test for engine component
Kaj Wallin [Thu, 29 Apr 2010 07:12:58 +0000 (10:12 +0300)]
Added two functional test for engine component

Reviewed by: V. Tiensuu

14 years agoPolishing personalInfo
Jukka Saastamoinen [Thu, 29 Apr 2010 07:11:55 +0000 (10:11 +0300)]
Polishing

14 years agoMinor refactoring & adding/updating documentation
Sami Rämö [Thu, 29 Apr 2010 06:37:11 +0000 (09:37 +0300)]
Minor refactoring & adding/updating documentation

14 years agoMerge branch 'dev' into map
Pekka Nissinen [Thu, 29 Apr 2010 05:46:46 +0000 (08:46 +0300)]
Merge branch 'dev' into map

14 years agoAdded Feature to show own location on the map
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.

14 years agoChanges for setting the zValue of the MapTile
Sami Rämö [Wed, 28 Apr 2010 13:19:53 +0000 (16:19 +0300)]
Changes for setting the zValue of the MapTile

14 years agoRemoved OpenGL
Sami Rämö [Wed, 28 Apr 2010 13:02:06 +0000 (16:02 +0300)]
Removed OpenGL

14 years agoCleanup & fixes
Sami Rämö [Wed, 28 Apr 2010 12:55:08 +0000 (15:55 +0300)]
Cleanup & fixes

  * changes to zoomed in flag

  * added queue length limit for queued fetching of map tiles

  * cleaned removal of stacked tiles

  * zoom animation was missing parent

14 years agoModified FriendListItem content.
Jussi Laitinen [Wed, 28 Apr 2010 12:47:52 +0000 (15:47 +0300)]
Modified FriendListItem content.

14 years agoMade some minor cosmetic changes (due to recently added settingsdialog files) and...
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

14 years agoAdded settingsdialog files
Katri Kaikkonen [Wed, 28 Apr 2010 12:40:29 +0000 (15:40 +0300)]
Added settingsdialog files

14 years agoAdded missing settingsdialog files
Katri Kaikkonen [Wed, 28 Apr 2010 10:21:59 +0000 (13:21 +0300)]
Added missing settingsdialog files

14 years agoCleaned up obsolete code from the engine engine
Kaj Wallin [Wed, 28 Apr 2010 09:53:56 +0000 (12:53 +0300)]
Cleaned up obsolete code from the engine

Reviewed by:

14 years agoMerge branch 'engine' into dev
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

14 years agoMerge branch 'image_fetcher' into engine
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

14 years agoRemoved old pictures.
Katri Kaikkonen [Wed, 28 Apr 2010 08:08:50 +0000 (11:08 +0300)]
Removed old pictures.

14 years agoMerge branch 'personalInfo' into dev
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

14 years agoMerge branch 'image_fetcher' into engine
Kaj Wallin [Wed, 28 Apr 2010 07:46:54 +0000 (10:46 +0300)]
Merge branch 'image_fetcher' into engine

14 years agorefactored engine and situareservice
lampehe-local [Wed, 28 Apr 2010 07:44:51 +0000 (10:44 +0300)]
refactored engine and situareservice

14 years agoAdded new bigger and "better" zoom buttons
Pekka Nissinen [Wed, 28 Apr 2010 07:19:39 +0000 (10:19 +0300)]
Added new bigger and "better" zoom buttons

14 years agoMerge branch 'master' into map
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

14 years agoUpdates
Jukka Saastamoinen [Wed, 28 Apr 2010 06:46:58 +0000 (09:46 +0300)]
Updates

14 years agoFixed unit test for mainWindow. Added object names to map and list views
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:

14 years agoCommit description: Removed loginScreeClosed slot as obsolete.
Kaj Wallin [Wed, 28 Apr 2010 05:16:31 +0000 (08:16 +0300)]
Commit description: Removed loginScreeClosed slot as obsolete.

Reviewed by:

14 years agoMerge branch 'engine' of https://vcs.maemo.org/git/situare into engine
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

14 years agoPersonal infotab mods in listviewscreen
Jukka Saastamoinen [Wed, 28 Apr 2010 04:19:44 +0000 (07:19 +0300)]
Personal infotab mods in listviewscreen

14 years agoModified FriendListItem::paint.
Jussi Laitinen [Tue, 27 Apr 2010 12:58:15 +0000 (15:58 +0300)]
Modified FriendListItem::paint.

14 years agoMerge branch 'engine' into friendlist
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

14 years agoAdded QPixmap for User class and implemented first version of profile image fetching...
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

14 years agoQueued map tile fetch & one more map tile removal bug fix
Sami Rämö [Tue, 27 Apr 2010 11:15:26 +0000 (14:15 +0300)]
Queued map tile fetch & one more map tile removal bug fix

  * queued map tile fetch

  * found and fixed bug where map tile was removed when it's
    bounding rect was not fully contained inside the view area

14 years agoZoom animation & min level change, queued stacked tiles removal
Sami Rämö [Tue, 27 Apr 2010 09:55:33 +0000 (12:55 +0300)]
Zoom animation & min level change, queued stacked tiles removal

  * Minimum viewable zoom level to 2

  * Queued removal of stacked tiles

  * Fix for case where map tiles from wrong zoom level
    were shown when zoom level was changed multiple times
    rapidly

  * current view tiles rect is updated frequently to
    MapScene and cleanup algorithms use that value

  * changed self made zoom animation to QPropertyAnimation

14 years agoRefactored class updatelocationdialog
lampehe-local [Tue, 27 Apr 2010 09:39:25 +0000 (12:39 +0300)]
Refactored class updatelocationdialog

14 years agoMerge branch 'master' into friendlist
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

14 years agoModified FriendListItem constructor and paintEvent.
Jussi Laitinen [Tue, 27 Apr 2010 09:27:04 +0000 (12:27 +0300)]
Modified FriendListItem constructor and paintEvent.

14 years agoFirst version of imagefetcher. Added imagefetcher.cpp/.h
lampehe-local [Tue, 27 Apr 2010 08:58:58 +0000 (11:58 +0300)]
First version of imagefetcher. Added imagefetcher.cpp/.h

14 years agoIntegrated updateLocation, it currently uses hardcoded coordinates.
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).

14 years agoModified FriendListItemDelegate::paint.
Jussi Laitinen [Mon, 26 Apr 2010 13:24:36 +0000 (16:24 +0300)]
Modified FriendListItemDelegate::paint.

14 years agoImplemented settings dialog and functionality for automatic location update setting
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ä

14 years agoMerge branch 'master' into engine
Kaj Wallin [Mon, 26 Apr 2010 12:01:54 +0000 (15:01 +0300)]
Merge branch 'master' into engine

14 years agoCommit description: Rewrote the architecture, engine loads first now
Kaj Wallin [Mon, 26 Apr 2010 12:00:54 +0000 (15:00 +0300)]
Commit description: Rewrote the architecture, engine loads first now

Reviewed by:

14 years agoFixed application icon sizes and re-organized resource files to another location
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

14 years agoModified friendlistitem.h comments.
Jussi Laitinen [Mon, 26 Apr 2010 11:04:17 +0000 (14:04 +0300)]
Modified friendlistitem.h comments.

14 years agoCreated new branch.
Jussi Laitinen [Mon, 26 Apr 2010 10:57:52 +0000 (13:57 +0300)]
Created new branch.

14 years agoCommit description: Moved update dialog from listview to mainwindow
Kaj Wallin [Mon, 26 Apr 2010 10:41:44 +0000 (13:41 +0300)]
Commit description: Moved update dialog from listview to mainwindow

Reviewed by:

14 years agoMerge branch 'master' into engine
Kaj Wallin [Mon, 26 Apr 2010 07:26:28 +0000 (10:26 +0300)]
Merge branch 'master' into engine

Conflicts:
src/src.pro

14 years agoCommit description:Changed list and map views to pointers for easy
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:

14 years agoCode clean-up added code blocks for headers and added QJson related lines to src.pro fetch_users
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

14 years agoFriendlist mockup.
Jussi Laitinen [Fri, 23 Apr 2010 12:54:52 +0000 (15:54 +0300)]
Friendlist mockup.