Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
4d95527f
Commit
4d95527f
authored
Aug 05, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some interaction issues. Ref #1808
parent
547de22d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
7 deletions
+23
-7
modules/gui/qt4/dialogs/interaction.cpp
modules/gui/qt4/dialogs/interaction.cpp
+23
-7
No files found.
modules/gui/qt4/dialogs/interaction.cpp
View file @
4d95527f
...
@@ -43,9 +43,11 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
...
@@ -43,9 +43,11 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
p_intf
(
_p_intf
),
p_dialog
(
_p_dialog
)
p_intf
(
_p_intf
),
p_dialog
(
_p_dialog
)
{
{
QVBoxLayout
*
layout
=
NULL
;
QVBoxLayout
*
layout
=
NULL
;
description
=
NULL
;
int
i_ret
=
-
1
;
int
i_ret
=
-
1
;
panel
=
NULL
;
panel
=
NULL
;
dialog
=
NULL
;
dialog
=
NULL
;
altButton
=
NULL
;
if
(
p_dialog
->
i_flags
&
DIALOG_BLOCKING_ERROR
)
if
(
p_dialog
->
i_flags
&
DIALOG_BLOCKING_ERROR
)
{
{
...
@@ -102,6 +104,17 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
...
@@ -102,6 +104,17 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
panel
->
setLayout
(
grid
);
panel
->
setLayout
(
grid
);
layout
->
addWidget
(
panel
);
layout
->
addWidget
(
panel
);
}
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_INTF_PROGRESS
)
{
if
(
p_intf
->
p_sys
->
p_mi
)
{
progressBar
=
p_intf
->
p_sys
->
p_mi
->
pgBar
;
progressBar
->
show
();
i_ret
=
2
;
}
else
p_dialog
->
i_flags
=
DIALOG_USER_PROGRESS
;
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_USER_PROGRESS
)
else
if
(
p_dialog
->
i_flags
&
DIALOG_USER_PROGRESS
)
{
{
dialog
=
new
QWidget
(
0
);
layout
=
new
QVBoxLayout
(
dialog
);
dialog
=
new
QWidget
(
0
);
layout
=
new
QVBoxLayout
(
dialog
);
...
@@ -115,12 +128,6 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
...
@@ -115,12 +128,6 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
progressBar
->
setOrientation
(
Qt
::
Horizontal
);
progressBar
->
setOrientation
(
Qt
::
Horizontal
);
layout
->
addWidget
(
progressBar
);
layout
->
addWidget
(
progressBar
);
}
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_INTF_PROGRESS
)
{
progressBar
=
p_intf
->
p_sys
->
p_mi
->
pgBar
;
progressBar
->
show
();
i_ret
=
2
;
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_PSZ_INPUT_OK_CANCEL
)
else
if
(
p_dialog
->
i_flags
&
DIALOG_PSZ_INPUT_OK_CANCEL
)
{
{
dialog
=
new
QWidget
(
0
);
layout
=
new
QVBoxLayout
(
dialog
);
dialog
=
new
QWidget
(
0
);
layout
=
new
QVBoxLayout
(
dialog
);
...
@@ -195,15 +202,24 @@ void InteractionDialog::update()
...
@@ -195,15 +202,24 @@ void InteractionDialog::update()
{
{
assert
(
progressBar
);
assert
(
progressBar
);
progressBar
->
setValue
(
(
int
)(
p_dialog
->
val
.
f_float
*
10
)
);
progressBar
->
setValue
(
(
int
)(
p_dialog
->
val
.
f_float
*
10
)
);
description
->
setText
(
qfu
(
p_dialog
->
psz_description
)
);
if
(
description
)
description
->
setText
(
qfu
(
p_dialog
->
psz_description
)
);
}
}
else
return
;
if
(
(
p_dialog
->
i_flags
&
DIALOG_INTF_PROGRESS
)
&&
if
(
(
p_dialog
->
i_flags
&
DIALOG_INTF_PROGRESS
)
&&
(
p_dialog
->
val
.
f_float
>=
100.0
)
)
(
p_dialog
->
val
.
f_float
>=
100.0
)
)
{
progressBar
->
hide
();
progressBar
->
hide
();
msg_Dbg
(
p_intf
,
"Progress Done"
);
}
if
(
(
p_dialog
->
i_flags
&
DIALOG_USER_PROGRESS
)
&&
if
(
(
p_dialog
->
i_flags
&
DIALOG_USER_PROGRESS
)
&&
(
p_dialog
->
val
.
f_float
>=
100.0
)
)
(
p_dialog
->
val
.
f_float
>=
100.0
)
)
{
assert
(
altButton
);
altButton
->
setText
(
qtr
(
"&Close"
)
);
altButton
->
setText
(
qtr
(
"&Close"
)
);
}
}
}
InteractionDialog
::~
InteractionDialog
()
InteractionDialog
::~
InteractionDialog
()
...
...
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