14 files changed, 48 insertions, 16 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 657d1de..7438f9d 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,10 +1,18 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.0.15 ************
+
+PwM/Pi:
+Added keyboard shorcuts for 
+- toggling summary view (space bar)
+- delete item (delete + backspace key)
+- add new item ( i + n key)
+
 ********** VERSION 2.0.14 ************
 
 Made Passwordmanager PwM/Pi more userfriendly:
 Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
 Fixed bug in KO/Pi todo printing.
 Made Qtopia calendar import possible on desktop .
 
 ********** VERSION 2.0.13 ************
diff --git a/bin/kdepim/kaddressbook/icons16/z_menu.png b/bin/kdepim/kaddressbook/icons16/z_menu.png
new file mode 100644
index 0000000..b32c8e5
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons16/z_menu.png
diff --git a/bin/kdepim/kaddressbook/icons22/z_menu.png b/bin/kdepim/kaddressbook/icons22/z_menu.png
new file mode 100644
index 0000000..b1866a2
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/z_menu.png
diff --git a/bin/kdepim/korganizer/icons16/z_menu.png b/bin/kdepim/korganizer/icons16/z_menu.png
new file mode 100644
index 0000000..b32c8e5
--- a/dev/null
+++ b/bin/kdepim/korganizer/icons16/z_menu.png
diff --git a/bin/kdepim/korganizer/iconsmini/z_menu.png b/bin/kdepim/korganizer/iconsmini/z_menu.png
new file mode 100644
index 0000000..584791a
--- a/dev/null
+++ b/bin/kdepim/korganizer/iconsmini/z_menu.png
diff --git a/bin/kdepim/korganizer/z_menu.png b/bin/kdepim/korganizer/z_menu.png
new file mode 100644
index 0000000..b1866a2
--- a/dev/null
+++ b/bin/kdepim/korganizer/z_menu.png
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1b17665..79f897b 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2123,17 +2123,17 @@ void KABCore::addActionsManually()
       mb->insertItem( i18n("&Help"), helpMenu );
       mIncSearchWidget = new IncSearchWidget( tb );
       // tb->insertWidget(-1, 0, mIncSearchWidget);
 #ifndef DESKTOP_VERSION
   } else  {
       //US setup toolbar
       QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
       QPopupMenu *popupBarTB = new QPopupMenu( this );
-      menuBarTB->insertItem( "ME", popupBarTB);
+      menuBarTB->insertItem( SmallIcon( "z_menu" ) , popupBarTB);
       tb->insertWidget(-1, 0, menuBarTB);
       mIncSearchWidget = new IncSearchWidget( tb );
 
       tb->enableMoving(false);
       popupBarTB->insertItem( i18n("&File"), fileMenu );
       popupBarTB->insertItem( i18n("&Edit"), editMenu );
       popupBarTB->insertItem( i18n("&View"), viewMenu );
       popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 70f00c6..6559119 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -359,18 +359,21 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
    if ( setColor ) {
       QStringList categories = mTodo->categories();
       QString cat = categories.first();
       if ( !cat.isEmpty()) {
           colorToSet = *(KOPrefs::instance()->categoryColor(cat) );
       } else
           setColor = false;  
    }
-
-   int odue = mTodo->hasDueSubTodo( !isOpen());
+   bool openMode = !isOpen();
+   // maybe we are in flat-display-mode
+   if ( !firstChild() )
+       openMode = false;
+   int odue = mTodo->hasDueSubTodo( openMode );
    if (odue == 2) {
        colorToSet = KOPrefs::instance()->mTodoOverdueColor;
        setColor = true;
    } else if ( odue == 1 ) {
        colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
        setColor = true;
    }
  
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 006a8dd..019f41f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -514,16 +514,29 @@ void MainWindow::initActions()
     QPopupMenu *actionMenu = new QPopupMenu( this );
     QPopupMenu *importMenu = new QPopupMenu( this );
     selectFilterMenu = new QPopupMenu( this );
     selectFilterMenu->setCheckable( true );
     syncMenu = new QPopupMenu( this );
     configureAgendaMenu = new QPopupMenu( this );
     configureToolBarMenu = new QPopupMenu( this );
     QPopupMenu *helpMenu = new QPopupMenu( this );
+
+    QIconSet icon;
+    int pixWid = 22, pixHei = 22;
+    QString pathString = "";
+    if ( !p->mToolBarMiniIcons ) {
+        if ( QApplication::desktop()->width() < 480 ) {
+            pathString += "icons16/";
+            pixWid = 18; pixHei = 16;
+        }
+    } else {
+        pathString += "iconsmini/";
+        pixWid = 18; pixHei = 16;
+    }
     if ( KOPrefs::instance()->mShowFullMenu ) {
         QMenuBar *menuBar1;
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
         menuBar1->insertItem( i18n("Actions"), actionMenu );
 #ifdef DESKTOP_VERSION
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
@@ -534,42 +547,32 @@ void MainWindow::initActions()
 #endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         QPEMenuBar *menuBar1;
         menuBar1 = new QPEMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
-        menuBar1->insertItem( i18n("ME"), menuBar);
+        icon = loadPixmap( pathString + "z_menu" );
+        menuBar1->insertItem( icon.pixmap(), menuBar);
+        //menuBar1->insertItem( i18n("ME"), menuBar);
         menuBar->insertItem( i18n("File"), importMenu );
         menuBar->insertItem( i18n("View"), viewMenu );
         menuBar->insertItem( i18n("Actions"), actionMenu );
         menuBar->insertItem( i18n("Synchronize"), syncMenu );
         menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
         menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar->insertItem( i18n("Help"), helpMenu );
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
-    QIconSet icon;
-    int pixWid = 22, pixHei = 22;
-    QString pathString = "";
-    if ( !p->mToolBarMiniIcons ) {
-        if ( QApplication::desktop()->width() < 480 ) {
-            pathString += "icons16/";
-            pixWid = 18; pixHei = 16;
-        }
-    } else {
-        pathString += "iconsmini/";
-        pixWid = 18; pixHei = 16;
-    }
     mWeekBgColor = iconToolBar->backgroundColor();
     mWeekPixmap.resize( pixWid , pixHei );
     mWeekPixmap.fill( mWeekBgColor );
     icon = mWeekPixmap;
     mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
     if ( p-> mShowIconWeekNum )
         mWeekAction->addTo( iconToolBar );
     mWeekFont = font();
diff --git a/pwmanager/pwmanager/listviewpwm.cpp b/pwmanager/pwmanager/listviewpwm.cpp
index 8d46fff..0df9431 100644
--- a/pwmanager/pwmanager/listviewpwm.cpp
+++ b/pwmanager/pwmanager/listviewpwm.cpp
@@ -42,16 +42,24 @@ bool ListViewPwM::event(QEvent *e)
         if (e->type() == QEvent::LayoutHint)
                 emit layoutChanged();
         if (e->type() == QEvent::KeyPress) {
         QKeyEvent* ke = (QKeyEvent*) e;
         if ( ke->key() == Qt::Key_Space) {
             emit toggleOverview();
             return true;
         }
+        if ( ke->key() == Qt::Key_I || ke->key() == Qt::Key_N || ke->key() == Qt::Key_Insert) {
+            emit insertPW();
+            return true;
+        }
+        if ( ke->key() == Qt::Key_Delete || ke->key() == Qt::Key_Backspace) {
+            emit deletePW();
+            return true;
+        }
 
     }
         return KListView::event(e);
 }
 
 
 QPixmap * ListViewItemPwM::onPix = 0;
 QPixmap * ListViewItemPwM::offPix = 0;
diff --git a/pwmanager/pwmanager/listviewpwm.h b/pwmanager/pwmanager/listviewpwm.h
index 840ee73..51008b8 100644
--- a/pwmanager/pwmanager/listviewpwm.h
+++ b/pwmanager/pwmanager/listviewpwm.h
@@ -29,16 +29,18 @@ class ListViewPwM : public KListView
 {
         Q_OBJECT
 public:
         ListViewPwM(QWidget *parent = 0, const char *name = 0);
 
 signals:
         void layoutChanged();
     void toggleOverview();
+    void insertPW();
+    void deletePW(   );
 
 protected:
         virtual bool event(QEvent *e);
 };
 
 class ListViewItemPwM : public QCheckListItem
 {
 public:
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index 0092692..2533487 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -61,16 +61,18 @@ PwMView::PwMView(PwM *_mainClass,
         doc->setListViewPointer(this);
         mainClass = _mainClass;
         resize(_mainClass->size());
         initStyle(conf()->confWndMainViewStyle());
         initCtxMenu();
         doc->setCurrentView(this);
         connect(doc, SIGNAL(dataChanged(PwMDoc *)), this, SLOT(updateView()));
         connect(this, SIGNAL(editPW()), mainClass, SLOT(editPwd_slot()));
+        connect(this, SIGNAL(insertPW()), mainClass, SLOT(addPwd_slot()));
+        connect(this, SIGNAL(deletePW()), mainClass, SLOT(deletePwd_slot()));
 }
 
 PwMView::~PwMView()
 {
 }
 
 void PwMView::initCtxMenu()
 {
diff --git a/pwmanager/pwmanager/pwmviewstyle.cpp b/pwmanager/pwmanager/pwmviewstyle.cpp
index 5f25880..ee35472 100644
--- a/pwmanager/pwmanager/pwmviewstyle.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle.cpp
@@ -98,16 +98,20 @@ void PwMViewStyle::initStyle(style_t style)
         connect(lv, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, int)),
                 v, SLOT(handleRightClick(QListViewItem *, const QPoint &, int)));
         connect(lv, SIGNAL(clicked(QListViewItem *)),
                 v, SLOT(refreshCommentTextEdit(QListViewItem *)));
         connect(lv, SIGNAL(returnPressed(QListViewItem *)),
                 this, SLOT(editPassWord(QListViewItem *)));
         connect(lv, SIGNAL(doubleClicked(QListViewItem *)),
                 this, SLOT(editPassWord(QListViewItem *)));
+        connect(lv, SIGNAL(insertPW()),
+                this, SIGNAL( insertPW() ));
+        connect(lv, SIGNAL(deletePW()),
+                this, SIGNAL( deletePW() ));
 
         lv->addColumn(i18n("Description"), 180);
         lv->addColumn(i18n("Username"), 150);
         lv->addColumn(i18n("Password"), 150);
         lv->addColumn(i18n("URL"), 180);
         lv->addColumn(i18n("Launcher"), 120);
         v->tmpReEnableSort();
 
diff --git a/pwmanager/pwmanager/pwmviewstyle.h b/pwmanager/pwmanager/pwmviewstyle.h
index 5656cbc..6c2d81c 100644
--- a/pwmanager/pwmanager/pwmviewstyle.h
+++ b/pwmanager/pwmanager/pwmviewstyle.h
@@ -103,11 +103,13 @@ private:
           */
         style_t curStyle;
 
         PwMViewStyle_0 *s0;
         PwMViewStyle_1 *s1;
         PwMView *v;
  signals:
     void editPW();
+    void insertPW();
+    void deletePW();
 
 };
 #endif