urgs. bug fixes

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
@@ -338,43 +338,40 @@
 { "Sat","Sa" },
 { "Saturday","Samstag" },
 { "Search for:","Suche nach:" },
 { "Search In","Suche in" },
 { "Search...","Suche..." },
 { "Search","Suche" },
 { "Select Addresses","Wähle Adressen" },
 { "Select all","Selektiere Alle" },
 { "Select a month","Wähle Monat" },
 { "Select a week","Wähle Woche" },
 { "Select a year","Wähle Jahr" },
 { "Send directly","Sende direkt" },
 { "&Send Messages","&Sende Nachrichten", },
 { "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..." },
 { "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." },
 { "Show Marcus Bains line","Zeige Marcus Bains Linie" },
 { "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..." },
 { "Show","Zeige" },
 { "Small","Klein" },
 { "Sorry","Entschuldigung" },
 {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
 { "Start:","Start:" },
 { "Start Date","Start Datum" },
 { "Start date: %1","Start Datum: %1" },
 { "Start Time","Start Zeit" },
 { "Status:","Status:" },
 { "Status","Status:" },
 { "Summaries","Titel" },
 { "Summary:","Titel:" },
 { "Summary","Titel" },
@@ -653,34 +650,34 @@
 {"Vacation","Urlaub" },
 {"VIP","VIP" },
 { "Import Sharp Calendar","Importiere Sharp Kalender" },
 { "This todo has been cancelled!","Dieses Todo wurde gecancelt!" },
 { "This event has been cancelled!","Dieser Termin wurde gecancelt!" },
 { "Cancelled","Gecancelt" },
 { "Multiple sync","Mehrfach Sync" },
 { "Local file","Lokale Datei" },
 { "Last file","Letzte Datei" },
 { "Keys + Colors...","Tasten + Farben..." },
 { "Mini icons in toolbar(nr)","Mini Icons in ToolBar(bn)" },
 { "Quick load/save (w/o Unicode)","Schnelles Laden/Speichern (o Unicode)" },
 { "Choose...","Wähle..." },
 { "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" },
 { "icons","Icons" },
 { "Show Sat/Sun together","Zeige Sam/Son zusammen" },
 { "Categorie colors are applied to text","Kategorie Farben färben Text" },
 { "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
 { "Day color odd months","Tagesfarbe ungerade Monate" },
 { "Day color even months","Tagesfarbe gerade Monate" },
 { "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" },
 { "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
 { "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" },
 { "Colors are applied to text","Farben werden auf Text angewendet" },
 { "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" },
 { "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi muß ausgeführt werden damit die Benachrichtigung funktioniert. Empfehlung für Zaurus: Diese Option nicht wählen und KO/Pi Alarm Applet installieren.\n" },
 { "Play beeps count:","Anzahl der Alarmpiepse: " },
@@ -789,33 +786,32 @@
 { "Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n","Backup Datei\nexistiert bereits!\nAlte Backup Datei vom:\n%1\nÜberschreiben?\n" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "Details of attendee","Teilnehmerdetails" },
 { "Work phone:\n","Telefon Arbeit:\n" },
 { "Work mobile phone:\n","Mobiltelefon Arbeit:\n" },
 { "Home phone:\n","Telefon privat:\n" },
 { "Mobile home phone:\n","Mobiltelefon privat:\n" },
 { "Email:\n","Email:\n" },
 { "Alarm disabled for this item","Alarm deaktiviert für dieses Item" },
 { "Audio Al.: ","Audio Al.: " },
 { "Proc.Al.: ","Proz.Al.: " },
 { "No sound set","Kein Sound definiert" },
 { "*.wav|Wav Files","*.wav|Wav Dateien" },
 { "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" },
 { "KO/Pi Features and hints","KO/Pi Eigenschaften und Tipps" },
 { "KO/Pi User translation HowTo","KO/Pi Benutzer-Übersetzung HowTo" },
 { "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" },
 { "Features + hints...","Eigenschaften + Tipps..." },
 { "User translation...","Benutzer Übersetzung..." },
 { "Sync HowTo...","Synchronisation HowTo..." },
 { "Print calendar...","Drucke Kalender..." },
 { "Anniversary","Jahrestag" },
 { "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" },
 { "Import Birthdays (KA/Pi)","Importiere Geburtstage (KA/Pi)" },
 { "Next recurrence is on: ","Nächste Wiederholung ist am:" },
 { "<b>Alarm on:  </b>","<b>Alarm am:  </b>" },
 { "<b>Access: </b>","<b>Zugriff: </b>" },
@@ -918,34 +914,32 @@
 { "extra Parameters:","extra Parameter:" },
 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
 { "External Apps.","Externe Appl." },
 { "24 hours","24 Std." },
 { "3 hours","3 Std." },
 { "1 hour","1 Std." },
 { "15 minutes","15 Min." },
 { "5 minutes","5 Min." },
 { "1 minute","1 Min." },
 { "23","23" },
 { "Mon 15","Mon 15" },
 { "Configure KO","Konfiguriere KO" },
 { "Event text","Termin Text" },
 { "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" },
 { "No email client installed","Kein Email Klient installiert" },
 { "Userdefined email client","Benutzerdef. Email Klient" },
 { "OM/Pi email client","OM/Pi Email Klient" },
 { "Include in multiple ","Beziehe in multiple " },
 { "calendar  ","Kalender  " },
 { "addressbook  ","Adressbuch  " },
 { "pwmanager","PWmanager" },
 { " sync"," Sync ein" },
 { "Write back synced data","Schreibe gesyncte Daten zurück" },
 { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Einträge zurück" },
 { "-- Write back (calendar) entries in future only","-- Schreibe nur zukünftige Kalender-Einträge zurück" },
 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },
@@ -1081,33 +1075,33 @@
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "Time Zone","Zeit Zone" },
 { "%1 groups subscribed","%1 Guppen abboniert" },
 { "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" },
 { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
 { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
 { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "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" },
 { "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
 { "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
 { "Sound.Al.: ","Sound.Al.: " },
 { "From: %1   To: %2   %3","Von: %1   Bis: %2   %3" },
 { "Restore","Wiederherstellen" },
 { "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
 { "% completed","% erledigt" },
 { "%d item(s) found.","%d Item(s) gefunden." },
 { "Set complete","Setze auf erledigt" },
 { "(cancelled)","(gecancelt)" },
 { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
 { " Local time "," Locale Zeit " },
 { "Form2","Form2" },
@@ -1322,22 +1316,25 @@
 { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" },
 { "KO/Pi Printout","KO/Pi Ausdruck" },
 { "Print unscaled","Drucke unskaliert" },
 { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." },
 { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." },
 { "Printout Mode","Druck Modus" },
 { "Filter menu icon","Filtermenu Icon" },
 { "<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" },
 { "<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" },
 { "%1d","%1t" },
 { "%1h","%1std" },
 { "%1min","%1min" },
 { "( %1 before )","( %1 vorher )" },
 { "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
@@ -1194,57 +1194,57 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
         if ( ci )
             ci->setSelected( true );
     }
 }
 void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
     KListView::contentsMouseReleaseEvent(e);
 }
 void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
 {
     KListView::contentsMouseMoveEvent(e);
 }
 #endif
 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 );
     if (  e->button() == RightButton    ) {
         QListViewItem* ci =  currentItem();
         //clearSelection();
         if ( ci )
             ci->setSelected( true );
     }
 }
 void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
     mPopupTimer->stop();
     KListView::contentsMouseReleaseEvent(e);
 }
 void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
 {
     // qDebug("contentsMouseMoveEv....... ");
     //  qDebug("start: %d  current %d ",mYMousePos , mapToGlobal( (e->pos())).y()   );
     int diff = mYMousePos - mapToGlobal( (e->pos())).y();
     if ( diff < 0 ) diff = -diff;
     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
@@ -813,62 +813,59 @@ void KOPrefsDialog::setupViewsTab()
   
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
   QHBox* hdummy = new QHBox(topFrame);
   new QLabel(i18n("Days in What's Next:"),hdummy);
   mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
   
   topLayout->addWidget(hdummy,ii++,0);
 
   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);
    
 
  
 
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 dummy =
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index db60383..7a945e3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -193,33 +193,36 @@ void SearchDialog::updateList()
 
     }
 }
 void SearchDialog::searchTextChanged( const QString &_text )
 {
 #if 0
     enableButton( KDialogBase::User1, !_text.isEmpty() );
 #endif
 }
 
 void SearchDialog::doSearch()
 {
     QRegExp re;
 
     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"));
         return;
     }
     if (!re.isValid() ) {
         KMessageBox::sorry(this,
                            i18n("Invalid search expression,\ncannot perform "
                                 "the search.\nPlease enter a search expression\n"
                                 "using the wildcard characters\n '*' and '?'"
                                 "where needed."));
         return;
     }
 
     search(re);
 
@@ -234,34 +237,37 @@ void SearchDialog::doSearch()
         QString mess; 
         mess = mess.sprintf( i18n("%d item(s) found."), mMatchedEvents.count()+ mMatchedJournals.count() + mMatchedTodos.count() );
         setCaption( i18n("KO/Pi Find: ") + mess);
 
     }
     searchEdit->setFocus();
 }
 void SearchDialog::updateConfig()
 {
     listView->updateConfig();
 }
 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 {
         mMatchedEvents.clear();
         mMatchedTodos.clear();
         mMatchedJournals.clear();
     }
     listView->setStartDate( mStartDate->date() );
     listView->showEvents(mMatchedEvents);
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
 }
 
 void SearchDialog::search(const QRegExp &re)
 {
     QPtrList<Event> events = mCalendar->events( mStartDate->date(),
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index a19900f..e2325d2 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -42,32 +42,36 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
 {
   mCategories->header()->hide();
 
   QStringList::Iterator it;
   bool categoriesExist=false;
   for (it = mPrefs->mCustomCategories.begin();
        it != mPrefs->mCustomCategories.end(); ++it ) {
     new QListViewItem(mCategories,*it);
     categoriesExist=true;
   }
 
   connect(mCategories,SIGNAL(selectionChanged(QListViewItem *)),
           SLOT(editItem(QListViewItem *)));
   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 );
   else
       showMaximized();
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 CategoryEditDialog::~CategoryEditDialog()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 void CategoryEditDialog::slotTextChanged(const QString &text)
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 974752c..a4e0024 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -42,32 +42,36 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
   : CategorySelectDialog_base( parent, name, true, fl ),
     mPrefs( prefs )
 {
     mColorItem = 0;
     mColorEnabled = false;
     mCategories->header()->hide();
 
     setCategories();
  
     connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog()));
     if ( QApplication::desktop()->width() > 460 )
         resize( 300, 360 );
     else
         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()
 {
     KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this );
     
     ced->exec(); 
     delete ced;
     slotApply();
     QStringList temp = mCategoryList;
     setCategories();
     setSelected( temp );
 }
 void CategorySelectDialog::setCategories()
 {
   mColorItem = 0;
   mCategories->clear();