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
82d7c41a
Commit
82d7c41a
authored
Sep 12, 2013
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: convert: don't enforce container extension (fix #9282)
parent
688f5db3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
modules/gui/qt4/dialogs/convert.cpp
modules/gui/qt4/dialogs/convert.cpp
+6
-8
No files found.
modules/gui/qt4/dialogs/convert.cpp
View file @
82d7c41a
...
...
@@ -129,7 +129,8 @@ void ConvertDialog::fileBrowse()
QString
fileName
=
QFileDialog
::
getSaveFileName
(
this
,
qtr
(
"Save file..."
),
p_intf
->
p_sys
->
filepath
,
QString
(
qtr
(
"Containers (*"
)
+
fileExtension
+
")"
)
);
QString
(
"%1 (*%2);;%3 (*.*)"
).
arg
(
qtr
(
"Containers"
)
)
.
arg
(
fileExtension
).
arg
(
qtr
(
"All"
)
)
);
fileLine
->
setText
(
toNativeSeparators
(
fileName
)
);
setDestinationFileExtension
();
}
...
...
@@ -174,13 +175,10 @@ void ConvertDialog::setDestinationFileExtension()
if
(
!
fileLine
->
text
().
isEmpty
()
&&
profile
->
isEnabled
()
)
{
QString
newFileExtension
=
"."
+
profile
->
getMux
();
QString
newFileName
;
int
index
=
fileLine
->
text
().
lastIndexOf
(
"."
);
if
(
index
!=
-
1
)
{
newFileName
=
fileLine
->
text
().
left
(
index
).
append
(
newFileExtension
);
}
else
{
newFileName
=
fileLine
->
text
().
append
(
newFileExtension
);
if
(
fileLine
->
text
().
lastIndexOf
(
"."
)
==
-
1
)
{
QString
newFileName
=
fileLine
->
text
().
append
(
newFileExtension
);
fileLine
->
setText
(
toNativeSeparators
(
newFileName
)
);
}
fileLine
->
setText
(
toNativeSeparators
(
newFileName
)
);
}
}
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