SVN commit 996897 by nhnielsen:

Move playlist layout selection actions to the settings menu

 M  +6 -0      MainWindow.cpp  
 M  +0 -9      playlist/PlaylistWidget.cpp  


--- trunk/extragear/multimedia/amarok/src/MainWindow.cpp #996896:996897
@@ -48,6 +48,7 @@
 #include "playlist/PlaylistController.h"
 #include "playlist/PlaylistModel.h"
 #include "playlist/PlaylistWidget.h"
+#include "playlist/layouts/LayoutConfigAction.h"
 #include "playlistmanager/PlaylistFileProvider.h"
 #include "playlistmanager/PlaylistManager.h"
 #include "services/ServicePluginManager.h"
@@ -865,7 +866,12 @@
     // or with it in the pipeline. track playback stops every ~3-4 tracks, and on tracks >5min it
     // stops at about 5:40. while we get this resolved upstream, don't make playing amarok such on osx.
     // so we disable replaygain on osx
+
+
 #ifndef Q_WS_MAC
+
+    Playlist::LayoutConfigAction *layoutConfigAction = new Playlist::LayoutConfigAction( this );
+    m_settingsMenu->addAction( layoutConfigAction );
     m_settingsMenu->addAction( Amarok::actionCollection()->action("replay_gain_mode") );
     m_settingsMenu->addSeparator();
 #endif
--- trunk/extragear/multimedia/amarok/src/playlist/PlaylistWidget.cpp #996896:996897
@@ -146,16 +146,7 @@
         plBar->addSeparator();
         plBar->addAction( Amarok::actionCollection()->action( "playlist_save" ) );
         plBar->addAction( Amarok::actionCollection()->action( "playlist_export" ) );
-        plBar->addSeparator();
 
-        Playlist::LayoutConfigAction *layoutConfigAction = new Playlist::LayoutConfigAction( this );
-        plBar->addAction( layoutConfigAction );
-        QToolButton *tbutton = qobject_cast<QToolButton*>(plBar->widgetForAction( layoutConfigAction ) );
-        if( tbutton )
-            tbutton->setPopupMode( QToolButton::InstantPopup );
-
-        plBar->addAction( new KToolBarSpacerAction( this ) );
-
     } //END Playlist Toolbar
 
     setFrameShape( QFrame::NoFrame );