From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/src/iconsidepane.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'kontact/src/iconsidepane.cpp') diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index d56513aeb..4303175f6 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -113,8 +113,8 @@ void EntryItem::reloadPixmap() if ( size != 0 ) mPixmap = KGlobal::iconLoader()->loadIcon( mPlugin->icon(), KIcon::Desktop, size, - mPlugin->disabled() ? - KIcon::DisabledState + mPlugin->disabled() ? + KIcon::DisabledState : KIcon::DefaultState); else mPixmap = TQPixmap(); @@ -250,7 +250,7 @@ void EntryItem::setPaintActive( bool paintActive ) mPaintActive = paintActive; } -Navigator::Navigator( SidePaneBase *parent, const char *name ) +Navigator::Navigator( IconSidePane *parent, const char *name ) : KListBox( parent, name ), mSidePane( parent ), mShowIcons( true ), mShowText( true ) { @@ -328,7 +328,6 @@ void Navigator::updatePlugins( TQValueList plugins_ ) mActions.clear(); mActions.setAutoDelete( false ); - int counter = 0; int minWidth = 0; qBubbleSort( plugins ); TQValueList::ConstIterator end = plugins.end(); @@ -343,14 +342,6 @@ void Navigator::updatePlugins( TQValueList plugins_ ) if ( item->width( this ) > minWidth ) minWidth = item->width( this ); - - TQString name = TQString( "CTRL+%1" ).arg( counter + 1 ); - KAction *action = new KAction( plugin->title(), plugin->icon(), KShortcut( name ), - mMapper, TQT_SLOT( map() ), - mSidePane->actionCollection(), name.latin1() ); - mActions.append( action ); - mMapper->setMapping( action, counter ); - counter++; } parentWidget()->setFixedWidth( minWidth ); -- cgit v1.2.1