namespace {
+// This function runs "configure" and then rereads lyx.defaults to
+// reconfigure the automatic settings.
+void reconfigure(LyXView & lv, string const & option)
+{
+ // emit message signal.
+ lv.message(_("Running configure..."));
+
+ // Run configure in user lyx directory
+ support::Path p(package().user_support());
+ string configure_command = package().configure_command();
+ configure_command += option;
+ Systemcall one;
+ one.startscript(Systemcall::Wait, configure_command);
+ p.pop();
+ // emit message signal.
+ lv.message(_("Reloading configuration..."));
+ lyxrc.read(support::libFileSearch(string(), "lyxrc.defaults"));
+ // Re-read packages.lst
+ LaTeXFeatures::getAvailable();
+
+ Alert::information(_("System reconfigured"),
+ _("The system has been reconfigured.\n"
+ "You need to restart LyX to make use of any\n"
+ "updated document class specifications."));
+}
+
+
bool getLocalStatus(Cursor cursor, FuncRequest const & cmd, FuncStatus & status)
{
// Try to fix cursor in case it is broken.
LyXFunc::LyXFunc()
- : lyx_view_(0), encoded_last_key(0), meta_fake_bit(key_modifier::none)
+ : lyx_view_(0), encoded_last_key(0), meta_fake_bit(NoModifier)
{
}
}
-void LyXFunc::processKeySym(KeySymbol const & keysym,
- key_modifier::state state)
+void LyXFunc::processKeySym(KeySymbol const & keysym, KeyModifier state)
{
LYXERR(Debug::KEY) << "KeySym is " << keysym.getSymbolName() << 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.
- // Mostly, meta_fake_bit = key_modifier::none. RVDK_PATCH_5.
+ // Mostly, meta_fake_bit = NoModifier. RVDK_PATCH_5.
if ((func.action != LFUN_CANCEL) && (func.action != LFUN_META_PREFIX)) {
// remove Caps Lock and Mod2 as a modifiers
func = keyseq.addkey(keysym, (state | meta_fake_bit));
}
// Dont remove this unless you know what you are doing.
- meta_fake_bit = key_modifier::none;
+ meta_fake_bit = NoModifier;
// Can this happen now ?
- if (func.action == LFUN_NOACTION) {
+ if (func.action == LFUN_NOACTION)
func = FuncRequest(LFUN_COMMAND_PREFIX);
- }
LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
<< " Key [action="
// why not return already here if action == -1 and
// num_bytes == 0? (Lgb)
- if (keyseq.length() > 1) {
+ if (keyseq.length() > 1)
lyx_view_->message(keyseq.print(true));
- }
// Maybe user can only reach the key via holding down shift.
// Let's see. But only if shift is the only modifier
- if (func.action == LFUN_UNKNOWN_ACTION &&
- state == key_modifier::shift) {
+ if (func.action == LFUN_UNKNOWN_ACTION && state == ShiftModifier) {
LYXERR(Debug::KEY) << "Trying without shift" << endl;
- func = keyseq.addkey(keysym, key_modifier::none);
+ func = keyseq.addkey(keysym, NoModifier);
LYXERR(Debug::KEY) << "Action now " << func.action << endl;
}
case LFUN_CANCEL:
BOOST_ASSERT(lyx_view_ && lyx_view_->view());
keyseq.reset();
- meta_fake_bit = key_modifier::none;
+ meta_fake_bit = NoModifier;
if (lyx_view_->buffer())
// cancel any selection
dispatch(FuncRequest(LFUN_MARK_OFF));
break;
case LFUN_META_PREFIX:
- meta_fake_bit = key_modifier::alt;
+ meta_fake_bit = AltModifier;
setMessage(keyseq.print(true));
break;
- case LFUN_BUFFER_TOGGLE_READ_ONLY:
+ case LFUN_BUFFER_TOGGLE_READ_ONLY: {
BOOST_ASSERT(lyx_view_ && lyx_view_->view() && lyx_view_->buffer());
- if (lyx_view_->buffer()->lyxvc().inUse())
- lyx_view_->buffer()->lyxvc().toggleReadOnly();
+ Buffer * buf = lyx_view_->buffer();
+ if (buf->lyxvc().inUse())
+ buf->lyxvc().toggleReadOnly();
else
- lyx_view_->buffer()->setReadonly(
- !lyx_view_->buffer()->isReadonly());
+ buf->setReadonly(!lyx_view_->buffer()->isReadonly());
break;
+ }
// --- Menus -----------------------------------------------
case LFUN_BUFFER_NEW:
docstring const str = bformat(_("Saving document %1$s..."),
makeDisplayPath(lyx_view_->buffer()->fileName()));
lyx_view_->message(str);
- menuWrite(lyx_view_->buffer());
+ lyx_view_->buffer()->menuWrite();
lyx_view_->message(str + _(" done."));
} else {
- writeAs(lyx_view_->buffer());
+ lyx_view_->buffer()->writeAs();
}
updateFlags = Update::None;
break;
case LFUN_BUFFER_WRITE_AS:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- writeAs(lyx_view_->buffer(), argument);
+ lyx_view_->buffer()->writeAs(argument);
updateFlags = Update::None;
break;
do {
if (!b->isClean()) {
if (!b->isUnnamed()) {
- menuWrite(b);
+ b->menuWrite();
lyxerr[Debug::ACTION] << "Saved " << b->fileName() << endl;
} else
- writeAs(b);
+ b->writeAs();
}
b = theBufferList().next(b);
} while (b != first);
}
// Push directory path.
- string const path(buffer->temppath());
+ string const path = buffer->temppath();
// Prevent the compiler from optimizing away p
FileName pp(path);
support::Path p(pp);
break;
case LFUN_BUFFER_AUTO_SAVE:
- autoSave(view());
+ lyx_view_->buffer()->autoSave();
break;
case LFUN_RECONFIGURE:
updateFlags = Update::None;
break;
- case LFUN_FILE_NEW:
+ case LFUN_FILE_NEW: {
BOOST_ASSERT(lyx_view_);
- newFile(*lyx_view_, argument);
+ string name;
+ string tmpname = split(argument, name, ':'); // Split filename
+ Buffer * const b = newFile(name, tmpname);
+ if (b)
+ lyx_view_->setBuffer(b);
updateFlags = Update::None;
break;
+ }
case LFUN_FILE_OPEN:
BOOST_ASSERT(lyx_view_);
bool LyXFunc::wasMetaKey() const
{
- return (meta_fake_bit != key_modifier::none);
+ return (meta_fake_bit != NoModifier);
}