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
6bb65f65
Commit
6bb65f65
authored
Aug 27, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: use the new helper in button selection
parent
662dc6f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
22 deletions
+1
-22
modules/gui/qt4/components/playlist/playlist.cpp
modules/gui/qt4/components/playlist/playlist.cpp
+1
-20
modules/gui/qt4/components/playlist/playlist.hpp
modules/gui/qt4/components/playlist/playlist.hpp
+0
-2
No files found.
modules/gui/qt4/components/playlist/playlist.cpp
View file @
6bb65f65
...
@@ -120,25 +120,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
...
@@ -120,25 +120,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
viewButton
->
setToolTip
(
qtr
(
"Change playlistview"
)
);
viewButton
->
setToolTip
(
qtr
(
"Change playlistview"
)
);
topbarLayout
->
addWidget
(
viewButton
);
topbarLayout
->
addWidget
(
viewButton
);
/* View selection menu */
viewButton
->
setMenu
(
StandardPLPanel
::
viewSelectionMenu
(
mainView
));
QSignalMapper
*
viewSelectionMapper
=
new
QSignalMapper
(
this
);
CONNECT
(
viewSelectionMapper
,
mapped
(
int
),
mainView
,
showView
(
int
)
);
QActionGroup
*
actionGroup
=
new
QActionGroup
(
this
);
# define MAX_VIEW StandardPLPanel::VIEW_COUNT
for
(
int
i
=
0
;
i
<
MAX_VIEW
;
i
++
)
{
viewActions
[
i
]
=
actionGroup
->
addAction
(
viewNames
[
i
]
);
viewActions
[
i
]
->
setCheckable
(
true
);
viewSelectionMapper
->
setMapping
(
viewActions
[
i
],
i
);
CONNECT
(
viewActions
[
i
],
triggered
(),
viewSelectionMapper
,
map
()
);
}
viewActions
[
mainView
->
currentViewIndex
()]
->
setChecked
(
true
);
QMenu
*
viewMenu
=
new
QMenu
(
viewButton
);
viewMenu
->
addActions
(
actionGroup
->
actions
()
);
viewButton
->
setMenu
(
viewMenu
);
CONNECT
(
viewButton
,
clicked
(),
mainView
,
cycleViews
()
);
CONNECT
(
viewButton
,
clicked
(),
mainView
,
cycleViews
()
);
/* Search */
/* Search */
...
@@ -247,7 +229,6 @@ void PlaylistWidget::changeView( const QModelIndex& index )
...
@@ -247,7 +229,6 @@ void PlaylistWidget::changeView( const QModelIndex& index )
{
{
searchEdit
->
clear
();
searchEdit
->
clear
();
locationBar
->
setIndex
(
index
);
locationBar
->
setIndex
(
index
);
viewActions
[
mainView
->
currentViewIndex
()]
->
setChecked
(
true
);
}
}
void
PlaylistWidget
::
clearPlaylist
()
void
PlaylistWidget
::
clearPlaylist
()
...
...
modules/gui/qt4/components/playlist/playlist.hpp
View file @
6bb65f65
...
@@ -63,8 +63,6 @@ private:
...
@@ -63,8 +63,6 @@ private:
StandardPLPanel
*
mainView
;
StandardPLPanel
*
mainView
;
PLSelector
*
selector
;
PLSelector
*
selector
;
QAction
*
viewActions
[
4
/* StandardPLPanel::VIEW_COUNT*/
];
LocationBar
*
locationBar
;
LocationBar
*
locationBar
;
SearchLineEdit
*
searchEdit
;
SearchLineEdit
*
searchEdit
;
...
...
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