From: Risto Lintinen Date: Fri, 28 Aug 2009 07:40:10 +0000 (+0300) Subject: Merge commit 'refs/1_0_6_candidate' of https://git.maemo.org/projects/qtmeetings... X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=HEAD;hp=6a31f3484996e9b7e719954c3a64a56d3fa586aa;p=qtmeetings Merge commit 'refs/1_0_6_candidate' of https://git.maemo.org/projects/qtmeetings into merge_1_0_6_release --- diff --git a/debian/postinst b/debian/postinst index a729807..1296c0e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -4,4 +4,8 @@ set -e maemo-select-menu-location QtMeetings.desktop +if [ -e /etc/QtMeetings.conf ]; then + chmod 666 /etc/QtMeetings.conf +fi + exit 0 \ No newline at end of file diff --git a/debian/qtmeetings/DEBIAN/conffiles b/debian/qtmeetings/DEBIAN/conffiles index d97a05d..0457b6c 100644 --- a/debian/qtmeetings/DEBIAN/conffiles +++ b/debian/qtmeetings/DEBIAN/conffiles @@ -1,2 +1,2 @@ -/etc/init.d/qtmeetings-launcher /etc/QtMeetings.conf +/etc/init.d/qtmeetings-launcher diff --git a/debian/qtmeetings/DEBIAN/control b/debian/qtmeetings/DEBIAN/control index 72b4cfb..e16ae0c 100644 --- a/debian/qtmeetings/DEBIAN/control +++ b/debian/qtmeetings/DEBIAN/control @@ -1,10 +1,10 @@ Package: qtmeetings -Version: 1.0.5-1 +Version: 1.0.6-1 Section: user/other Priority: optional Architecture: armel -Depends: libalarm0 (>= 0.5.20), libc6 (>= 2.5.0-1), libgcc1 (>= 1:3.4.4), libqt4-network (>= 4.4.0), libqt4-xml (>= 4.4.0), libqtcore4 (>= 4.4.0), libqtgui4 (>= 4.4.0), libstdc++6 (>= 3.4.4) -Installed-Size: 660 +Depends: libalarm0 (>= 0.5.20), libc6 (>= 2.5.0-1), libgcc1 (>= 1:3.4.4), libqt4-network (>= 4.5.0), libqt4-xml (>= 4.5.0), libqtcore4 (>= 4.5.0), libqtgui4 (>= 4.5.0), libstdc++6 (>= 3.4.4) +Installed-Size: 952 Maintainer: Zoltan Papp Description: Qt application to access meeting room's shared calendar on Microsoft Exchange Server 2007 developed for Nokia diff --git a/debian/qtmeetings/DEBIAN/md5sums b/debian/qtmeetings/DEBIAN/md5sums index 479426b..b27420b 100644 --- a/debian/qtmeetings/DEBIAN/md5sums +++ b/debian/qtmeetings/DEBIAN/md5sums @@ -1,7 +1,7 @@ -24d4fabbf8f62ef25a57769182b6417e usr/share/doc/qtmeetings/README.Debian -7895482ea907cf53dab85a4543e838f5 usr/share/doc/qtmeetings/copyright -62db04cd3c8d12c924158af250a0d2df usr/share/applications/hildon/QtMeetings.desktop 3491e49963a41b9b27e27ead4e6d559b usr/bin/qtmeetings-devstopper -bbfd6c68e82075825bf439c6834e20c4 usr/bin/qtmeetings -2d402ba0e905291c6c5ac0d4efe4d519 usr/bin/qtmeetings-updatercd +ebce7d43fce37c2865bb80dfda7a486f usr/bin/qtmeetings ad0a015d12de590f84f7d955255b9c1e usr/bin/qtmeetings-rename +2d402ba0e905291c6c5ac0d4efe4d519 usr/bin/qtmeetings-updatercd +62db04cd3c8d12c924158af250a0d2df usr/share/applications/hildon/QtMeetings.desktop +7895482ea907cf53dab85a4543e838f5 usr/share/doc/qtmeetings/copyright +24d4fabbf8f62ef25a57769182b6417e usr/share/doc/qtmeetings/README.Debian diff --git a/debian/qtmeetings/DEBIAN/postinst b/debian/qtmeetings/DEBIAN/postinst index a729807..1296c0e 100755 --- a/debian/qtmeetings/DEBIAN/postinst +++ b/debian/qtmeetings/DEBIAN/postinst @@ -4,4 +4,8 @@ set -e maemo-select-menu-location QtMeetings.desktop +if [ -e /etc/QtMeetings.conf ]; then + chmod 666 /etc/QtMeetings.conf +fi + exit 0 \ No newline at end of file diff --git a/debian/qtmeetings/DEBIAN/postrm b/debian/qtmeetings/DEBIAN/postrm index 00ece1c..5ca9600 100755 --- a/debian/qtmeetings/DEBIAN/postrm +++ b/debian/qtmeetings/DEBIAN/postrm @@ -25,4 +25,8 @@ if [ -e /usr/var/qtmeetings.txt ]; then rm /usr/var/qtmeetings.txt fi +if [ -e /usr/var/qtmeetings.log ]; then + rm /usr/var/qtmeetings.log +fi + exit 0 diff --git a/debian/qtmeetings/etc/QtMeetings.conf b/debian/qtmeetings/etc/QtMeetings.conf index 7066087..9f1d726 100644 --- a/debian/qtmeetings/etc/QtMeetings.conf +++ b/debian/qtmeetings/etc/QtMeetings.conf @@ -2,11 +2,7 @@ - - - jklexch01.ixonos.com + @@ -14,7 +10,7 @@ - + @@ -49,7 +45,16 @@ Hercules
meetingroom.hercules@ixonos.com
- + + + + + 0 + + 05.10.2009 03:00:00 + 01.04.2010 03:00:00 + + diff --git a/debian/qtmeetings/usr/bin/qtmeetings b/debian/qtmeetings/usr/bin/qtmeetings index a7ebed1..a317694 100755 Binary files a/debian/qtmeetings/usr/bin/qtmeetings and b/debian/qtmeetings/usr/bin/qtmeetings differ diff --git a/src/BusinessLogic/UIManager.cpp b/src/BusinessLogic/UIManager.cpp index 1c58381..066ca2d 100644 --- a/src/BusinessLogic/UIManager.cpp +++ b/src/BusinessLogic/UIManager.cpp @@ -146,6 +146,9 @@ void UIManager::settingsViewRequest() void UIManager::settingsOkClicked() { // Show the weekly view and restart the idle timer + QT_DELETE(iWeeklyView); + createWeeklyView(); + if ( iWeeklyView != 0 ) { iWindowManager->showView( static_cast( iWeeklyView ) ); diff --git a/src/UserInterface/Views/SettingsView.cpp b/src/UserInterface/Views/SettingsView.cpp index fad4c15..4730108 100644 --- a/src/UserInterface/Views/SettingsView.cpp +++ b/src/UserInterface/Views/SettingsView.cpp @@ -195,6 +195,8 @@ QWidget *SettingsView::initWeekViewTab() wgl->addWidget( dayEndsLabel, 2, 0 ); wgl->addWidget( iDayEndTime, 2, 1, 1, 2 ); + connect( iDayStartTime, SIGNAL( timeChanged( QTime ) ), this, SLOT( dayStartTimeChanged( QTime ) ) ); + weeklyInformation->setLayout( wgl ); QVBoxLayout *mainLayout = new QVBoxLayout; @@ -411,6 +413,12 @@ void SettingsView::handleCancelClicked() emit cancelClicked(); } +void SettingsView::dayStartTimeChanged( const QTime &aTime ) +{ + qDebug() << "dayStartTimeChanged " << aTime; + iDayEndTime->setMinimumTime( aTime ); +} + void SettingsView::setValues() { // set user information diff --git a/src/UserInterface/Views/SettingsView.h b/src/UserInterface/Views/SettingsView.h index 923da77..77e37cd 100644 --- a/src/UserInterface/Views/SettingsView.h +++ b/src/UserInterface/Views/SettingsView.h @@ -10,6 +10,7 @@ class QTimeEdit; class QRadioButton; class QCheckBox; class QSize; +class QTime; //! User interface class. Shows the settings view and handles configuration changes. class SettingsView : public ViewBase @@ -40,6 +41,8 @@ private slots: void handleOkClicked(); //! Slot to handle the Cancel button pressing. void handleCancelClicked(); + //! Slot to handle the day end time minimum value + void dayStartTimeChanged( const QTime &aTime ); private: //! Initialize "Settings" tab.