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

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 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 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 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 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 agoStarted to modify personalinfoarea to "final" version
Jukka Saastamoinen [Fri, 23 Apr 2010 11:45:21 +0000 (14:45 +0300)]
Started to modify personalinfoarea to "final" version

14 years agoAdded user class and related unit-tests, implemented user data fetching, re-factored...
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

14 years agoBeautifying of codes
Jukka Saastamoinen [Fri, 23 Apr 2010 05:15:03 +0000 (08:15 +0300)]
Beautifying of codes

14 years agoChanged Doxyfile to ignore moc_* files
Sami Rämö [Thu, 22 Apr 2010 09:41:17 +0000 (12:41 +0300)]
Changed Doxyfile to ignore moc_* files

14 years agoRefactored MapScene clean-up code
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

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

14 years agoButtonitems added
Jukka Saastamoinen [Thu, 22 Apr 2010 08:36:05 +0000 (11:36 +0300)]
Buttonitems added

14 years agoModified MapFetcher::loadImageFromCache to check if tile was expired.
Jussi Laitinen [Thu, 22 Apr 2010 08:32:10 +0000 (11:32 +0300)]
Modified MapFetcher::loadImageFromCache to check if tile was expired.

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

14 years agoAdded tile expiration date check to MapFetcher.
Jussi Laitinen [Thu, 22 Apr 2010 05:42:33 +0000 (08:42 +0300)]
Added tile expiration date check to MapFetcher.

14 years agoMerged map to dev. Removed map control panel.
Jussi Laitinen [Thu, 22 Apr 2010 05:17:01 +0000 (08:17 +0300)]
Merged map to dev. Removed map control panel.

14 years agoMerge branch 'map' into dev
Jussi Laitinen [Thu, 22 Apr 2010 05:12:39 +0000 (08:12 +0300)]
Merge branch 'map' into dev

14 years agoMerge branch 'jskia73' into dev
Jukka Saastamoinen [Thu, 22 Apr 2010 03:55:13 +0000 (06:55 +0300)]
Merge branch 'jskia73' into dev

14 years agoGeneric button and testbench for it created.
Jukka Saastamoinen [Thu, 22 Apr 2010 03:51:57 +0000 (06:51 +0300)]
Generic button and testbench for it created.

14 years agoFixed a bug in MapEngine::removeStackedTiles() (not tested)
Sami Rämö [Wed, 21 Apr 2010 13:29:59 +0000 (16:29 +0300)]
Fixed a bug in MapEngine::removeStackedTiles() (not tested)

14 years agoAdded valgrind suppression file to repository.
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.

14 years agoRestored map_class_diagram.dia
Sami Rämö [Wed, 21 Apr 2010 09:55:32 +0000 (12:55 +0300)]
Restored map_class_diagram.dia

14 years agoAdded separators to mainwindow.h, viewmapscreen.h and viewlistscreen.h
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

14 years agoFinished fixing bug #5577. All doxygen generation warnings are now
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.

14 years agoFixed bug that causes application to ask for new login even if
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.

14 years agoMade a few changes that enables custom zoom buttons into map view
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

14 years agoAdded initial version of zoom button panel classes & related gfx
Pekka Nissinen [Wed, 21 Apr 2010 07:53:59 +0000 (10:53 +0300)]
Added initial version of zoom button panel classes & related gfx

14 years agoMerge branch 'wallika-own' v0.2
Kaj Wallin [Mon, 19 Apr 2010 13:08:22 +0000 (16:08 +0300)]
Merge branch 'wallika-own'

Conflicts:
src/ui/mapviewscreen.cpp

14 years agoMerged and resolved conflict
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

14 years agoMerged map to master
Sami Rämö [Mon, 19 Apr 2010 12:36:34 +0000 (15:36 +0300)]
Merged map to master

Reviewed by Sami & Jussi

14 years agoFinalised review and removed review comments
Sami Rämö [Mon, 19 Apr 2010 12:27:57 +0000 (15:27 +0300)]
Finalised review and removed review comments

14 years agoMerged and resolved conflicts.
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

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

14 years agoModified reviewed code.
Jussi Laitinen [Mon, 19 Apr 2010 12:09:03 +0000 (15:09 +0300)]
Modified reviewed code.

14 years agoMerged with latest version of updatelocationdialog
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>

14 years agoremove tr()' from debug prints
Kaj Wallin [Mon, 19 Apr 2010 12:04:44 +0000 (15:04 +0300)]
remove tr()' from debug prints

14 years agoRemoved some review comments
Sami Rämö [Mon, 19 Apr 2010 12:02:21 +0000 (15:02 +0300)]
Removed some review comments

14 years agoReview
Sami Rämö [Mon, 19 Apr 2010 12:00:14 +0000 (15:00 +0300)]
Review

14 years agoIntegrated messageupdate dialog, code reviewed by wallika
Jukka Saastamoinen [Mon, 19 Apr 2010 11:52:57 +0000 (14:52 +0300)]
Integrated messageupdate dialog, code reviewed by wallika

14 years agoReview fixes
Sami Rämö [Mon, 19 Apr 2010 11:48:23 +0000 (14:48 +0300)]
Review fixes

14 years agoFixed reviewed code.
Jussi Laitinen [Mon, 19 Apr 2010 11:47:58 +0000 (14:47 +0300)]
Fixed reviewed code.

14 years agochanged order of methods and variables to match with common style lampehe
Ville Tiensuu [Mon, 19 Apr 2010 11:44:58 +0000 (14:44 +0300)]
changed order of methods and variables to match with common style

14 years agoCode reviewed by Ville Tiensuu, findings fixed. Removed teststringformations unit...
lampehe-local [Mon, 19 Apr 2010 11:32:06 +0000 (14:32 +0300)]
Code reviewed by Ville Tiensuu, findings fixed. Removed teststringformations unit-tests

14 years agocode rewieved by Henri Lampela and final fixes done
Ville Tiensuu [Mon, 19 Apr 2010 11:15:05 +0000 (14:15 +0300)]
code rewieved by Henri Lampela and final fixes done

14 years agoReview todo comments added
Sami Rämö [Mon, 19 Apr 2010 10:59:36 +0000 (13:59 +0300)]
Review todo comments added

14 years agoRouted infotab button signals out
Jukka Saastamoinen [Mon, 19 Apr 2010 10:11:23 +0000 (13:11 +0300)]
Routed infotab button signals out

14 years agosomething changed
Kaj Wallin [Mon, 19 Apr 2010 09:36:22 +0000 (12:36 +0300)]
something changed

14 years agoSome cleanup for FacebookServices and SituareServices
lampehe-local [Mon, 19 Apr 2010 08:52:24 +0000 (11:52 +0300)]
Some cleanup for FacebookServices and SituareServices

14 years agoSorted header definition to alphabetical order. MainWindow now forces
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.

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

14 years agoAdded some missing comments
Sami Rämö [Mon, 19 Apr 2010 08:40:06 +0000 (11:40 +0300)]
Added some missing comments

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

14 years agoAdded MapEngine::combineTiles method and modified
Jussi Laitinen [Mon, 19 Apr 2010 08:37:07 +0000 (11:37 +0300)]
Added MapEngine::combineTiles method and modified
MapEngine::removeStackedTiles.

14 years agoRestored Doxyfile
Sami Rämö [Mon, 19 Apr 2010 08:28:32 +0000 (11:28 +0300)]
Restored Doxyfile

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

14 years agoChanged the code naming style according to agreed guideline
Jukka Saastamoinen [Mon, 19 Apr 2010 08:06:33 +0000 (11:06 +0300)]
Changed the code naming style according to agreed guideline

14 years agomodified code to obey general namings and style
Ville Tiensuu [Mon, 19 Apr 2010 08:04:49 +0000 (11:04 +0300)]
modified code to obey general namings and style

14 years agoChanged header comment block texts
Sami Rämö [Mon, 19 Apr 2010 07:59:20 +0000 (10:59 +0300)]
Changed header comment block texts

14 years agoChanged MapTile datamember initialisations
Sami Rämö [Mon, 19 Apr 2010 07:48:25 +0000 (10:48 +0300)]
Changed MapTile datamember initialisations

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

14 years agoModified header files function and member order.
Jussi Laitinen [Mon, 19 Apr 2010 07:29:51 +0000 (10:29 +0300)]
Modified header files function and member order.

14 years agoFixed some headers to match coding guidelines
Sami Rämö [Mon, 19 Apr 2010 07:27:33 +0000 (10:27 +0300)]
Fixed some headers to match coding guidelines

14 years agoEdited header files to match coding conventions. Changed member
Kaj Wallin [Mon, 19 Apr 2010 07:25:09 +0000 (10:25 +0300)]
Edited header files to match coding conventions. Changed member
variable names.

14 years agoPrepared for merge
Kaj Wallin [Mon, 19 Apr 2010 05:58:57 +0000 (08:58 +0300)]
Prepared for merge

