summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-05 15:46:34 (UTC)
committer zautrix <zautrix>2005-04-05 15:46:34 (UTC)
commit8734ae4789ed411cb546edd304816a77c431a2bf (patch) (unidiff)
tree8fc66d9dfb9baf6ef62278dd58d49f6156c0414f
parent637415693af8fe9974b45c355ecfdd0745617ac3 (diff)
downloadkdepimpi-8734ae4789ed411cb546edd304816a77c431a2bf.zip
kdepimpi-8734ae4789ed411cb546edd304816a77c431a2bf.tar.gz
kdepimpi-8734ae4789ed411cb546edd304816a77c431a2bf.tar.bz2
urgs. bug fixes
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
@@ -342,35 +342,32 @@
342{ "Search...","Suche..." }, 342{ "Search...","Suche..." },
343{ "Search","Suche" }, 343{ "Search","Suche" },
344{ "Select Addresses","Wähle Adressen" }, 344{ "Select Addresses","Wähle Adressen" },
345{ "Select all","Selektiere Alle" }, 345{ "Select all","Selektiere Alle" },
346{ "Select a month","Wähle Monat" }, 346{ "Select a month","Wähle Monat" },
347{ "Select a week","Wähle Woche" }, 347{ "Select a week","Wähle Woche" },
348{ "Select a year","Wähle Jahr" }, 348{ "Select a year","Wähle Jahr" },
349{ "Send directly","Sende direkt" }, 349{ "Send directly","Sende direkt" },
350{ "&Send Messages","&Sende Nachrichten", }, 350{ "&Send Messages","&Sende Nachrichten", },
351{ "Sep","Sep" }, 351{ "Sep","Sep" },
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." },
357{ "Show Event...","Zeige Termin..." }, 356{ "Show Event...","Zeige Termin..." },
358{ "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." }, 357{ "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." },
359{ "Show Marcus Bains line","Zeige Marcus Bains Linie" }, 358{ "Show Marcus Bains line","Zeige Marcus Bains Linie" },
360{ "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, 359{ "Show summary after syncing","Zeige Zusammenfassung nach Sync." },
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" },
367{ "Show...","Zeige..." }, 364{ "Show...","Zeige..." },
368{ "Show","Zeige" }, 365{ "Show","Zeige" },
369{ "Small","Klein" }, 366{ "Small","Klein" },
370{ "Sorry","Entschuldigung" }, 367{ "Sorry","Entschuldigung" },
371{"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"}, 368{"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
372{ "Start:","Start:" }, 369{ "Start:","Start:" },
373{ "Start Date","Start Datum" }, 370{ "Start Date","Start Datum" },
374{ "Start date: %1","Start Datum: %1" }, 371{ "Start date: %1","Start Datum: %1" },
375{ "Start Time","Start Zeit" }, 372{ "Start Time","Start Zeit" },
376{ "Status:","Status:" }, 373{ "Status:","Status:" },
@@ -657,26 +654,26 @@
657{ "This event has been cancelled!","Dieser Termin wurde gecancelt!" }, 654{ "This event has been cancelled!","Dieser Termin wurde gecancelt!" },
658{ "Cancelled","Gecancelt" }, 655{ "Cancelled","Gecancelt" },
659{ "Multiple sync","Mehrfach Sync" }, 656{ "Multiple sync","Mehrfach Sync" },
660{ "Local file","Lokale Datei" }, 657{ "Local file","Lokale Datei" },
661{ "Last file","Letzte Datei" }, 658{ "Last file","Letzte Datei" },
662{ "Keys + Colors...","Tasten + Farben..." }, 659{ "Keys + Colors...","Tasten + Farben..." },
663{ "Mini icons in toolbar(nr)","Mini Icons in ToolBar(bn)" }, 660{ "Mini icons in toolbar(nr)","Mini Icons in ToolBar(bn)" },
664{ "Quick load/save (w/o Unicode)","Schnelles Laden/Speichern (o Unicode)" }, 661{ "Quick load/save (w/o Unicode)","Schnelles Laden/Speichern (o Unicode)" },
665{ "Choose...","Wähle..." }, 662{ "Choose...","Wähle..." },
666{ "Use colors for application:","Setze Farben für Programm:" }, 663{ "Use colors for application:","Setze Farben für Programm:" },
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 " },
673{ "short month","kurzen Monat" }, 670{ "short month","kurzen Monat" },
674{ "icons","Icons" }, 671{ "icons","Icons" },
675{ "Show Sat/Sun together","Zeige Sam/Son zusammen" }, 672{ "Show Sat/Sun together","Zeige Sam/Son zusammen" },
676{ "Categorie colors are applied to text","Kategorie Farben färben Text" }, 673{ "Categorie colors are applied to text","Kategorie Farben färben Text" },
677{ "Month view uses day colors","Monatsansicht zeigt Tagesfarben" }, 674{ "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
678{ "Day color odd months","Tagesfarbe ungerade Monate" }, 675{ "Day color odd months","Tagesfarbe ungerade Monate" },
679{ "Day color even months","Tagesfarbe gerade Monate" }, 676{ "Day color even months","Tagesfarbe gerade Monate" },
680{ "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" }, 677{ "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" },
681{ "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" }, 678{ "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
682{ "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" }, 679{ "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" },
@@ -793,25 +790,24 @@
793{ "Work mobile phone:\n","Mobiltelefon Arbeit:\n" }, 790{ "Work mobile phone:\n","Mobiltelefon Arbeit:\n" },
794{ "Home phone:\n","Telefon privat:\n" }, 791{ "Home phone:\n","Telefon privat:\n" },
795{ "Mobile home phone:\n","Mobiltelefon privat:\n" }, 792{ "Mobile home phone:\n","Mobiltelefon privat:\n" },
796{ "Email:\n","Email:\n" }, 793{ "Email:\n","Email:\n" },
797{ "Alarm disabled for this item","Alarm deaktiviert für dieses Item" }, 794{ "Alarm disabled for this item","Alarm deaktiviert für dieses Item" },
798{ "Audio Al.: ","Audio Al.: " }, 795{ "Audio Al.: ","Audio Al.: " },
799{ "Proc.Al.: ","Proz.Al.: " }, 796{ "Proc.Al.: ","Proz.Al.: " },
800{ "No sound set","Kein Sound definiert" }, 797{ "No sound set","Kein Sound definiert" },
801{ "*.wav|Wav Files","*.wav|Wav Dateien" }, 798{ "*.wav|Wav Files","*.wav|Wav Dateien" },
802{ "No program set","Kein Programm definiert" }, 799{ "No program set","Kein Programm definiert" },
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!" },
808{ "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" }, 804{ "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" },
809{ "KO/Pi Features and hints","KO/Pi Eigenschaften und Tipps" }, 805{ "KO/Pi Features and hints","KO/Pi Eigenschaften und Tipps" },
810{ "KO/Pi User translation HowTo","KO/Pi Benutzer-Übersetzung HowTo" }, 806{ "KO/Pi User translation HowTo","KO/Pi Benutzer-Übersetzung HowTo" },
811{ "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" }, 807{ "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" },
812{ "Features + hints...","Eigenschaften + Tipps..." }, 808{ "Features + hints...","Eigenschaften + Tipps..." },
813{ "User translation...","Benutzer Übersetzung..." }, 809{ "User translation...","Benutzer Übersetzung..." },
814{ "Sync HowTo...","Synchronisation HowTo..." }, 810{ "Sync HowTo...","Synchronisation HowTo..." },
815{ "Print calendar...","Drucke Kalender..." }, 811{ "Print calendar...","Drucke Kalender..." },
816{ "Anniversary","Jahrestag" }, 812{ "Anniversary","Jahrestag" },
817{ "When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n","Wenn Geburtstage mehrfach importiert\nwerden, werden doppelte Einträge ignoriert\nwenn sie nicht verändert wurden.\n" }, 813{ "When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n","Wenn Geburtstage mehrfach importiert\nwerden, werden doppelte Einträge ignoriert\nwenn sie nicht verändert wurden.\n" },
@@ -922,26 +918,24 @@
922{ "3 hours","3 Std." }, 918{ "3 hours","3 Std." },
923{ "1 hour","1 Std." }, 919{ "1 hour","1 Std." },
924{ "15 minutes","15 Min." }, 920{ "15 minutes","15 Min." },
925{ "5 minutes","5 Min." }, 921{ "5 minutes","5 Min." },
926{ "1 minute","1 Min." }, 922{ "1 minute","1 Min." },
927{ "23","23" }, 923{ "23","23" },
928{ "Mon 15","Mon 15" }, 924{ "Mon 15","Mon 15" },
929{ "Configure KO","Konfiguriere KO" }, 925{ "Configure KO","Konfiguriere KO" },
930{ "Event text","Termin Text" }, 926{ "Event text","Termin Text" },
931{ "ToDo","ToDo" }, 927{ "ToDo","ToDo" },
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" },
938{ "Used %1 Client","Benutzter %1 Client" }, 932{ "Used %1 Client","Benutzter %1 Client" },
939{ "No email client installed","Kein Email Klient installiert" }, 933{ "No email client installed","Kein Email Klient installiert" },
940{ "Userdefined email client","Benutzerdef. Email Klient" }, 934{ "Userdefined email client","Benutzerdef. Email Klient" },
941{ "OM/Pi email client","OM/Pi Email Klient" }, 935{ "OM/Pi email client","OM/Pi Email Klient" },
942{ "Include in multiple ","Beziehe in multiple " }, 936{ "Include in multiple ","Beziehe in multiple " },
943{ "calendar ","Kalender " }, 937{ "calendar ","Kalender " },
944{ "addressbook ","Adressbuch " }, 938{ "addressbook ","Adressbuch " },
945{ "pwmanager","PWmanager" }, 939{ "pwmanager","PWmanager" },
946{ " sync"," Sync ein" }, 940{ " sync"," Sync ein" },
947{ "Write back synced data","Schreibe gesyncte Daten zurück" }, 941{ "Write back synced data","Schreibe gesyncte Daten zurück" },
@@ -1085,25 +1079,25 @@
1085{ "%1 groups subscribed","%1 Guppen abboniert" }, 1079{ "%1 groups subscribed","%1 Guppen abboniert" },
1086{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, 1080{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },
1087{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, 1081{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
1088{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, 1082{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
1089{ "Save settings","Speichere Einstellungen" }, 1083{ "Save settings","Speichere Einstellungen" },
1090{ "Save standard","Speichere Standard" }, 1084{ "Save standard","Speichere Standard" },
1091{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, 1085{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
1092{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, 1086{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
1093{ "Data storage path","Daten Speicherpfad" }, 1087{ "Data storage path","Daten Speicherpfad" },
1094{ "Language","Sprache" }, 1088{ "Language","Sprache" },
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)" },
1100{ "KO/Pi","KO/Pi" }, 1094{ "KO/Pi","KO/Pi" },
1101{ "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" }, 1095{ "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
1102{ "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." }, 1096{ "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
1103{ "Sound.Al.: ","Sound.Al.: " }, 1097{ "Sound.Al.: ","Sound.Al.: " },
1104{ "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" }, 1098{ "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" },
1105{ "Restore","Wiederherstellen" }, 1099{ "Restore","Wiederherstellen" },
1106{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" }, 1100{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
1107{ "% completed","% erledigt" }, 1101{ "% completed","% erledigt" },
1108{ "%d item(s) found.","%d Item(s) gefunden." }, 1102{ "%d item(s) found.","%d Item(s) gefunden." },
1109{ "Set complete","Setze auf erledigt" }, 1103{ "Set complete","Setze auf erledigt" },
@@ -1326,18 +1320,21 @@
1326{ "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, 1320{ "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." },
1327{ "Printout Mode","Druck Modus" }, 1321{ "Printout Mode","Druck Modus" },
1328{ "Filter menu icon","Filtermenu Icon" }, 1322{ "Filter menu icon","Filtermenu Icon" },
1329{ "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" }, 1323{ "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" },
1330{ "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" }, 1324{ "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" },
1331{ "%1d","%1t" }, 1325{ "%1d","%1t" },
1332{ "%1h","%1std" }, 1326{ "%1h","%1std" },
1333{ "%1min","%1min" }, 1327{ "%1min","%1min" },
1334{ "( %1 before )","( %1 vorher )" }, 1328{ "( %1 before )","( %1 vorher )" },
1335{ "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, 1329{ "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" },
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{ "","" },
1340{ "","" }, 1338{ "","" },
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
@@ -1198,53 +1198,53 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
1198void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) 1198void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
1199{ 1199{
1200 KListView::contentsMouseReleaseEvent(e); 1200 KListView::contentsMouseReleaseEvent(e);
1201} 1201}
1202void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) 1202void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
1203{ 1203{
1204 KListView::contentsMouseMoveEvent(e); 1204 KListView::contentsMouseMoveEvent(e);
1205} 1205}
1206#endif 1206#endif
1207void KOListViewListView::popupMenu() 1207void 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 }
1223 KListView::contentsMousePressEvent( e ); 1223 KListView::contentsMousePressEvent( e );
1224 if ( e->button() == RightButton ) { 1224 if ( e->button() == RightButton ) {
1225 QListViewItem* ci = currentItem(); 1225 QListViewItem* ci = currentItem();
1226 //clearSelection(); 1226 //clearSelection();
1227 if ( ci ) 1227 if ( ci )
1228 ci->setSelected( true ); 1228 ci->setSelected( true );
1229 } 1229 }
1230} 1230}
1231void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) 1231void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
1232{ 1232{
1233 mPopupTimer->stop(); 1233 mPopupTimer->stop();
1234 KListView::contentsMouseReleaseEvent(e); 1234 KListView::contentsMouseReleaseEvent(e);
1235} 1235}
1236void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) 1236void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
1237{ 1237{
1238 // qDebug("contentsMouseMoveEv....... "); 1238 // qDebug("contentsMouseMoveEv....... ");
1239 // qDebug("start: %d current %d ",mYMousePos , mapToGlobal( (e->pos())).y() ); 1239 // qDebug("start: %d current %d ",mYMousePos , mapToGlobal( (e->pos())).y() );
1240 int diff = mYMousePos - mapToGlobal( (e->pos())).y(); 1240 int diff = mYMousePos - mapToGlobal( (e->pos())).y();
1241 if ( diff < 0 ) diff = -diff; 1241 if ( diff < 0 ) diff = -diff;
1242 if ( diff > 15 ) 1242 if ( diff > 15 )
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 }
1248 KListView::contentsMouseMoveEvent(e); 1248 KListView::contentsMouseMoveEvent(e);
1249} 1249}
1250 1250
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 8439b81..e72f94b 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -817,54 +817,51 @@ void KOPrefsDialog::setupViewsTab()
817 ii = 0; 817 ii = 0;
818 818
819 819
820 QHBox* hdummy = new QHBox(topFrame); 820 QHBox* hdummy = new QHBox(topFrame);
821 new QLabel(i18n("Days in What's Next:"),hdummy); 821 new QLabel(i18n("Days in What's Next:"),hdummy);
822 mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); 822 mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
823 823
824 topLayout->addWidget(hdummy,ii++,0); 824 topLayout->addWidget(hdummy,ii++,0);
825 825
826 QHBox *prioBox = new QHBox(topFrame); 826 QHBox *prioBox = new QHBox(topFrame);
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 )
836 mPrioSpin->setFixedWidth( 40 ); 833 mPrioSpin->setFixedWidth( 40 );
837 834
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);
861 858
862 859
863 860
864 861
865 // *********************** Todo View 862 // *********************** Todo View
866 863
867 topFrame = addPage(i18n("Todo View"),0,0); 864 topFrame = addPage(i18n("Todo View"),0,0);
868 // DesktopIcon("viewmag",KIcon::SizeMedium)); 865 // DesktopIcon("viewmag",KIcon::SizeMedium));
869 866
870 topLayout = new QGridLayout(topFrame,4,1); 867 topLayout = new QGridLayout(topFrame,4,1);
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index db60383..7a945e3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -197,25 +197,28 @@ void SearchDialog::searchTextChanged( const QString &_text )
197{ 197{
198#if 0 198#if 0
199 enableButton( KDialogBase::User1, !_text.isEmpty() ); 199 enableButton( KDialogBase::User1, !_text.isEmpty() );
200#endif 200#endif
201} 201}
202 202
203void SearchDialog::doSearch() 203void SearchDialog::doSearch()
204{ 204{
205 QRegExp re; 205 QRegExp re;
206 206
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,
212 i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals")); 215 i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals"));
213 return; 216 return;
214 } 217 }
215 if (!re.isValid() ) { 218 if (!re.isValid() ) {
216 KMessageBox::sorry(this, 219 KMessageBox::sorry(this,
217 i18n("Invalid search expression,\ncannot perform " 220 i18n("Invalid search expression,\ncannot perform "
218 "the search.\nPlease enter a search expression\n" 221 "the search.\nPlease enter a search expression\n"
219 "using the wildcard characters\n '*' and '?'" 222 "using the wildcard characters\n '*' and '?'"
220 "where needed.")); 223 "where needed."));
221 return; 224 return;
@@ -238,26 +241,29 @@ void SearchDialog::doSearch()
238 } 241 }
239 searchEdit->setFocus(); 242 searchEdit->setFocus();
240} 243}
241void SearchDialog::updateConfig() 244void SearchDialog::updateConfig()
242{ 245{
243 listView->updateConfig(); 246 listView->updateConfig();
244} 247}
245void SearchDialog::updateView() 248void SearchDialog::updateView()
246{ 249{
247 //qDebug("SearchDialog::updateView() %d ", isVisible()); 250 //qDebug("SearchDialog::updateView() %d ", isVisible());
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);
254 } else { 260 } else {
255 mMatchedEvents.clear(); 261 mMatchedEvents.clear();
256 mMatchedTodos.clear(); 262 mMatchedTodos.clear();
257 mMatchedJournals.clear(); 263 mMatchedJournals.clear();
258 } 264 }
259 listView->setStartDate( mStartDate->date() ); 265 listView->setStartDate( mStartDate->date() );
260 listView->showEvents(mMatchedEvents); 266 listView->showEvents(mMatchedEvents);
261 listView->addTodos(mMatchedTodos); 267 listView->addTodos(mMatchedTodos);
262 listView->addJournals(mMatchedJournals); 268 listView->addJournals(mMatchedJournals);
263} 269}
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index a19900f..e2325d2 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -46,24 +46,28 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
46 bool categoriesExist=false; 46 bool categoriesExist=false;
47 for (it = mPrefs->mCustomCategories.begin(); 47 for (it = mPrefs->mCustomCategories.begin();
48 it != mPrefs->mCustomCategories.end(); ++it ) { 48 it != mPrefs->mCustomCategories.end(); ++it ) {
49 new QListViewItem(mCategories,*it); 49 new QListViewItem(mCategories,*it);
50 categoriesExist=true; 50 categoriesExist=true;
51 } 51 }
52 52
53 connect(mCategories,SIGNAL(selectionChanged(QListViewItem *)), 53 connect(mCategories,SIGNAL(selectionChanged(QListViewItem *)),
54 SLOT(editItem(QListViewItem *))); 54 SLOT(editItem(QListViewItem *)));
55 connect(mEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(slotTextChanged(const QString &))); 55 connect(mEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(slotTextChanged(const QString &)));
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 )
60 resize( 300, 360 ); 64 resize( 300, 360 );
61 else 65 else
62 showMaximized(); 66 showMaximized();
63} 67}
64 68
65/* 69/*
66 * Destroys the object and frees any allocated resources 70 * Destroys the object and frees any allocated resources
67 */ 71 */
68CategoryEditDialog::~CategoryEditDialog() 72CategoryEditDialog::~CategoryEditDialog()
69{ 73{
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 974752c..a4e0024 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -46,24 +46,28 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
46 mColorEnabled = false; 46 mColorEnabled = false;
47 mCategories->header()->hide(); 47 mCategories->header()->hide();
48 48
49 setCategories(); 49 setCategories();
50 50
51 connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog())); 51 connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog()));
52 if ( QApplication::desktop()->width() > 460 ) 52 if ( QApplication::desktop()->width() > 460 )
53 resize( 300, 360 ); 53 resize( 300, 360 );
54 else 54 else
55 showMaximized(); 55 showMaximized();
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()
60{ 64{
61 KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this ); 65 KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this );
62 66
63 ced->exec(); 67 ced->exec();
64 delete ced; 68 delete ced;
65 slotApply(); 69 slotApply();
66 QStringList temp = mCategoryList; 70 QStringList temp = mCategoryList;
67 setCategories(); 71 setCategories();
68 setSelected( temp ); 72 setSelected( temp );
69} 73}