From eae0ddd71371d2e56b39891d05ca3a385c33727b Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 07 Mar 2005 16:50:01 +0000 Subject: icons added --- 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,5 +1,13 @@ 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: 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 Binary files differ 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 Binary files differ 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 Binary files differ 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 Binary files differ 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 Binary files differ diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1b17665..79f897b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2128,7 +2128,7 @@ void KABCore::addActionsManually() //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 ); diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 70f00c6..6559119 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -364,8 +364,11 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i } 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; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 006a8dd..019f41f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -519,6 +519,19 @@ void MainWindow::initActions() 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(); @@ -539,7 +552,9 @@ void MainWindow::initActions() 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 ); @@ -553,18 +568,6 @@ void MainWindow::initActions() } 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 ); 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 @@ -47,6 +47,14 @@ bool ListViewPwM::event(QEvent *e) 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); 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 @@ -34,6 +34,8 @@ public: signals: void layoutChanged(); void toggleOverview(); + void insertPW(); + void deletePW( ); protected: virtual bool event(QEvent *e); 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 @@ -66,6 +66,8 @@ PwMView::PwMView(PwM *_mainClass, 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() 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 @@ -103,6 +103,10 @@ void PwMViewStyle::initStyle(style_t style) 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); 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 @@ -108,6 +108,8 @@ private: PwMView *v; signals: void editPW(); + void insertPW(); + void deletePW(); }; #endif -- cgit v0.9.0.2