Commit 305917c3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt: add the playlist view selection to the main menu

parent 6bb65f65
......@@ -57,10 +57,12 @@ public:
void forceHide();
void forceShow();
QStackedWidget *artContainer;
StandardPLPanel *mainView;
private:
QSplitter *leftSplitter;
QSplitter *split;
StandardPLPanel *mainView;
PLSelector *selector;
LocationBar *locationBar;
......
......@@ -933,7 +933,13 @@ int MainInterface::getControlsVisibilityStatus()
{
if( !controls ) return 0;
return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
+ CONTROLS_ADVANCED * controls->b_advancedVisible );
+ CONTROLS_ADVANCED * controls->b_advancedVisible );
}
StandardPLPanel *MainInterface::getPlaylistView()
{
if( !playlistWidget ) return NULL;
else return playlistWidget->mainView;
}
void MainInterface::setStatusBarVisibility( bool b_visible )
......
......@@ -54,6 +54,7 @@ class SpeedControlWidget;
class QVBoxLayout;
class QMenu;
class QSize;
class StandardPLPanel;
enum {
CONTROLS_VISIBLE = 0x1,
......@@ -87,6 +88,7 @@ public:
int getControlsVisibilityStatus();
bool isPlDocked() { return ( b_plDocked != false ); }
bool isInterfaceFullScreen() { return b_interfaceFullScreen; }
StandardPLPanel* getPlaylistView();
protected:
void dropEventPlay( QDropEvent* event, bool b_play ) { dropEventPlay(event, b_play, true); }
......
......@@ -49,6 +49,7 @@
#include "extensions_manager.hpp" /* Extensions menu */
#include "util/qmenuview.hpp" /* Simple Playlist menu */
#include "components/playlist/playlist_model.hpp" /* PLModel getter */
#include "components/playlist/standardpanel.hpp" /* PLView getter */
#include <QMenu>
#include <QMenuBar>
......@@ -474,6 +475,8 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
qtr( "Play&list" ), mi,
SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
if( mi->getPlaylistView() )
menu->addMenu( StandardPLPanel::viewSelectionMenu( mi->getPlaylistView() ) );
menu->addSeparator();
/* Minimal View */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment