-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 17 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 10 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 17 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 12 | ||||
-rw-r--r-- | libkdepim/categoryeditdialog.cpp | 4 | ||||
-rw-r--r-- | libkdepim/categoryselectdialog.cpp | 4 |
6 files changed, 36 insertions, 28 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 711509d..7e7f8b7 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -351,7 +351,6 @@ { "Sep","Sep" }, { "September","September" }, { "Shopping","Einkaufen" }, -{ "Use short date in (WN/E) view","Kurzdatum in (WN/Termin) Ansicht" }, { "Show Dates","Zeige Daten" }, { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." }, { "Show Event...","Zeige Termin..." }, @@ -360,8 +359,6 @@ { "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, { "Show time as:","Zeige Zeit als" }, { "Show Todo...","Zeige To-Do" }, -{ "Show topmost todo prios in What's N.:","Anz. höchster Prios in What's N.:"}, -{ "Show topmost todo prios in What's Next:","Anz. höchster Prios in What's Next:"}, { "Show vertical screen (Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, { "&Show","Zeige" }, { "Show...","Zeige..." }, @@ -666,8 +663,8 @@ { "Use colors for application:","Setze Farben für Programm:" }, { "Buttons, menus, etc.:","Knöpfe, Menu, etc.:" }, { "Frames, labels, etc.:","Rahmen, Label, etc.:" }, -{ "Show parent To-Do's in What's Next view","Zeige Ober-Todo in What's Next Anz." }, -{ "Show location in What's Next view","Zeige Ort in What's Next Anz." }, +{ "Show parent To-Do's","Zeige Ober-Todos" }, +{ "Show location","Zeige Orte" }, { "Show events that recur ","Zeige Termine, die sich wiederholen:" }, { "Show in every cell ","Zeige in jeder Zelle " }, { "short month","kurzen Monat" }, @@ -802,7 +799,6 @@ { "No program set","Kein Programm definiert" }, { "Running '%1'","Ausführen '%1'" }, { "Playing '%1'","Abspielen '%1'" }, -{ "Show Sync Events in WN/Agenda view","Zeige Sync Events in WN/Agenda Ansicht" }, { "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" }, { "Load!","Laden!" }, { "Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n","Backup Datei vom:\n%1\nDas Laden der Backup Datei\nlöscht die aktuellen Daten!\n" }, @@ -931,8 +927,6 @@ { "ToDo","ToDo" }, { "Today","Heute" }, { "What's Next View","What's Next Ansicht" }, -{ "Show Sync Events in \nWhat's Next/Agenda view","Zeige Sync Termine in \nWhat's Next/Agenda view" }, -{ "Use short date in \nWhat's Next/Event view","Zeige Kurzdatum in \nWhat's Next/Event view" }, { "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" }, { "Alarm","Alarm" }, { "Used %1 Client","Benutzter %1 Client" }, @@ -1094,7 +1088,7 @@ { "Language","Sprache" }, { "Show time in agenda items","Zeige Zeit in Agenda Items" }, { "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" }, -{ "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" }, +{ "Show events, that are done","Zeige abgelaufene Termine" }, { "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" }, { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, { "KO/Pi","KO/Pi" }, @@ -1335,9 +1329,12 @@ { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, +{ "Show Sync Events in WN+Agenda","Zeige Sync-Ereignisse in WN+Agenda" }, +{ "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" }, +{ "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" }, +{ "","" }, { "","" }, { "","" }, { "","" }, { "","" }, { "","" }, -{ "","" },
\ No newline at end of file diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index e0e138e..341f473 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -1207,17 +1207,17 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) void KOListViewListView::popupMenu() { mPopupTimer->stop(); - //qDebug("HUUUUUUUUUUUUUUUUUUUU "); QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton ); - QApplication::postEvent( this->viewport(), e ); + QApplication::postEvent( this->viewport(), e ); + } void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) { - //qDebug("contentsMousePressEvent++++ "); + //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y()); mYMousePos = mapToGlobal( (e->pos())).y(); if ( e->button() == LeftButton ) { mPopupTimer->start( 600 ); - mEventPos = e->pos(); + mEventPos = contentsToViewport(e->pos()); mEventGlobalPos = e->globalPos(); } KListView::contentsMousePressEvent( e ); @@ -1242,7 +1242,7 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) if ( diff > 15 ) mPopupTimer->stop(); else { - mEventPos = e->pos(); + mEventPos = contentsToViewport(e->pos()); mEventGlobalPos = e->globalPos(); } KListView::contentsMouseMoveEvent(e); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 8439b81..e72f94b 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -826,36 +826,33 @@ void KOPrefsDialog::setupViewsTab() QHBox *prioBox = new QHBox(topFrame); // intervalBox->setSpacing(mSpacingHint); topLayout->addWidget(prioBox,ii++,0); - QString messa = i18n("Show topmost todo prios in What's Next:"); - - if ( QApplication::desktop()->width() < 300 ) - messa = i18n("Show topmost todo prios in What's N.:"); - QLabel *prioLabel = new QLabel(messa, prioBox); + + QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); mPrioSpin = new QSpinBox(0,5,1,prioBox); if ( QApplication::desktop()->width() < 300 ) mPrioSpin->setFixedWidth( 40 ); KPrefsDialogWidBool *passwdk = - addWidBool(i18n("Show events, that are done in \nWhat's Next view"), + addWidBool(i18n("Show events, that are done"), &(KOPrefs::instance()->mWNViewShowsPast),topFrame); topLayout->addWidget(passwdk->checkBox(), ii++,0); passwdk = - addWidBool(i18n("Show parent To-Do's in What's Next view"), + addWidBool(i18n("Show parent To-Do's"), &(KOPrefs::instance()->mWNViewShowsParents),topFrame); topLayout->addWidget(passwdk->checkBox(), ii++,0); passwdk = - addWidBool(i18n("Show location in What's Next view"), + addWidBool(i18n("Show location"), &(KOPrefs::instance()->mWNViewShowLocation),topFrame); topLayout->addWidget(passwdk->checkBox(), ii++,0); passwdk = - addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), + addWidBool(i18n("Show Sync Events in WN+Agenda"), &(KOPrefs::instance()->mShowSyncEvents),topFrame); topLayout->addWidget(passwdk->checkBox(), ii++,0); passwdk = - addWidBool(i18n("Use short date in \nWhat's Next/Event view"), + addWidBool(i18n("Use short date in WN+Event view"), &(KOPrefs::instance()->mShortDateInViewer),topFrame); topLayout->addWidget(passwdk->checkBox(), ii++,0); diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index db60383..7a945e3 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -206,7 +206,10 @@ void SearchDialog::doSearch() re.setWildcard(true); // most people understand these better. re.setCaseSensitive(false); - re.setPattern(searchEdit->text()); + QString st = searchEdit->text(); + if ( st.right(1) != "*") + st += "*"; + re.setPattern(st); if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) { KMessageBox::sorry(this, i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals")); @@ -247,8 +250,11 @@ void SearchDialog::updateView() //qDebug("SearchDialog::updateView() %d ", isVisible()); QRegExp re; re.setWildcard(true); // most people understand these better. - re.setCaseSensitive(false); - re.setPattern(searchEdit->text()); + re.setCaseSensitive(false); + QString st = searchEdit->text(); + if ( st.right(1) != "*") + st += "*"; + re.setPattern(st); if (re.isValid()) { search(re); } else { diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp index a19900f..e2325d2 100644 --- a/libkdepim/categoryeditdialog.cpp +++ b/libkdepim/categoryeditdialog.cpp @@ -55,6 +55,10 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent, connect(mEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(slotTextChanged(const QString &))); mButtonRemove->setEnabled(categoriesExist); mButtonModify->setEnabled(categoriesExist); +#ifndef DESKTOP_VERSION + mButtonOk->hide(); + mButtonCancel->hide(); +#endif mButtonAdd->setEnabled(!mEdit->text().isEmpty()); if ( QApplication::desktop()->width() > 460 ) resize( 300, 360 ); diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 974752c..a4e0024 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -55,6 +55,10 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent, showMaximized(); connect( mSetColorCat, SIGNAL( clicked() ), this, SLOT( setColorCat() ) ); // connect( mCategories, SIGNAL( clicked(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) ); +#ifndef DESKTOP_VERSION + mButtonOk->hide(); + mButtonCancel->hide(); +#endif } void CategorySelectDialog::editCategoriesDialog() { |