qtmeetings
12 years agoMerge commit 'refs/1_0_6_candidate' of https://git.maemo.org/projects/qtmeetings... master
Risto Lintinen [Fri, 28 Aug 2009 07:40:10 +0000 (10:40 +0300)]
Merge commit 'refs/1_0_6_candidate' of https://git.maemo.org/projects/qtmeetings into merge_1_0_6_release

12 years ago- Fixed week view refresh after settings are changed
Risto Lintinen [Thu, 27 Aug 2009 09:25:26 +0000 (12:25 +0300)]
- Fixed week view refresh after settings are changed
- Fixed day endtime can't be less than start time
- Added read and write access to conf file in postinstall

12 years ago1.0.6 candidate 1_0_6_candidate
Risto Lintinen [Thu, 27 Aug 2009 05:38:59 +0000 (08:38 +0300)]
1.0.6 candidate

commit 7e9daec272450fa2eeffe0a08732ef4696b37a4f
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Wed Aug 26 14:57:11 2009 +0300

    added refresh on statusbar click

commit 627d527566f469ac20bfd9ee536f4624f9dd0655
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Wed Aug 26 11:45:17 2009 +0300

    deleted unnecessary files

commit 52cdeca811d3ffc2804aede00616640d93429171
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Wed Aug 26 11:44:05 2009 +0300

    deb packaging improvements

commit a39640fc3ee32d823998ea9a14a106c8bca92b1c
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Tue Aug 25 10:28:23 2009 +0300

    fixes for debian install

commit 031dfbe58e5265dfff05b8ceb7ffae21be7c4868
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Tue Aug 25 10:27:15 2009 +0300

    User interface and menu fixes

commit 51d64b3d9f4cacc447c74e5811e692fbe9b4137f
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Mon Aug 24 12:04:45 2009 +0300

    Status bar fixed

commit a2659d5f04b1662bea18fbbbff3a763fcfe3ff7c
Author: Timo Holopainen <holopti@holopti-desktop.(none)>
Date:   Mon Aug 24 11:23:38 2009 +0300

    Show confidential meeting details setting added

    Squashed commit of the following:

    commit d8ce7147dfa33ee9bb79e10b09b3a82018bdb05b
    Author: Timo Holopainen <holopti@holopti-desktop.(none)>
    Date:   Mon Aug 24 11:03:06 2009 +0300

        Show confidential meeting details setting added to settings. Meeting view updated to support that privacy setting.

commit 11e5e6349ca6f86f864075fb9d38a778950cebf2
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Fri Aug 21 13:01:48 2009 +0300

    code warnings cleaned

commit 663a2fc8ce3a0b8b987655fe709a831a3db9b315
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Fri Aug 21 12:05:25 2009 +0300

    User interface update

12 years agoadded refresh on statusbar click
Risto Lintinen [Wed, 26 Aug 2009 11:57:11 +0000 (14:57 +0300)]
added refresh on statusbar click

12 years agodeleted unnecessary files
Risto Lintinen [Wed, 26 Aug 2009 08:45:17 +0000 (11:45 +0300)]
deleted unnecessary files

12 years agodeb packaging improvements
Risto Lintinen [Wed, 26 Aug 2009 08:44:05 +0000 (11:44 +0300)]
deb packaging improvements

12 years agofixes for debian install
Risto Lintinen [Tue, 25 Aug 2009 07:28:23 +0000 (10:28 +0300)]
fixes for debian install

12 years agoUser interface and menu fixes
Risto Lintinen [Tue, 25 Aug 2009 07:27:15 +0000 (10:27 +0300)]
User interface and menu fixes

12 years agoStatus bar fixed
Risto Lintinen [Mon, 24 Aug 2009 09:04:45 +0000 (12:04 +0300)]
Status bar fixed

12 years agoShow confidential meeting details setting added
Timo Holopainen [Mon, 24 Aug 2009 08:23:38 +0000 (11:23 +0300)]
Show confidential meeting details setting added

Squashed commit of the following:

commit d8ce7147dfa33ee9bb79e10b09b3a82018bdb05b
Author: Timo Holopainen <holopti@holopti-desktop.(none)>
Date:   Mon Aug 24 11:03:06 2009 +0300

    Show confidential meeting details setting added to settings. Meeting view updated to support that privacy setting.

12 years agocode warnings cleaned
Risto Lintinen [Fri, 21 Aug 2009 10:01:48 +0000 (13:01 +0300)]
code warnings cleaned

