Kaydet (Commit) b2629288 authored tarafından Miklos Vajna's avatar Miklos Vajna

fdo#30714 Use different default key bindings for Hungarian locale

Mimic Hungarian Excel's key bindings:

* inserting current date is Ctrl-'.'
* inserting current time is Ctrl-Shift-'.'
üst 63961609
...@@ -226,6 +226,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = ...@@ -226,6 +226,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
KEY_SEMICOLON | KEY_MOD1 , KEY_SEMICOLON | KEY_MOD1 ,
KEY_BRACKETLEFT | KEY_MOD1 , KEY_BRACKETLEFT | KEY_MOD1 ,
KEY_BRACKETRIGHT | KEY_MOD1, KEY_BRACKETRIGHT | KEY_MOD1,
KEY_POINT | KEY_MOD1 ,
KEY_F1 | KEY_MOD1 , KEY_F1 | KEY_MOD1 ,
KEY_F2 | KEY_MOD1 , KEY_F2 | KEY_MOD1 ,
...@@ -302,6 +303,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = ...@@ -302,6 +303,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 , KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 ,
KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 , KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 ,
KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1, KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1,
KEY_POINT | KEY_SHIFT | KEY_MOD1,
KEY_F1 | KEY_SHIFT | KEY_MOD1, KEY_F1 | KEY_SHIFT | KEY_MOD1,
KEY_F2 | KEY_SHIFT | KEY_MOD1, KEY_F2 | KEY_SHIFT | KEY_MOD1,
...@@ -373,6 +375,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = ...@@ -373,6 +375,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
KEY_SEMICOLON | KEY_MOD2 , KEY_SEMICOLON | KEY_MOD2 ,
KEY_BRACKETLEFT | KEY_MOD2 , KEY_BRACKETLEFT | KEY_MOD2 ,
KEY_BRACKETRIGHT | KEY_MOD2, KEY_BRACKETRIGHT | KEY_MOD2,
KEY_POINT | KEY_MOD2 ,
KEY_F1 | KEY_MOD2 , KEY_F1 | KEY_MOD2 ,
KEY_F2 | KEY_MOD2 , KEY_F2 | KEY_MOD2 ,
...@@ -444,6 +447,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = ...@@ -444,6 +447,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
KEY_SEMICOLON | KEY_SHIFT | KEY_MOD2 , KEY_SEMICOLON | KEY_SHIFT | KEY_MOD2 ,
KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 , KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 ,
KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2, KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2,
KEY_POINT | KEY_SHIFT | KEY_MOD2,
KEY_F1 | KEY_SHIFT | KEY_MOD2, KEY_F1 | KEY_SHIFT | KEY_MOD2,
KEY_F2 | KEY_SHIFT | KEY_MOD2, KEY_F2 | KEY_SHIFT | KEY_MOD2,
...@@ -583,6 +587,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = ...@@ -583,6 +587,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_POINT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_F1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_F2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
......
...@@ -815,6 +815,16 @@ ...@@ -815,6 +815,16 @@
<value xml:lang="en-US">.uno:InsertCurrentTime</value> <value xml:lang="en-US">.uno:InsertCurrentTime</value>
</prop> </prop>
</node> </node>
<node oor:name="POINT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="hu">.uno:InsertCurrentDate</value>
</prop>
</node>
<node oor:name="POINT_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="hu">.uno:InsertCurrentTime</value>
</prop>
</node>
<node oor:name="BRACKETLEFT_MOD1" oor:op="replace"> <node oor:name="BRACKETLEFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:MarkPrecedents</value> <value xml:lang="en-US">.uno:MarkPrecedents</value>
......
...@@ -1125,7 +1125,7 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const ...@@ -1125,7 +1125,7 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
nKeySym = XK_slash; nKeySym = XK_slash;
break; break;
case KEY_POINT: case KEY_POINT:
nKeySym = XK_period; aCustomKeyName = '.';
break; break;
case KEY_COMMA: case KEY_COMMA:
nKeySym = XK_comma; nKeySym = XK_comma;
...@@ -1467,6 +1467,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const ...@@ -1467,6 +1467,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
break; break;
case XK_period: case XK_period:
nKey = KEY_POINT; nKey = KEY_POINT;
*pcPrintable = '.';
break; break;
case XK_comma: case XK_comma:
nKey = KEY_COMMA; nKey = KEY_COMMA;
......
...@@ -215,7 +215,7 @@ static sal_uInt16 GetKeyCode( guint keyval ) ...@@ -215,7 +215,7 @@ static sal_uInt16 GetKeyCode( guint keyval )
case GDK_KP_Multiply: nCode = KEY_MULTIPLY; break; case GDK_KP_Multiply: nCode = KEY_MULTIPLY; break;
case GDK_slash: case GDK_slash:
case GDK_KP_Divide: nCode = KEY_DIVIDE; break; case GDK_KP_Divide: nCode = KEY_DIVIDE; break;
case GDK_period: case GDK_period: nCode = KEY_POINT; break;
case GDK_decimalpoint: nCode = KEY_POINT; break; case GDK_decimalpoint: nCode = KEY_POINT; break;
case GDK_comma: nCode = KEY_COMMA; break; case GDK_comma: nCode = KEY_COMMA; break;
case GDK_less: nCode = KEY_LESS; break; case GDK_less: nCode = KEY_LESS; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment