Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
9f0375cd
Commit
9f0375cd
authored
Feb 22, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt, menus: various changes, speedups and addition to approach mac menus.
parent
8d5ee287
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
196 additions
and
204 deletions
+196
-204
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-4
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+177
-191
modules/gui/qt4/menus.hpp
modules/gui/qt4/menus.hpp
+18
-9
No files found.
modules/gui/qt4/main_interface.cpp
View file @
9f0375cd
...
...
@@ -121,9 +121,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
mainBasedSize
=
settings
->
value
(
"mainBasedSize"
,
QSize
(
350
,
120
)
).
toSize
();
mainVideoSize
=
settings
->
value
(
"mainVideoSize"
,
QSize
(
400
,
300
)
).
toSize
();
/* Visualisation, not really used yet */
visualSelectorEnabled
=
settings
->
value
(
"visual-selector"
,
false
).
toBool
();
/* Do we want anoying popups or not */
notificationEnabled
=
(
bool
)
config_GetInt
(
p_intf
,
"qt-notification"
);
...
...
@@ -141,7 +138,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/************
* Menu Bar *
************/
QVLCMenu
::
createMenuBar
(
this
,
p_intf
,
visualSelectorEnabled
);
QVLCMenu
::
createMenuBar
(
this
,
p_intf
);
#if 0
/* Create a Dock to get the playlist */
...
...
modules/gui/qt4/menus.cpp
View file @
9f0375cd
This diff is collapsed.
Click to expand it.
modules/gui/qt4/menus.hpp
View file @
9f0375cd
...
...
@@ -79,7 +79,7 @@ class QVLCMenu : public QObject
public:
/* Main bar creation */
static
void
createMenuBar
(
MainInterface
*
mi
,
intf_thread_t
*
,
bool
);
static
void
createMenuBar
(
MainInterface
*
mi
,
intf_thread_t
*
);
/* Popups Menus */
static
void
PopupMenu
(
intf_thread_t
*
,
bool
);
...
...
@@ -102,31 +102,40 @@ private:
/* All main Menus */
static
QMenu
*
FileMenu
(
intf_thread_t
*
,
QWidget
*
);
static
QMenu
*
SDMenu
(
intf_thread_t
*
,
QWidget
*
);
static
QMenu
*
ToolsMenu
(
QMenu
*
);
static
QMenu
*
ToolsMenu
(
QWidget
*
);
static
QMenu
*
ViewMenu
(
intf_thread_t
*
,
QMenu
*
,
MainInterface
*
,
bool
,
bool
with
=
true
);
static
QMenu
*
ViewMenu
(
intf_thread_t
*
,
MainInterface
*
,
bool
with
=
true
);
static
QMenu
*
InterfacesMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
);
static
QMenu
*
NavigMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
NavigMenu
(
intf_thread_t
*
,
QWidget
*
);
static
QMenu
*
RebuildNavigMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
VideoMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
VideoMenu
(
intf_thread_t
*
,
QWidget
*
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
,
QWidget
*
);
static
QMenu
*
InterfacesMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
);
static
QMenu
*
HelpMenu
(
QWidget
*
);
/* Popups Menus */
static
void
PopupMenuStaticEntries
(
QMenu
*
menu
);
static
void
PopupMenuControlEntries
(
QMenu
*
menu
,
intf_thread_t
*
p_intf
,
input_thread_t
*
p_input
);
static
void
PopupMenuPlaylistControlEntries
(
QMenu
*
menu
,
intf_thread_t
*
p_intf
,
static
void
PopupPlayEntries
(
QMenu
*
menu
,
intf_thread_t
*
p_intf
,
input_thread_t
*
p_input
);
static
void
PopupMenuControlEntries
(
QMenu
*
menu
,
intf_thread_t
*
p_intf
);
static
void
PopupMenuPlaylistControlEntries
(
QMenu
*
menu
,
intf_thread_t
*
p_intf
);
/* Generic automenu methods */
static
QMenu
*
Populate
(
intf_thread_t
*
,
QMenu
*
current
,
vector
<
const
char
*>&
,
vector
<
vlc_object_t
*>&
);
static
void
CreateAndConnect
(
QMenu
*
,
const
char
*
,
QString
,
QString
,
int
,
vlc_object_t
*
,
vlc_value_t
,
int
,
bool
c
=
false
);
int
,
vlc_object_t
*
,
vlc_value_t
,
int
,
bool
c
=
false
);
static
void
UpdateItem
(
intf_thread_t
*
,
QMenu
*
,
const
char
*
,
vlc_object_t
*
,
bool
);
static
int
CreateChoicesMenu
(
QMenu
*
,
const
char
*
,
vlc_object_t
*
,
bool
);
...
...
@@ -152,7 +161,7 @@ public:
{
case
1
:
QVLCMenu
::
AudioMenu
(
p_intf
,
menu
);
break
;
case
2
:
QVLCMenu
::
VideoMenu
(
p_intf
,
menu
);
break
;
case
3
:
QVLCMenu
::
NavigMenu
(
p_intf
,
menu
);
break
;
case
3
:
QVLCMenu
::
Rebuild
NavigMenu
(
p_intf
,
menu
);
break
;
case
4
:
QVLCMenu
::
InterfacesMenu
(
p_intf
,
menu
);
break
;
}
}
...
...
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