From 30aafe977dd63a9b8996dd57c5f7cf290ada7f6d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 14 Oct 2014 11:39:45 -0500 Subject: 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 --- 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 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kaddressbook') 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 ); -- cgit v1.2.3