-rw-r--r-- | korganizer/calendarview.cpp | 25 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 6 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 9 |
3 files changed, 31 insertions, 9 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1024b4e..b3686aa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3927,7 +3927,7 @@ void CalendarView::editFilters() } void CalendarView::toggleFilter() { - showFilter(! mFilterView->isVisible()); + showFilter(! mCalEditView->isVisible()); } KOFilterView *CalendarView::filterView() @@ -3944,8 +3944,29 @@ void CalendarView::showFilter(bool visible) if (visible) { 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 if (visible) mFilterView->show(); else mFilterView->hide(); diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index bc6aae4..9fe285c 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -446,7 +446,7 @@ void KOPrefs::usrReadConfig() kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); } while ( mNextAvailableCalendar <= numCals ) { - qDebug("Read cal #%d ", mNextAvailableCalendar ); + //qDebug("Read cal #%d ", mNextAvailableCalendar ); QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); KopiCalendarFile *kkf = getNewCalendar(); kkf->isStandard = config()->readBoolEntry( prefix+"_isStandard", false ); @@ -520,10 +520,10 @@ void KOPrefs::usrWriteConfig() while ( numCal < mNextAvailableCalendar ) { KopiCalendarFile * kkf = mCalendars.first(); 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 ); config()->writeEntry( prefix+"_isStandard", kkf->isStandard ); config()->writeEntry( prefix+"_isEnabled", kkf->isEnabled ); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 0cb0bce..95e1607 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -787,7 +787,8 @@ void MainWindow::initActions() mToggleNav = action ; icon = loadPixmap( pathString + "filter" ); 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 ); connect( action, SIGNAL( activated() ), mView, SLOT( toggleFilter() ) ); @@ -1488,7 +1489,7 @@ void MainWindow::keyBindings() i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + 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")+ i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ @@ -1987,9 +1988,9 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) mView->showDatePicker( ); break; case Qt::Key_F: - if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) mView->editFilters(); - else + break; + case Qt::Key_R: mView->toggleFilter(); break; case Qt::Key_X: |