Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
7f2ce08c
Commit
7f2ce08c
authored
May 18, 2014
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: move getDirectoryDialog to a static helper
parent
3f2ef26a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+1
-1
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+3
-2
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+2
-1
No files found.
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
7f2ce08c
...
@@ -358,7 +358,7 @@ void StandardPLPanel::popupAction( QAction *action )
...
@@ -358,7 +358,7 @@ void StandardPLPanel::popupAction( QAction *action )
break
;
break
;
case
VLCModelSubInterface
:
:
ACTION_ENQUEUEDIR
:
case
VLCModelSubInterface
:
:
ACTION_ENQUEUEDIR
:
temp
=
THEDP
->
getDirectoryDialog
(
);
temp
=
DialogsProvider
::
getDirectoryDialog
(
p_intf
);
if
(
temp
.
isEmpty
()
)
return
;
if
(
temp
.
isEmpty
()
)
return
;
a
.
uris
<<
temp
;
a
.
uris
<<
temp
;
action
->
setData
(
QVariant
::
fromValue
(
a
)
);
action
->
setData
(
QVariant
::
fromValue
(
a
)
);
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
7f2ce08c
...
@@ -514,9 +514,10 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
...
@@ -514,9 +514,10 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
Open
::
openMRL
(
p_intf
,
uri
,
go
,
pl
);
Open
::
openMRL
(
p_intf
,
uri
,
go
,
pl
);
}
}
QString
DialogsProvider
::
getDirectoryDialog
()
QString
DialogsProvider
::
getDirectoryDialog
(
intf_thread_t
*
p_intf
)
{
{
QString
dir
=
QFileDialog
::
getExistingDirectory
(
NULL
,
qtr
(
I_OP_DIR_WINTITLE
),
p_intf
->
p_sys
->
filepath
);
QString
dir
=
QFileDialog
::
getExistingDirectory
(
NULL
,
qtr
(
I_OP_DIR_WINTITLE
),
p_intf
->
p_sys
->
filepath
);
if
(
dir
.
isEmpty
()
)
return
QString
();
if
(
dir
.
isEmpty
()
)
return
QString
();
...
...
modules/gui/qt4/dialogs_provider.hpp
View file @
7f2ce08c
...
@@ -90,6 +90,8 @@ public:
...
@@ -90,6 +90,8 @@ public:
EXT_FILTER_PLAYLIST
,
EXT_FILTER_PLAYLIST
,
const
QString
&
path
=
QString
()
);
const
QString
&
path
=
QString
()
);
bool
isDying
()
{
return
b_isDying
;
}
bool
isDying
()
{
return
b_isDying
;
}
static
QString
getDirectoryDialog
(
intf_thread_t
*
p_intf
);
protected:
protected:
QSignalMapper
*
menusMapper
;
QSignalMapper
*
menusMapper
;
QSignalMapper
*
menusUpdateMapper
;
QSignalMapper
*
menusUpdateMapper
;
...
@@ -143,7 +145,6 @@ public slots:
...
@@ -143,7 +145,6 @@ public slots:
void
openNetDialog
();
void
openNetDialog
();
void
openCaptureDialog
();
void
openCaptureDialog
();
QString
getDirectoryDialog
();
void
PLAppendDialog
(
int
tab
=
OPEN_FILE_TAB
);
void
PLAppendDialog
(
int
tab
=
OPEN_FILE_TAB
);
void
MLAppendDialog
(
int
tab
=
OPEN_FILE_TAB
);
void
MLAppendDialog
(
int
tab
=
OPEN_FILE_TAB
);
...
...
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