From 30aafe977dd63a9b8996dd57c5f7cf290ada7f6d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 14 Oct 2014 11:39:45 -0500 Subject: [PATCH] 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 | 2 +- akregator/src/configdialog.cpp | 4 ++-- certmanager/conf/kleopatra_config_appear.desktop | 2 +- certmanager/conf/kleopatra_config_dnorder.desktop | 2 +- kaddressbook/addresseeeditorwidget.cpp | 4 ++-- kaddressbook/distributionlistentryview.cpp | 2 +- kaddressbook/geowidget.cpp | 2 +- kaddressbook/imagewidget.cpp | 2 +- kaddressbook/kabcore.cpp | 2 +- kaddressbook/views/configurecardviewdialog.cpp | 2 +- kaddressbook/views/configuretableviewdialog.cpp | 2 +- karm/preferences.cpp | 2 +- kmail/kmail_config_appearance.desktop | 2 +- kmail/recipientspicker.cpp | 2 +- knode/knode_config_appearance.desktop | 2 +- korganizer/korganizer_configfreebusy.desktop | 2 +- korganizer/korganizer_configgroupautomation.desktop | 2 +- korganizer/korganizer_configgroupscheduling.desktop | 2 +- libtdepim/addresseeemailselection.cpp | 2 +- libtdepim/addresseeview.cpp | 4 ++-- libtdepim/addressesdialog.cpp | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 0642fa48..05a6a8e0 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/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()); } diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp index cf6eae4c..d33eed1b 100644 --- a/akregator/src/configdialog.cpp +++ b/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; } diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop index fe10f662..d778cc17 100644 --- a/certmanager/conf/kleopatra_config_appear.desktop +++ b/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 diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop index 12e00458..e70b8c0b 100644 --- a/certmanager/conf/kleopatra_config_dnorder.desktop +++ b/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 diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index a39101b4..c3e2e6fb 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/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 ); diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 0290f6e2..b09d8c97 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/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", "

%1

%2
%3

" ).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() ); diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 2d127559..8e9726c5 100644 --- a/kaddressbook/geowidget.cpp +++ b/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 ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 722b8dd7..f10bf7b2 100644 --- a/kaddressbook/imagewidget.cpp +++ b/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() ); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 9caffe58..2f60f046 100644 --- a/kaddressbook/kabcore.cpp +++ b/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

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

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." ) ); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 35d0b50c..2fe22f8c 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/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 ); } diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 04044e4c..1bd70c29 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/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 ); diff --git a/karm/preferences.cpp b/karm/preferences.cpp index fbfe2063..29b242cf 100644 --- a/karm/preferences.cpp +++ b/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 ); diff --git a/kmail/kmail_config_appearance.desktop b/kmail/kmail_config_appearance.desktop index 0c377b6c..73944baa 100644 --- a/kmail/kmail_config_appearance.desktop +++ b/kmail/kmail_config_appearance.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=looknfeel +Icon=preferences-desktop Type=Service X-TDE-ServiceTypes=TDECModule diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 04cc50e1..be47b022 100644 --- a/kmail/recipientspicker.cpp +++ b/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; diff --git a/knode/knode_config_appearance.desktop b/knode/knode_config_appearance.desktop index 4e8341c2..04084276 100644 --- a/knode/knode_config_appearance.desktop +++ b/knode/knode_config_appearance.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=looknfeel +Icon=preferences-desktop Type=Service X-TDE-ServiceTypes=TDECModule diff --git a/korganizer/korganizer_configfreebusy.desktop b/korganizer/korganizer_configfreebusy.desktop index 25b9b579..f66de67b 100644 --- a/korganizer/korganizer_configfreebusy.desktop +++ b/korganizer/korganizer_configfreebusy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=personal +Icon=preferences-desktop-personal Type=Service X-TDE-ServiceTypes=TDECModule diff --git a/korganizer/korganizer_configgroupautomation.desktop b/korganizer/korganizer_configgroupautomation.desktop index 33732f06..89f46af0 100644 --- a/korganizer/korganizer_configgroupautomation.desktop +++ b/korganizer/korganizer_configgroupautomation.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=personal +Icon=preferences-desktop-personal Type=Service X-TDE-ServiceTypes=TDECModule diff --git a/korganizer/korganizer_configgroupscheduling.desktop b/korganizer/korganizer_configgroupscheduling.desktop index 3455250e..ff36d05b 100644 --- a/korganizer/korganizer_configgroupscheduling.desktop +++ b/korganizer/korganizer_configgroupscheduling.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=personal +Icon=preferences-desktop-personal Type=Service X-TDE-ServiceTypes=TDECModule diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index d0a0e34f..bd70302e 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/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 diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 29cbf1c2..16c9bbf2 100644 --- a/libtdepim/addresseeview.cpp +++ b/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 ) ); } } diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index 0afd9a81..d764b376 100644 --- a/libtdepim/addressesdialog.cpp +++ b/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 {