anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix bug #5991: Select function in environments.

Browse Source 
C-M-a now selects the contents of an inset, if the whole inset is already selected, it will jump out the inset and selects everything in that inset.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31598 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-10-12 08:21:32 +00:00
parent b2ed4bffe0
commit a18553e403
6 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/bind/cua.bind
View File

@ -81,6 +81,7 @@
\bind "C-S-Z" "redo" \bind "C-S-Z" "redo"
\bind "C-a" "command-sequence buffer-begin ; buffer-end-select" # select all \bind "C-a" "command-sequence buffer-begin ; buffer-end-select" # select all
\bind "C-M-a" "inset-select-all"
\bind "C-S-E" "changes-track" # it's what MS Word uses \bind "C-S-E" "changes-track" # it's what MS Word uses
\bind "~S-M-quotedbl" "quote-insert single" \bind "~S-M-quotedbl" "quote-insert single"

1
lib/bind/mac.bind
View File

@ -69,6 +69,7 @@
\bind "C-S-Z" "redo" \bind "C-S-Z" "redo"
\bind "C-a" "command-sequence buffer-begin ; buffer-end-select" # select all \bind "C-a" "command-sequence buffer-begin ; buffer-end-select" # select all
\bind "C-M-a" "inset-select-all"
\bind "C-S-E" "changes-track" # it's what MS Word uses \bind "C-S-E" "changes-track" # it's what MS Word uses
\bind "~S-M-quotedbl" "quote-insert single" \bind "~S-M-quotedbl" "quote-insert single"

3
src/FuncCode.h
View File

@ -415,7 +415,7 @@ enum FuncCode
LFUN_VC_COMMAND, LFUN_VC_COMMAND,
// 320 // 320
LFUN_MATH_FONT_STYLE, LFUN_MATH_FONT_STYLE,
LFUN_SCREEN_SHOW_CURSOR, // vfr, 20090325 LFUN_INSET_SELECT_ALL, // vfr, 20090822
LFUN_BUFFER_ZOOM_IN, // vfr, 20090330 LFUN_BUFFER_ZOOM_IN, // vfr, 20090330
LFUN_BUFFER_ZOOM_OUT, // vfr, 20090330 LFUN_BUFFER_ZOOM_OUT, // vfr, 20090330
LFUN_INSET_BEGIN, // JMarc, 20090316 LFUN_INSET_BEGIN, // JMarc, 20090316
@ -426,6 +426,7 @@ enum FuncCode
LFUN_VC_LOCKING_TOGGLE, LFUN_VC_LOCKING_TOGGLE,
LFUN_MATH_BIGDELIM, LFUN_MATH_BIGDELIM,
LFUN_GRAPHICS_RELOAD, // vfr 20090810 LFUN_GRAPHICS_RELOAD, // vfr 20090810
LFUN_SCREEN_SHOW_CURSOR, // vfr, 20090325
LFUN_LASTACTION // end of the table LFUN_LASTACTION // end of the table
}; };

9
src/LyXAction.cpp
View File

@ -1038,6 +1038,15 @@ void LyXAction::init()
*/ */
{ LFUN_INSET_END_SELECT, "inset-end-select", ReadOnly, Edit }, { LFUN_INSET_END_SELECT, "inset-end-select", ReadOnly, Edit },
/*!
* \var lyx::FuncCode lyx::LFUN_INSET_SELECT_ALL
* \li Action: Selects all contents of an inset.
* \li Syntax: inset-select-all
* \li Origin: vfr, 22 Aug 2009
* \endvar
*/
{ LFUN_INSET_SELECT_ALL, "inset-select-all", ReadOnly, Edit },
/*! /*!
* \var lyx::FuncCode lyx::LFUN_LINE_BEGIN * \var lyx::FuncCode lyx::LFUN_LINE_BEGIN
* \li Action: Move the cursor to the begining of the (screen) line. * \li Action: Move the cursor to the begining of the (screen) line.

13
src/Text3.cpp
View File

@ -561,6 +561,18 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
cur.updateFlags(Update::FitCursor); cur.updateFlags(Update::FitCursor);
break; break;
case LFUN_INSET_SELECT_ALL:
if (cur.depth() == 1 || !cur.selection() || !cur.selBegin().at_begin()
|| !cur.selEnd().at_end()) {
needsUpdate |= cur.selHandle(false);
needsUpdate |= cursorTop(cur);
needsUpdate |= cur.selHandle(true);
needsUpdate |= cursorBottom(cur);
} else
cur.undispatched();
cur.updateFlags(Update::FitCursor);
break;
case LFUN_CHAR_FORWARD: case LFUN_CHAR_FORWARD:
case LFUN_CHAR_FORWARD_SELECT: case LFUN_CHAR_FORWARD_SELECT:
//LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur); //LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur);
@ -2445,6 +2457,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_INSET_END: case LFUN_INSET_END:
case LFUN_INSET_BEGIN_SELECT: case LFUN_INSET_BEGIN_SELECT:
case LFUN_INSET_END_SELECT: case LFUN_INSET_END_SELECT:
case LFUN_INSET_SELECT_ALL:
case LFUN_UNICODE_INSERT: case LFUN_UNICODE_INSERT:
// these are handled in our dispatch() // these are handled in our dispatch()
enable = true; enable = true;

3
status.16x
View File

@ -54,6 +54,9 @@ What's new
- Close button on tabs is configurable now (bug 5977). - Close button on tabs is configurable now (bug 5977).
- New LFUN inset-select-all allows to select the whole contents of
an inset (bug 5991).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION