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
69204454
Commit
69204454
authored
Aug 26, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetics + Enable menu in playlist
parent
6a42cf33
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
28 deletions
+31
-28
modules/gui/qt4/components/playlist/selector.cpp
modules/gui/qt4/components/playlist/selector.cpp
+2
-0
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+2
-0
modules/gui/qt4/dialogs/playlist.cpp
modules/gui/qt4/dialogs/playlist.cpp
+2
-2
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+22
-25
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+2
-1
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+1
-0
No files found.
modules/gui/qt4/components/playlist/selector.cpp
View file @
69204454
...
...
@@ -32,6 +32,8 @@ PLSelector::PLSelector( QWidget *p, intf_thread_t *_p_intf,
{
model
=
new
PLModel
(
THEPL
,
THEPL
->
p_root_category
,
1
,
this
);
view
=
new
QTreeView
(
0
);
view
->
setIconSize
(
QSize
(
24
,
24
)
);
view
->
setAlternatingRowColors
(
true
);
view
->
setIndentation
(
0
);
view
->
header
()
->
hide
();
view
->
setModel
(
model
);
...
...
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
69204454
...
...
@@ -43,6 +43,8 @@ StandardPLPanel::StandardPLPanel( QWidget *_parent, intf_thread_t *_p_intf,
model
=
new
PLModel
(
p_playlist
,
p_root
,
-
1
,
this
);
view
=
new
QVLCTreeView
(
0
);
view
->
setModel
(
model
);
view
->
setIconSize
(
QSize
(
20
,
20
)
);
view
->
setAlternatingRowColors
(
true
);
view
->
header
()
->
resizeSection
(
0
,
300
);
view
->
setSelectionMode
(
QAbstractItemView
::
ExtendedSelection
);
...
...
modules/gui/qt4/dialogs/playlist.cpp
View file @
69204454
...
...
@@ -33,9 +33,9 @@ PlaylistDialog *PlaylistDialog::instance = NULL;
PlaylistDialog
::
PlaylistDialog
(
intf_thread_t
*
_p_intf
)
:
QVLCMW
(
_p_intf
)
{
setWindowTitle
(
qtr
(
"Playlist"
)
);
QWidget
*
main
=
new
QWidget
(
this
);
setCentralWidget
(
main
);
setWindowTitle
(
qtr
(
"Playlist"
)
);
QVLCMenu
::
createPlMenuBar
(
menuBar
(),
p_intf
);
selector
=
new
PLSelector
(
centralWidget
(),
p_intf
,
THEPL
);
...
...
@@ -50,7 +50,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
layout
->
addWidget
(
selector
,
0
);
layout
->
addWidget
(
rightPanel
,
10
);
centralWidget
()
->
setLayout
(
layout
);
readSettings
(
"playlist"
,
QSize
(
600
,
3
00
)
);
readSettings
(
"playlist"
,
QSize
(
600
,
5
00
)
);
}
PlaylistDialog
::~
PlaylistDialog
()
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
69204454
...
...
@@ -173,19 +173,33 @@ void DialogsProvider::menuUpdateAction( QObject *data )
void
DialogsProvider
::
simpleAppendDialog
()
{
QStringList
files
=
showSimpleOpen
();
QString
file
;
foreach
(
file
,
files
)
{
const
char
*
psz_utf8
=
file
.
toUtf8
().
data
();
playlist_PlaylistAdd
(
THEPL
,
psz_utf8
,
psz_utf8
,
PLAYLIST_APPEND
|
PLAYLIST_PREPARSE
,
PLAYLIST_END
);
}
}
void
DialogsProvider
::
simpleOpenDialog
()
{
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
==
NULL
)
QStringList
files
=
showSimpleOpen
();
QString
file
;
for
(
size_t
i
=
0
;
i
<
files
.
size
();
i
++
)
{
return
;
const
char
*
psz_utf8
=
files
[
i
].
toUtf8
().
data
();
/* Play the first one, parse and enqueue the other ones */
playlist_PlaylistAdd
(
THEPL
,
psz_utf8
,
psz_utf8
,
PLAYLIST_APPEND
|
(
i
?
0
:
PLAYLIST_GO
)
|
(
i
?
PLAYLIST_PREPARSE
:
0
),
PLAYLIST_END
);
}
}
QStringList
DialogsProvider
::
showSimpleOpen
()
{
QString
FileTypes
;
FileTypes
=
"Video Files ( "
;
FileTypes
+=
EXTENSIONS_VIDEO
;
...
...
@@ -193,27 +207,10 @@ void DialogsProvider::simpleOpenDialog()
FileTypes
+=
EXTENSIONS_AUDIO
;
FileTypes
+=
");; PlayList Files ( "
;
FileTypes
+=
EXTENSIONS_PLAYLIST
;
FileTypes
+=
");; Subtitles Files ( "
;
FileTypes
+=
EXTENSIONS_SUBTITLE
;
FileTypes
+=
");; All Files (*.*) "
;
FileTypes
.
replace
(
QString
(
";*"
),
QString
(
" *"
));
QStringList
fileList
=
QFileDialog
::
getOpenFileNames
(
NULL
,
qfu
(
I_POP_SEL_FILES
),
p_intf
->
p_vlc
->
psz_homedir
,
FileTypes
);
QStringList
files
=
fileList
;
for
(
size_t
i
=
0
;
i
<
files
.
size
();
i
++
)
{
const
char
*
psz_utf8
=
files
[
i
].
toUtf8
().
data
();
playlist_PlaylistAdd
(
p_playlist
,
psz_utf8
,
psz_utf8
,
PLAYLIST_APPEND
|
(
i
?
0
:
PLAYLIST_GO
)
|
(
i
?
PLAYLIST_PREPARSE
:
0
),
PLAYLIST_END
);
}
vlc_object_release
(
p_playlist
);
return
QFileDialog
::
getOpenFileNames
(
NULL
,
qfu
(
I_POP_SEL_FILES
),
p_intf
->
p_vlc
->
psz_homedir
,
FileTypes
);
}
void
DialogsProvider
::
bookmarksDialog
()
...
...
modules/gui/qt4/dialogs_provider.hpp
View file @
69204454
...
...
@@ -39,7 +39,7 @@ class DialogsProvider : public QObject
{
Q_OBJECT
;
public:
static
DialogsProvider
*
getInstance
()
static
DialogsProvider
*
getInstance
()
{
assert
(
instance
);
return
instance
;
...
...
@@ -62,6 +62,7 @@ private:
DialogsProvider
(
intf_thread_t
*
);
intf_thread_t
*
p_intf
;
static
DialogsProvider
*
instance
;
QStringList
showSimpleOpen
();
public
slots
:
void
playlistDialog
();
...
...
modules/gui/qt4/menus.cpp
View file @
69204454
...
...
@@ -131,6 +131,7 @@ void QVLCMenu::createMenuBar( QMenuBar *bar, intf_thread_t *p_intf )
void
QVLCMenu
::
createPlMenuBar
(
QMenuBar
*
bar
,
intf_thread_t
*
p_intf
)
{
QMenu
*
manageMenu
=
new
QMenu
();
manageMenu
->
setTitle
(
qtr
(
"Operations"
)
);
manageMenu
->
addAction
(
"Quick &Add File..."
,
THEDP
,
SLOT
(
simpleAppendDialog
()
)
);
manageMenu
->
addSeparator
();
...
...
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