14 years agoAdded missing doxygen comments to listviewscreen.h
Jukka Saastamoinen [Mon, 19 Apr 2010 05:43:37 +0000 (08:43 +0300)]
Added missing doxygen comments to listviewscreen.h

14 years agoAdded situare icons in different sizes
Jukka Saastamoinen [Mon, 19 Apr 2010 05:26:34 +0000 (08:26 +0300)]
Added situare icons in different sizes

14 years agoAdded comments to mapengine.h, mapscene.h and mapview.h.
Jussi Laitinen [Sun, 18 Apr 2010 15:50:45 +0000 (18:50 +0300)]
Added comments to mapengine.h, mapscene.h and mapview.h.

14 years agoModified MapEngine::removeStackedTiles and added MapEngine::removeTile.
Jupe [Sun, 18 Apr 2010 15:43:46 +0000 (18:43 +0300)]
Modified MapEngine::removeStackedTiles and added MapEngine::removeTile.

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

14 years agoAdded signal and slot for view scaling level change
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

14 years agoAdded comments to mapcommon.h.
Jussi Laitinen [Fri, 16 Apr 2010 13:10:18 +0000 (16:10 +0300)]
Added comments to mapcommon.h.

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

14 years agoAdded src/image.qrc.
Jussi Laitinen [Fri, 16 Apr 2010 13:05:48 +0000 (16:05 +0300)]
Added src/image.qrc.

14 years agoModified MapEngine::removeStackedTiles.
Jussi Laitinen [Fri, 16 Apr 2010 13:03:11 +0000 (16:03 +0300)]
Modified MapEngine::removeStackedTiles.

14 years agoCleaned some old comments and modified scene rect size setting.
Sami Rämö [Fri, 16 Apr 2010 12:44:22 +0000 (15:44 +0300)]
Cleaned some old comments and modified scene rect size setting.

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

14 years agoAdded missing resource file
Sami Rämö [Fri, 16 Apr 2010 12:17:00 +0000 (15:17 +0300)]
Added missing resource file

14 years agomodified src.pro
Ville Tiensuu [Fri, 16 Apr 2010 12:09:10 +0000 (15:09 +0300)]
modified src.pro

14 years agoMerge branch 'jskia73' kaikkka
Jukka Saastamoinen [Fri, 16 Apr 2010 12:08:34 +0000 (15:08 +0300)]
Merge branch 'jskia73'

14 years agoCleaned memleaks from listviewscreen.cpp
Jukka Saastamoinen [Fri, 16 Apr 2010 12:04:44 +0000 (15:04 +0300)]
Cleaned memleaks from listviewscreen.cpp

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

14 years agoupdated facebook classes
Ville Tiensuu [Fri, 16 Apr 2010 11:29:00 +0000 (14:29 +0300)]
updated facebook classes

14 years agoRemoved unused image from src/resources
Pekka Nissinen [Fri, 16 Apr 2010 11:02:08 +0000 (14:02 +0300)]
Removed unused image from src/resources

14 years agoAdded missing files & folders
lampehe-local [Fri, 16 Apr 2010 10:43:11 +0000 (13:43 +0300)]
Added missing files & folders

14 years agoFirst phase of facebookservice and situareservice integration.
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.

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

14 years agoModified mapviewscreen to remove margins.
Jussi Laitinen [Fri, 16 Apr 2010 09:57:22 +0000 (12:57 +0300)]
Modified mapviewscreen to remove margins.

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

14 years agoRemoved magic numbers, added null check to tile removal method.
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.

14 years agoReturned back to self made scrolling.
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.

14 years agoRemoved debug messages from MapEngine.
Jussi Laitinen [Thu, 15 Apr 2010 13:48:11 +0000 (16:48 +0300)]
Removed debug messages from MapEngine.

14 years agoAdded mapcommon.h.
Jussi Laitinen [Thu, 15 Apr 2010 12:28:27 +0000 (15:28 +0300)]
Added mapcommon.h.

14 years agoFixed unit tests, more accurate limits for latitude coordinates.
Sami Rämö [Thu, 15 Apr 2010 12:26:44 +0000 (15:26 +0300)]
Fixed unit tests, more accurate limits for latitude coordinates.

14 years agoRenamed common.h to mapcommon.h and moved to src/map.
Jussi Laitinen [Thu, 15 Apr 2010 12:22:49 +0000 (15:22 +0300)]
Renamed common.h to mapcommon.h and moved to src/map.

14 years agoRemove dummy infolabel from MainWindow. No review needed.
Kaj Wallin [Thu, 15 Apr 2010 11:57:24 +0000 (14:57 +0300)]
Remove dummy infolabel from MainWindow. No review needed.

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