summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-13 07:32:41 (UTC)
committer zautrix <zautrix>2005-06-13 07:32:41 (UTC)
commit2be8214908c52298ba79c8058d340edca5a8b417 (patch) (side-by-side diff)
tree35c2775e9c00c2fe9c5616b3123d3dab62fad983
parentc4ebf56feb36302b61b9c5ca6af97626812427b8 (diff)
downloadkdepimpi-2be8214908c52298ba79c8058d340edca5a8b417.zip
kdepimpi-2be8214908c52298ba79c8058d340edca5a8b417.tar.gz
kdepimpi-2be8214908c52298ba79c8058d340edca5a8b417.tar.bz2
fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt3
-rw-r--r--korganizer/calendarview.cpp25
-rw-r--r--korganizer/koprefs.cpp6
-rw-r--r--korganizer/mainwindow.cpp9
4 files changed, 32 insertions, 11 deletions
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 @@
{ "<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ","<p><b>X</b>: Nächste-X-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
{ "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
{ "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
-{ "<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n","<p><b>F</b>: Zeige/verstecke Filter Ansicht |<b>F+ctrl</b>: Editiere Filter </p>\n" },
{ "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
{ "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) für selektiertes Item</p>\n" },
{ "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
@@ -1380,7 +1379,7 @@
{ "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. 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 <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. 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 <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." },
{ "Configure KO/Pi...","Konfiguriere KO/Pi..." },
{ "Global Settings...","Globale Einstellungen..." },
-{ "","" },
+{ "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\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()
@@ -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: