anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/BufferView.cpp:

Browse Source 
* src/Text3.cpp:
	- fix LFUN_INSET_SETTINGS so that it also works at cursor position.

* LyXAction.cpp:
	- doxy.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23923 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-03-24 14:12:19 +00:00
parent 8aae2dcd3b
commit bb51488435
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferView.cpp
View File

@ -948,6 +948,8 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
case LFUN_INSET_SETTINGS: { case LFUN_INSET_SETTINGS: {
InsetCode code = cur.inset().lyxCode(); InsetCode code = cur.inset().lyxCode();
if (cur.nextInset())
code = cur.nextInset()->lyxCode();
bool enable = false; bool enable = false;
switch (code) { switch (code) {
case TABULAR_CODE: case TABULAR_CODE:

20
src/LyXAction.cpp
View File

@ -1088,7 +1088,25 @@ void LyXAction::init()
*/ */
{ LFUN_NEXT_INSET_MODIFY, "next-inset-modify", ReadOnly, Edit }, { LFUN_NEXT_INSET_MODIFY, "next-inset-modify", ReadOnly, Edit },
{ LFUN_INSET_DIALOG_UPDATE, "", Noop, Hidden }, { LFUN_INSET_DIALOG_UPDATE, "", Noop, Hidden },
/*!
* \var lyx::FuncCode lyx::LFUN_INSET_SETTINGS
* \li Action: Open the inset's properties dialog.
* \li Notion: Used for box, branch, ert, float, listings, note, tabular, wrap insets.
* \li Syntax: inset-settings
* \endvar
*/
{ LFUN_INSET_SETTINGS, "inset-settings", ReadOnly, Edit }, { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly, Edit },
/*!
* \var lyx::FuncCode lyx::LFUN_NEXT_INSET_TOGGLE
* \li Action: Toggles the inset at cursor position. For collapsables, this means it will
be (un-)collapsed, in case of other insets, the editing widget (dialog) will
be entered. Also cf. #LFUN_INSET_SETTINGS.
* \li Notion: Used for label, floats, listings, box, branch, external, wrap
bibtex, ert, command, graphics, note, space, vspace, tabular,
bibitem, inlude, ref insets.
* \li Syntax: next-inset-toggle
* \endvar
*/
{ LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly, Edit }, { LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly, Edit },
{ LFUN_INSET_TOGGLE, "inset-toggle", ReadOnly, Hidden }, { LFUN_INSET_TOGGLE, "inset-toggle", ReadOnly, Hidden },
{ LFUN_ALL_INSETS_TOGGLE, "all-insets-toggle", ReadOnly, Edit }, { LFUN_ALL_INSETS_TOGGLE, "all-insets-toggle", ReadOnly, Edit },
@ -1299,7 +1317,7 @@ void LyXAction::init()
* \li Action: Saves the current buffer to a temporary file. * \li Action: Saves the current buffer to a temporary file.
* \li Notion: Saves the current buffer to a file named "#filename#". This LFUN * \li Notion: Saves the current buffer to a file named "#filename#". This LFUN
is called automatically by LyX, to "autosave" the current buffer. is called automatically by LyX, to "autosave" the current buffer.
* \li Syntax: buffer-auto-save * \li Syntax: buffer-auto-save
* \endvar * \endvar
*/ */
{ LFUN_BUFFER_AUTO_SAVE, "buffer-auto-save", Noop, Buffer }, { LFUN_BUFFER_AUTO_SAVE, "buffer-auto-save", Noop, Buffer },

10
src/Text3.cpp
View File

@ -847,9 +847,17 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
needsUpdate |= dissolveInset(cur); needsUpdate |= dissolveInset(cur);
break; break;
case LFUN_INSET_SETTINGS: case LFUN_INSET_SETTINGS: {
// if there is an inset at cursor, access this
Inset * inset = cur.nextInset();
if (inset) {
inset->showInsetDialog(bv);
break;
}
// if not work, access the underlying inset.
cur.inset().showInsetDialog(bv); cur.inset().showInsetDialog(bv);
break; break;
}
case LFUN_SPACE_INSERT: case LFUN_SPACE_INSERT:
if (cur.paragraph().layout().free_spacing) if (cur.paragraph().layout().free_spacing)