summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt17
-rw-r--r--korganizer/kolistview.cpp10
-rw-r--r--korganizer/koprefsdialog.cpp17
-rw-r--r--korganizer/searchdialog.cpp12
-rw-r--r--libkdepim/categoryeditdialog.cpp4
-rw-r--r--libkdepim/categoryselectdialog.cpp4
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
@@ -352,5 +352,4 @@
352{ "September","September" }, 352{ "September","September" },
353{ "Shopping","Einkaufen" }, 353{ "Shopping","Einkaufen" },
354{ "Use short date in (WN/E) view","Kurzdatum in (WN/Termin) Ansicht" },
355{ "Show Dates","Zeige Daten" }, 354{ "Show Dates","Zeige Daten" },
356{ "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." }, 355{ "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." },
@@ -361,6 +360,4 @@
361{ "Show time as:","Zeige Zeit als" }, 360{ "Show time as:","Zeige Zeit als" },
362{ "Show Todo...","Zeige To-Do" }, 361{ "Show Todo...","Zeige To-Do" },
363{ "Show topmost todo prios in What's N.:","Anz. höchster Prios in What's N.:"},
364{ "Show topmost todo prios in What's Next:","Anz. höchster Prios in What's Next:"},
365{ "Show vertical screen (Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, 362{ "Show vertical screen (Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" },
366{ "&Show","Zeige" }, 363{ "&Show","Zeige" },
@@ -667,6 +664,6 @@
667{ "Buttons, menus, etc.:","Knöpfe, Menu, etc.:" }, 664{ "Buttons, menus, etc.:","Knöpfe, Menu, etc.:" },
668{ "Frames, labels, etc.:","Rahmen, Label, etc.:" }, 665{ "Frames, labels, etc.:","Rahmen, Label, etc.:" },
669{ "Show parent To-Do's in What's Next view","Zeige Ober-Todo in What's Next Anz." }, 666{ "Show parent To-Do's","Zeige Ober-Todos" },
670{ "Show location in What's Next view","Zeige Ort in What's Next Anz." }, 667{ "Show location","Zeige Orte" },
671{ "Show events that recur ","Zeige Termine, die sich wiederholen:" }, 668{ "Show events that recur ","Zeige Termine, die sich wiederholen:" },
672{ "Show in every cell ","Zeige in jeder Zelle " }, 669{ "Show in every cell ","Zeige in jeder Zelle " },
@@ -803,5 +800,4 @@
803{ "Running '%1'","Ausführen '%1'" }, 800{ "Running '%1'","Ausführen '%1'" },
804{ "Playing '%1'","Abspielen '%1'" }, 801{ "Playing '%1'","Abspielen '%1'" },
805{ "Show Sync Events in WN/Agenda view","Zeige Sync Events in WN/Agenda Ansicht" },
806{ "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" }, 802{ "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" },
807{ "Load!","Laden!" }, 803{ "Load!","Laden!" },
@@ -932,6 +928,4 @@
932{ "Today","Heute" }, 928{ "Today","Heute" },
933{ "What's Next View","What's Next Ansicht" }, 929{ "What's Next View","What's Next Ansicht" },
934{ "Show Sync Events in \nWhat's Next/Agenda view","Zeige Sync Termine in \nWhat's Next/Agenda view" },
935{ "Use short date in \nWhat's Next/Event view","Zeige Kurzdatum in \nWhat's Next/Event view" },
936{ "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" }, 930{ "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" },
937{ "Alarm","Alarm" }, 931{ "Alarm","Alarm" },
@@ -1095,5 +1089,5 @@
1095{ "Show time in agenda items","Zeige Zeit in Agenda Items" }, 1089{ "Show time in agenda items","Zeige Zeit in Agenda Items" },
1096{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" }, 1090{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
1097{ "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" }, 1091{ "Show events, that are done","Zeige abgelaufene Termine" },
1098{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" }, 1092{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
1099{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, 1093{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
@@ -1336,4 +1330,8 @@
1336{ "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, 1330{ "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" },
1337{ "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, 1331{ "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." },
1332{ "Show Sync Events in WN+Agenda","Zeige Sync-Ereignisse in WN+Agenda" },
1333{ "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" },
1334{ "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" },
1335{ "","" },
1338{ "","" }, 1336{ "","" },
1339{ "","" }, 1337{ "","" },
@@ -1341,3 +1339,2 @@
1341{ "","" }, 1339{ "","" },
1342{ "","" }, 1340{ "","" },
1343{ "","" }, \ 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
@@ -1208,15 +1208,15 @@ void KOListViewListView::popupMenu()
1208{ 1208{
1209 mPopupTimer->stop(); 1209 mPopupTimer->stop();
1210 //qDebug("HUUUUUUUUUUUUUUUUUUUU ");
1211 QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton ); 1210 QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton );
1212 QApplication::postEvent( this->viewport(), e ); 1211 QApplication::postEvent( this->viewport(), e );
1212
1213} 1213}
1214void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) 1214void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
1215{ 1215{
1216 //qDebug("contentsMousePressEvent++++ "); 1216 //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y());
1217 mYMousePos = mapToGlobal( (e->pos())).y(); 1217 mYMousePos = mapToGlobal( (e->pos())).y();
1218 if ( e->button() == LeftButton ) { 1218 if ( e->button() == LeftButton ) {
1219 mPopupTimer->start( 600 ); 1219 mPopupTimer->start( 600 );
1220 mEventPos = e->pos(); 1220 mEventPos = contentsToViewport(e->pos());
1221 mEventGlobalPos = e->globalPos(); 1221 mEventGlobalPos = e->globalPos();
1222 } 1222 }
@@ -1243,5 +1243,5 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
1243 mPopupTimer->stop(); 1243 mPopupTimer->stop();
1244 else { 1244 else {
1245 mEventPos = e->pos(); 1245 mEventPos = contentsToViewport(e->pos());
1246 mEventGlobalPos = e->globalPos(); 1246 mEventGlobalPos = e->globalPos();
1247 } 1247 }
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 8439b81..e72f94b 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -827,9 +827,6 @@ void KOPrefsDialog::setupViewsTab()
827 // intervalBox->setSpacing(mSpacingHint); 827 // intervalBox->setSpacing(mSpacingHint);
828 topLayout->addWidget(prioBox,ii++,0); 828 topLayout->addWidget(prioBox,ii++,0);
829 QString messa = i18n("Show topmost todo prios in What's Next:"); 829
830 830 QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
831 if ( QApplication::desktop()->width() < 300 )
832 messa = i18n("Show topmost todo prios in What's N.:");
833 QLabel *prioLabel = new QLabel(messa, prioBox);
834 mPrioSpin = new QSpinBox(0,5,1,prioBox); 831 mPrioSpin = new QSpinBox(0,5,1,prioBox);
835 if ( QApplication::desktop()->width() < 300 ) 832 if ( QApplication::desktop()->width() < 300 )
@@ -838,23 +835,23 @@ void KOPrefsDialog::setupViewsTab()
838 KPrefsDialogWidBool *passwdk = 835 KPrefsDialogWidBool *passwdk =
839 836
840 addWidBool(i18n("Show events, that are done in \nWhat's Next view"), 837 addWidBool(i18n("Show events, that are done"),
841 &(KOPrefs::instance()->mWNViewShowsPast),topFrame); 838 &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
842 topLayout->addWidget(passwdk->checkBox(), ii++,0); 839 topLayout->addWidget(passwdk->checkBox(), ii++,0);
843 passwdk = 840 passwdk =
844 addWidBool(i18n("Show parent To-Do's in What's Next view"), 841 addWidBool(i18n("Show parent To-Do's"),
845 &(KOPrefs::instance()->mWNViewShowsParents),topFrame); 842 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
846 topLayout->addWidget(passwdk->checkBox(), ii++,0); 843 topLayout->addWidget(passwdk->checkBox(), ii++,0);
847 844
848 passwdk = 845 passwdk =
849 addWidBool(i18n("Show location in What's Next view"), 846 addWidBool(i18n("Show location"),
850 &(KOPrefs::instance()->mWNViewShowLocation),topFrame); 847 &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
851 topLayout->addWidget(passwdk->checkBox(), ii++,0); 848 topLayout->addWidget(passwdk->checkBox(), ii++,0);
852 849
853 passwdk = 850 passwdk =
854 addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), 851 addWidBool(i18n("Show Sync Events in WN+Agenda"),
855 &(KOPrefs::instance()->mShowSyncEvents),topFrame); 852 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
856 topLayout->addWidget(passwdk->checkBox(), ii++,0); 853 topLayout->addWidget(passwdk->checkBox(), ii++,0);
857 passwdk = 854 passwdk =
858 addWidBool(i18n("Use short date in \nWhat's Next/Event view"), 855 addWidBool(i18n("Use short date in WN+Event view"),
859 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 856 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
860 topLayout->addWidget(passwdk->checkBox(), ii++,0); 857 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
@@ -207,5 +207,8 @@ void SearchDialog::doSearch()
207 re.setWildcard(true); // most people understand these better. 207 re.setWildcard(true); // most people understand these better.
208 re.setCaseSensitive(false); 208 re.setCaseSensitive(false);
209 re.setPattern(searchEdit->text()); 209 QString st = searchEdit->text();
210 if ( st.right(1) != "*")
211 st += "*";
212 re.setPattern(st);
210 if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) { 213 if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) {
211 KMessageBox::sorry(this, 214 KMessageBox::sorry(this,
@@ -248,6 +251,9 @@ void SearchDialog::updateView()
248 QRegExp re; 251 QRegExp re;
249 re.setWildcard(true); // most people understand these better. 252 re.setWildcard(true); // most people understand these better.
250 re.setCaseSensitive(false); 253 re.setCaseSensitive(false);
251 re.setPattern(searchEdit->text()); 254 QString st = searchEdit->text();
255 if ( st.right(1) != "*")
256 st += "*";
257 re.setPattern(st);
252 if (re.isValid()) { 258 if (re.isValid()) {
253 search(re); 259 search(re);
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index a19900f..e2325d2 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -56,4 +56,8 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
56 mButtonRemove->setEnabled(categoriesExist); 56 mButtonRemove->setEnabled(categoriesExist);
57 mButtonModify->setEnabled(categoriesExist); 57 mButtonModify->setEnabled(categoriesExist);
58#ifndef DESKTOP_VERSION
59 mButtonOk->hide();
60 mButtonCancel->hide();
61#endif
58 mButtonAdd->setEnabled(!mEdit->text().isEmpty()); 62 mButtonAdd->setEnabled(!mEdit->text().isEmpty());
59 if ( QApplication::desktop()->width() > 460 ) 63 if ( QApplication::desktop()->width() > 460 )
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 974752c..a4e0024 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -56,4 +56,8 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
56 connect( mSetColorCat, SIGNAL( clicked() ), this, SLOT( setColorCat() ) ); 56 connect( mSetColorCat, SIGNAL( clicked() ), this, SLOT( setColorCat() ) );
57 // connect( mCategories, SIGNAL( clicked(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) ); 57 // connect( mCategories, SIGNAL( clicked(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) );
58#ifndef DESKTOP_VERSION
59 mButtonOk->hide();
60 mButtonCancel->hide();
61#endif
58} 62}
59void CategorySelectDialog::editCategoriesDialog() 63void CategorySelectDialog::editCategoriesDialog()