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
6f55cc51
Commit
6f55cc51
authored
Feb 17, 2012
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: simple_prefs: Fix action button for hotkeys conflict dialog.
As "Ok" did not mean which action would have been done.
parent
c8d0c9ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
modules/gui/qt4/components/preferences_widgets.cpp
modules/gui/qt4/components/preferences_widgets.cpp
+1
-1
No files found.
modules/gui/qt4/components/preferences_widgets.cpp
View file @
6f55cc51
...
...
@@ -1556,7 +1556,7 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table,
vLayout
->
insertWidget
(
1
,
warning
);
buttonBox
=
new
QDialogButtonBox
;
QPushButton
*
ok
=
new
QPushButton
(
qtr
(
"
OK
"
)
);
QPushButton
*
ok
=
new
QPushButton
(
qtr
(
"
Assign
"
)
);
QPushButton
*
cancel
=
new
QPushButton
(
qtr
(
"Cancel"
)
);
buttonBox
->
addButton
(
ok
,
QDialogButtonBox
::
AcceptRole
);
buttonBox
->
addButton
(
cancel
,
QDialogButtonBox
::
RejectRole
);
...
...
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