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

pull/21/head
Timothy Pearson 10 years ago
parent 1bc23e19f6
commit 30aafe977d

@ -42,7 +42,7 @@ namespace Akregator {
AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name) AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
: AddFeedWidgetBase(parent, 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()); statusLabel->setText(TQString());
} }

@ -47,9 +47,9 @@ ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, TDEConfigSkeleton
addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings"); addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
m_settingsAppearance = new SettingsAppearance(this, "Appearance"); m_settingsAppearance = new SettingsAppearance(this, "Appearance");
addPage(m_settingsAppearance, i18n("Appearance"), "fonts"); 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"); 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_settingsAdvanced->selectFactory(Settings::archiveBackend());
m_config = config; m_config = config;
} }

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

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

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

@ -105,7 +105,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
TQPixmap pixmap; TQPixmap pixmap;
pixmap.convertFromImage( m_entry.addressee.photo().data() ); 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_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->setURL( m_list.name() );
m_distListLabel->setText( m_list.name() ); m_distListLabel->setText( m_list.name() );

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

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

@ -1410,7 +1410,7 @@ void KABCore::initActions()
this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); 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." ) ); 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(), TQT_SLOT( setWhoAmI() ), actionCollection(),
"edit_set_personal" ); "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." ) ); 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." ) );

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

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

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

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

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

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

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

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

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

@ -133,7 +133,7 @@ TQPixmap AddresseeEmailSelection::itemIcon( const TDEABC::Addressee &addressee,
if ( !addressee.photo().data().isNull() ) if ( !addressee.photo().data().isNull() )
return addressee.photo().data().smoothScale( 16, 16 ); return addressee.photo().data().smoothScale( 16, 16 );
else 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 bool AddresseeEmailSelection::itemEnabled( const TDEABC::Addressee &addressee, uint ) const

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

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

Loading…
Cancel
Save