KDE

SVN commit 753841 by jpetso:

Icon naming spec compliance (code changes - KDE/):
* actions/user -> places/user-identity
* places/contact -> mimetypes/x-office-contact
* fix KMail and KNode configuration dialog page icons
* and bits of other fix-up stuff.


 M  +1 -1      kdebase/apps/dolphin/src/dolphincategorydrawer.cpp  
 M  +3 -3      kdebase/workspace/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp  
 M  +1 -1      kdebase/workspace/krunner/interface.cpp  
 M  +1 -1      kdegraphics/okular/ui/annotationproxymodels.cpp  
 M  +2 -2      kdegraphics/okular/ui/side_reviews.cpp  
 M  +1 -1      kdenetwork/kopete/kopete/config/accounts/kopete_accountconfig.desktop  
 M  +1 -1      kdenetwork/kopete/kopete/identity/identitystatuswidget.cpp  
 M  +1 -1      kdenetwork/kopete/libkopete/kopeteidentity.cpp  
 M  +1 -1      kdenetwork/kopete/plugins/contactnotes/kopete_contactnotes.desktop  
 M  +2 -2      kdenetwork/kopete/protocols/telepathy/telepathyaccount.cpp  
 M  +1 -1      kdenetwork/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp  
 M  +2 -2      kdenetwork/kopete/protocols/yahoo/yahoocontact.cpp  
 M  +1 -1      kdepim/kmail/kmail_config_accounts.desktop  
 M  +1 -1      kdepim/kmail/kmail_config_appearance.desktop  
 M  +1 -1      kdepim/kmail/kmail_config_composer.desktop  
 M  +1 -1      kdepim/kmail/kmail_config_identity.desktop  
 M  +1 -1      kdepim/kmail/kmail_config_security.desktop  
 M  +1 -1      kdepim/kmobiletools/kmobiletools/libkmobiletools/devicemenu.cpp  
 M  +3 -3      kdepim/kmobiletools/kmobiletools/mainpart/addressdetails.cpp  
 M  +1 -1      kdepim/kmobiletools/kmobiletools/mainpart/popupaddressee.cpp  
 M  +4 -4      kdepim/kmobiletools/kmobiletools/mainpart/services/addressbook/addressbook.cpp  
 M  +1 -1      kdepim/knode/knode_config_accounts.desktop  
 M  +1 -1      kdepim/knode/knode_config_appearance.desktop  
 M  +1 -1      kdepim/knode/knode_config_cleanup.desktop  
 M  +1 -1      kdepim/knode/knode_config_identity.desktop  
 M  +1 -1      kdepim/knode/knode_config_privacy.desktop  
 M  +1 -1      kdepim/kresources/scalix/scalixadmin/mainwindow.cpp  


--- trunk/KDE/kdebase/apps/dolphin/src/dolphincategorydrawer.cpp #753840:753841
@@ -177,7 +177,7 @@
             }
             else
             {
-                icon = KIconLoader::global()->loadIcon("user", KIconLoader::NoGroup, option.fontMetrics.height());
+                icon = KIconLoader::global()->loadIcon("user-identity", KIconLoader::NoGroup, option.fontMetrics.height());
             }
 
             opt.rect.setTop(opt.rect.top() - icon.height());
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp #753840:753841
@@ -82,10 +82,10 @@
     itsMenuButton->setToolTip(i18n("Set Criteria"));
 
     itsMenu=new QMenu(this);
-    itsPixmaps[CRIT_FAMILY]=SmallIcon("text");
+    itsPixmaps[CRIT_FAMILY]=SmallIcon("draw-text");
     itsPixmaps[CRIT_STYLE]=SmallIcon("format-text-bold");
-    itsPixmaps[CRIT_FOUNDRY]=SmallIcon("user");
-    itsPixmaps[CRIT_FONTCONFIG]=SmallIcon("edit-find");
+    itsPixmaps[CRIT_FOUNDRY]=SmallIcon("x-office-contact");
+    itsPixmaps[CRIT_FONTCONFIG]=SmallIcon("system-search");
     itsPixmaps[CRIT_FILENAME]=SmallIcon("application-x-font-type1");
     itsPixmaps[CRIT_LOCATION]=SmallIcon("folder");
     itsPixmaps[CRIT_WS]=SmallIcon("draw-freehand");
--- trunk/KDE/kdebase/workspace/krunner/interface.cpp #753840:753841
@@ -418,7 +418,7 @@
 
     display();
     m_header->setText(i18n("Switch users"));
