5 files changed, 63 insertions, 28 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 1a045f3..f8f8b96 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1021,13 +1021,13 @@
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
-{ "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datumsnavigator</p>\n" },
+{ "<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X+ctrl</b>: Zeige/verstecke Datumsnavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monatsansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochenansicht | <b>U</b>: Wochenansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
-{ "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: Nächste-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
+{ "<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" },
@@ -1326,6 +1326,18 @@
 { "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" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
\ No newline at end of file
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index abb3b3b..041effc 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -184,47 +184,43 @@ QString PhoneNumber::typeLabel( int type )
    
   if (!typeString.isEmpty())
     typeString += " ";
-      
   if ((type & Cell) == Cell)
-    typeString += i18n("Mobile");
-  else if ((type & Fax) == Fax)
+    typeString += i18n("Mobile") +" ";
+  if ((type & Sip) == Sip)
+    typeString += i18n("SIP")+" ";
+  if ((type & Car) == Car)
+    typeString += i18n("Car")+" ";
+
+  if ((type & Fax) == Fax)
     typeString += i18n("Fax");
   else if ((type & Msg) == Msg)
     typeString += i18n("Messenger");
-  else if ((type & Voice) == Voice) {
-// add nothing in case of the Voice flag
-//    typeString += i18n("Voice");
-  }
   else if ((type & Video) == Video)
     typeString += i18n("Video");
   else if ((type & Bbs) == Bbs)
     typeString += i18n("Mailbox");
   else if ((type & Modem) == Modem)
     typeString += i18n("Modem");
-  else if ((type & Car) == Car)
-    typeString += i18n("Car");
   else if ((type & Isdn) == Isdn)
     typeString += i18n("ISDN");
   else if ((type & Pcs) == Pcs)
     typeString += i18n("PCS");
   else if ((type & Pager) == Pager)
     typeString += i18n("Pager");
-  else if ((type & Sip) == Sip)
-    typeString += i18n("SIP");
-    
   // add the prefered flag    
-  if (!typeString.isEmpty())
-    typeString += " ";
   /*
   if ((type & Pref) == Pref)
     typeString += i18n("(p)");
   */
   //if we still have no match, return "other"        
-  if (typeString.isEmpty())
+  if (typeString.isEmpty()) {
+      if ((type & Voice) == Voice)
+          return i18n("Voice");
+      else
     return i18n("Other");
+  }
     
-    
-  return typeString;
+  return typeString.stripWhiteSpace();
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const PhoneNumber &phone )
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 0e01b02..e72face 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -189,6 +189,7 @@ qDebug("EmailEditDialog::EmailEditDialog has to be changed (lowPrio)");
   mEmailListBox->insertStringList( items );
   // set default state
   selectionChanged( -1 );
+  mEmailEdit->setFocus(); 
 
 #ifndef KAB_EMBEDDED
   KAcceleratorManager::manage( this );
@@ -225,6 +226,7 @@ void EmailEditDialog::add()
 void EmailEditDialog::edit()
 {
   mEmailEdit->setText( mEmailListBox->currentText() );
+  mEmailListBox->removeItem( mEmailListBox->currentItem() );
   mEmailEdit->setFocus();
 }
 
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 19bb676..a435959 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -213,7 +213,8 @@ void PhoneEditWidget::edit()
 
   if ( dlg.exec() ) {
     if ( dlg.changed() ) {
-      mPhoneList = dlg.phoneNumbers();
+      KABC::PhoneNumber::List list = dlg.phoneNumbers();
+      setPhoneNumbers( list );
       updateCombos();
       updateLineEdits();
       emit modified();
@@ -339,6 +340,9 @@ private:
 PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number )
   : QListViewItem( parent ), mPhoneNumber( number )
 {
+#ifdef DESKTOP_VERSION
+    setRenameEnabled ( 0, true );
+#endif
   makeText();
 }
 
@@ -406,10 +410,27 @@ void PhoneEditDialog::slotAddPhoneNumber()
   PhoneTypeDialog dlg( tmp, this );
 
   if ( dlg.exec() ) {
+      QListViewItem* i = mListView->firstChild();
     KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
+      bool insert = true;
+      while ( i ) {
+          PhoneViewItem* p = ( PhoneViewItem* ) i;
+          KABC::PhoneNumber pn = p->phoneNumber();
+          if ( (pn.type() | KABC::PhoneNumber::Pref)  == (phoneNumber.type() | KABC::PhoneNumber::Pref)  ) {
+              if ( p->text(0).isEmpty()) {
+                  p->setPhoneNumber( phoneNumber  );
+                  mPhoneNumberList.remove( pn );
+                  mPhoneNumberList.append( phoneNumber );
+                  insert = false;
+                  break;
+              }
+          }
+          i = i->nextSibling();
+      }
+      if ( insert ) {
     mPhoneNumberList.append( phoneNumber );
     new PhoneViewItem( mListView, phoneNumber );
-
+      }
     mChanged = true;
   }
 }
@@ -504,6 +525,8 @@ PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
   }
 
   mPreferredBox->setChecked( mPhoneNumber.type() & KABC::PhoneNumber::Pref );
+  mNumber->setFocus();
+  mNumber->setSelection( 0, 1024);
 }
 
 KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 09a0880..d98915b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1439,19 +1439,21 @@ void MainWindow::keyBindings()
     QString cap = i18n("KO/Pi Keys + Colors");
     QString text =  i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
         i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
+        i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") +
+        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>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>N</b>: Next days view| <b>W</b>: What's next view\n ")+
+        i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+
         i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
         i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
         i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
         i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+
         i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
         i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
-        i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
+        i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+
         i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
         i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
         i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+
@@ -1900,12 +1902,7 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
         mView->viewManager()->showListView();
         break;
     case Qt::Key_N:
-        if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->viewManager()->showNextView();
-        else {
-            mView->viewManager()->showNextXView();
-            showSelectedDates = true;
-        }
         break;
     case Qt::Key_V:
         mView->viewManager()->showTodoView();
@@ -1923,7 +1920,12 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
             mView->toggleFilter();
         break;
     case Qt::Key_X:
+        if ( e->state() == Qt::ControlButton )
         mView->toggleDateNavigatorWidget();
+        else {
+            mView->viewManager()->showNextXView();
+            showSelectedDates = true;
+        }
         break;
     case Qt::Key_Space:
         mView->toggleExpand();