mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
fix LFUN_CUT and LFUN_PASTE in insettabular (bug 1799), partial restore of middle mouse button in tabular (see FIXME)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9719 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
d13d6da879
commit
fdfd858b02
@ -1,5 +1,9 @@
|
|||||||
2005-03-17 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
2005-03-17 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||||
|
|
||||||
|
* insettabular.C (doDispatch): get middle mouse button back again
|
||||||
|
(partially), pass LFUN_CUT and LFUN_PASTE to insettext's dispatch
|
||||||
|
when only a part of the cell is selected (fix bug 1799)
|
||||||
|
|
||||||
* insettabular.C: handle some more character attributes in
|
* insettabular.C: handle some more character attributes in
|
||||||
M. Vermeers method (when multiple cells in tables are selected);
|
M. Vermeers method (when multiple cells in tables are selected);
|
||||||
disable some more senseless lfuns when multiple cells are selected
|
disable some more senseless lfuns when multiple cells are selected
|
||||||
|
@ -455,8 +455,13 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//if (cmd.button() == mouse_button::button2)
|
if (cmd.button() == mouse_button::button2) {
|
||||||
// dispatch(cur, FuncRequest(LFUN_PASTESELECTION, "paragraph"));
|
// FIXME: pasting multiple cells (with insettabular's own
|
||||||
|
// LFUN_PASTESELECTION still does not work! (jspitzm)
|
||||||
|
cmd = FuncRequest(LFUN_PASTESELECTION, "paragraph");
|
||||||
|
cell(cur.idx())->dispatch(cur, cmd);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// we'll pop up the table dialog on release
|
// we'll pop up the table dialog on release
|
||||||
if (cmd.button() == mouse_button::button3)
|
if (cmd.button() == mouse_button::button3)
|
||||||
@ -623,10 +628,14 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
|
|||||||
}
|
}
|
||||||
|
|
||||||
case LFUN_CUT:
|
case LFUN_CUT:
|
||||||
if (copySelection(cur)) {
|
if (tablemode(cur)) {
|
||||||
recordUndo(cur, Undo::DELETE);
|
if (copySelection(cur)) {
|
||||||
cutSelection(cur);
|
recordUndo(cur, Undo::DELETE);
|
||||||
|
cutSelection(cur);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
cell(cur.idx())->dispatch(cur, cmd);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LFUN_BACKSPACE:
|
case LFUN_BACKSPACE:
|
||||||
@ -641,8 +650,11 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
|
|||||||
case LFUN_COPY:
|
case LFUN_COPY:
|
||||||
if (!cur.selection())
|
if (!cur.selection())
|
||||||
break;
|
break;
|
||||||
finishUndo();
|
if (tablemode(cur)) {
|
||||||
copySelection(cur);
|
finishUndo();
|
||||||
|
copySelection(cur);
|
||||||
|
} else
|
||||||
|
cell(cur.idx())->dispatch(cur, cmd);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LFUN_PASTESELECTION: {
|
case LFUN_PASTESELECTION: {
|
||||||
|
Loading…
Reference in New Issue
Block a user