situare
13 years agobackup before removing small profile image handling from source code
Ville Tiensuu [Mon, 31 May 2010 11:46:47 +0000 (14:46 +0300)]
backup before removing small profile image handling from source code

13 years agocleaning
Ville Tiensuu [Mon, 31 May 2010 11:10:13 +0000 (14:10 +0300)]
cleaning

13 years agofinalising big profile images
Ville Tiensuu [Mon, 31 May 2010 10:41:36 +0000 (13:41 +0300)]
finalising big profile images

13 years agoworking new borders for bigger profile images bigger_images
Ville Tiensuu [Fri, 28 May 2010 13:11:25 +0000 (16:11 +0300)]
working new borders for bigger profile images

13 years agoplayed with image borders
ville tiensuu [Thu, 27 May 2010 19:21:12 +0000 (22:21 +0300)]
played with image borders

13 years agostarted feature to show bigger profile images
Ville Tiensuu [Thu, 27 May 2010 13:28:47 +0000 (16:28 +0300)]
started feature to show bigger profile images

13 years agomoved test from own test class to TestMapEngine class.
Ville Tiensuu [Thu, 27 May 2010 06:43:55 +0000 (09:43 +0300)]
moved test from own test class to TestMapEngine class.
moved data const from common.h to engine.cpp

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Thu, 27 May 2010 05:10:29 +0000 (08:10 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agoFixed test project files so no debug is printed
Kaj Wallin [Thu, 27 May 2010 05:09:52 +0000 (08:09 +0300)]
Fixed test project files so no debug is printed

Reviewed by:

13 years agoTest script removes unit test binaries after testing
Sami Rämö [Wed, 26 May 2010 14:20:23 +0000 (17:20 +0300)]
Test script removes unit test binaries after testing

 - Binaries are removed so they are not annoying in the list
   of untracked files if commit is made without compiling
   tests after running the script.

13 years agoMerge branch 'zoom_button_drag'
Kaj Wallin [Wed, 26 May 2010 13:51:22 +0000 (16:51 +0300)]
Merge branch 'zoom_button_drag'

13 years agoFixed some test cases
Kaj Wallin [Wed, 26 May 2010 13:50:30 +0000 (16:50 +0300)]
Fixed some test cases

Reviewed by:

13 years agoMerge branch 'master' into zoom_button_drag
Kaj Wallin [Wed, 26 May 2010 13:23:52 +0000 (16:23 +0300)]
Merge branch 'master' into zoom_button_drag

Conflicts:
src/common.h
tests/ui/zoombuttonpanel/zoombuttonpanel.pro

13 years agoRemoved obsolete references to OpenGL
Pekka Nissinen [Wed, 26 May 2010 13:21:03 +0000 (16:21 +0300)]
Removed obsolete references to OpenGL

13 years agoRemoved obsolete unittest
Kaj Wallin [Wed, 26 May 2010 13:19:11 +0000 (16:19 +0300)]
Removed obsolete unittest

Reviewed by:

13 years agoFinished zoom panel drag feature fixes
Kaj Wallin [Wed, 26 May 2010 13:12:25 +0000 (16:12 +0300)]
Finished zoom panel drag feature fixes

Reviewed by: Marko Niemelä

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Wed, 26 May 2010 12:36:11 +0000 (15:36 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
doc/test_cases/functionality-tests.doc

13 years agofinal fixing after merge
Ville Tiensuu [Wed, 26 May 2010 12:26:21 +0000 (15:26 +0300)]
final fixing after merge

13 years agoMerge branch 'userinfo'
Katri Kaikkonen [Wed, 26 May 2010 12:10:54 +0000 (15:10 +0300)]
Merge branch 'userinfo'

Conflicts:
doc/test_cases/functionality-tests.doc

13 years agoAdded minor changes to userinfo
Katri Kaikkonen [Wed, 26 May 2010 11:26:41 +0000 (14:26 +0300)]
Added minor changes to userinfo

Reviewed by: Marko Niemelä

13 years agoMerge branch 'show_gps_location_on_first_start'
Ville Tiensuu [Wed, 26 May 2010 11:14:00 +0000 (14:14 +0300)]
Merge branch 'show_gps_location_on_first_start'

13 years agoFinal fixing.
Ville Tiensuu [Wed, 26 May 2010 10:45:41 +0000 (13:45 +0300)]
Final fixing.
Reviewed by: Pekka Nissinen

13 years agoFixed faulty release logic for ZoomButtonPanel
Kaj Wallin [Wed, 26 May 2010 10:30:38 +0000 (13:30 +0300)]
Fixed faulty release logic for ZoomButtonPanel

Reviewed by:

13 years agoRemoved timer from zoombutton, created new signals and fixed some logics
Kaj Wallin [Wed, 26 May 2010 10:11:41 +0000 (13:11 +0300)]
Removed timer from zoombutton, created new signals and fixed some logics

Reviewed by:

13 years agochanged implementation of setZoomLevel in mapEngine show_gps_location_on_first_start
Ville Tiensuu [Wed, 26 May 2010 10:07:46 +0000 (13:07 +0300)]
changed implementation of setZoomLevel in mapEngine

13 years agoMerged master with test script modifications
Sami Rämö [Wed, 26 May 2010 08:52:39 +0000 (11:52 +0300)]
Merged master with test script modifications

Conflicts:
tests/ui/friendlist/friendlist.pro

13 years agoUse up-to-date tests and run in test directory test_script
Sami Rämö [Wed, 26 May 2010 08:02:29 +0000 (11:02 +0300)]
Use up-to-date tests and run in test directory

 - Reviewed by Ville

 - delete unit test binaries and run qmake &  make for
   tests.pro so unit tests run are always up-to-date

 - run each unit test in it's directory so test finds
   it's test data placed in it's directory

13 years agoDeleted friendlist binary from tests.
Jussi Laitinen [Wed, 26 May 2010 08:01:43 +0000 (11:01 +0300)]
Deleted friendlist binary from tests.

13 years agoHad zoom panel drag fetaure reviewed. Updated functional tests.
Kaj Wallin [Wed, 26 May 2010 05:54:41 +0000 (08:54 +0300)]
Had zoom panel drag fetaure reviewed. Updated functional tests.

Reviewed by: Henri Lampela

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Wed, 26 May 2010 05:20:24 +0000 (08:20 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agofinal fixing
Ville Tiensuu [Tue, 25 May 2010 12:52:21 +0000 (15:52 +0300)]
final fixing

13 years agoCorrected led image dropshadows
Pekka Nissinen [Tue, 25 May 2010 12:40:51 +0000 (15:40 +0300)]
Corrected led image dropshadows

13 years agoMerge branch 'master' into zoom_button_drag
Kaj Wallin [Tue, 25 May 2010 12:20:54 +0000 (15:20 +0300)]
Merge branch 'master' into zoom_button_drag

Conflicts:
src/ui/imagebutton.h
src/ui/mainwindow.cpp
src/ui/zoombuttonpanel.cpp
src/ui/zoombuttonpanel.h

13 years agofinalising this feature branch
Ville Tiensuu [Tue, 25 May 2010 12:12:29 +0000 (15:12 +0300)]
finalising this feature branch

13 years agoMerge branch 'master' into userinfo userinfo
Katri Kaikkonen [Tue, 25 May 2010 12:04:21 +0000 (15:04 +0300)]
Merge branch 'master' into userinfo

13 years agoFinished implementing zoom button drag feature zoom_button_drag
Kaj Wallin [Tue, 25 May 2010 11:56:25 +0000 (14:56 +0300)]
Finished implementing zoom button drag feature

Reviewed by:

13 years agoMinor fixes to userinfo
Katri Kaikkonen [Tue, 25 May 2010 11:30:08 +0000 (14:30 +0300)]
Minor fixes to userinfo

13 years agoMade a few small changes to ImageButton and ZoomButtonPanel classes.
Pekka Nissinen [Tue, 25 May 2010 11:18:15 +0000 (14:18 +0300)]
Made a few small changes to ImageButton and ZoomButtonPanel classes.

Reviewed by: Marko Niemelä

13 years agoFixed unit tests
Sami Rämö [Tue, 25 May 2010 10:58:50 +0000 (13:58 +0300)]
Fixed unit tests

 - removed some garbage unit tests

 - fixed some broken unit tests

 - added some new tests for FriendLocationItem

 - test script modifications

      * check if unit test file is executable

      * doesn't try to test master tests.pro project

      * added some instructional prints if executables
        for all unit tests are not found

      * check if test report contains any qDebug or
        qWarning prints and instruct to disable them

13 years agoChanged friend_group.png in res/images.
Jussi Laitinen [Tue, 25 May 2010 09:48:54 +0000 (12:48 +0300)]
Changed friend_group.png in res/images.

13 years agobackup
Ville Tiensuu [Tue, 25 May 2010 09:31:57 +0000 (12:31 +0300)]
backup

13 years agoMerge branch 'master' into userinfo
Katri Kaikkonen [Tue, 25 May 2010 08:29:34 +0000 (11:29 +0300)]
Merge branch 'master' into userinfo

Conflicts:
images.qrc
src/ui/userinfopanel.cpp

13 years agoFixed missing members
Katri Kaikkonen [Tue, 25 May 2010 08:20:08 +0000 (11:20 +0300)]
Fixed missing members

13 years agoAdded new background images to userinfo item
Katri Kaikkonen [Tue, 25 May 2010 08:09:19 +0000 (11:09 +0300)]
Added new background images to userinfo item

13 years agoMerge branch 'master' into userinfo
Katri Kaikkonen [Tue, 25 May 2010 08:08:51 +0000 (11:08 +0300)]
Merge branch 'master' into userinfo

Conflicts:
src/ui/userinfopanel.h
src/ui/userpanel.cpp

13 years agoadded functionality to show gps location on first start
Ville Tiensuu [Tue, 25 May 2010 07:43:24 +0000 (10:43 +0300)]
added functionality to show gps location on first start

13 years agoToggled debug messages off.
lampehe-local [Tue, 25 May 2010 07:10:28 +0000 (10:10 +0300)]
Toggled debug messages off.

13 years agoImplemented logout feature
lampehe-local [Tue, 25 May 2010 07:05:19 +0000 (10:05 +0300)]
Implemented logout feature
Reviewed by: Ville Tiensuu
Bug fix
Reviewed by: Henri Lampela

13 years agoFixed seg fault bug in FriendListView. logout_bug
Jussi Laitinen [Tue, 25 May 2010 06:57:47 +0000 (09:57 +0300)]
Fixed seg fault bug in FriendListView.

13 years agoBugs with master
lampehe-local [Tue, 25 May 2010 06:46:28 +0000 (09:46 +0300)]
Bugs with master

13 years agoAdded project for building all unit tests
Sami Rämö [Tue, 25 May 2010 05:46:07 +0000 (08:46 +0300)]
Added project for building all unit tests

 - new unit tests must be added manually to tests/tests.pro

 - all unit tests can be built by using tests/tests.pro

 - whole project, including actual application and unit tests,
   can be built using situare.pro

 - actual application can be built using src/src.pro

13 years agoCreated new script for running all unit tests
Sami Rämö [Mon, 24 May 2010 12:41:10 +0000 (15:41 +0300)]
Created new script for running all unit tests

 - All .pro files are searched under tests directory and
   file with same name (without .pro extension)
   is expected to be the actual unit test executable

13 years agoMerge branch 'logout_refactored'
lampehe-local [Mon, 24 May 2010 12:01:29 +0000 (15:01 +0300)]
Merge branch 'logout_refactored'

Conflicts:
src/ui/mainwindow.h

13 years agoFinal implementation of logout logout_refactored
lampehe-local [Mon, 24 May 2010 11:49:39 +0000 (14:49 +0300)]
Final implementation of logout

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Mon, 24 May 2010 11:41:02 +0000 (14:41 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agomerged with use_last_location
Ville Tiensuu [Mon, 24 May 2010 11:37:16 +0000 (14:37 +0300)]
merged with use_last_location

13 years agoChanged profile_pic_border.png in res/images. Changed AvatarImage and
Jussi Laitinen [Mon, 24 May 2010 11:17:53 +0000 (14:17 +0300)]
Changed profile_pic_border.png in res/images. Changed AvatarImage and
FriendListItem image sizes.

13 years agoModified map item click functional test.
Jussi Laitinen [Mon, 24 May 2010 09:19:24 +0000 (12:19 +0300)]
Modified map item click functional test.

13 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Mon, 24 May 2010 08:52:17 +0000 (11:52 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

13 years agoFriend list code reviewed.
Jussi Laitinen [Mon, 24 May 2010 08:45:58 +0000 (11:45 +0300)]
Friend list code reviewed.

Reviewed by: Henri Lampela

13 years agoChanged isOpen data member match naming convention
Kaj Wallin [Mon, 24 May 2010 08:16:12 +0000 (11:16 +0300)]
Changed isOpen data member match naming convention

Reviewed by: Henri Lampela

13 years agoZoomb button mode is now set to disabled when zoombuttonpanel gets
Kaj Wallin [Mon, 24 May 2010 07:59:05 +0000 (10:59 +0300)]
Zoomb button mode is now set to disabled when zoombuttonpanel gets
mouse press event

Reviewed by:

14 years agoMerge branch 'master' into friendlist
Jussi Laitinen [Mon, 24 May 2010 06:59:35 +0000 (09:59 +0300)]
Merge branch 'master' into friendlist

14 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Mon, 24 May 2010 06:59:24 +0000 (09:59 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

14 years agoAdded mouse press and release methods to FriendGroupItem and
Jussi Laitinen [Mon, 24 May 2010 06:58:32 +0000 (09:58 +0300)]
Added mouse press and release methods to FriendGroupItem and
FriendLocationItem.

14 years agoUpdated valgrind suppress file and .gitignore
Kaj Wallin [Mon, 24 May 2010 05:38:12 +0000 (08:38 +0300)]
Updated valgrind suppress file and .gitignore

Reviewed by:

14 years agoAdded test case for location item click and friend list filtering.
Jussi Laitinen [Fri, 21 May 2010 13:49:47 +0000 (16:49 +0300)]
Added test case for location item click and friend list filtering.

14 years agoMerged logout implementation to new refactored master
lampehe-local [Fri, 21 May 2010 13:45:40 +0000 (16:45 +0300)]
Merged logout implementation to new refactored master

14 years agoMerge branch 'master' into friendlist
Jussi Laitinen [Fri, 21 May 2010 13:36:19 +0000 (16:36 +0300)]
Merge branch 'master' into friendlist

Conflicts:
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h

14 years agoAdded scrollbar to userinfo
Katri Kaikkonen [Fri, 21 May 2010 13:23:40 +0000 (16:23 +0300)]
Added scrollbar to userinfo

14 years agoMerged with latest master
Kaj Wallin [Fri, 21 May 2010 12:58:08 +0000 (15:58 +0300)]
Merged with latest master

Reviewed by:

14 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Fri, 21 May 2010 12:21:03 +0000 (15:21 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare

14 years agominor fix
Kaj Wallin [Fri, 21 May 2010 12:20:03 +0000 (15:20 +0300)]
minor fix

Reviewed by: Jussi Laitinen

14 years agoPre-merge. Also change drawOsmLicense to use QSize
Kaj Wallin [Fri, 21 May 2010 12:17:53 +0000 (15:17 +0300)]
Pre-merge. Also change drawOsmLicense to use QSize

Reviewed by: Jussi Laitinen

14 years agoRemoved map_class_diagram.dia
Sami Rämö [Fri, 21 May 2010 12:11:55 +0000 (15:11 +0300)]
Removed map_class_diagram.dia

14 years agoMerge branch 'master' into friendlist
Jussi Laitinen [Fri, 21 May 2010 11:46:53 +0000 (14:46 +0300)]
Merge branch 'master' into friendlist

14 years agoAdded images to res/images.
Jussi Laitinen [Fri, 21 May 2010 11:44:22 +0000 (14:44 +0300)]
Added images to res/images.

14 years agoMerge branch 'master' into new_info_panel_inheritance
Kaj Wallin [Fri, 21 May 2010 11:32:35 +0000 (14:32 +0300)]
Merge branch 'master' into new_info_panel_inheritance

14 years agoAdded manually changes made to master while moving MapEngine
Sami Rämö [Fri, 21 May 2010 11:29:59 +0000 (14:29 +0300)]
Added manually changes made to master while moving MapEngine

14 years agoFinished unit test and renamed userpanel.* to userinfopanel.* as per new_info_panel_inheritance
Kaj Wallin [Fri, 21 May 2010 10:39:56 +0000 (13:39 +0300)]
Finished unit test and renamed userpanel.* to userinfopanel.* as per
naming convention. Also had the whole branch reviewed

Reviewed by: Jussi Laitinen

14 years agoAdded ImageButton::setButtonIcon method. Modified FriendListItem to
Jussi Laitinen [Fri, 21 May 2010 10:33:46 +0000 (13:33 +0300)]
Added ImageButton::setButtonIcon method. Modified FriendListItem to
use profile image as button.

14 years agoMerge branch 'move_map_engine' (NOT FINISHED!)
Sami Rämö [Fri, 21 May 2010 10:32:48 +0000 (13:32 +0300)]
Merge branch 'move_map_engine' (NOT FINISHED!)

Conflicted files checkouted from move_map_engine branch.
Still requiring manual merge of master branch changes.

Conflicts:
src/engine/engine.cpp
src/engine/engine.h
src/map/mapengine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/mapviewscreen.cpp

14 years agoFixed review defects move_map_engine
Sami Rämö [Fri, 21 May 2010 10:14:59 +0000 (13:14 +0300)]
Fixed review defects

 - Reviewed by Jussi

14 years agoAdded check to SidePanel::setType to disallow multiple type sets
Kaj Wallin [Fri, 21 May 2010 07:37:27 +0000 (10:37 +0300)]
Added check to SidePanel::setType to disallow multiple type sets

Reviewed by:

14 years agoDefault screen size, init order, map not drawing all tiles
Sami Rämö [Fri, 21 May 2010 07:36:38 +0000 (10:36 +0300)]
Default screen size, init order, map not drawing all tiles

 - changed window default size in desktop matching N900 screen size

 - changed execution order when starting application

 - fixed map not drawing all tiles when screen resized

 - added some missing debug prints

14 years agoFixed naming convention and started writing unit tests
Kaj Wallin [Fri, 21 May 2010 07:24:39 +0000 (10:24 +0300)]
Fixed naming convention and started writing unit tests

Reviewed by:

14 years agoCommented new code and fixed some of the old
Kaj Wallin [Fri, 21 May 2010 07:07:15 +0000 (10:07 +0300)]
Commented new code and fixed some of the old

Reviewed by:

14 years agoDisabled debug prints from src.pro.
Jussi Laitinen [Fri, 21 May 2010 05:56:09 +0000 (08:56 +0300)]
Disabled debug prints from src.pro.

14 years agoConverted friendlistpanel to comply with new inheritance
Kaj Wallin [Fri, 21 May 2010 05:52:19 +0000 (08:52 +0300)]
Converted friendlistpanel to comply with new inheritance

Reviewed by:

14 years agoCleanup & commenting
Sami Rämö [Fri, 21 May 2010 05:48:16 +0000 (08:48 +0300)]
Cleanup & commenting

14 years agoChanged GPS and automatic update buttons slots
Sami Rämö [Thu, 20 May 2010 12:17:34 +0000 (15:17 +0300)]
Changed GPS and automatic update buttons slots

 - Changed GPS & auto centering signals so that actions are not
   dependent on menu button signals anymore, which weren't emitted
   at startup when states were set but didn't change from buttons
   default states

 - changed messages so that they are displayed only at startup
   and when automatic centering is disabled because user have
   scrolled the map

 - some sorting

 - changed MapEngine GPS and automatic centering settings change
   methods to public

14 years agoAdded distance icons to FriendListItem.
Jussi Laitinen [Thu, 20 May 2010 11:34:01 +0000 (14:34 +0300)]
Added distance icons to FriendListItem.

14 years agoFixing broken things
Sami Rämö [Thu, 20 May 2010 10:36:48 +0000 (13:36 +0300)]
Fixing broken things

 - Fixed setting GPS & automatic centering states based on settings file

 - GPS enabled state is now read from GPS class and not used local datamember in engine anymore

 - connected engine slots for GPS & auto centering enabling

 - some documentation

 - fixed manual location cross hair visibility inversion

14 years agoCreated SidePanel class, which is base class for both panels.
Kaj Wallin [Thu, 20 May 2010 10:05:00 +0000 (13:05 +0300)]
Created SidePanel class, which is base class for both panels.
UserInfoPanel is converted to use this inheritance.

Reviewed by:

14 years agoFirst "working" version after moving MapEngine
Sami Rämö [Thu, 20 May 2010 09:21:24 +0000 (12:21 +0300)]
First "working" version after moving MapEngine

 - Moved MapEngine under main engine class

 - Removed MapViewScreen and moved all stuff to MainWindow

 - Still requires much cleaning and documenting and checking
   all signals and slots

14 years agoAdded connections from FriendGroupItem to MapEngine. Added
Jussi Laitinen [Thu, 20 May 2010 08:59:02 +0000 (11:59 +0300)]
Added connections from FriendGroupItem to MapEngine. Added
mousePressEvent to FriendGroupItem.

14 years agoMerge branch 'master' into friendlist
Jussi Laitinen [Thu, 20 May 2010 07:14:11 +0000 (10:14 +0300)]
Merge branch 'master' into friendlist

14 years agoMinor fixes to gps classes. Added support to QtSimulator.
Jussi Laitinen [Thu, 20 May 2010 07:12:00 +0000 (10:12 +0300)]
Minor fixes to gps classes. Added support to QtSimulator.

14 years agoAdded methods to filter list in FriendListView.
Jussi Laitinen [Thu, 20 May 2010 06:29:40 +0000 (09:29 +0300)]
Added methods to filter list in FriendListView.

14 years agoMaked corsshair to be transparent for mouse events.
Ville Tiensuu [Wed, 19 May 2010 11:13:09 +0000 (14:13 +0300)]
Maked corsshair to be transparent for mouse events.
Reviewed by: Kaj Wallin