[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kmail
From:       Andreas Gungl <a.gungl () gmx ! de>
Date:       2004-09-01 21:28:18
Message-ID: 20040901212818.2C0241EFF () office ! kde ! org
[Download RAW message or body]

CVS commit by gungl: 

use a separator in the toolbar before plugged filters


  M +6 -1      kmmainwidget.cpp   1.256
  M +1 -0      kmmainwidget.h   1.73
  M +0 -1      kmmainwin.rc   1.79


--- kdepim/kmail/kmmainwidget.cpp  #1.255:1.256
@@ -128,4 +128,7 @@ KMMainWidget::KMMainWidget(QWidget *pare
   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 )
@@ -3319,6 +3322,8 @@ void KMMainWidget::initializeFilterActio
   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 );
+  }
 }
 

--- kdepim/kmail/kmmainwidget.h  #1.72:1.73
@@ -461,4 +461,5 @@ private:
   QGuardedPtr<KMail::Vacation> mVacation;
   KActionCollection *mActionCollection;
+  KActionSeparator  *mToolbarActionSeparator;
   QVBoxLayout *mTopLayout;
   bool mDestructed, mForceJumpToUnread;

--- kdepim/kmail/kmmainwin.rc  #1.78:1.79
@@ -168,5 +168,4 @@
   <Separator/>
   <Action name="search_messages" />
-  <WeakSeparator/>
   <ActionList name="toolbar_filter_actions" />
  </ToolBar>


[prev in list] [next in list] [prev in thread] [next in thread]