Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
80224804
Commit
80224804
authored
Feb 19, 2010
by
Hugo Beauzee-Luyssen
Browse files
The progress bar is now non-modal, so the user can hide the import windows.
parent
1645d008
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/Gui/import/ImportController.cpp
View file @
80224804
...
...
@@ -73,10 +73,7 @@ ImportController::ImportController(QWidget *parent) :
m_ui
->
treeView
->
setColumnHidden
(
3
,
true
);
m_ui
->
forwardButton
->
setEnabled
(
true
);
m_progressDialog
=
new
QProgressDialog
(
tr
(
"Importing files..."
),
tr
(
"Cancel"
),
0
,
0
,
NULL
);
m_progressDialog
->
setWindowModality
(
Qt
::
WindowModal
);
m_progressDialog
->
setMinimumDuration
(
1000
);
m_ui
->
progressBar
->
setHidden
(
true
);
connect
(
m_ui
->
treeView
,
SIGNAL
(
clicked
(
QModelIndex
)
),
this
,
SLOT
(
treeViewClicked
(
QModelIndex
)
)
);
...
...
@@ -229,7 +226,7 @@ void
ImportController
::
importMedia
(
const
QString
&
filePath
)
{
++
m_nbMediaToLoad
;
m_progress
Dialog
->
setMaximum
(
m_nbMediaToLoad
);
m_
ui
->
progress
Bar
->
setMaximum
(
m_nbMediaToLoad
);
foreach
(
Media
*
media
,
m_temporaryMedias
.
values
()
)
if
(
media
->
getFileInfo
()
->
filePath
()
==
filePath
)
return
;
...
...
@@ -436,9 +433,13 @@ ImportController::mediaLoaded()
{
m_nbMediaLoaded
=
0
;
m_nbMediaToLoad
=
0
;
m_progress
Dialog
->
hide
();
m_
ui
->
progress
Bar
->
hide
();
}
else
m_progressDialog
->
setValue
(
m_nbMediaLoaded
);
{
if
(
m_nbMediaToLoad
>
3
)
m_ui
->
progressBar
->
show
();
m_ui
->
progressBar
->
setValue
(
m_nbMediaLoaded
);
}
}
src/Gui/import/ImportController.h
View file @
80224804
...
...
@@ -82,7 +82,6 @@ class ImportController : public QDialog
QUuid
m_currentUuid
;
QUuid
m_savedUuid
;
bool
m_controllerSwitched
;
QProgressDialog
*
m_progressDialog
;
QHash
<
QUuid
,
Media
*>
m_temporaryMedias
;
quint32
m_nbMediaToLoad
;
quint32
m_nbMediaLoaded
;
...
...
src/Gui/import/ui/ImportController.ui
View file @
80224804
...
...
@@ -38,6 +38,16 @@
</item>
<item>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_9"
>
<item>
<widget
class=
"QProgressBar"
name=
"progressBar"
>
<property
name=
"value"
>
<number>
0
</number>
</property>
<property
name=
"textVisible"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item>
<widget
class=
"QWidget"
name=
"stackViewContainer"
native=
"true"
>
<property
name=
"minimumSize"
>
...
...
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