[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground
From: Jakob Petsovits <jpetso () gmx ! at>
Date: 2007-12-26 22:51:27
Message-ID: 1198709487.129875.2069.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 753232 by jpetso:
Icon renaming (code changes - playground):
kaddressbook -> office-address-book
M +2 -2 base/kdeprint/kdeprintfax/kdeprintfax.cpp
M +1 -0 pim/khalkhi/control/kcmkhalkhi.desktop
M +7 -7 pim/khalkhiapplet/khalkhiapplet.cpp
M +1 -0 pim/khalkhiapplet/khalkhiapplet.desktop
M +8 -8 pim/kickpim/kickpimwidget.cpp
M +1 -1 pim/kmobile/kioslave/mimetypes/mobile_addressbook.desktop
M +1 -1 pim/kmobile/kioslave/mobile.protocol
M +4 -4 pim/mailody/src/messageview.cpp
--- trunk/playground/base/kdeprint/kdeprintfax/kdeprintfax.cpp #753231:753232
@@ -100,7 +100,7 @@
m_newbtn->setToolTip( i18n( "Add fax number" ) );
connect( m_newbtn, SIGNAL( clicked() ), SLOT( slotFaxAdd() ) );
m_abbtn = new KPushButton( mainw );
- m_abbtn->setIcon( SmallIcon( "kaddressbook" ) );
+ m_abbtn->setIcon( SmallIcon( "office-address-book" ) );
m_abbtn->setToolTip( i18n( "Add fax number from addressbook" ) );
connect( m_abbtn, SIGNAL( clicked() ), SLOT( slotKab() ) );
m_delbtn = new KPushButton( mainw );
@@ -235,7 +235,7 @@
action = actionCollection()->addAction("fax_ab");
action->setText( i18n("A&ddress Book") );
- action->setIcon( KIcon( "kaddressbook" ) );
+ action->setIcon( KIcon( "office-address-book" ) );
action->setShortcut( Qt::CTRL+Qt::Key_A );
connect( action, SIGNAL( triggered() ), this, SLOT(slotKab()) );
--- trunk/playground/pim/khalkhi/control/kcmkhalkhi.desktop #753231:753232
@@ -2,6 +2,7 @@
Encoding=UTF-8
Exec=kcmshell kcmkhalkhi
Icon=kaddressbook
+# KDE 4 icon name: office-address-book
Type=Application
Terminal=false
--- trunk/playground/pim/khalkhiapplet/khalkhiapplet.cpp #753231:753232
@@ -182,7 +182,7 @@
QPopupMenu Menu;
- Menu.insertItem( SmallIconSet("kaddressbook"), i18n("Address book"), 1 );
+ Menu.insertItem( SmallIconSet("kaddressbook"), i18n("Address book"), 1 ); // \
KDE 4 icon name: office-address-book Menu.insertSeparator();
if( Button )
{
@@ -191,14 +191,14 @@
if( Filler )
Menu.insertItem( SmallIcon("configure"), i18n("&Configure \"%1\" \
button...").arg(Button->titel()), 5 ); if( ButtonList.size() > 1 )
- Menu.insertItem( SmallIcon("remove"), i18n("Remove \"%1\" \
button").arg(Button->titel()), 6 ); + Menu.insertItem( \
SmallIcon("remove"), i18n("Remove \"%1\" button").arg(Button->titel()), 6 ); // KDE 4 \
icon name: list-remove if( CountBefore < Menu.count() )
Menu.insertSeparator();
}
QPopupMenu AddMenu;
- AddMenu.insertItem( SmallIcon("identity"), i18n("New Person \
Button..."), 2 );
- AddMenu.insertItem( SmallIcon("kuser"), i18n("New Category \
Button..."), 3 );
- AddMenu.insertItem( SmallIcon("kaddressbook"), i18n("New All Persons \
Button"), 4 ); + AddMenu.insertItem( SmallIcon("identity"), i18n("New \
Person Button..."), 2 ); // KDE 4 name: contact-new + AddMenu.insertItem( \
SmallIcon("kuser"), i18n("New Category Button..."), 3 ); // KDE 4 name: \
user-group-new + AddMenu.insertItem( SmallIcon("kaddressbook"), i18n("New \
All Persons Button"), 4 ); // KDE 4 name: address-book-new Menu.insertItem( \
i18n("Add"), &AddMenu ); Menu.insertSeparator();
Menu.insertItem( SmallIcon("configure"), i18n("&Configure People \
Applet..."), 7 ); @@ -506,7 +506,7 @@
DropServices->set( Filler->person(), Event );
DropServices->fillMenu( Menu, 0 );
Menu->insertSeparator();
- Menu->insertItem( SmallIcon("cancel"), i18n("&Cancel") );
+ Menu->insertItem( SmallIcon("cancel"), i18n("&Cancel") ); // KDE 4 name: \
dialog-cancel
Menu->exec( mapToGlobal(Event->pos()) );
delete Menu;
@@ -520,7 +520,7 @@
ListDropServices->set( Filler->personList(), Event );
ListDropServices->fillMenu( Menu, 0 );
Menu->insertSeparator();
- Menu->insertItem( SmallIcon("cancel"), i18n("&Cancel") );
+ Menu->insertItem( SmallIcon("cancel"), i18n("&Cancel") ); // KDE 4 \
name: dialog-cancel
Menu->exec( mapToGlobal(Event->pos()) );
delete Menu;
--- trunk/playground/pim/khalkhiapplet/khalkhiapplet.desktop #753231:753232
@@ -26,6 +26,7 @@
Comment[sv]=Snabbåtkomst av personer i adressboken
Comment[xx]=xx Quick access to the entries in your addressbookxx
Icon=kaddressbook
+# KDE 4 icon name: office-address-book
Type=plugin
X-KDE-Library=khalkhiapplet
--- trunk/playground/pim/kickpim/kickpimwidget.cpp #753231:753232
@@ -105,16 +105,16 @@
// misc popup
m_popupMisc = new KPopupMenu(this,"RightClickPopupMisc");
- m_popupMisc->insertItem ( SmallIcon("korganizer"), i18n("K&Organizer"), \
POPUP_ORGANIZER);
- m_popupMisc->insertItem ( SmallIcon("kaddressbook"), i18n("&KAddressBook"), \
POPUP_ADDR_BOOK);
- m_popupMisc->insertItem ( SmallIcon("edit_add"), i18n("Add &Contact"), \
POPUP_ADDR_ADD); + m_popupMisc->insertItem ( SmallIcon("korganizer"), \
i18n("K&Organizer"), POPUP_ORGANIZER); // KDE 4 icon name: office-calendar \
+ m_popupMisc->insertItem ( SmallIcon("kaddressbook"), i18n("&KAddressBook"), \
POPUP_ADDR_BOOK); // KDE 4 icon name: office-address-book + m_popupMisc->insertItem \
( SmallIcon("edit_add"), i18n("Add &Contact"), POPUP_ADDR_ADD); // KDE \
4 icon name: contact-new m_popupMisc->insertSeparator();
- m_popupMisc->insertItem ( SmallIcon("mail_get"), i18n("Check Mails &Now"), \
POPUP_MAIL_CHECK);
- m_popupMisc->insertItem ( SmallIcon("mail_find"), i18n("A&utocheck Mails"), \
POPUP_MAIL_TOGGLE); + m_popupMisc->insertItem ( SmallIcon("mail_get"), \
i18n("Check Mails &Now"), POPUP_MAIL_CHECK); // KDE 4 icon name: mail-receive + \
m_popupMisc->insertItem ( SmallIcon("mail_find"), i18n("A&utocheck Mails"), \
POPUP_MAIL_TOGGLE); // KDE 4 icon name: ??? "mail_find" is "edit-find-mail", but I \
think that's a bad fit. Maybe not have any icon at all? \
m_popupMisc->insertSeparator();
- m_popupMisc->insertItem ( SmallIcon("configure"), i18n("&Email Settings"), \
POPUP_MAIL_PREFS);
- m_popupMisc->insertItem ( SmallIcon("configure"), i18n("&Settings"), \
POPUP_MISC_PREFS );
- m_popupMisc->insertItem ( SmallIcon("configure_shortcuts"), i18n("Define \
&Keys..."), POPUP_MISC_KEYS ); + m_popupMisc->insertItem ( SmallIcon("configure"), \
i18n("&Email Settings"), POPUP_MAIL_PREFS); // KDE 4 icon name: configure \
(stays the same) + m_popupMisc->insertItem ( SmallIcon("configure"), \
i18n("&Settings"), POPUP_MISC_PREFS ); // KDE 4 icon name: configure \
(stays the same) + m_popupMisc->insertItem ( SmallIcon("configure_shortcuts"), \
i18n("Define &Keys..."), POPUP_MISC_KEYS ); // KDE 4 icon name: configure-shortcuts \
m_popupMisc->insertSeparator(); m_popupMisc->insertItem ( *m_icon, \
i18n("&About")+" KickPim", POPUP_MISC_ABOUT );
--- trunk/playground/pim/kmobile/kioslave/mimetypes/mobile_addressbook.desktop \
#753231:753232 @@ -18,7 +18,7 @@
Comment[pt_BR]=Contatos no Dispositivo Móvel
Comment[sv]=Kontakter i mobilenhet
Comment[xx]=xxContacts in Mobile Devicexx
-Icon=kaddressbook
+Icon=office-address-book
Type=MimeType
MimeType=inode/addressbook
Patterns=
--- trunk/playground/pim/kmobile/kioslave/mobile.protocol #753231:753232
@@ -15,4 +15,4 @@
# mimetype=text/plain
# determineMimetypeFromExtension=true
DocPath=kioslave/mobile.html
-Icon=kaddressbook
+Icon=office-address-book
--- trunk/playground/pim/mailody/src/messageview.cpp #753231:753232
@@ -446,9 +446,9 @@
QMenu* p = new QMenu(this);
QAction* newmsg = new QAction(i18n("New Message to..."), this);
- newmsg->setIcon(KIcon("email"));
+ newmsg->setIcon(KIcon("mail-message-new"));
QAction* add = new QAction(i18n("Add to KAddressBook..."), this);
- add->setIcon(KIcon("kaddressbook"));
+ add->setIcon(KIcon("contact-new"));
QAction* copy = new QAction(i18n("Copy"), this);
copy->setIcon(KIcon("edit-copy"));
@@ -737,11 +737,11 @@
QMenu* p = new QMenu(0);
QAction* add = new QAction(i18n("Add to KAddressBook..."), this);
- add->setIcon(KIcon("kaddressbook"));
+ add->setIcon(KIcon("contact-new"));
QAction* copy = new QAction(i18n("Copy"), this);
add->setIcon(KIcon("edit-copy"));
QAction* newmsg = new QAction(i18n("New Message to..."), this);
- newmsg->setIcon(KIcon("email"));
+ newmsg->setIcon(KIcon("mail-message-new"));
QAction* newurl = new QAction(i18n("Open"), this);
QAction* newtab = new QAction(i18n("Open in New Tab"), this);
QAction* zoomin = new QAction(i18n("Zoom In"), this);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic