author | zautrix <zautrix> | 2005-06-13 07:32:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-13 07:32:41 (UTC) |
commit | 2be8214908c52298ba79c8058d340edca5a8b417 (patch) (side-by-side diff) | |
tree | 35c2775e9c00c2fe9c5616b3123d3dab62fad983 /korganizer | |
parent | c4ebf56feb36302b61b9c5ca6af97626812427b8 (diff) | |
download | kdepimpi-2be8214908c52298ba79c8058d340edca5a8b417.zip kdepimpi-2be8214908c52298ba79c8058d340edca5a8b417.tar.gz kdepimpi-2be8214908c52298ba79c8058d340edca5a8b417.tar.bz2 |
fixes
-rw-r--r-- | korganizer/calendarview.cpp | 29 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 6 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 13 |
3 files changed, 35 insertions, 13 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1024b4e..b3686aa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3929,3 +3929,3 @@ void CalendarView::toggleFilter() { - showFilter(! mFilterView->isVisible()); + showFilter(! mCalEditView->isVisible()); } @@ -3944,6 +3944,27 @@ void CalendarView::showFilter(bool visible) if (visible) { - mCalEditView->readConfig(); - mCalEditView->show(); + mCalEditView->readConfig(); + mCalEditView->show(); + QValueList<int> sizes; + sizes = mLeftFrame->sizes(); + if ( sizes.count() == 4 && sizes[3] < 20 ) { + sizes.clear(); + sizes << 100; + sizes << 0; + sizes << 0; + sizes << 100; + mLeftFrame->setSizes(sizes); + } +#if 0 + sizes = mLeftFrame->sizes(); + int ccc = 0; + while ( ccc < sizes.count()) { + qDebug("size %d %d ", ccc, sizes[ccc]); + ++ccc; + } +#endif + + } + else { + mCalEditView->hide(); } - else mCalEditView->hide(); #else diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index bc6aae4..9fe285c 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -448,3 +448,3 @@ void KOPrefs::usrReadConfig() while ( mNextAvailableCalendar <= numCals ) { - qDebug("Read cal #%d ", mNextAvailableCalendar ); + //qDebug("Read cal #%d ", mNextAvailableCalendar ); QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); @@ -522,6 +522,6 @@ void KOPrefs::usrWriteConfig() while ( kkf ) { - qDebug("cal num %d %d ", kkf->mCalNumber, numCal); + //qDebug("cal num %d %d ", kkf->mCalNumber, numCal); if ( kkf->mCalNumber == numCal ) { ++writeCal; - qDebug("Write calendar %d %d ", numCal , writeCal); + //qDebug("Write calendar %d %d ", numCal , writeCal); QString prefix = "Cal_" + QString::number( writeCal ); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 0cb0bce..95e1607 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -789,3 +789,4 @@ void MainWindow::initActions() configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); - action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); + icon = loadPixmap( pathString + "configure" ); + action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); action->addTo( viewMenu ); @@ -1490,3 +1491,3 @@ void MainWindow::keyBindings() i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ - i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ + i18n("<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n")+ i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ @@ -1989,6 +1990,6 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) case Qt::Key_F: - if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) - mView->editFilters(); - else - mView->toggleFilter(); + mView->editFilters(); + break; + case Qt::Key_R: + mView->toggleFilter(); break; |