-    m_header->setPixmap("user");
+    m_header->setPixmap("system-switch-user");
     m_defaultMatch = 0;
     m_context.setSearchTerm("SESSIONS");
     sessionrunner->match(&m_context);
--- trunk/KDE/kdegraphics/okular/ui/annotationproxymodels.cpp #753840:753841
@@ -438,7 +438,7 @@
         if ( role == Qt::DisplayRole )
             return item->author();
         else if ( role == Qt::DecorationRole )
-            return KIcon( item->author().isEmpty() ? "precense_away" : "user" );
+            return KIcon( item->author().isEmpty() ? "user-away" : "user-identity" );
         else
             return QVariant();
     } else {
--- trunk/KDE/kdegraphics/okular/ui/side_reviews.cpp #753840:753841
@@ -119,12 +119,12 @@
     toolBar->setIconSize( QSize( 16, 16 ) );
     toolBar->setMovable( false );
     // - add Page button
-    QAction * groupByPageAction = toolBar->addAction( KIcon( "text-plain" ), i18n( "Group by Page" ) );
+    QAction * groupByPageAction = toolBar->addAction( KIcon( "text-x-generic" ), i18n( "Group by Page" ) );
     groupByPageAction->setCheckable( true );
     connect( groupByPageAction, SIGNAL( toggled( bool ) ), this, SLOT( slotPageEnabled( bool ) ) );
     groupByPageAction->setChecked( Okular::Settings::groupByPage() );
     // - add Author button
-    QAction * groupByAuthorAction = toolBar->addAction( KIcon( "user" ), i18n( "Group by Author" ) );
+    QAction * groupByAuthorAction = toolBar->addAction( KIcon( "user-identity" ), i18n( "Group by Author" ) );
     groupByAuthorAction->setCheckable( true );
     connect( groupByAuthorAction, SIGNAL( toggled( bool ) ), this, SLOT( slotAuthorEnabled( bool ) ) );
     groupByAuthorAction->setChecked( Okular::Settings::groupByAuthor() );
--- trunk/KDE/kdenetwork/kopete/kopete/config/accounts/kopete_accountconfig.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=user
+Icon=network-workgroup
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdenetwork/kopete/kopete/identity/identitystatuswidget.cpp #753840:753841
@@ -169,7 +169,7 @@
  d->photoPath = d->identity->property(props->photo()).value().toString();
  d->ui.photo->setIcon( QIcon( d->photoPath ) );
  } else {
- d->ui.photo->setIcon( KIcon( "user" ) );
+ d->ui.photo->setIcon( KIcon( "user-identity" ) );
     }
 
  d->ui.identityName->setText(d->identity->label());
--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteidentity.cpp #753840:753841
@@ -165,7 +165,7 @@
  if (hasProperty( Kopete::Global::Properties::self()->photo().key() ))
  return property(Kopete::Global::Properties::self()->photo()).value().toString();
  else
- return "user";
+ return "user-identity";
 }
 
 
--- trunk/KDE/kdenetwork/kopete/plugins/contactnotes/kopete_contactnotes.desktop #753840:753841
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-Kopete-Version=1000900
-Icon=contact
+Icon=x-office-contact
 X-KDE-ServiceTypes=Kopete/Plugin
 X-KDE-Library=kopete_contactnotes
 X-KDE-PluginInfo-Author=Olivier Goffart
--- trunk/KDE/kdenetwork/kopete/protocols/telepathy/telepathyaccount.cpp #753840:753841
@@ -93,11 +93,11 @@
  KActionMenu *actionMenu = Kopete::Account::actionMenu();
 
  // FIXME: Maybe we should cache the action.
- KAction *changeAliasAction = new KAction( KIcon("userconfig"), i18n("&Change Alias..."), 0 );
+ KAction *changeAliasAction = new KAction( KIcon("edit-rename"), i18n("&Change Alias..."), 0 );
  changeAliasAction->setEnabled( isConnected() );
  QObject::connect(changeAliasAction, SIGNAL(triggered(bool)), this, SLOT(slotSetAlias()));
 
- KAction *changeAvatarAction = new KAction( KIcon("user"), i18n("Change &Avatar..."), 0 );
+ KAction *changeAvatarAction = new KAction( KIcon("user-properties"), i18n("Change &Avatar..."), 0 );
  changeAvatarAction->setEnabled( isConnected() );
  QObject::connect(changeAvatarAction, SIGNAL(triggered(bool)), this, SLOT(slotChangeAvatar()));
 
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp #753840:753841
@@ -49,7 +49,7 @@
 
  m_yahooRoom = yahooRoom;
 
