Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Frontend controls: Remove hash key
authorWuzzy <Wuzzy2@mail.ru>
Sat, 04 May 2019 00:56:01 +0200
changeset 14895 9379ef4fac80
parent 14894 d17c1a28df17
child 14896 12ffbbf81ee1
Frontend controls: Remove hash key
QTfrontend/sdlkeys.cpp file | annotate | diff | comparison | revisions
QTfrontend/util/DataManager.cpp file | annotate | diff | comparison | revisions
share/hedgewars/Data/misc/keys.csv file | annotate | diff | comparison | revisions 
--- a/QTfrontend/sdlkeys.cpp	Sat May 04 00:14:12 2019 +0200
+++ b/QTfrontend/sdlkeys.cpp	Sat May 04 00:56:01 2019 +0200
@@ -39,7 +39,6 @@
     {"pause", QT_TRANSLATE_NOOP("binds (keys)", "Pause")},
     {"escape", QT_TRANSLATE_NOOP("binds (keys)", "Escape")},
     {"space", QT_TRANSLATE_NOOP("binds (keys)", "Space")},
-    {"#", "#"},
     {"'", "'"},
     {",", ","},
     {"-", "-"},
--- a/QTfrontend/util/DataManager.cpp	Sat May 04 00:14:12 2019 +0200
+++ b/QTfrontend/util/DataManager.cpp	Sat May 04 00:56:01 2019 +0200
@@ -179,7 +179,7 @@
                 if ((QString(sdlkeys[j][0]) != "f13") && (QString(sdlkeys[j][0]) != "f14") && (QString(sdlkeys[j][0]) != "f15"))
                 {
                     // If SDL doesn't know a name, show fallback name and a warning
-		    //: Name of QWERTY US keyboard layout
+                    //: Name of QWERTY US keyboard layout
                     keyDisplay = keyDisplay + QString(" ") + HWApplication::translate("binds (keys)", "(QWERTY)");
                 }
             }
--- a/share/hedgewars/Data/misc/keys.csv	Sat May 04 00:14:12 2019 +0200
+++ b/share/hedgewars/Data/misc/keys.csv	Sat May 04 00:56:01 2019 +0200
@@ -44,7 +44,7 @@
 47,"["
 48,"]"
 49,"\"
-50,"#"
+50,"nonushash"
 51,";"
 52,"'"
 53,"`"
@@ -94,6 +94,7 @@
 97,"keypad_9"
 98,"keypad_0"
 99,"keypad_."
+100,"nonusbackslash"
 101,"menu"
 102,"power"
 103,"keypad_="
@@ -220,4 +221,4 @@
 283,"app1"
 284,"app2"
 285,"audiorewind"
-286,"audiofastforwar"
\ No newline at end of file
+286,"audiofastforwar"
hedgewars-draft