Commit 59d8e399 authored by Francois Cartegnie's avatar Francois Cartegnie

Qt: MainInterface: namespace visibility property

parent 176df713
...@@ -56,12 +56,6 @@ class QMenu; ...@@ -56,12 +56,6 @@ class QMenu;
class QSize; class QSize;
class StandardPLPanel; class StandardPLPanel;
enum {
CONTROLS_VISIBLE = 0x1,
CONTROLS_HIDDEN = 0x2,
CONTROLS_ADVANCED = 0x4,
};
class MainInterface : public QVLCMW class MainInterface : public QVLCMW
{ {
Q_OBJECT Q_OBJECT
...@@ -85,6 +79,12 @@ public: ...@@ -85,6 +79,12 @@ public:
QSystemTrayIcon *getSysTray() { return sysTray; } QSystemTrayIcon *getSysTray() { return sysTray; }
QMenu *getSysTrayMenu() { return systrayMenu; } QMenu *getSysTrayMenu() { return systrayMenu; }
FullscreenControllerWidget* getFullscreenControllerWidget() { return fullscreenControls; } FullscreenControllerWidget* getFullscreenControllerWidget() { return fullscreenControls; }
enum
{
CONTROLS_VISIBLE = 0x1,
CONTROLS_HIDDEN = 0x2,
CONTROLS_ADVANCED = 0x4,
};
int getControlsVisibilityStatus(); int getControlsVisibilityStatus();
bool isPlDocked() { return ( b_plDocked != false ); } bool isPlDocked() { return ( b_plDocked != false ); }
bool isInterfaceFullScreen() { return b_interfaceFullScreen; } bool isInterfaceFullScreen() { return b_interfaceFullScreen; }
......
...@@ -483,7 +483,8 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac ...@@ -483,7 +483,8 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
action = menu->addAction( qtr( "Mi&nimal Interface" ) ); action = menu->addAction( qtr( "Mi&nimal Interface" ) );
action->setShortcut( qtr( "Ctrl+H" ) ); action->setShortcut( qtr( "Ctrl+H" ) );
action->setCheckable( true ); action->setCheckable( true );
action->setChecked( (mi->getControlsVisibilityStatus() & CONTROLS_HIDDEN ) ); action->setChecked( (mi->getControlsVisibilityStatus()
& MainInterface::CONTROLS_HIDDEN ) );
CONNECT( action, triggered( bool ), mi, toggleMinimalView( bool ) ); CONNECT( action, triggered( bool ), mi, toggleMinimalView( bool ) );
CONNECT( mi, minimalViewToggled( bool ), action, setChecked( bool ) ); CONNECT( mi, minimalViewToggled( bool ), action, setChecked( bool ) );
...@@ -500,7 +501,7 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac ...@@ -500,7 +501,7 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
action = menu->addAction( qtr( "&Advanced Controls" ), mi, action = menu->addAction( qtr( "&Advanced Controls" ), mi,
SLOT( toggleAdvancedButtons() ) ); SLOT( toggleAdvancedButtons() ) );
action->setCheckable( true ); action->setCheckable( true );
if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) if( mi->getControlsVisibilityStatus() & MainInterface::CONTROLS_ADVANCED )
action->setChecked( true ); action->setChecked( true );
/* Docked Playlist */ /* Docked Playlist */
......
Markdown is supported
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