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

Final touch on minimalistic branches

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19989 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-09-02 08:38:09 +00:00
parent 904fd84bba
commit 3f358459fc
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/InsetBranch.cpp
View File

@ -102,7 +102,10 @@ void InsetBranch::setButtonLabel()
s = _("Undef: ") + s; s = _("Undef: ") + s;
} }
} }
setLabel(isOpen() ? s : getNewLabel(s) ); if (decoration() == Classic)
setLabel(isOpen() ? s : getNewLabel(s) );
else
setLabel(params_.branch + ": " + getNewLabel(s));
} }

14
src/insets/InsetERT.cpp
View File

@ -198,6 +198,15 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
//lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl; //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
switch (cmd.action) { switch (cmd.action) {
case LFUN_MOUSE_PRESS:
if (cmd.button() != mouse_button::button3)
InsetCollapsable::doDispatch(cur, cmd);
else
// This makes the cursor leave the
// inset when it collapses on mouse-3
cur.undispatched();
break;
case LFUN_QUOTE_INSERT: { case LFUN_QUOTE_INSERT: {
// We need to bypass the fancy quotes in Text // We need to bypass the fancy quotes in Text
FuncRequest f(LFUN_SELF_INSERT, "\""); FuncRequest f(LFUN_SELF_INSERT, "\"");
@ -381,7 +390,10 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
void InsetERT::setButtonLabel() void InsetERT::setButtonLabel()
{ {
// FIXME UNICODE // FIXME UNICODE
setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT"))); if (decoration() == Classic)
setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
else
setLabel(getNewLabel(_("ERT")));
} }