[Amarok] Moved playlist layouts selection menu back to the

[Seb Ruiz]

2009/8/13 Teo Mrnjavac <teo at getamarok.com>:
> commit 0297885a911708618986f9f4746f711b00a3cc03
> Author:     Teo Mrnjavac <teo at getamarok.com>
> AuthorDate: Tue Aug 11 10:57:42 2009 +0200
> Commit:     Teo Mrnjavac <teo at getamarok.com>
> CommitDate: Wed Aug 12 12:42:56 2009 +0200
>
>    Moved playlist layouts selection menu back to the playlist toolbar.

Why did you do this? We discussed this at length to move it _out_ of
the toolbar. This is not a feature which can be justified to be in the
toolbar (as it's not going to be used often enough for enough people).
Leaving it in the menu bar makes it still accessible without polluting
the UI.

I call for revert please.

>
> diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
> index d451cb9..a2435c1 100644
> --- a/src/MainWindow.cpp
> +++ b/src/MainWindow.cpp
> @@ -49,7 +49,6 @@
>  #include "playlist/PlaylistController.h"
>  #include "playlist/PlaylistModel.h"
>  #include "playlist/PlaylistWidget.h"
> -#include "playlist/layouts/LayoutConfigAction.h"
>  #include "playlistmanager/file/PlaylistFileProvider.h"
>  #include "playlistmanager/PlaylistManager.h"
>  #include "services/ServicePluginManager.h"
> @@ -876,9 +875,6 @@ MainWindow::createMenus()
>
>
>  #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
> diff --git a/src/playlist/PlaylistWidget.cpp b/src/playlist/PlaylistWidget.cpp
> index 31f3b70..50646a9 100644
> --- a/src/playlist/PlaylistWidget.cpp
> +++ b/src/playlist/PlaylistWidget.cpp
> @@ -119,6 +119,15 @@ Playlist::Widget::Widget( QWidget* parent )
>         plBar->addSeparator();
>         plBar->addAction( Amarok::actionCollection()->action( "playlist_save" ) );
>
> +        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 );
> +        tbutton->setIcon( KIcon( "align-horizontal-left" ) );
> +
>         plBar->addAction( new KToolBarSpacerAction( this ) );
>     } //END Playlist Toolbar
>
>
>
>



-- 
Seb Ruiz

http://www.sebruiz.net/
http://amarok.kde.org/