CVS commit by danimo: allow for resizing of the new action if a larger toolbar size is set. Now this clearly shows the need of dedicated icons. M +1 -1 plugins/kaddressbook/kaddressbook_plugin.cpp 1.40 M +1 -1 plugins/kmail/kmail_plugin.cpp 1.36 M +1 -1 plugins/knode/knode_plugin.cpp 1.11 M +1 -1 plugins/knotes/knotes_plugin.cpp 1.22 M +1 -1 src/mainwindow.cpp 1.114 --- kdepim/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp #1.39:1.40 @@ -58,5 +58,5 @@ KAddressbookPlugin::KAddressbookPlugin( setInstance( KAddressbookPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Contact..." ), BarIcon( "identity" ), + insertNewAction( new KAction( i18n( "New Contact..." ), "identity", 0, this, SLOT( slotNewContact() ), actionCollection(), "new_contact" ) ); --- kdepim/kontact/plugins/kmail/kmail_plugin.cpp #1.35:1.36 @@ -55,5 +55,5 @@ KMailPlugin::KMailPlugin(Kontact::Core * setInstance( KMailPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Mail..." ), BarIcon( "mail_new" ), + insertNewAction( new KAction( i18n( "New Mail..." ), "mail_new", 0, this, SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); --- kdepim/kontact/plugins/knode/knode_plugin.cpp #1.10:1.11 @@ -49,5 +49,5 @@ KNodePlugin::KNodePlugin( Kontact::Core setInstance( KNodePluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Article..." ), BarIcon( "mail_new" ), + insertNewAction( new KAction( i18n( "New Article..." ), "mail_new", 0, this, SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); --- kdepim/kontact/plugins/knotes/knotes_plugin.cpp #1.21:1.22 @@ -42,5 +42,5 @@ KNotesPlugin::KNotesPlugin( Kontact::Cor setInstance( KNotesPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Note..." ), BarIcon( "knotes" ), 0, + insertNewAction( new KAction( i18n( "New Note..." ), "knotes", 0, this, SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); --- kdepim/kontact/src/mainwindow.cpp #1.113:1.114 @@ -492,5 +492,5 @@ void MainWindow::selectPlugin( Kontact:: setCaption( i18n("Plugin dependent window title" ,"%1 - Kontact").arg( plugin->title() ) ); if ( action ) { - mNewActions->setIconSet( action->iconSet() ); + mNewActions->setIcon( action->icon() ); mNewActions->setText( action->text() ); } else { // we'll use the action of the first plugin which offers one