*/
#include <config.h>
+#include <vector>
#include "LyXFunc.h"
#include "Color.h"
#include "Session.h"
#include "LyX.h"
-#include "lyx_cb.h"
+#include "callback.h"
#include "LyXAction.h"
#include "lyxfind.h"
#include "Lexer.h"
#include "LyXRC.h"
#include "Row.h"
-#include "LyXServer.h"
-#include "LyXTextClassList.h"
+#include "Server.h"
+#include "TextClassList.h"
#include "LyXVC.h"
#include "Paragraph.h"
#include "ParIterator.h"
#include "insets/InsetERT.h"
#include "insets/InsetExternal.h"
#include "insets/InsetFloat.h"
+#include "insets/InsetListings.h"
#include "insets/InsetGraphics.h"
#include "insets/InsetInclude.h"
#include "insets/InsetNote.h"
#include "insets/InsetWrap.h"
#include "frontends/Application.h"
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
#include "frontends/Dialogs.h"
#include "frontends/FileDialog.h"
#include "frontends/FontLoader.h"
#include "frontends/Gui.h"
-#include "frontends/LyXKeySym.h"
+#include "frontends/KeySymbol.h"
#include "frontends/LyXView.h"
#include "frontends/Menubar.h"
#include "frontends/Toolbars.h"
// see http://bugzilla.lyx.org/show_bug.cgi?id=3092
if (bm.bottom_pit != new_pit || bm.bottom_pos != new_pos || bm.top_id != new_id )
const_cast<BookmarksSection::Bookmark &>(bm).updatePos(new_pit, new_pos, new_id);
- }
+ }
}
-void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
+void LyXFunc::processKeySym(KeySymbolPtr keysym, key_modifier::state state)
{
LYXERR(Debug::KEY) << "KeySym is " << keysym->getSymbolName() << endl;
break;
case LFUN_LAYOUT_TABULAR:
- enable = cur.innerInsetOfType(InsetBase::TABULAR_CODE);
+ enable = cur.innerInsetOfType(Inset::TABULAR_CODE);
break;
case LFUN_LAYOUT:
enable = false;
if (!cur)
break;
- InsetBase::Code code = cur.inset().lyxCode();
+ Inset::Code code = cur.inset().lyxCode();
switch (code) {
- case InsetBase::TABULAR_CODE:
+ case Inset::TABULAR_CODE:
enable = cmd.argument() == "tabular";
break;
- case InsetBase::ERT_CODE:
+ case Inset::ERT_CODE:
enable = cmd.argument() == "ert";
break;
- case InsetBase::FLOAT_CODE:
+ case Inset::FLOAT_CODE:
enable = cmd.argument() == "float";
break;
- case InsetBase::WRAP_CODE:
+ case Inset::WRAP_CODE:
enable = cmd.argument() == "wrap";
break;
- case InsetBase::NOTE_CODE:
+ case Inset::NOTE_CODE:
enable = cmd.argument() == "note";
break;
- case InsetBase::BRANCH_CODE:
+ case Inset::BRANCH_CODE:
enable = cmd.argument() == "branch";
break;
- case InsetBase::BOX_CODE:
+ case Inset::BOX_CODE:
enable = cmd.argument() == "box";
break;
+ case Inset::LISTINGS_CODE:
+ enable = cmd.argument() == "listings";
+ break;
default:
break;
}
case LFUN_INSET_APPLY: {
string const name = cmd.getArg(0);
- InsetBase * inset = lyx_view_->getDialogs().getOpenInset(name);
+ Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
FuncStatus fs;
break;
}
+ case LFUN_DIALOG_TOGGLE:
+ flag.setOnOff(lyx_view_->getDialogs().visible(cmd.getArg(0)));
+ // fall through to set "enable"
case LFUN_DIALOG_SHOW: {
string const name = cmd.getArg(0);
if (!buf)
enable = Exporter::isExportable(*buf, "dvi")
&& lyxrc.print_command != "none";
else if (name == "character")
- enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
+ enable = cur.inset().lyxCode() != Inset::ERT_CODE &&
+ cur.inset().lyxCode() != Inset::LISTINGS_CODE;
else if (name == "latexlog")
enable = isFileReadable(FileName(buf->getLogName().second));
else if (name == "spellchecker")
}
case LFUN_DIALOG_SHOW_NEW_INSET:
- enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
- if (cur.inset().lyxCode() == InsetBase::CAPTION_CODE) {
+ enable = cur.inset().lyxCode() != Inset::ERT_CODE &&
+ cur.inset().lyxCode() != Inset::LISTINGS_CODE;
+ if (cur.inset().lyxCode() == Inset::CAPTION_CODE) {
FuncStatus flag;
if (cur.inset().getStatus(cur, cmd, flag))
return flag;
enable = LyX::ref().session().bookmarks().size() > 0;
break;
- case LFUN_TOOLBAR_TOGGLE_STATE: {
- ToolbarInfo::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
- if (!(flags & ToolbarInfo::AUTO))
- flag.setOnOff(flags & ToolbarInfo::ON);
+ case LFUN_TOOLBAR_TOGGLE: {
+ bool const current = lyx_view_->getToolbars().visible(cmd.getArg(0));
+ flag.setOnOff(current);
+ break;
+ }
+ case LFUN_WINDOW_CLOSE: {
+ enable = (theApp()->gui().viewIds().size() > 1);
break;
}
case LFUN_BUFFER_UPDATE:
case LFUN_BUFFER_VIEW:
case LFUN_BUFFER_IMPORT:
- case LFUN_TOC_VIEW:
case LFUN_BUFFER_AUTO_SAVE:
case LFUN_RECONFIGURE:
case LFUN_HELP_OPEN:
case LFUN_BUFFER_NEXT:
case LFUN_BUFFER_PREVIOUS:
case LFUN_WINDOW_NEW:
- case LFUN_WINDOW_CLOSE:
case LFUN_LYX_QUIT:
// these are handled in our dispatch()
break;
menuWrite(lyx_view_->buffer());
lyx_view_->message(str + _(" done."));
} else {
- writeAs(lyx_view_->buffer());
+ writeAs(lyx_view_->buffer());
}
updateFlags = Update::None;
break;
docstring text = bformat(_("Any changes will be lost. Are you sure "
"you want to revert to the saved version of the document %1$s?"), file);
int const ret = Alert::prompt(_("Revert to saved document?"),
- text, 0, 1, _("&Revert"), _("&Cancel"));
+ text, 1, 1, _("&Revert"), _("&Cancel"));
if (ret == 0)
reloadBuffer();
command2);
} else {
// case 2: print directly to a printer
+ if (target_name != "default")
+ command += lyxrc.print_to_printer + target_name + ' ';
res = one.startscript(
Systemcall::DontWait,
command + quoteName(dviname));
if (fs::exists(filename.toFilesystemEncoding())) {
docstring text = bformat(
_("The file %1$s already exists.\n\n"
- "Do you want to over-write that file?"),
+ "Do you want to overwrite that file?"),
makeDisplayPath(filename.absFilename()));
- if (Alert::prompt(_("Over-write file?"),
- text, 0, 1, _("&Over-write"), _("&Cancel")) != 0)
+ if (Alert::prompt(_("Overwrite file?"),
+ text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0)
break;
}
command += lyxrc.print_to_file
theApp()->gui().closeAllViews();
break;
- case LFUN_TOC_VIEW: {
- BOOST_ASSERT(lyx_view_);
- InsetCommandParams p("tableofcontents");
- string const data = InsetCommandMailer::params2string("toc", p);
- lyx_view_->getDialogs().show("toc", data, 0);
- break;
- }
-
case LFUN_BUFFER_AUTO_SAVE:
autoSave(view());
break;
case LFUN_SERVER_NOTIFY:
dispatch_buffer = keyseq->print(false);
- theLyXServer().notifyClient(to_utf8(dispatch_buffer));
+ theServer().notifyClient(to_utf8(dispatch_buffer));
break;
case LFUN_SERVER_GOTO_FILE_ROW: {
} else if (name == "float") {
InsetFloatParams p;
data = InsetFloatMailer::params2string(p);
+ } else if (name == "listings") {
+ InsetListingsParams p;
+ data = InsetListingsMailer::params2string(p);
} else if (name == "graphics") {
InsetGraphicsParams p;
Buffer const & buffer = *lyx_view_->buffer();
BOOST_ASSERT(lyx_view_);
string const & name = argument;
// Can only update a dialog connected to an existing inset
- InsetBase * inset = lyx_view_->getDialogs().getOpenInset(name);
+ Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument());
inset->dispatch(view()->cursor(), fr);
Dialogs::hide(argument, 0);
break;
+ case LFUN_DIALOG_TOGGLE: {
+ BOOST_ASSERT(lyx_view_);
+ if (lyx_view_->getDialogs().visible(cmd.getArg(0)))
+ dispatch(FuncRequest(LFUN_DIALOG_HIDE, argument));
+ else
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, argument));
+ break;
+ }
+
case LFUN_DIALOG_DISCONNECT_INSET:
BOOST_ASSERT(lyx_view_);
lyx_view_->getDialogs().disconnect(argument);
BOOST_ASSERT(lyx_view_);
FileName const filename =
makeAbsPath(argument, lyx_view_->buffer()->filePath());
- setMessage(bformat(_("Opening child document %1$s..."),
- makeDisplayPath(filename.absFilename())));
view()->saveBookmark(false);
string const parentfilename = lyx_view_->buffer()->fileName();
if (theBufferList().exists(filename.absFilename()))
lyx_view_->setBuffer(theBufferList().getBuffer(filename.absFilename()));
else
- lyx_view_->loadLyXFile(filename);
- // Set the parent name of the child document.
- // This makes insertion of citations and references in the child work,
- // when the target is in the parent or another child document.
- lyx_view_->buffer()->setParentName(parentfilename);
+ if (lyx_view_->loadLyXFile(filename)) {
+ // Set the parent name of the child document.
+ // This makes insertion of citations and references in the child work,
+ // when the target is in the parent or another child document.
+ lyx_view_->buffer()->setParentName(parentfilename);
+ setMessage(bformat(_("Opening child document %1$s..."),
+ makeDisplayPath(filename.absFilename())));
+ } else
+ setMessage(_("Document not loaded."));
break;
}
case LFUN_PREFERENCES_SAVE: {
lyxrc.write(makeAbsPath("preferences",
- package().user_support().absFilename()),
- false);
+ package().user_support().absFilename()),
+ false);
break;
}
case LFUN_INSET_APPLY: {
BOOST_ASSERT(lyx_view_);
string const name = cmd.getArg(0);
- InsetBase * inset = lyx_view_->getDialogs().getOpenInset(name);
+ Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_MODIFY, argument);
inset->dispatch(view()->cursor(), fr);
BOOST_ASSERT(lyx_view_);
string action;
string const name = split(argument, action, ' ');
- InsetBase::Code const inset_code =
- InsetBase::translate(name);
+ Inset::Code const inset_code =
+ Inset::translate(name);
Cursor & cur = view()->cursor();
FuncRequest fr(LFUN_INSET_TOGGLE, action);
- InsetBase & inset = lyx_view_->buffer()->inset();
+ Inset & inset = lyx_view_->buffer()->inset();
InsetIterator it = inset_iterator_begin(inset);
InsetIterator const end = inset_iterator_end(inset);
for (; it != end; ++it) {
if (!it->asInsetMath()
- && (inset_code == InsetBase::NO_CODE
+ && (inset_code == Inset::NO_CODE
|| inset_code == it->lyxCode())) {
Cursor tmpcur = cur;
tmpcur.pushLeft(*it);
if (defaults.writeFile(FileName(defaults.fileName())))
setMessage(bformat(_("Document defaults saved in %1$s"),
- makeDisplayPath(fname)));
+ makeDisplayPath(fname)));
else
setErrorMessage(from_ascii(N_("Unable to save document defaults")));
break;
Cursor & cur = view()->cursor();
FuncRequest fr(LFUN_INSET_REFRESH);
- InsetBase & inset = lyx_view_->buffer()->inset();
+ Inset & inset = lyx_view_->buffer()->inset();
InsetIterator it = inset_iterator_begin(inset);
InsetIterator const end = inset_iterator_end(inset);
for (; it != end; ++it)
- if (it->lyxCode() == InsetBase::CITE_CODE)
+ if (it->lyxCode() == Inset::CITE_CODE)
it->dispatch(cur, fr);
break;
}
LyX::ref().session().bookmarks().clear();
break;
- case LFUN_TOOLBAR_TOGGLE_STATE:
- lyx_view_->toggleToolbarState(argument);
+ case LFUN_TOOLBAR_TOGGLE: {
+ BOOST_ASSERT(lyx_view_);
+ string const name = cmd.getArg(0);
+ bool const allowauto = cmd.getArg(1) == "allowauto";
+ lyx_view_->toggleToolbarState(name, allowauto);
+ ToolbarInfo::Flags const flags =
+ lyx_view_->getToolbarState(name);
+ docstring state;
+ if (flags & ToolbarInfo::ON)
+ state = _("on");
+ else if (flags & ToolbarInfo::OFF)
+ state = _("off");
+ else if (flags & ToolbarInfo::AUTO)
+ state = _("auto");
+
+ setMessage(bformat(_("Toolbar \"%1$s\" state set to %2$s"),
+ from_ascii(name), state));
break;
+ }
default: {
BOOST_ASSERT(lyx_view_);
docstring const file = makeDisplayPath(lyxfile.absFilename(), 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
- "Do you want to over-write that document?"), file);
- int const ret = Alert::prompt(_("Over-write document?"),
- text, 0, 1, _("&Over-write"), _("&Cancel"));
+ "Do you want to overwrite that document?"), file);
+ int const ret = Alert::prompt(_("Overwrite document?"),
+ text, 0, 1, _("&Overwrite"), _("&Cancel"));
if (ret == 1) {
lyx_view_->message(_("Canceled."));
projects / lyx.git / blobdiff