- m_actionInvite = new KAction( KIcon("contact"), i18n( "&Invite others" ), this ); // icon should probably be "contact-invite", but let's leave it at "contact" for easier greppability
+ m_actionInvite = new KAction( KIcon("x-office-contact"), i18n( "&Invite others" ), this ); // icon should probably be "contact-invite", but that doesn't exist... please request an icon on http://techbase.kde.org/index.php?title=Projects/Oxygen/Missing_Icons
         actionCollection()->addAction( "yahooInvite", m_actionInvite );
  connect ( m_actionInvite, SIGNAL( triggered ( bool ) ), this, SLOT( slotInviteOthers() ) );
 
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/yahoocontact.cpp #753840:753841
@@ -425,7 +425,7 @@
 
  if ( !m_inviteConferenceAction )
  {
- m_inviteConferenceAction = new KAction( KIcon("contact"), i18n( "&Invite to Conference" ), this ); // icon should probably be "contact-invite", but let's leave it at "contact" for easier greppability
+ m_inviteConferenceAction = new KAction( KIcon("x-office-contact"), i18n( "&Invite to Conference" ), this ); // icon should probably be "contact-invite", but that doesn't exist... please request an icon on http://techbase.kde.org/index.php?title=Projects/Oxygen/Missing_Icons
  connect( m_inviteConferenceAction, SIGNAL( triggered(bool) ), this, SLOT( inviteConference() ) );
  }
  if ( isReachable() )
@@ -437,7 +437,7 @@
 
  if ( !m_profileAction )
  {
- m_profileAction = new KAction( KIcon("help-about"), i18n( "&View Yahoo Profile" ), this );
+ m_profileAction = new KAction( KIcon("document-preview"), i18n( "&View Yahoo Profile" ), this );
  connect( m_profileAction, SIGNAL( triggered(bool) ), this, SLOT( slotUserProfile() ) );
  }
  m_profileAction->setEnabled( true );
--- trunk/KDE/kdepim/kmail/kmail_config_accounts.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=network
+Icon=network-workgroup
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/kmail/kmail_config_appearance.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=preferences-desktop-default-applications
+Icon=preferences-desktop-theme
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/kmail/kmail_config_composer.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=edit
+Icon=accessories-text-editor
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/kmail/kmail_config_identity.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=contact
+Icon=user-identity
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/kmail/kmail_config_security.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=encrypted
+Icon=security-high
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/devicemenu.cpp #753840:753841
@@ -47,7 +47,7 @@
     else
     {
         addSeparator();
-        addAction( KIcon( "user-contact" ),  i18n("Phonebook"), this, SLOT(slotGoPhonebook()) );
+        addAction( KIcon( "x-office-contact" ),  i18n("Phonebook"), this, SLOT(slotGoPhonebook()) );
         addAction( KIcon( "mail-receive" ),  i18n("SMS"), this, SLOT(slotGoSMS()) );
     }
     addAction( KIcon( "configure" ), i18n("Configure"), this, SLOT(slotConfigureDevice()) );
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/addressdetails.cpp #753840:753841
@@ -69,12 +69,12 @@
     if(addressee.isEmpty()) return;
     ro=readOnly;
     QString htmlData; // ="<img src=\"%1\" align=\"middle\"> <b><i>%2</b>";
-//     htmlData=htmlData.arg( KIconLoader::global()->iconPath("contact", KIcon::Desktop, false) ).arg( addressee.formattedName() );
+//     htmlData=htmlData.arg( KIconLoader::global()->iconPath("x-office-contact", KIcon::Desktop, false) ).arg( addressee.formattedName() );
     /*="<div style=\"border-bottom-style : hidden; border-bottom-width : 10; border-left-style : hidden;\
         border-left-width : 5; border-right-style : hidden; border-right-width : 5; border-spacing : 5; border-top-style :\
         hidden; border-top-width : 10;background-color: %1; color: %2\">\
     <img src=\"%3\" align=\"middle\"> <b><i>%4</b></i></div>\n\n";*/
-    QString renderData=getTemplate().arg( KIconLoader::global()->iconPath("contact", -KIconLoader::SizeHuge, false) )
+    QString renderData=getTemplate().arg( KIconLoader::global()->iconPath("x-office-contact", -KIconLoader::SizeHuge, false) )
             .arg( addressee.formattedName() );
     if(readOnly) renderData=renderData.arg(QString() ).arg(QString() );
     else renderData=renderData
@@ -84,7 +84,7 @@
     htmlData = htmlData
                 .arg( KGlobalSettings::activeTitleColor().name() )
                 .arg( KGlobalSettings::activeTextColor().name() )
-                .arg( KIconLoader::global()->iconPath("contact", KIconLoader::Desktop, false) ).arg( addressee.formattedName() );
+                .arg( KIconLoader::global()->iconPath("x-office-contact", KIconLoader::Desktop, false) ).arg( addressee.formattedName() );
     */
     KABC::PhoneNumber::List numberList = addressee.phoneNumbers();
     for ( KABC::PhoneNumber::List::Iterator it = numberList.begin(); it != numberList.end(); it++ )
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/popupaddressee.cpp #753840:753841
@@ -28,7 +28,7 @@
 {
     setObjectName(deviceName);
     if(addressee.isEmpty()) return;
-    addTitle( KIcon( "contact" ), addressee.formattedName() );
+    addTitle( KIcon( "x-office-contact" ), addressee.formattedName() );
     if(!ro) {
         addAction( KIcon("document-properties"), i18n("Edit"), this, SLOT(slotEdit()));
         addAction( KIcon("edit-delete"), i18n("Delete"), this, SLOT(slotDelete()));
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/services/addressbook/addressbook.cpp #753840:753841
@@ -66,7 +66,7 @@
 }
 
 KIcon Addressbook::icon() const {
-    return KIcon( "office-address-book" );
+    return KIcon( "x-office-address-book" );
 }
 
 QWidget* Addressbook::widget() const {
@@ -175,7 +175,7 @@
 
         // prepare the header (ugly table style)
         html += "<table border=\"0\"><tr><td><img src=\"";
-        html += KIconLoader::global()->iconPath( "user", -KIconLoader::SizeMedium, false );
+        html += KIconLoader::global()->iconPath( "x-office-contact", -KIconLoader::SizeMedium, false );
         html += "\"></td><td valign=\"middle\"><h2>";
         html += addressee.name();
         html += "</h2></td></tr></table>";
@@ -229,7 +229,7 @@
 void Addressbook::addEntry( const KMobileTools::AddressbookEntry& entry ) {
     AddressbookEntryItem* item = new AddressbookEntryItem( m_addresseeList );
     item->setText( entry.name() );
-    item->setIcon( KIcon( "user-contact" ) );
+    item->setIcon( KIcon( "x-office-contact" ) );
     item->setAddressee( entry );
 }
 
@@ -251,7 +251,7 @@
 void Addressbook::requestEntryAddition( const KMobileTools::AddressbookEntry& entry ) {
     AddressbookEntryItem* item = new AddressbookEntryItem( m_addresseeList );
     item->setText( entry.name() );
-    item->setIcon( KIcon( "user-contact" ) );
+    item->setIcon( KIcon( "x-office-contact" ) );
     item->setAddressee( entry );
     item->setState( AddressbookEntryItem::AdditionRequested );
 
--- trunk/KDE/kdepim/knode/knode_config_accounts.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=network
+Icon=network-workgroup
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/knode/knode_config_appearance.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=preferences-desktop-default-applications
+Icon=preferences-desktop-theme
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/knode/knode_config_cleanup.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=wizard
+Icon=plasmagik
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/knode/knode_config_identity.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=contact
+Icon=user-identity
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/knode/knode_config_privacy.desktop #753840:753841
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=password
+Icon=signature
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
--- trunk/KDE/kdepim/kresources/scalix/scalixadmin/mainwindow.cpp #753840:753841
@@ -42,7 +42,7 @@
 
   item = new KPageWidgetItem( new DelegatePage( wdg ), i18n( "Delegates" ) );
   item->setHeader( i18n( "Setup delegates for my account" ) );
-  item->setIcon( KIcon( "contact" ) );
+  item->setIcon( KIcon( "user-identity" ) );
   wdg->addPage( item );
 
   item = new KPageWidgetItem( new OutOfOfficePage( wdg ), i18n( "Out of Office..." ) );
_______________________________________________
kmobiletools mailing list
kmobiletools@...
https://mail.kde.org/mailman/listinfo/kmobiletools