| Summary: | Kontact does not load the correct icons for new mail, todo, event, etc... in the Kontact toolbar | ||
|---|---|---|---|
| Product: | [Applications] kontact | Reporter: | Carlos Woelz <carloswoelz> |
| Component: | general | Assignee: | kdepim bugs <pim-bugs-null> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | NOR | ||
| Version First Reported In: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | Compiled Sources | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
|
Description
Carlos Woelz
2003-11-06 22:45:05 UTC
Left, not right. Subject: kdelibs/kdeui CVS commit by tokoe: Use iconSet when available in KToolBarPopupAction, otherwise the wrong icons are loaded when actions from different parts (instances) are plugged in. CCMAIL:67450-done@bugs.kde.org M +15 -9 kactionclasses.cpp 1.332 --- kdelibs/kdeui/kactionclasses.cpp #1.331:1.332 @@ -1812,4 +1812,9 @@ int KToolBarPopupAction::plug( QWidget * int id_ = KAction::getToolButtonID(); + if ( !iconSet().isNull() ) { + bar->insertButton( iconSet().pixmap(), id_, SIGNAL( clicked() ), this, + SLOT( slotActivated() ), isEnabled(), plainText(), + index ); + } else { KInstance * instance; if ( m_parentCollection ) @@ -1821,4 +1826,5 @@ int KToolBarPopupAction::plug( QWidget * SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); + } addContainer( bar, id_ ); I still have the general icon for new mail. The others seem fixed. Subject: kdepim/kontact/plugins/kmail CVS commit by vkrause: There is no "mail_new2" icon anymore. CCMAIL: 67450-done@bugs.kde.org M +1 -1 kmail_plugin.cpp 1.26 --- kdepim/kontact/plugins/kmail/kmail_plugin.cpp #1.25:1.26 @@ -48,5 +48,5 @@ KMailPlugin::KMailPlugin(Kontact::Core * setInstance( KMailPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Mail" ), BarIcon( "mail_new2" ), + insertNewAction( new KAction( i18n( "New Mail" ), BarIcon( "mail_new" ), 0, this, SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); |