From 2be8214908c52298ba79c8058d340edca5a8b417 Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 13 Jun 2005 07:32:41 +0000 Subject: fixes --- diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index bb3a00d..acf17b2 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1022,7 +1022,6 @@ { "

X: Next X days view| W: What's next view\n ","

X: Nächste-X-Tage Ansicht | W: What's Next Ansicht\n " }, { "

1-0 (+ctrl): Select filter 1-10 (11-20)

\n","

1-0 (+ctrl): Selektiere Filter 1-10 (11-20)

\n" }, { "

O: Filter On/Off | J: Journal view

\n","

O: Filter An/Aus | J: Journal Ansicht

\n" }, -{ "

F: Toggle filterview |F+ctrl: Edit filter

\n","

F: Zeige/verstecke Filter Ansicht |F+ctrl: Editiere Filter

\n" }, { "

Space: Toggle fullscreen | P: Date picker

\n","

Space: Zeige fullscreen | P: Datums Picker

\n" }, { "

I: Show info for selected event/todo

\n","

I: Zeige Info (Details) für selektiertes Item

\n" }, { "

H: This help dialog | S: Search dialog

\n","

H: Dieser Hilfe Dialog | S: Such Dialog

\n" }, @@ -1380,7 +1379,7 @@ { "You can make a printout of the List View and the list view in the Search Dialog! To do this, please go to the List View/Search Dialog. Right click on the list. Select in the popup menu the entry Print complete list. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose Hide selected items. After that you can print the list without these items.","Sie können die Listenansicht und die Listenansicht im Suchdialog ausdrucken! Um das zu machen gehen Sie bitte zur Listenansicht oder zum Suchdialog. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag Drucke komplette Liste. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen Verstecke Selektierte. Danach können Sie die Liste ohne diese Einträge ausdrucken." }, { "Configure KO/Pi...","Konfiguriere KO/Pi..." }, { "Global Settings...","Globale Einstellungen..." }, -{ "","" }, +{ "

R: Toggle Resource View |F: Edit filter

\n","

R: Zeige Resource Ansicht | F: Editiere Filter

\n" }, { "","" }, { "","" }, { "","" }, 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() @@ -3942,10 +3942,31 @@ void CalendarView::showFilter(bool visible) { #if 1 if (visible) { - mCalEditView->readConfig(); - mCalEditView->show(); + mCalEditView->readConfig(); + mCalEditView->show(); + QValueList 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("

A+(shift or ctrl): Show occurence of next alarm

\n") + i18n("

I: Show info for selected event/todo

\n") + i18n("

Space: Toggle fullscreen | P: Date picker

\n")+ - i18n("

F: Toggle filterview |F+ctrl: Edit filter

\n")+ + i18n("

R: Toggle Resource View |F: Edit filter

\n")+ i18n("

O: Filter On/Off | J: Journal view

\n")+ i18n("

1-0 (+ctrl): Select filter 1-10 (11-20)

\n")+ i18n("

X: Next X days view| W: What's next view\n ")+ @@ -1987,10 +1988,10 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) mView->showDatePicker( ); break; 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; case Qt::Key_X: if ( e->state() == Qt::ControlButton ) -- cgit v0.9.0.2