12 years agoUser interface update
Risto Lintinen [Fri, 21 Aug 2009 09:05:25 +0000 (12:05 +0300)]
User interface update

12 years agoSquashed commit of the following:
Risto Lintinen [Thu, 20 Aug 2009 06:34:56 +0000 (09:34 +0300)]
Squashed commit of the following:

commit 00c18cb215544822964279b5640fcd7fda2a1361
Author: Risto Lintinen <lintiri@lintiri-desktop.(none)>
Date:   Thu Aug 20 09:30:40 2009 +0300

    traffic lights fixed

12 years agoRemoved some lines used for debugging purposes
Jan Lapinkataja [Thu, 4 Jun 2009 09:02:46 +0000 (12:02 +0300)]
Removed some lines used for debugging purposes

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Olli Kasari [Mon, 1 Jun 2009 13:06:37 +0000 (16:06 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

12 years agoChanged communication to take a week and year as parameters instead of dates as it...
Olli Kasari [Mon, 1 Jun 2009 13:02:43 +0000 (16:02 +0300)]
Changed communication to take a week and year as parameters instead of dates as it seems this application is only interested in meetings of one week at a time.

12 years agomissing methods added.
itkonma [Mon, 1 Jun 2009 09:00:47 +0000 (12:00 +0300)]
missing methods added.

12 years agoMerge branch 'dev_itkonma'
itkonma [Mon, 1 Jun 2009 08:50:08 +0000 (11:50 +0300)]
Merge branch 'dev_itkonma'

Conflicts:
src/BusinessLogic/UIManager.cpp
src/BusinessLogic/UIManager.h
src/Domain/Configuration/Configuration.cpp

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
itkonma [Mon, 1 Jun 2009 08:45:36 +0000 (11:45 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/UIManager.h
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp

12 years agoSettings view fixed.
itkonma [Mon, 1 Jun 2009 07:26:47 +0000 (10:26 +0300)]
Settings view fixed.

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Zoltan Papp [Mon, 1 Jun 2009 07:12:18 +0000 (10:12 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

12 years agoFix with merging from master
Zoltan Papp [Mon, 1 Jun 2009 07:10:53 +0000 (10:10 +0300)]
Fix with merging from master

12 years agoFixed the room status changing information flow
Mikko Siren [Mon, 1 Jun 2009 07:01:10 +0000 (10:01 +0300)]
Fixed the room status changing information flow

12 years agoMerge branch 'master' into dev_local
Zoltan Papp [Mon, 1 Jun 2009 06:41:31 +0000 (09:41 +0300)]
Merge branch 'master' into dev_local

12 years agoFixed errors caused by auto merge that did not work correctly
Mikko Siren [Mon, 1 Jun 2009 06:35:48 +0000 (09:35 +0300)]
Fixed errors caused by auto merge that did not work correctly

12 years agoFixed Jan's/Mikko's missing declaration.
Zoltan Papp [Mon, 1 Jun 2009 06:28:42 +0000 (09:28 +0300)]
Fixed Jan's/Mikko's missing declaration.

12 years agoMerge branch 'master' into dev_local
Zoltan Papp [Mon, 1 Jun 2009 06:16:11 +0000 (09:16 +0300)]
Merge branch 'master' into dev_local

12 years agoMerge branch 'master' into dev_local
Zoltan Papp [Mon, 1 Jun 2009 06:14:56 +0000 (09:14 +0300)]
Merge branch 'master' into dev_local

Conflicts:
src/BusinessLogic/UIManager.h

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
itkonma [Mon, 1 Jun 2009 06:09:24 +0000 (09:09 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/UIManager.h

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Mikko Siren [Fri, 29 May 2009 10:32:11 +0000 (13:32 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

12 years agoSettings saved with ok and cancel added to SettingsView.
itkonma [Fri, 29 May 2009 10:11:03 +0000 (13:11 +0300)]
Settings saved with ok and cancel added to SettingsView.
TODO: application restart needed after saving settings.

12 years agoChanged the idle screen timer to old value. This is what happens when you give people...
Mikko Siren [Fri, 29 May 2009 10:08:02 +0000 (13:08 +0300)]
Changed the idle screen timer to old value. This is what happens when you give people who are used to GUI based version controlling softwares a command line one without any working GUI for it

12 years agoConfilcts solved
Jan Lapinkataja [Fri, 29 May 2009 10:07:54 +0000 (13:07 +0300)]
Confilcts solved

Conflicts:
src/BusinessLogic/Engine.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp

12 years agoOperation mode changing related defects corrected.
Jan Lapinkataja [Fri, 29 May 2009 10:04:46 +0000 (13:04 +0300)]
Operation mode changing related defects corrected.

12 years agoModified the dialog signaling to prevent idle screen coming from visible while dialog...
Mikko Siren [Fri, 29 May 2009 09:47:16 +0000 (12:47 +0300)]
Modified the dialog signaling to prevent idle screen coming from visible while dialog is shown. Does not work for progress bar right now.

12 years agoEmpty line at the end of file
Mikko Siren [Thu, 28 May 2009 13:06:57 +0000 (16:06 +0300)]
Empty line at the end of file

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Mikko Siren [Thu, 28 May 2009 13:05:21 +0000 (16:05 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

12 years agoFixed the room status indicator view partly. Image is still not shown
Mikko Siren [Thu, 28 May 2009 13:05:18 +0000 (16:05 +0300)]
Fixed the room status indicator view partly. Image is still not shown

12 years agoConfilct solved
Jan Lapinkataja [Thu, 28 May 2009 12:29:09 +0000 (15:29 +0300)]
Confilct solved

Conflicts:
src/BusinessLogic/UIManager.h

12 years agoCorrected the password dialog and progress bar related errors. Texts and titles of...
Jan Lapinkataja [Thu, 28 May 2009 12:26:57 +0000 (15:26 +0300)]
Corrected the password dialog and progress bar related errors. Texts and titles of those were incorrect and cancel button was visible during operation mode change.

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Mikko Siren [Thu, 28 May 2009 10:21:51 +0000 (13:21 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

12 years agoChanged something cannot remember what
Mikko Siren [Thu, 28 May 2009 10:21:45 +0000 (13:21 +0300)]
Changed something cannot remember what

12 years agoChanges to screen saver mode connection status handling
Zoltan Papp [Thu, 28 May 2009 10:11:27 +0000 (13:11 +0300)]
Changes to screen saver mode connection status handling

12 years agoMerge branch 'master' into dev_local
Zoltan Papp [Thu, 28 May 2009 10:08:16 +0000 (13:08 +0300)]
Merge branch 'master' into dev_local

Conflicts:
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/UserInterface/WindowManager.h

12 years agoMerge branch 'jasa'
Jan Lapinkataja [Thu, 28 May 2009 09:26:29 +0000 (12:26 +0300)]
Merge branch 'jasa'

12 years agoMeeting detaild cancel button correction
Jan Lapinkataja [Thu, 28 May 2009 09:25:28 +0000 (12:25 +0300)]
Meeting detaild cancel button correction

12 years agoAdded first fetching of meetings trough UIManager
Mikko Siren [Thu, 28 May 2009 08:15:59 +0000 (11:15 +0300)]
Added first fetching of meetings trough UIManager

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Mikko Siren [Thu, 28 May 2009 07:27:55 +0000 (10:27 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

12 years agoCommented the UIManager include file
Mikko Siren [Thu, 28 May 2009 07:27:50 +0000 (10:27 +0300)]
Commented the UIManager include file

12 years agoMerge branch 'jasa'
Jan Lapinkataja [Thu, 28 May 2009 06:57:35 +0000 (09:57 +0300)]
Merge branch 'jasa'

12 years agoChanges to error texts
Jan Lapinkataja [Thu, 28 May 2009 06:52:34 +0000 (09:52 +0300)]
Changes to error texts

12 years agoAdded no connection indicator to screen saver mode (no logic implemented yet)
Zoltan Papp [Thu, 28 May 2009 06:08:11 +0000 (09:08 +0300)]
Added no connection indicator to screen saver mode (no logic implemented yet)

12 years agoMerge branch 'dev_puontsi' into master_merge
Simo Puonti [Thu, 28 May 2009 05:56:04 +0000 (08:56 +0300)]
Merge branch 'dev_puontsi' into master_merge

12 years agoMerge branch 'master' into master_merge
Simo Puonti [Thu, 28 May 2009 05:49:58 +0000 (08:49 +0300)]
Merge branch 'master' into master_merge

12 years agoMerge
Mikko Siren [Wed, 27 May 2009 14:14:44 +0000 (17:14 +0300)]
Merge

12 years agoGot the new stuff working, last commit before final pull push
Mikko Siren [Wed, 27 May 2009 13:54:44 +0000 (16:54 +0300)]
Got the new stuff working, last commit before final pull push

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Jan Lapinkataja [Wed, 27 May 2009 13:42:14 +0000 (16:42 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/Engine.cpp

12 years agoAuto refresh of meetings showed wrong meetings (Task id 1166)
Jan Lapinkataja [Wed, 27 May 2009 13:35:42 +0000 (16:35 +0300)]
Auto refresh of meetings showed wrong meetings (Task id 1166)

12 years agoMerged the engine
Mikko Siren [Wed, 27 May 2009 13:10:04 +0000 (16:10 +0300)]
Merged the engine

12 years agoMerged and got it partly working
Mikko Siren [Wed, 27 May 2009 13:05:51 +0000 (16:05 +0300)]
Merged and got it partly working

12 years agoMerge finished
Jan Lapinkataja [Wed, 27 May 2009 12:46:20 +0000 (15:46 +0300)]
Merge finished

12 years agoSummer time/winter time/Timezone changes done
Simo Puonti [Wed, 27 May 2009 12:27:47 +0000 (15:27 +0300)]
Summer time/winter time/Timezone changes done

12 years agoGot something working
Mikko Siren [Wed, 27 May 2009 11:10:50 +0000 (14:10 +0300)]
Got something working

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Jan Lapinkataja [Wed, 27 May 2009 10:26:33 +0000 (13:26 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/Engine.cpp
src/UserInterface/Views/WeeklyViewWidget.h

12 years agoRe-implemented the showing of meetings (Task id 1166). Corrected the errortable order...
Jan Lapinkataja [Wed, 27 May 2009 10:13:45 +0000 (13:13 +0300)]
Re-implemented the showing of meetings (Task id 1166). Corrected the errortable order so that correct error messages are now shown.

12 years agofixed the pro-file
Simo Puonti [Wed, 27 May 2009 09:00:54 +0000 (12:00 +0300)]
fixed the pro-file

12 years agoMerge branch 'master_merge' into dev_puontsi
Simo Puonti [Wed, 27 May 2009 07:37:46 +0000 (10:37 +0300)]
Merge branch 'master_merge' into dev_puontsi

Conflicts:
src/Domain/Configuration/Configuration.cpp
src/Domain/Configuration/DateTimeSettings.cpp

12 years agoadded the conf file changes
Simo Puonti [Wed, 27 May 2009 07:28:26 +0000 (10:28 +0300)]
added the conf file changes

12 years agoWork done for the date/time..
Simo Puonti [Wed, 27 May 2009 07:26:12 +0000 (10:26 +0300)]
Work done for the date/time..

12 years agoMerged
Mikko Siren [Wed, 27 May 2009 06:54:02 +0000 (09:54 +0300)]
Merged

12 years agoStill working
Mikko Siren [Wed, 27 May 2009 06:45:03 +0000 (09:45 +0300)]
Still working

12 years agoMerge branch 'master' into dev_local
Zoltan Papp [Wed, 27 May 2009 06:40:54 +0000 (09:40 +0300)]
Merge branch 'master' into dev_local

Conflicts:
src/BusinessLogic/Engine.cpp

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
itkonma [Tue, 26 May 2009 11:52:25 +0000 (14:52 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/Engine.cpp

12 years agoMerge branch 'master' into dev_local
Zoltan Papp [Tue, 26 May 2009 11:50:09 +0000 (14:50 +0300)]
Merge branch 'master' into dev_local

Conflicts:
src/BusinessLogic/Engine.cpp

12 years agoUIManager and some functionality
Mikko Siren [Tue, 26 May 2009 11:46:46 +0000 (14:46 +0300)]
UIManager and some functionality

12 years agochanges done by simo
Simo Puonti [Tue, 26 May 2009 11:08:14 +0000 (14:08 +0300)]
changes done by simo

12 years agoFirst commit to dev_local, trying to merge with master..
Zoltan Papp [Tue, 26 May 2009 11:05:42 +0000 (14:05 +0300)]
First commit to dev_local, trying to merge with .

12 years agoRemoved commented code.
Kimmo Teerimaki [Tue, 26 May 2009 10:33:58 +0000 (13:33 +0300)]
Removed commented code.

12 years agoWhen moving from Room Status View to Weekly View, the current week of default room...
itkonma [Tue, 26 May 2009 10:20:59 +0000 (13:20 +0300)]
When moving from Room Status View to Weekly View, the current week of default room is shown

12 years agoTimezone offset.
Kimmo Teerimaki [Tue, 26 May 2009 10:19:21 +0000 (13:19 +0300)]
Timezone offset.

12 years agodate/time configuration implementation in progress..
Zoltan Papp [Tue, 26 May 2009 09:43:40 +0000 (12:43 +0300)]
date/time configuration implementation in progress..

12 years agoEnabled the error sending from Operation Mode changing. And corrected some possible...
Jan Lapinkataja [Tue, 26 May 2009 09:30:04 +0000 (12:30 +0300)]
Enabled the error sending from Operation Mode changing. And corrected some possible bugs. (Task id 1168)

12 years agoMerged
Mikko Siren [Tue, 26 May 2009 07:54:06 +0000 (10:54 +0300)]
Merged

12 years agoViewBase added and major changes to use the new architecture
Mikko Siren [Tue, 26 May 2009 07:43:41 +0000 (10:43 +0300)]
ViewBase added and major changes to use the new architecture

12 years agoProgress bar related updating
Jan Lapinkataja [Fri, 22 May 2009 12:53:38 +0000 (15:53 +0300)]
Progress bar related updating

12 years agoDoxygen documentation added
Jan Lapinkataja [Fri, 22 May 2009 08:18:56 +0000 (11:18 +0300)]
Doxygen documentation added

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Jan Lapinkataja [Fri, 22 May 2009 08:00:10 +0000 (11:00 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/UserInterface/Utils/ProgressBar.cpp

12 years agoNew thread class (OperationodeToggler) created in DeviceControl module to send sub...
Jan Lapinkataja [Fri, 22 May 2009 07:58:35 +0000 (10:58 +0300)]
New thread class (OperationodeToggler) created in DeviceControl module to send sub-status signals to progress bar (Task id 1168)

12 years agoTask #1170 Progress bar for meeting details pop-up
Ossi Jormakka [Fri, 22 May 2009 07:17:31 +0000 (10:17 +0300)]
Task #1170 Progress bar for meeting details pop-up

12 years agoMerge branch 'jasa'
Jan Lapinkataja [Wed, 20 May 2009 11:52:16 +0000 (14:52 +0300)]
Merge branch 'jasa'

12 years agoProgressBar connections modified + Progress Bar class itself updated
Jan Lapinkataja [Wed, 20 May 2009 11:51:06 +0000 (14:51 +0300)]
ProgressBar connections modified + Progress Bar class itself updated

12 years agoMerge branch 'master' of https://git.maemo.org/projects/qtmeetings
Ossi Jormakka [Wed, 20 May 2009 08:06:13 +0000 (11:06 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
QtMeetings.pro
src/main.cpp

12 years agoMultiple simultaneous request support to Communication
Ossi Jormakka [Wed, 20 May 2009 07:58:52 +0000 (10:58 +0300)]
Multiple simultaneous request support to Communication

12 years agoMerge branch 'jasa'
Jan Lapinkataja [Wed, 20 May 2009 07:33:48 +0000 (10:33 +0300)]
Merge branch 'jasa'

12 years ago- Re-factored the code so that Engine is now the main class that owns WindowManager...
Jan Lapinkataja [Wed, 20 May 2009 07:27:06 +0000 (10:27 +0300)]
- Re-factored the code so that Engine is now the main class that owns WindowManager and contains all the logical parts of it (Task 1176)
- Some updating to progress bar class relation with operation mode change (Task 1168)

12 years agoTesting if the name is now correct. Two previous commits mistakely committed with...
Jan Lapinkataja [Tue, 19 May 2009 13:55:15 +0000 (16:55 +0300)]
Testing if the name is now correct. Two previous commits mistakely committed with Papp Zoltan.

12 years agoMoved the logicasl part of the progresbar/password dialog from WindowManager to Engin...
Zoltan Papp [Tue, 19 May 2009 13:41:28 +0000 (16:41 +0300)]
Moved the logicasl part of the progresbar/password dialog from WindowManager to Engine (related to tasks 1168 and 1169)

12 years agoRe-factored the basic idea of the application: Engine is the main class that ownsWind...
Zoltan Papp [Tue, 19 May 2009 12:28:55 +0000 (15:28 +0300)]
Re-factored the basic idea of the application: Engine is the main class that ownsWindowManager from now on.

12 years agoqtmeetings sources to Maemo garage
Ossi Jormakka [Tue, 19 May 2009 06:25:11 +0000 (09:25 +0300)]
qtmeetings sources to Maemo garage

12 years agoMaemo garage GIT testing
Ossi Jormakka [Wed, 13 May 2009 08:33:34 +0000 (11:33 +0300)]
Maemo garage GIT testing