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
f36c50b0
Commit
f36c50b0
authored
Aug 20, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: simplify and hopefully fix progress bar deletion
This should fix LP#947156.
parent
29de0421
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
modules/gui/qt4/dialogs/external.cpp
modules/gui/qt4/dialogs/external.cpp
+2
-4
modules/gui/qt4/dialogs/external.hpp
modules/gui/qt4/dialogs/external.hpp
+1
-2
No files found.
modules/gui/qt4/dialogs/external.cpp
View file @
f36c50b0
...
...
@@ -58,9 +58,6 @@ DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent)
Qt
::
BlockingQueuedConnection
);
progressBar
.
addCallback
(
this
,
SLOT
(
startProgressBar
(
void
*
)),
Qt
::
BlockingQueuedConnection
);
connect
(
this
,
SIGNAL
(
progressBarDestroyed
(
QWidget
*
)),
SLOT
(
stopProgressBar
(
QWidget
*
)));
dialog_Register
(
intf
);
}
...
...
@@ -197,6 +194,7 @@ QVLCProgressDialog::QVLCProgressDialog (DialogHandler *parent,
connect
(
this
,
SIGNAL
(
described
(
const
QString
&
)),
SLOT
(
setLabelText
(
const
QString
&
)));
connect
(
this
,
SIGNAL
(
canceled
(
void
)),
SLOT
(
saveCancel
(
void
)));
connect
(
this
,
SIGNAL
(
released
(
void
)),
SLOT
(
deleteLater
(
void
)));
data
->
pf_update
=
update
;
data
->
pf_check
=
check
;
...
...
@@ -226,7 +224,7 @@ void QVLCProgressDialog::destroy (void *priv)
{
QVLCProgressDialog
*
self
=
static_cast
<
QVLCProgressDialog
*>
(
priv
);
emit
self
->
handler
->
progressBarDestroyed
(
self
);
emit
self
->
released
(
);
}
void
QVLCProgressDialog
::
saveCancel
(
void
)
...
...
modules/gui/qt4/dialogs/external.hpp
View file @
f36c50b0
...
...
@@ -51,7 +51,6 @@ private:
QVLCPointer
question
;
QVLCPointer
progressBar
;
signals:
void
progressBarDestroyed
(
QWidget
*
);
void
error
(
const
QString
&
,
const
QString
&
);
private
slots
:
...
...
@@ -85,7 +84,7 @@ private slots:
signals:
void
progressed
(
int
);
void
described
(
const
QString
&
);
void
destroy
ed
(
void
);
void
releas
ed
(
void
);
};
#endif
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