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
dbd2819c
Commit
dbd2819c
authored
Feb 17, 2012
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: simple_prefs: fix some hotkeys text
parent
6f55cc51
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
modules/gui/qt4/components/preferences_widgets.cpp
modules/gui/qt4/components/preferences_widgets.cpp
+8
-6
No files found.
modules/gui/qt4/components/preferences_widgets.cpp
View file @
dbd2819c
...
@@ -1543,12 +1543,13 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table,
...
@@ -1543,12 +1543,13 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table,
conflicts
=
false
;
conflicts
=
false
;
table
=
_table
;
table
=
_table
;
setWindowTitle
(
b_global
?
qtr
(
"Global"
)
:
""
setWindowTitle
(
(
b_global
?
qtr
(
"Global"
)
+
QString
(
" "
)
:
""
)
+
qtr
(
"Hotkey
for "
)
+
keyToChange
);
+
qtr
(
"Hotkey
change"
)
);
setWindowRole
(
"vlc-key-input"
);
setWindowRole
(
"vlc-key-input"
);
QVBoxLayout
*
vLayout
=
new
QVBoxLayout
(
this
);
QVBoxLayout
*
vLayout
=
new
QVBoxLayout
(
this
);
selected
=
new
QLabel
(
qtr
(
"Press the new keys for "
)
+
keyToChange
);
selected
=
new
QLabel
(
qtr
(
"Press the new key or combination for "
)
+
QString
(
"<b>%1</b>"
).
arg
(
keyToChange
)
);
vLayout
->
addWidget
(
selected
,
Qt
::
AlignCenter
);
vLayout
->
addWidget
(
selected
,
Qt
::
AlignCenter
);
warning
=
new
QLabel
;
warning
=
new
QLabel
;
...
@@ -1579,8 +1580,8 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
...
@@ -1579,8 +1580,8 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
!
conflictList
[
0
]
->
data
(
b_global
?
2
:
1
,
Qt
::
UserRole
).
toString
().
isEmpty
()
&&
!
conflictList
[
0
]
->
data
(
b_global
?
2
:
1
,
Qt
::
UserRole
).
toString
().
isEmpty
()
&&
conflictList
[
0
]
->
data
(
b_global
?
2
:
1
,
Qt
::
UserRole
).
toString
()
!=
"Unset"
)
conflictList
[
0
]
->
data
(
b_global
?
2
:
1
,
Qt
::
UserRole
).
toString
()
!=
"Unset"
)
{
{
warning
->
setText
(
qtr
(
"Warning: th
e key is already assigned to
\"
"
)
+
warning
->
setText
(
qtr
(
"Warning: th
is key or combination is already assigned to
"
)
+
conflictList
[
0
]
->
text
(
0
)
+
"
\"
"
);
QString
(
"
\"
<b>%1</b>
\"
"
).
arg
(
conflictList
[
0
]
->
text
(
0
)
)
);
warning
->
show
();
warning
->
show
();
buttonBox
->
show
();
buttonBox
->
show
();
...
@@ -1599,7 +1600,8 @@ void KeyInputDialog::keyPressEvent( QKeyEvent *e )
...
@@ -1599,7 +1600,8 @@ void KeyInputDialog::keyPressEvent( QKeyEvent *e )
e
->
key
()
==
Qt
::
Key_AltGr
)
e
->
key
()
==
Qt
::
Key_AltGr
)
return
;
return
;
int
i_vlck
=
qtEventToVLCKey
(
e
);
int
i_vlck
=
qtEventToVLCKey
(
e
);
selected
->
setText
(
qtr
(
"Key: "
)
+
VLCKeyToString
(
i_vlck
)
);
selected
->
setText
(
qtr
(
"Key or combination: "
)
+
QString
(
"<b>%1</b>"
).
arg
(
VLCKeyToString
(
i_vlck
)
)
);
checkForConflicts
(
i_vlck
);
checkForConflicts
(
i_vlck
);
keyValue
=
i_vlck
;
keyValue
=
i_vlck
;
}
}
...
...
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