Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
62d7d384
Commit
62d7d384
authored
May 02, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: better hotkeys change management.
Close #2245
parent
9c95e933
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
modules/gui/qt4/components/preferences_widgets.cpp
modules/gui/qt4/components/preferences_widgets.cpp
+7
-4
modules/gui/qt4/components/preferences_widgets.hpp
modules/gui/qt4/components/preferences_widgets.hpp
+1
-1
No files found.
modules/gui/qt4/components/preferences_widgets.cpp
View file @
62d7d384
...
...
@@ -1326,6 +1326,10 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table,
selected
=
new
QLabel
(
qtr
(
"Press the new keys for "
)
+
keyToChange
);
vLayout
->
addWidget
(
selected
,
Qt
::
AlignCenter
);
warning
=
new
QLabel
;
warning
->
hide
();
vLayout
->
insertWidget
(
1
,
warning
);
buttonBox
=
new
QDialogButtonBox
;
QPushButton
*
ok
=
new
QPushButton
(
qtr
(
"OK"
)
);
QPushButton
*
cancel
=
new
QPushButton
(
qtr
(
"Cancel"
)
);
...
...
@@ -1347,12 +1351,11 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
if
(
conflictList
.
size
()
&&
conflictList
[
0
]
->
data
(
1
,
Qt
::
UserRole
).
toInt
()
>
1
)
/* Avoid 0 or -1 that are the "Unset" states*/
/* Avoid 0 or -1 that are the "Unset" states
*/
{
QLabel
*
warning
=
new
QLabel
(
qtr
(
"Warning: the key is already assigned to
\"
"
)
+
warning
->
setText
(
qtr
(
"Warning: the key is already assigned to
\"
"
)
+
conflictList
[
0
]
->
text
(
0
)
+
"
\"
"
);
vLayout
->
insertWidget
(
1
,
warning
);
warning
->
show
(
);
buttonBox
->
show
();
conflicts
=
true
;
...
...
modules/gui/qt4/components/preferences_widgets.hpp
View file @
62d7d384
...
...
@@ -468,7 +468,7 @@ private:
void
checkForConflicts
(
int
i_vlckey
);
void
keyPressEvent
(
QKeyEvent
*
);
void
wheelEvent
(
QWheelEvent
*
);
QLabel
*
selected
;
QLabel
*
selected
,
*
warning
;
QVBoxLayout
*
vLayout
;
QDialogButtonBox
*
buttonBox
;
};
...
...
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