Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
305917c3
Commit
305917c3
authored
Aug 27, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: add the playlist view selection to the main menu
parent
6bb65f65
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
modules/gui/qt4/components/playlist/playlist.hpp
modules/gui/qt4/components/playlist/playlist.hpp
+3
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+7
-1
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+2
-0
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+3
-0
No files found.
modules/gui/qt4/components/playlist/playlist.hpp
View file @
305917c3
...
@@ -57,10 +57,12 @@ public:
...
@@ -57,10 +57,12 @@ public:
void
forceHide
();
void
forceHide
();
void
forceShow
();
void
forceShow
();
QStackedWidget
*
artContainer
;
QStackedWidget
*
artContainer
;
StandardPLPanel
*
mainView
;
private:
private:
QSplitter
*
leftSplitter
;
QSplitter
*
leftSplitter
;
QSplitter
*
split
;
QSplitter
*
split
;
StandardPLPanel
*
mainView
;
PLSelector
*
selector
;
PLSelector
*
selector
;
LocationBar
*
locationBar
;
LocationBar
*
locationBar
;
...
...
modules/gui/qt4/main_interface.cpp
View file @
305917c3
...
@@ -933,7 +933,13 @@ int MainInterface::getControlsVisibilityStatus()
...
@@ -933,7 +933,13 @@ int MainInterface::getControlsVisibilityStatus()
{
{
if
(
!
controls
)
return
0
;
if
(
!
controls
)
return
0
;
return
(
(
controls
->
isVisible
()
?
CONTROLS_VISIBLE
:
CONTROLS_HIDDEN
)
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
)
void
MainInterface
::
setStatusBarVisibility
(
bool
b_visible
)
...
...
modules/gui/qt4/main_interface.hpp
View file @
305917c3
...
@@ -54,6 +54,7 @@ class SpeedControlWidget;
...
@@ -54,6 +54,7 @@ class SpeedControlWidget;
class
QVBoxLayout
;
class
QVBoxLayout
;
class
QMenu
;
class
QMenu
;
class
QSize
;
class
QSize
;
class
StandardPLPanel
;
enum
{
enum
{
CONTROLS_VISIBLE
=
0x1
,
CONTROLS_VISIBLE
=
0x1
,
...
@@ -87,6 +88,7 @@ public:
...
@@ -87,6 +88,7 @@ public:
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
;
}
StandardPLPanel
*
getPlaylistView
();
protected:
protected:
void
dropEventPlay
(
QDropEvent
*
event
,
bool
b_play
)
{
dropEventPlay
(
event
,
b_play
,
true
);
}
void
dropEventPlay
(
QDropEvent
*
event
,
bool
b_play
)
{
dropEventPlay
(
event
,
b_play
,
true
);
}
...
...
modules/gui/qt4/menus.cpp
View file @
305917c3
...
@@ -49,6 +49,7 @@
...
@@ -49,6 +49,7 @@
#include "extensions_manager.hpp"
/* Extensions menu */
#include "extensions_manager.hpp"
/* Extensions menu */
#include "util/qmenuview.hpp"
/* Simple Playlist menu */
#include "util/qmenuview.hpp"
/* Simple Playlist menu */
#include "components/playlist/playlist_model.hpp"
/* PLModel getter */
#include "components/playlist/playlist_model.hpp"
/* PLModel getter */
#include "components/playlist/standardpanel.hpp"
/* PLView getter */
#include <QMenu>
#include <QMenu>
#include <QMenuBar>
#include <QMenuBar>
...
@@ -474,6 +475,8 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
...
@@ -474,6 +475,8 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
qtr
(
"Play&list"
),
mi
,
qtr
(
"Play&list"
),
mi
,
SLOT
(
togglePlaylist
()
),
qtr
(
"Ctrl+L"
)
);
SLOT
(
togglePlaylist
()
),
qtr
(
"Ctrl+L"
)
);
if
(
mi
->
getPlaylistView
()
)
menu
->
addMenu
(
StandardPLPanel
::
viewSelectionMenu
(
mi
->
getPlaylistView
()
)
);
menu
->
addSeparator
();
menu
->
addSeparator
();
/* Minimal View */
/* Minimal View */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment