#include "undo_funcs.h"
#include "ParagraphParameters.h"
-#include "insets/inseturl.h"
-#include "insets/insetlatexaccent.h"
-#include "insets/insettoc.h"
-#include "insets/insetref.h"
-#include "insets/insetparent.h"
-#include "insets/insetindex.h"
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "insets/insetcite.h"
-#include "insets/insettext.h"
-#include "insets/insetert.h"
-#include "insets/insetexternal.h"
-#include "insets/insetgraphics.h"
-#include "insets/insetfoot.h"
-#include "insets/insetmarginal.h"
-#include "insets/insetminipage.h"
-#include "insets/insetfloat.h"
-#if 0
-#include "insets/insetlist.h"
-#include "insets/insettheorem.h"
-#endif
+#include "insets/insetcommand.h"
#include "insets/insettabular.h"
-#include "insets/insetcaption.h"
#include "mathed/formulamacro.h"
#include "mathed/math_cursor.h"
#include "support/path.h"
#include "support/lyxfunctional.h"
+#include "BoostFormat.h"
+
#include <ctime>
#include <clocale>
#include <cstdlib>
LyXFunc::LyXFunc(LyXView * o)
: owner(o),
keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
- cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get())
+ cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get()),
+ meta_fake_bit(key_modifier::none)
{
- meta_fake_bit = key_modifier::none;
- lyx_dead_action = LFUN_NOACTION;
- lyx_calling_dead_action = LFUN_NOACTION;
}
<< keysym->getSymbolName()
<< endl;
}
+
// Do nothing if we have nothing (JMarc)
if (!keysym->isOK()) {
lyxerr[Debug::KEY] << "Empty kbd action (probably composing)"
}
if (keysym->isModifier()) {
+ lyxerr[Debug::KEY] << "isModifier true" << endl;
return;
}
cancel_meta_seq.reset();
int action = cancel_meta_seq.addkey(keysym, state);
- if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "action first set to [" << action << "]" << endl;
- }
+ lyxerr[Debug::KEY] << "action first set to [" << action << ']' << endl;
// When not cancel or meta-fake, do the normal lookup.
// Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
// remove Caps Lock and Mod2 as a modifiers
action = keyseq.addkey(keysym, (state | meta_fake_bit));
lyxerr[Debug::KEY] << "action now set to ["
- << action << "]" << endl;
+ << action << ']' << endl;
}
// Dont remove this unless you know what you are doing.
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "Key [action="
<< action << "]["
- << keyseq.print() << "]"
+ << keyseq.print() << ']'
<< endl;
}
owner->message(keyseq.print());
}
- if (action == LFUN_UNKNOWN_ACTION) {
- // It is unknown, but what if we remove all
- // the modifiers? (Lgb)
+
+ // Maybe user can only reach the key via holding down shift.
+ // Let's see. But only if shift is the only modifier
+ if (action == LFUN_UNKNOWN_ACTION && state == key_modifier::shift) {
+ lyxerr[Debug::KEY] << "Trying without shift" << endl;
action = keyseq.addkey(keysym, key_modifier::none);
-
- lyxerr[Debug::KEY] << "Removing modifiers...\n"
- << "Action now set to ["
- << action << "]" << endl;
-
- if (action == LFUN_UNKNOWN_ACTION) {
+ lyxerr[Debug::KEY] << "Action now " << action << endl;
+ }
+
+ if (action == LFUN_UNKNOWN_ACTION) {
+ // Hmm, we didn't match any of the keysequences. See
+ // if it's normal insertable text not already covered
+ // by a binding
+ if (keysym->isText() && keyseq.length() == 1) {
+ lyxerr[Debug::KEY] << "isText() is true, inserting." << endl;
+ action = LFUN_SELFINSERT;
+ } else {
+ lyxerr[Debug::KEY] << "Unknown, !isText() - giving up" << endl;
owner->message(_("Unknown function."));
return;
}
char c = keysym->getISOEncoded();
string argument;
+ // FIXME: why ...
if (c != 0)
argument = c;
case LFUN_REDO:
disable = buf->redostack.empty();
break;
+ case LFUN_CUT:
+ case LFUN_COPY:
+ if (tli && tli->lyxCode() == Inset::TABULAR_CODE) {
+ InsetTabular * t(static_cast<InsetTabular*>(tli));
+ if (t->hasSelection()) {
+ disable = false;
+ break;
+ }
+ }
+ disable = !mathcursor && !view()->getLyXText()->selection.set();
+ break;
#ifndef HAVE_LIBAIKSAURUS
case LFUN_THESAURUS_ENTRY:
disable = true;
break;
}
+ case LFUN_INSET_OPTARG:
+ disable = (TEXT(false)->cursor.par()->layout()->optionalargs == 0);
+ break;
+
case LFUN_TABULAR_FEATURE:
if (mathcursor) {
#if 0
case LFUN_INSET_WIDE_FLOAT:
code = Inset::FLOAT_CODE;
break;
+ case LFUN_INSET_WRAP:
+ code = Inset::WRAP_CODE;
+ break;
case LFUN_FLOAT_LIST:
code = Inset::FLOAT_LIST_CODE;
break;
case LFUN_INSERT_LABEL:
code = Inset::LABEL_CODE;
break;
+ case LFUN_INSET_OPTARG:
+ code = Inset::OPTARG_CODE;
+ break;
case LFUN_REF_INSERT:
code = Inset::REF_CODE;
break;
default:
break;
}
- if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code)) {
+ if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code))
disable = true;
- }
if (disable)
flag.disabled(true);
int const action = lyxaction.LookupFunc(s);
if (action == LFUN_UNKNOWN_ACTION) {
+#if USE_BOOST_FORMAT
+boost::format fmt(_("Unknown function (%1$s)"));
+fmt % s;
+owner->message(fmt.str());
+#else
string const msg = string(_("Unknown function ("))
- + s + ")";
+ + s + ')';
owner->message(msg);
+#endif
return;
}
void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
{
lyxerr[Debug::ACTION] << "LyXFunc::dispatch: action[" << ev.action
- <<"] arg[" << ev.argument << "]" << endl;
+ <<"] arg[" << ev.argument << ']' << endl;
// we have not done anything wrong yet.
errorstat = false;
}
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
- view()->menuUndo();
+ view()->undo();
goto exit_with_message;
} else if (action == LFUN_REDO) {
- view()->menuRedo();
+ view()->redo();
goto exit_with_message;
} else if (((result=inset->
// Hand-over to inset's own dispatch:
case LFUN_MENUWRITE:
if (!owner->buffer()->isUnnamed()) {
ostringstream s1;
- s1 << _("Saving document") << ' '
- << MakeDisplayPath(owner->buffer()->fileName() + "...");
- owner->message(s1.str().c_str());
+#if USE_BOOST_FORMAT
+ s1 << boost::format(_("Saving document %1$s..."))
+ % MakeDisplayPath(owner->buffer()->fileName());
+#else
+ s1 << _("Saving document ")
+ << MakeDisplayPath(owner->buffer()->fileName())
+ << _("...");
+#endif
+ owner->message(STRCONV(s1.str()));
MenuWrite(view(), owner->buffer());
s1 << _(" done.");
- owner->message(s1.str().c_str());
+ owner->message(STRCONV(s1.str()));
} else
WriteAs(view(), owner->buffer());
break;
break;
case LFUN_UNDO:
- view()->menuUndo();
+ view()->undo();
break;
case LFUN_REDO:
- view()->menuRedo();
+ view()->redo();
break;
case LFUN_MENUSEARCH:
break;
}
ostringstream str;
- str << _("Opening help file") << ' '
- << MakeDisplayPath(fname) << "...";
- owner->message(str.str().c_str());
+#if USE_BOOST_FORMAT
+ str << boost::format(_("Opening help file %1$s..."))
+ % MakeDisplayPath(fname);
+#else
+ str << _("Opening help file ")
+ << MakeDisplayPath(fname) << _("...");
+#endif
+ owner->message(STRCONV(str.str()));
view()->buffer(bufferlist.loadLyXFile(fname, false));
owner->allowInput();
break;
Paragraph * par = owner->buffer()->getParFromID(id);
if (par == 0) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
- << id << "]" << endl;
+ << id << ']' << endl;
break;
} else {
lyxerr[Debug::INFO] << "Paragraph " << par->id()
lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
break;
- case LFUN_KMAP_OFF: // keymap off
+ case LFUN_KMAP_OFF:
owner->getIntl().KeyMapOn(false);
break;
- case LFUN_KMAP_PRIM: // primary keymap
+ case LFUN_KMAP_PRIM:
owner->getIntl().KeyMapPrim();
break;
- case LFUN_KMAP_SEC: // secondary keymap
+ case LFUN_KMAP_SEC:
owner->getIntl().KeyMapSec();
break;
- case LFUN_KMAP_TOGGLE: // toggle keymap
+ case LFUN_KMAP_TOGGLE:
owner->getIntl().ToggleKeyMap();
break;
x11_name != lcolor.getX11Name(LColor::graphicsbg));
if (!lcolor.setColor(lyx_name, x11_name)) {
- static string const err1 (N_("Set-color \""));
- static string const err2 (
- N_("\" failed - color is undefined "
- "or may not be redefined"));
- setErrorMessage(_(err1) + lyx_name + _(err2));
+#if USE_BOOST_FORMAT
+ setErrorMessage(
+ boost::io::str(
+ boost::format(
+ _("Set-color \"%1$s\" failed "
+ "- color is undefined or "
+ "may not be redefined"))
+ % lyx_name));
+#else
+ setErrorMessage(_("Set-color ") + lyx_name
+ + _(" failed - color is undefined"
+ " or may not be redefined"));
+#endif
+
break;
}
string dispatch_msg = msg;
if (!dispatch_msg.empty())
- dispatch_msg += " ";
+ dispatch_msg += ' ';
string comname = lyxaction.getActionName(ev.action);
if (pseudoaction == LFUN_UNKNOWN_ACTION) {
pseudoaction = ev.action;
} else {
- comname += " " + ev.argument;
+ comname += ' ' + ev.argument;
argsadded = true;
}
}
if (!shortcuts.empty()) {
comname += ": " + shortcuts;
} else if (!argsadded && !ev.argument.empty()) {
- comname += " " + ev.argument;
+ comname += ' ' + ev.argument;
}
if (!comname.empty()) {
comname = rtrim(comname);
- dispatch_msg += "(" + comname + ')';
+ dispatch_msg += '(' + comname + ')';
}
lyxerr[Debug::ACTION] << "verbose dispatch msg " << dispatch_msg << endl;
string(lyxrc.template_path)));
FileDialog::Result result =
- fileDlg.Select(lyxrc.template_path,
+ fileDlg.open(lyxrc.template_path,
_("*.lyx|LyX Documents (*.lyx)"));
if (result.first == FileDialog::Later)
string(AddPath(system_lyxdir, "examples"))));
FileDialog::Result result =
- fileDlg.Select(initpath,
+ fileDlg.open(initpath,
"*.lyx|LyX Documents (*.lyx)");
if (result.first == FileDialog::Later)
}
ostringstream str;
- str << _("Opening document") << ' ' << disp_fn << "...";
+#if USE_BOOST_FORMAT
+ str << boost::format(_("Opening document %1$s...")) % disp_fn;
+#else
+ str << _("Opening document ") << disp_fn << _("...");
+#endif
- owner->message(str.str().c_str());
+ owner->message(STRCONV(str.str()));
Buffer * openbuf = bufferlist.loadLyXFile(filename);
+ ostringstream str2;
if (openbuf) {
view()->buffer(openbuf);
- ostringstream str;
- str << _("Document") << ' ' << disp_fn << ' ' << _("opened.");
- owner->message(str.str().c_str());
+#if USE_BOOST_FORMAT
+ str2 << boost::format(_("Document %1$s opened.")) % disp_fn;
+#else
+ str2 << _("Document ") << disp_fn << _(" opened.");
+#endif
} else {
- ostringstream str;
- str << _("Could not open document") << ' ' << disp_fn;
- owner->message(str.str().c_str());
+#if USE_BOOST_FORMAT
+ str2 << boost::format(_("Could not open document %1$s"))
+ % disp_fn;
+#else
+ str2 << _("Could not open document ") << disp_fn;
+#endif
}
+ owner->message(STRCONV(str2.str()));
}
initpath = trypath;
}
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Select %1$s file to import"));
+ fmt % formats.prettyName(format);
+ string const text = fmt.str();
+#else
string const text = _("Select ") + formats.prettyName(format)
- + _(" file to import");
+ + _(" file to import");;
+#endif
FileDialog fileDlg(owner, text,
LFUN_IMPORT,
string const extension = "*." + formats.extension(format)
+ "| " + formats.prettyName(format)
- + " (*." + formats.extension(format) + ")";
+ + " (*." + formats.extension(format) + ')';
- FileDialog::Result result = fileDlg.Select(initpath,
+ FileDialog::Result result = fileDlg.open(initpath,
extension);
if (result.first == FileDialog::Later)