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
d8f50ad6
Commit
d8f50ad6
authored
Aug 03, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #1808 on AVI fixing.
parent
1b4877cc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
modules/gui/qt4/dialogs/interaction.cpp
modules/gui/qt4/dialogs/interaction.cpp
+14
-2
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-1
No files found.
modules/gui/qt4/dialogs/interaction.cpp
View file @
d8f50ad6
...
...
@@ -20,6 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
...
...
@@ -58,7 +59,6 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
ErrorsDialog
::
getInstance
(
p_intf
)
->
addError
(
qfu
(
p_dialog
->
psz_title
),
qfu
(
p_dialog
->
psz_description
)
);
i_ret
=
0
;
// QApplication::style()->standardPixmap(QStyle::SP_MessageBoxCritical)
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_WARNING
)
{
...
...
@@ -119,6 +119,7 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
{
progressBar
=
p_intf
->
p_sys
->
p_mi
->
pgBar
;
progressBar
->
show
();
i_ret
=
2
;
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_PSZ_INPUT_OK_CANCEL
)
{
...
...
@@ -131,18 +132,24 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
layout
->
addWidget
(
inputEdit
);
}
else
msg_Err
(
p_intf
,
"unknown dialog type %i"
,
p_dialog
->
i_flags
);
{
msg_Err
(
p_intf
,
"Unknown dialog type %i"
,
p_dialog
->
i_flags
);
return
;
}
/* We used a message box */
if
(
i_ret
!=
-
1
)
{
if
(
i_ret
==
0
)
Finish
(
DIALOG_OK_YES
);
else
if
(
i_ret
==
1
)
Finish
(
DIALOG_NO
);
else
if
(
i_ret
==
2
)
return
;
else
Finish
(
DIALOG_CANCELLED
);
}
else
/* Custom box, finish it */
{
assert
(
dialog
);
/* Start the DialogButtonBox config */
QDialogButtonBox
*
buttonBox
=
new
QDialogButtonBox
;
if
(
p_dialog
->
psz_default_button
)
...
...
@@ -165,12 +172,17 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
buttonBox
->
addButton
(
otherButton
,
QDialogButtonBox
::
ActionRole
);
}
layout
->
addWidget
(
buttonBox
);
/* End the DialogButtonBox */
/* CONNECTs */
if
(
p_dialog
->
psz_default_button
)
BUTTONACT
(
defaultButton
,
defaultB
()
);
if
(
p_dialog
->
psz_alternate_button
)
BUTTONACT
(
altButton
,
altB
()
);
if
(
p_dialog
->
psz_other_button
)
BUTTONACT
(
otherButton
,
otherB
()
);
/* set the layouts and thte title */
dialog
->
setLayout
(
layout
);
dialog
->
setWindowTitle
(
qfu
(
p_dialog
->
psz_title
)
);
}
...
...
modules/gui/qt4/main_interface.cpp
View file @
d8f50ad6
...
...
@@ -900,7 +900,7 @@ void MainInterface::setName( QString name )
void
MainInterface
::
setStatus
(
int
status
)
{
msg_Dbg
(
p_intf
,
"
I was here, updating your status"
);
msg_Dbg
(
p_intf
,
"
Updating the stream status: %i"
,
status
);
/* Forward the status to the controls to toggle Play/Pause */
controls
->
setStatus
(
status
);
...
...
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