mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the "quoteright" key to the list of available keyboard shortcuts.

Browse Source 
Change-Id: I24800c28b1513b883c42d9ce1c787eaf07815b92
This commit is contained in:
Kohei Yoshida 2014-05-02 12:29:15 -04:00
parent af10cb2c9c
commit dd9c9a69da
9 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cui/source/customize/acccfg.cxx
View File

@ -203,6 +203,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
KEY_Y | KEY_MOD1 ,
KEY_Z | KEY_MOD1 ,
KEY_SEMICOLON | KEY_MOD1 ,
KEY_QUOTERIGHT | KEY_MOD1 ,
KEY_BRACKETLEFT | KEY_MOD1 ,
KEY_BRACKETRIGHT | KEY_MOD1,
KEY_POINT | KEY_MOD1 ,
@ -280,6 +281,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
KEY_Y | KEY_SHIFT | KEY_MOD1,
KEY_Z | KEY_SHIFT | KEY_MOD1,
KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 ,
KEY_QUOTERIGHT | KEY_SHIFT | KEY_MOD1 ,
KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 ,
KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1,
KEY_POINT | KEY_SHIFT | KEY_MOD1,
@ -352,6 +354,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
KEY_Y | KEY_MOD2 ,
KEY_Z | KEY_MOD2 ,
KEY_SEMICOLON | KEY_MOD2 ,
KEY_QUOTERIGHT | KEY_MOD2 ,
KEY_BRACKETLEFT | KEY_MOD2 ,
KEY_BRACKETRIGHT | KEY_MOD2,
KEY_POINT | KEY_MOD2 ,
@ -424,6 +427,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
KEY_Y | KEY_SHIFT | KEY_MOD2,
KEY_Z | KEY_SHIFT | KEY_MOD2,
KEY_SEMICOLON | KEY_SHIFT | KEY_MOD2 ,
KEY_QUOTERIGHT | KEY_SHIFT | KEY_MOD2 ,
KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 ,
KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2,
KEY_POINT | KEY_SHIFT | KEY_MOD2,
@ -564,6 +568,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
KEY_Y | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_Z | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_QUOTERIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
KEY_POINT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,

1
framework/source/accelerators/keymapping.cxx
View File

@ -135,6 +135,7 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] =
{css::awt::Key::BRACKETLEFT , "KEY_BRACKETLEFT" },
{css::awt::Key::BRACKETRIGHT , "KEY_BRACKETRIGHT" },
{css::awt::Key::SEMICOLON , "KEY_SEMICOLON" },
{css::awt::Key::QUOTERIGHT , "KEY_QUOTERIGHT" },
{0 , "" } // mark the end of this array!
};

1
include/vcl/keycodes.hxx
View File

@ -145,6 +145,7 @@
#define KEY_BRACKETLEFT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETLEFT)
#define KEY_BRACKETRIGHT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETRIGHT)
#define KEY_SEMICOLON ((sal_uInt16)::com::sun::star::awt::Key::SEMICOLON)
#define KEY_QUOTERIGHT ((sal_uInt16)::com::sun::star::awt::Key::QUOTERIGHT)
#define KEY_CAPSLOCK ((sal_uInt16)::com::sun::star::awt::Key::CAPSLOCK)
#define KEY_NUMLOCK ((sal_uInt16)::com::sun::star::awt::Key::NUMLOCK)

3
offapi/com/sun/star/awt/Key.idl
View File

@ -362,6 +362,9 @@ published constants Key
const short SEMICOLON = 1317;
const short QUOTERIGHT = 1318;
const short DELETE_TO_END_OF_PARAGRAPH = 1539;

8
vcl/unx/generic/app/saldisp.cxx
View File

@ -919,7 +919,9 @@ OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
case KEY_SEMICOLON:
aCustomKeyName = ";";
break;
case KEY_QUOTERIGHT:
aCustomKeyName = "'";
break;
default:
nKeySym = 0;
break;
@ -1262,6 +1264,10 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
nKey = KEY_SEMICOLON;
*pcPrintable = ';';
break;
case XK_quoteright:
nKey = KEY_QUOTERIGHT;
*pcPrintable = '\'';
break;
// - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000
case 0x1000FF02: // apXK_Copy
nKey = KEY_COPY;

1
vcl/unx/gtk/window/gtksalframe.cxx
View File

@ -255,6 +255,7 @@ static sal_uInt16 GetKeyCode( guint keyval )
case GDK_bracketleft: nCode = KEY_BRACKETLEFT; break;
case GDK_bracketright: nCode = KEY_BRACKETRIGHT; break;
case GDK_semicolon: nCode = KEY_SEMICOLON; break;
case GDK_quoteright: nCode = KEY_QUOTERIGHT; break;
// some special cases, also see saldisp.cxx
// - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000
case 0x1000FF02: // apXK_Copy

1
vcl/unx/gtk/window/gtksalmenu.cxx
View File

@ -139,6 +139,7 @@ static void KeyCodeToGdkKey ( const KeyCode& rKeyCode, guint* pGdkKeyCode, GdkMo
case KEY_BRACKETLEFT: nKeyCode = GDK_bracketleft; break;
case KEY_BRACKETRIGHT: nKeyCode = GDK_bracketright; break;
case KEY_SEMICOLON: nKeyCode = GDK_semicolon; break;
case KEY_QUOTERIGHT: nKeyCode = GDK_quoteright; break;
// Special cases
case KEY_COPY: nKeyCode = GDK_Copy; break;

1
vcl/win/source/app/salinst.cxx
View File

@ -332,6 +332,7 @@ void SalData::initKeyCodeMap()
initKey( '[', KEY_BRACKETLEFT );
initKey( ']', KEY_BRACKETRIGHT );
initKey( ';', KEY_SEMICOLON );
initKey( '\'', KEY_QUOTERIGHT );
}
// SalData

3
vcl/win/source/window/salframe.cxx
View File

@ -2550,6 +2550,9 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode )
case KEY_SEMICOLON:
cSVCode = ';';
break;
case KEY_QUOTERIGHT:
cSVCode = '\'';
break;
case KEY_BRACKETLEFT:
cSVCode = '[';
break;