Bring package_development, package_games, package_graphics, package_network, package_multimedia, package_wordprocessing, edu_science, package_utilities, input_devices_settings, kcmsystem, personal, and looknfeel icons into XDG compliance

akregator/src/addfeeddialog.cpp

@@ -42,7 +42,7 @@ namespace Akregator {
 AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
    : AddFeedWidgetBase(parent, name)
 {
-    pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true));
+    pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true));
     statusLabel->setText(TQString());
 }
 

akregator/src/configdialog.cpp

@@ -47,9 +47,9 @@ ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, TDEConfigSkeleton
     addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
     m_settingsAppearance = new SettingsAppearance(this, "Appearance");
     addPage(m_settingsAppearance, i18n("Appearance"), "fonts");
-    addPage(new SettingsBrowser(this, "Browser"), i18n("Browser"), "package_network");
+    addPage(new SettingsBrowser(this, "Browser"), i18n("Browser"), "applications-internet");
     m_settingsAdvanced = new SettingsAdvanced(this, "Advanced");
-    addPage(m_settingsAdvanced, i18n("Advanced"), "package_network");
+    addPage(m_settingsAdvanced, i18n("Advanced"), "applications-internet");
     m_settingsAdvanced->selectFactory(Settings::archiveBackend());
     m_config = config;
 }

certmanager/conf/kleopatra_config_appear.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=looknfeel
+Icon=preferences-desktop
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 X-DocPath=kleopatra/configuration-appearance.html

certmanager/conf/kleopatra_config_dnorder.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=looknfeel
+Icon=preferences-desktop
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 X-DocPath=kleopatra/configuration-dn-order.html

kaddressbook/addresseeeditorwidget.cpp

@@ -157,7 +157,7 @@ void AddresseeEditorWidget::setupTab1()
 
   // Person icon
   label = new TQLabel( tab1 );
-  label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop,
+  label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Desktop,
                                                       TDEIcon::SizeMedium ) );
   layout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
@@ -384,7 +384,7 @@ void AddresseeEditorWidget::setupTab2()
   // Personal info
 
   label = new TQLabel( tab2 );
-  label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop,
+  label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Desktop,
                                                      TDEIcon::SizeMedium ) );
   layout->addMultiCellWidget( label, 4, 5, 0, 0 );
 

kaddressbook/distributionlistentryview.cpp

@@ -105,7 +105,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
 
     TQPixmap pixmap;
     pixmap.convertFromImage( m_entry.addressee.photo().data() );
-    m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop ) : pixmap );
+    m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Desktop ) : pixmap );
     m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) );
     m_distListLabel->setURL( m_list.name() );
     m_distListLabel->setText( m_list.name() );

kaddressbook/geowidget.cpp

@@ -54,7 +54,7 @@ GeoWidget::GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *nam
   topLayout->setSpacing( KDialog::spacingHint() );
 
   label = new TQLabel( this );
-  label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "package_network",
+  label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "applications-internet",
                     TDEIcon::Desktop, TDEIcon::SizeMedium ) );
   label->setAlignment( TQt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );

kaddressbook/imagewidget.cpp

@@ -144,7 +144,7 @@ void ImageButton::startDrag()
 void ImageButton::updateGUI()
 {
   if ( mPicture.data().isNull() )
-    setPixmap( TDEGlobal::iconLoader()->iconPath( "personal", TDEIcon::Desktop ) );
+    setPixmap( TDEGlobal::iconLoader()->iconPath( "preferences-desktop-personal", TDEIcon::Desktop ) );
   else
     setPixmap( mPicture.data() );
 }

kaddressbook/kabcore.cpp

@@ -1410,7 +1410,7 @@ void KABCore::initActions()
                         this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
   action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) );
 
-  mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "personal", 0, this,
+  mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "preferences-desktop-personal", 0, this,
                                TQT_SLOT( setWhoAmI() ), actionCollection(),
                                "edit_set_personal" );
   mActionWhoAmI->setWhatsThis( i18n( "Set the personal contact<p>The data of this contact will be used in many other TDE applications, so you do not have to input your personal data several times." ) );

kaddressbook/views/configurecardviewdialog.cpp

@@ -52,7 +52,7 @@ ConfigureCardViewWidget::ConfigureCardViewWidget( TDEABC::AddressBook *ab, TQWid
   : ViewConfigureWidget( ab, parent, name )
 {
   TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
-                           DesktopIcon( "looknfeel" ) );
+                           DesktopIcon( "preferences-desktop" ) );
   mAdvancedPage = new CardViewLookNFeelPage( page );
 }
 

kaddressbook/views/configuretableviewdialog.cpp

@@ -46,7 +46,7 @@ ConfigureTableViewWidget::ConfigureTableViewWidget( TDEABC::AddressBook *ab,
   : ViewConfigureWidget( ab, parent, name )
 {
   TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
-                           TDEGlobal::iconLoader()->loadIcon( "looknfeel",
+                           TDEGlobal::iconLoader()->loadIcon( "preferences-desktop",
                            TDEIcon::Panel ) );
 
   mPage = new LookAndFeelPage( page );

karm/preferences.cpp

@@ -46,7 +46,7 @@ Preferences *Preferences::instance( const TQString &icsfile )
 
 void Preferences::makeBehaviorPage()
 {
-  TQPixmap icon = SmallIcon( "kcmsystem", TDEIcon::SizeMedium);
+  TQPixmap icon = SmallIcon( "preferences-system", TDEIcon::SizeMedium);
   TQFrame* behaviorPage = addPage( i18n("Behavior"), i18n("Behavior Settings"),
       icon );
 

kmail/kmail_config_appearance.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=looknfeel
+Icon=preferences-desktop
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 

kmail/recipientspicker.cpp

@@ -105,7 +105,7 @@ void RecipientItem::setAddressee( const TDEABC::Addressee &a,
   if ( !img.isNull() )
     mIcon = img.smoothScale( 20, 20, TQ_ScaleMin );
   else
-    mIcon = TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small );
+    mIcon = TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Small );
 
   mName = mAddressee.realName();
   mKey = mAddressee.realName() + '|' + mEmail;

knode/knode_config_appearance.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=looknfeel
+Icon=preferences-desktop
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 

korganizer/korganizer_configfreebusy.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=personal
+Icon=preferences-desktop-personal
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 

korganizer/korganizer_configgroupautomation.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=personal
+Icon=preferences-desktop-personal
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 

korganizer/korganizer_configgroupscheduling.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=personal
+Icon=preferences-desktop-personal
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 

libtdepim/addresseeemailselection.cpp

@@ -133,7 +133,7 @@ TQPixmap AddresseeEmailSelection::itemIcon( const TDEABC::Addressee &addressee,
   if ( !addressee.photo().data().isNull() )
     return addressee.photo().data().smoothScale( 16, 16 );
   else
-    return TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small );
+    return TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Small );
 }
 
 bool AddresseeEmailSelection::itemEnabled( const TDEABC::Addressee &addressee, uint ) const

libtdepim/addresseeview.cpp

@@ -207,7 +207,7 @@ TQString AddresseeView::vCardAsHTML( const TDEABC::Addressee& addr, ::KIMProxy *
     } else if ( !pic.url().isEmpty() ) {
       image = (pic.url().startsWith( "http://" ) || pic.url().startsWith( "https://" ) ? pic.url() : "http://" + pic.url());
     } else {
-      image = "file:" + TDEGlobal::iconLoader()->iconPath( "personal", TDEIcon::Desktop );
+      image = "file:" + TDEGlobal::iconLoader()->iconPath( "preferences-desktop-personal", TDEIcon::Desktop );
     }
   }
 
@@ -554,7 +554,7 @@ void AddresseeView::updateView()
       }
     } else {
       TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL,
-        TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop, 128 ) );
+        TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Desktop, 128 ) );
     }
   }
 

libtdepim/addressesdialog.cpp

@@ -105,7 +105,7 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TDEABC::A
 
   if ( addr.photo().url().isEmpty() ) {
     if ( addr.photo().data().isNull() )
-      setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small ) );
+      setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Small ) );
     else
       setPixmap( 0, addr.photo().data().smoothScale( 16, 16 ) );
   } else {