use a separator in the toolbar before plugged filters

svn path=/trunk/kdepim/; revision=343341
wilder-work
Andreas Gungl 22 years ago
parent a7befa1c78
commit 71ddc4a909
  1. 7
      kmmainwidget.cpp
  2. 1
      kmmainwidget.h
  3. 1
      kmmainwin.rc

@ -127,6 +127,9 @@ KMMainWidget::KMMainWidget(QWidget *parent, const char *name,
mJob = 0;
mConfig = config;
mGUIClient = aGUIClient;
// FIXME This should become a line separator as soon as the API
// is extended in kdelibs.
mToolbarActionSeparator = new KActionSeparator( actionCollection );
if( !s_mainWidgetList )
mwlsd.setObject( s_mainWidgetList, new QPtrList<KMMainWidget>() );
@ -3318,8 +3321,10 @@ void KMMainWidget::initializeFilterActions()
}
if ( !mFilterMenuActions.isEmpty() && mGUIClient->factory() )
mGUIClient->plugActionList( "menu_filter_actions", mFilterMenuActions );
if ( !mFilterTBarActions.isEmpty() && mGUIClient->factory() )
if ( !mFilterTBarActions.isEmpty() && mGUIClient->factory() ) {
mFilterTBarActions.prepend( mToolbarActionSeparator );
mGUIClient->plugActionList( "toolbar_filter_actions", mFilterTBarActions );
}
}

@ -460,6 +460,7 @@ private:
QGuardedPtr<KMail::Vacation> mVacation;
KActionCollection *mActionCollection;
KActionSeparator *mToolbarActionSeparator;
QVBoxLayout *mTopLayout;
bool mDestructed, mForceJumpToUnread;
QPtrList<KAction> mFilterMenuActions;

@ -167,7 +167,6 @@
<Action name="move_to_trash" />
<Separator/>
<Action name="search_messages" />
<WeakSeparator/>
<ActionList name="toolbar_filter_actions" />
</ToolBar>
</kpartgui>

Loading…
Cancel
Save