#include <time.h>
#include <locale.h>
+#include <utility>
+#include <algorithm>
#include <cstdlib>
#include <cctype>
#include "minibuffer.h"
#include "vspace.h"
#include "LyXView.h"
-#include "filedlg.h"
#include "lyx_gui_misc.h"
#include "support/filetools.h"
#include "support/FileInfo.h"
#include "trans_mgr.h"
#include "layout.h"
#include "WorkArea.h"
-#include "lyxfr1.h"
#include "bufferview_funcs.h"
+#include "frontends/FileDialog.h"
#include "frontends/Dialogs.h"
#include "frontends/Toolbar.h"
#include "frontends/Menubar.h"
#include "importer.h"
#include "FontLoader.h"
#include "TextCache.h"
+#include "lyxfind.h"
using std::pair;
+using std::make_pair;
using std::endl;
using std::find_if;
-extern void math_insert_symbol(BufferView *, string const &);
-extern bool math_insert_greek(BufferView *, char);
extern BufferList bufferlist;
extern LyXServer * lyxserver;
extern int greek_kb_flag;
extern bool selection_possible;
+extern void MenuSendto();
-extern kb_keymap * toplevel_keymap;
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
-#if 0
-extern void MenuFax(Buffer *);
-#endif
extern void show_symbols_form(LyXFunc *);
extern LyXAction lyxaction;
bool LyXFunc::show_sc = true;
-
LyXFunc::LyXFunc(LyXView * o)
: owner(o)
{
setupLocalKeymap();
}
+inline
+LyXText * LyXFunc::TEXT(bool flag=true) const
+{
+ if (flag)
+ return owner->view()->text;
+ return owner->view()->getLyXText();
+}
// I changed this func slightly. I commented out the ...FinishUndo(),
// this means that all places that used to have a moveCursorUpdate, now
// a moveCursorUpdate to some of the functions that updated the cursor, but
// that did not show its new position.
inline
-void LyXFunc::moveCursorUpdate(LyXText * text, bool selecting)
+void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
{
- if (selecting || text->mark_set) {
- text->SetSelection();
- if (text->bv_owner)
+ if (selecting || TEXT(flag)->mark_set) {
+ TEXT(flag)->SetSelection(owner->view());
+ if (TEXT(flag)->bv_owner)
owner->view()->toggleToggle();
}
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
+ owner->view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
owner->view()->showCursor();
/* ---> Everytime the cursor is moved, show the current font state. */
}
+void LyXFunc::handleKeyFunc(kb_action action)
+{
+ char c = 0;
+
+ if (keyseq.length == -1 && keyseq.getiso() != 0)
+ c = keyseq.getiso();
+ owner->getIntl()->getTrans()
+ .deadkey(c, get_accent(action).accent, TEXT(false));
+ // Need to reset, in case the minibuffer calls these
+ // actions
+ keyseq.reset();
+ keyseq.length = 0;
+ // copied verbatim from do_accent_char
+ owner->view()->update(TEXT(false),
+ BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ TEXT(false)->sel_cursor = TEXT(false)->cursor;
+}
+
+
int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
{
string argument;
if (tli && (keysym == XK_Escape)) {
if (tli == tli->GetLockingInset()) {
owner->view()->unlockInset(tli);
- owner->view()->text->CursorRight(owner->view());
- moveCursorUpdate(owner->view()->text, false);
+ TEXT()->CursorRight(owner->view());
+ moveCursorUpdate(true, false);
owner->showState();
} else {
tli->UnlockInsetInInset(owner->view(),
return 0;
}
-
LyXFunc::func_status LyXFunc::getStatus(int ac) const
+{
+ return getStatus(ac, string());
+}
+
+LyXFunc::func_status LyXFunc::getStatus(int ac, string const & not_to_use_arg) const
{
kb_action action;
func_status flag = LyXFunc::OK;
if (lyxaction.isPseudoAction(ac))
action = lyxaction.retrieveActionArg(ac, argument);
- else
+ else {
action = static_cast<kb_action>(ac);
+ if (!not_to_use_arg.empty())
+ argument = not_to_use_arg; // exept here
+ }
if (action == LFUN_UNKNOWN_ACTION) {
setErrorMessage(N_("Unknown action"));
disable = !Exporter::IsExportable(buf, "dvi")
|| lyxrc.print_command == "none";
break;
-#if 0
- case LFUN_FAX:
- disable = !Exporter::IsExportable(buf, "ps")
- || lyxrc.fax_command == "none";
- break;
-#else
case LFUN_EXPORT:
disable = argument == "fax" &&
!Exporter::IsExportable(buf, argument);
break;
-#endif
case LFUN_UNDO:
disable = buf->undostack.empty();
break;
if (buf) {
func_status box = LyXFunc::ToggleOff;
LyXFont const & font =
- owner->view()->getLyXText()->real_current_font;
+ TEXT(false)->real_current_font;
switch (action) {
case LFUN_EMPH:
if (font.emph() == LyXFont::ON)
if (owner->view()->available())
owner->view()->hideCursor();
- // We have to do this heare because of te goto below. (Lgb)
- LyXText * text = owner->view()->getLyXText();
-
// We cannot use this function here
- if (getStatus(ac) & Disabled)
+ if (getStatus(ac, do_not_use_this_arg) & Disabled)
goto exit_with_message;
commandshortcut.erase();
inset->GetCursorPos(owner->view(), slx, sly);
owner->view()->unlockInset(inset);
owner->view()->menuUndo();
- if (owner->view()->text->cursor.par()->
- IsInset(owner->view()->text->cursor.pos())) {
+ if (TEXT()->cursor.par()->
+ IsInset(TEXT()->cursor.pos())) {
inset = static_cast<UpdatableInset*>(
- owner->view()->text->cursor.par()->
- GetInset(owner->view()->text->
+ TEXT()->cursor.par()->
+ GetInset(TEXT()->
cursor.pos()));
} else {
inset = 0;
owner->view()->unlockInset(inset);
owner->view()->menuRedo();
inset = static_cast<UpdatableInset*>(
- owner->view()->text->cursor.par()->
- GetInset(owner->view()->text->
+ TEXT()->cursor.par()->
+ GetInset(TEXT()->
cursor.pos()));
if (inset)
inset->Edit(owner->view(),slx,sly,0);
case LFUN_UNKNOWN_ACTION:
case LFUN_BREAKPARAGRAPH:
case LFUN_BREAKLINE:
- owner->view()->text->CursorRight(owner->view());
+ TEXT()->CursorRight(owner->view());
owner->view()->setState();
owner->showState();
break;
case LFUN_RIGHT:
- if (!owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- owner->view()->text->CursorRight(owner->view());
- moveCursorUpdate(owner->view()->text, false);
+ if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ TEXT()->CursorRight(owner->view());
+ moveCursorUpdate(true, false);
owner->showState();
}
return string();
case LFUN_LEFT:
- if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- owner->view()->text->CursorRight(owner->view());
- moveCursorUpdate(owner->view()->text, false);
+ if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ TEXT()->CursorRight(owner->view());
+ moveCursorUpdate(true, false);
owner->showState();
}
return string();
case LFUN_DOWN:
- owner->view()->text->CursorDown(owner->view());
- moveCursorUpdate(owner->view()->text, false);
+ TEXT()->CursorDown(owner->view());
+ moveCursorUpdate(true, false);
owner->showState();
return string();
default:
}
}
+ Assert(action != LFUN_SELECT_FILE_SYNC);
+
switch (action) {
// --- Misc -------------------------------------------
case LFUN_WORDFINDFORWARD :
searched_string = last_search;
}
- LyXText * ltCur = owner->view()->text ;
-
if (!searched_string.empty() &&
((action == LFUN_WORDFINDBACKWARD) ?
- ltCur->SearchBackward(owner->view(), searched_string) :
- ltCur->SearchForward(owner->view(), searched_string))) {
+ SearchBackward(owner->view(), searched_string) :
+ SearchForward(owner->view(), searched_string))) {
// ??? What is that ???
- owner->view()->update(ltCur, BufferView::SELECT|BufferView::FITCUR);
+ owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR);
// ??? Needed ???
// clear the selection (if there is any)
owner->view()->toggleSelection();
- owner->view()->text->ClearSelection();
+ TEXT()->ClearSelection(owner->view());
// Move cursor so that successive C-s 's will not stand in place.
if (action == LFUN_WORDFINDFORWARD )
- owner->view()->text->CursorRightOneWord(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
+ TEXT()->CursorRightOneWord(owner->view());
+ TEXT()->FinishUndo();
+ moveCursorUpdate(true, false);
// ??? Needed ???
// set the new selection
owner->view()->showCursor();
}
break;
-
+
case LFUN_PREFIX:
{
if (owner->view()->available()) {
- owner->view()->update(owner->view()->text,
+ owner->view()->update(TEXT(),
BufferView::SELECT|BufferView::FITCUR);
}
string buf;
owner->view()->center();
break;
- case LFUN_APPENDIX:
- if (owner->view()->available()) {
- text->toggleAppendix(owner->view());
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- break;
-
// --- Menus -----------------------------------------------
case LFUN_MENUNEW:
MenuNew(false);
MenuNew(true);
break;
- case LFUN_MENUOPEN:
- MenuOpen();
- break;
-
case LFUN_CLOSEBUFFER:
CloseBuffer();
break;
MakeDisplayPath(owner->buffer()->fileName()),
"...");
MenuWrite(owner->view(), owner->buffer());
- //owner->getMiniBuffer()-> {
- // Set(_("Document saved as"),
- // MakeDisplayPath(owner->buffer()->fileName()));
- //} else {
- //owner->getMiniBuffer()->Set(_("Save failed!"));
- //}
- } else {
- MenuWriteAs(owner->view(), owner->buffer());
- }
+ } else
+ WriteAs(owner->view(), owner->buffer());
break;
- case LFUN_MENUWRITEAS:
- MenuWriteAs(owner->view(), owner->buffer());
+ case LFUN_WRITEAS:
+ WriteAs(owner->view(), owner->buffer(), argument);
break;
case LFUN_MENURELOAD:
owner->getDialogs()->showPrint();
break;
-#if 0
- case LFUN_FAX:
- MenuFax(owner->buffer());
- break;
-#endif
-
case LFUN_EXPORT:
- Exporter::Export(owner->buffer(), argument, false);
+ if (argument == "custom")
+ MenuSendto();
+ else
+ Exporter::Export(owner->buffer(), argument, false);
break;
case LFUN_IMPORT:
break;
}
- case LFUN_TOC_INSERT:
- case LFUN_LOA_INSERT:
- case LFUN_LOF_INSERT:
- case LFUN_LOT_INSERT:
- {
- InsetCommandParams p;
-
- if (action == LFUN_TOC_INSERT )
- p.setCmdName( "tableofcontents" );
- else if (action == LFUN_LOA_INSERT )
- p.setCmdName( "listofalgorithms" );
- else if (action == LFUN_LOF_INSERT )
- p.setCmdName( "listoffigures" );
- else
- p.setCmdName( "listoftables" );
-
- Inset * inset = new InsetTOC( p );
- if (!owner->view()->insertInset( inset, "Standard", true ) )
- delete inset;
- break;
- }
-
case LFUN_DIALOG_TABULAR_INSERT:
owner->getDialogs()->showTabularCreate();
break;
- case LFUN_TABULAR_FEATURE:
- case LFUN_SCROLL_INSET:
- // this is not handled here as this funktion is only aktive
- // if we have a locking_inset and that one is (or contains)
- // a tabular-inset
- break;
-
case LFUN_FIGURE:
Figure();
break;
- case LFUN_INSET_GRAPHICS:
- {
- Inset * new_inset = new InsetGraphics;
- if (!owner->view()->insertInset(new_inset)) {
- delete new_inset;
- } else {
- // this is need because you don't use a inset->Edit()
- owner->view()->updateInset(new_inset, true);
- new_inset->Edit(owner->view(), 0, 0, 0);
- }
- break;
- }
-
case LFUN_AUTOSAVE:
AutoSave(owner->view());
break;
break;
case LFUN_MENUSEARCH:
- {
- // Ok this is one _very_ bad solution, but I think that some
- // of this will be rewritten as part of GUI indep anyway.
- // Lgb
- static LyXFindReplace FR_;
- FR_.StartSearch(owner->view());
- }
- break;
-
- case LFUN_PASTE:
- owner->view()->paste();
- owner->view()->setState();
- break;
-
- case LFUN_PASTESELECTION:
- {
- bool asPara = false;
- if (argument == "paragraph") asPara = true;
- owner->view()->pasteClipboard(asPara);
- }
- break;
-
- case LFUN_CUT:
- owner->view()->cut();
- break;
-
- case LFUN_COPY:
- owner->view()->copy();
- break;
-
- case LFUN_LAYOUT_COPY:
- owner->view()->copyEnvironment();
- break;
-
- case LFUN_LAYOUT_PASTE:
- owner->view()->pasteEnvironment();
- owner->view()->setState();
- break;
-
- case LFUN_GOTOERROR:
- owner->view()->gotoInset(Inset::ERROR_CODE, false);
+ owner->getDialogs()->showSearch();
break;
case LFUN_REMOVEERRORS:
if (owner->view()->removeAutoInsets()) {
owner->view()->redraw();
- owner->view()->fitCursor(owner->view()->text);
+ owner->view()->fitCursor(TEXT());
}
break;
- case LFUN_GOTONOTE:
- owner->view()->gotoInset(Inset::IGNORE_CODE, false);
- break;
-
- case LFUN_REFERENCE_GOTO:
- {
- vector<Inset::Code> tmp;
- tmp.push_back(Inset::LABEL_CODE);
- tmp.push_back(Inset::REF_CODE);
- owner->view()->gotoInset(tmp, true);
- break;
- }
-
#ifndef NEW_INSETS
case LFUN_OPENSTUFF:
owner->view()->openStuff();
break;
case LFUN_DEPTH:
- changeDepth(owner->view(), text, 0);
+ changeDepth(owner->view(), TEXT(false), 0);
break;
case LFUN_DEPTH_MIN:
- changeDepth(owner->view(), text, -1);
+ changeDepth(owner->view(), TEXT(false), -1);
break;
case LFUN_DEPTH_PLUS:
- changeDepth(owner->view(), text, 1);
+ changeDepth(owner->view(), TEXT(false), 1);
break;
case LFUN_FREE:
- Free(owner->view());
- owner->view()->setState();
- owner->showState();
+ owner->getDialogs()->setUserFreeFont();
break;
case LFUN_TEX:
#ifndef NEW_INSETS
case LFUN_FOOTMELT:
if (owner->view()->available()
- && !owner->view()->text->selection
- && owner->view()->text->cursor.par()->footnoteflag
+ && !TEXT()->selection
+ && TEXT()->cursor.par()->footnoteflag
!= LyXParagraph::NO_FOOTNOTE)
{ // only melt footnotes with FOOTMELT, not margins etc
- if (owner->view()->text->cursor.par()->footnotekind == LyXParagraph::FOOTNOTE)
+ if (TEXT()->cursor.par()->footnotekind == LyXParagraph::FOOTNOTE)
Melt(owner->view());
}
else
case LFUN_MARGINMELT:
if (owner->view()->available()
- && !owner->view()->text->selection
- && owner->view()->text->cursor.par()->footnoteflag
+ && !TEXT()->selection
+ && TEXT()->cursor.par()->footnoteflag
!= LyXParagraph::NO_FOOTNOTE) {
// only melt margins
- if (owner->view()->text->cursor.par()->footnotekind == LyXParagraph::MARGIN)
+ if (TEXT()->cursor.par()->footnotekind == LyXParagraph::MARGIN)
Melt(owner->view());
} else
Margin(owner->view());
owner->view()->buffer(bufferlist.getBuffer(argument));
break;
-
- case LFUN_FILE_INSERT:
- {
- MenuInsertLyXFile(argument);
- }
- break;
-
- case LFUN_FILE_INSERT_ASCII:
- {
- bool asPara = (argument == "paragraph");
- InsertAsciiFile(owner->view(), string(), asPara);
- }
- break;
-
case LFUN_FILE_NEW:
{
// servercmd: argument must be <file>:<template>
break;
case LFUN_FILE_OPEN:
- owner->view()->buffer(bufferlist.loadLyXFile(argument));
+ Open(argument);
break;
case LFUN_LATEX_LOG:
return string();
}
- case LFUN_LAYOUT:
- {
- lyxerr.debug() << "LFUN_LAYOUT: (arg) "
- << argument << endl;
-
- // Derive layout number from given argument (string)
- // and current buffer's textclass (number). */
- LyXTextClassList::ClassList::size_type tclass =
- owner->view()->buffer()->params.textclass;
- pair <bool, LyXTextClass::size_type> layout =
- textclasslist.NumberOfLayout(tclass, argument);
-
- // If the entry is obsolete, use the new one instead.
- if (layout.first) {
- string obs = textclasslist.Style(tclass,layout.second)
- .obsoleted_by();
- if (!obs.empty())
- layout =
- textclasslist.NumberOfLayout(tclass, obs);
- }
-
- // see if we found the layout number:
- if (!layout.first) {
- setErrorMessage(string(N_("Layout ")) + argument +
- N_(" not known"));
- break;
- }
-
- if (current_layout != layout.second) {
- owner->view()->hideCursor();
- current_layout = layout.second;
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->
- SetLayout(owner->view(), layout.second);
- owner->setLayout(layout.second);
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- owner->view()->setState();
- }
- }
- break;
-
case LFUN_LAYOUT_DOCUMENT:
owner->getDialogs()->showLayoutDocument();
break;
case LFUN_LAYOUT_PARAGRAPH:
-#ifdef USE_OLD_PARAGRAPH_LAYOUT
- MenuLayoutParagraph();
-#else
owner->getDialogs()->showLayoutParagraph();
-#endif
break;
case LFUN_LAYOUT_CHARACTER:
- MenuLayoutCharacter();
+ owner->getDialogs()->showLayoutCharacter();
break;
case LFUN_LAYOUT_TABULAR:
break;
case LFUN_LAYOUT_PREAMBLE:
- MenuLayoutPreamble();
+ owner->getDialogs()->showPreamble();
break;
case LFUN_LAYOUT_SAVE_DEFAULT:
owner->getToolbar()->openLayoutList();
break;
- case LFUN_LANGUAGE:
- Lang(owner->view(), argument);
- owner->view()->setState();
- owner->showState();
- break;
-
- case LFUN_EMPH:
- Emph(owner->view());
- owner->showState();
- break;
-
- case LFUN_BOLD:
- Bold(owner->view());
- owner->showState();
- break;
-
- case LFUN_NOUN:
- Noun(owner->view());
- owner->showState();
- break;
-
- case LFUN_CODE:
- Code(owner->view());
- owner->showState();
- break;
-
- case LFUN_SANS:
- Sans(owner->view());
- owner->showState();
- break;
-
- case LFUN_ROMAN:
- Roman(owner->view());
- owner->showState();
- break;
-
- case LFUN_DEFAULT:
- StyleReset(owner->view());
- owner->showState();
- break;
-
- case LFUN_UNDERLINE:
- Underline(owner->view());
- owner->showState();
- break;
-
- case LFUN_FONT_SIZE:
- FontSize(owner->view(), argument);
- owner->showState();
- break;
-
- case LFUN_FONT_STATE:
- setMessage(CurrentState(owner->view()));
- break;
-
- case LFUN_UPCASE_WORD:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->ChangeWordCase(owner->view(), LyXText::text_uppercase);
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- break;
-
- case LFUN_LOWCASE_WORD:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->ChangeWordCase(owner->view(), LyXText::text_lowercase);
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- break;
-
- case LFUN_CAPITALIZE_WORD:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->ChangeWordCase(owner->view(),
- LyXText::text_capitalization);
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- break;
-
- case LFUN_INSERT_LABEL:
- MenuInsertLabel(owner->view(), argument);
- break;
-
- case LFUN_REF_INSERT:
- if (argument.empty()) {
- InsetCommandParams p("ref");
- owner->getDialogs()->createRef(p.getAsString());
- } else {
- InsetCommandParams p;
- p.setFromString(argument);
-
- InsetRef * inset = new InsetRef(p, *owner->buffer());
- if (!owner->view()->insertInset(inset))
- delete inset;
- else
- owner->view()->updateInset(inset, true);
- }
- break;
-
- case LFUN_BOOKMARK_SAVE:
- owner->view()->savePosition(strToUnsignedInt(argument));
- break;
-
- case LFUN_BOOKMARK_GOTO:
- owner->view()->restorePosition(strToUnsignedInt(argument));
- break;
-
- case LFUN_REF_GOTO:
- {
- string label(argument);
- if (label.empty()) {
- InsetRef * inset =
- static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
- if (inset) {
- label = inset->getContents();
- owner->view()->savePosition(0);
- }
- }
-
- if (!label.empty()) {
- //owner->view()->savePosition(0);
- if (!owner->view()->gotoLabel(label))
- WriteAlert(_("Error"),
- _("Couldn't find this label"),
- _("in current document."));
- }
- }
- break;
-
case LFUN_MENU_OPEN_BY_NAME:
owner->getMenubar()->openByName(argument);
break; // RVDK_PATCH_5
ShowSpellChecker(owner->view());
break; // RVDK_PATCH_5
- // --- Cursor Movements -----------------------------
- case LFUN_RIGHT:
+ // --- lyxserver commands ----------------------------
+
+
+ case LFUN_GETNAME:
+ setMessage(owner->buffer()->fileName());
+ lyxerr.debug() << "FNAME["
+ << owner->buffer()->fileName()
+ << "] " << endl;
+ break;
+
+ case LFUN_NOTIFY:
{
- LyXText * tmptext = owner->view()->text;
- bool is_rtl = tmptext->cursor.par()->isRightToLeftPar(owner->buffer()->params);
- if (!tmptext->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
- if (is_rtl)
- tmptext->CursorLeft(owner->view(), false);
- if (tmptext->cursor.pos() < tmptext->cursor.par()->Last()
- && tmptext->cursor.par()->GetChar(tmptext->cursor.pos())
- == LyXParagraph::META_INSET
- && tmptext->cursor.par()->GetInset(tmptext->cursor.pos())
- && tmptext->cursor.par()->GetInset(tmptext->cursor.pos())->Editable() == Inset::HIGHLY_EDITABLE){
- Inset * tmpinset = tmptext->cursor.par()->GetInset(tmptext->cursor.pos());
- setMessage(tmpinset->EditMessage());
- int y = 0;
- if (is_rtl) {
- LyXFont font =
- tmptext->GetFont(owner->view()->buffer(),
- tmptext->cursor.par(),
- tmptext->cursor.pos());
- y = tmpinset->descent(owner->view(),font);
- }
- tmpinset->Edit(owner->view(), 0, y, 0);
- break;
- }
- if (!is_rtl)
- tmptext->CursorRight(owner->view(), false);
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
+ string buf;
+ keyseq.print(buf);
+ dispatch_buffer = buf;
+ lyxserver->notifyClient(dispatch_buffer);
}
break;
-
- case LFUN_LEFT:
+
+ case LFUN_GOTOFILEROW:
{
- // This is soooo ugly. Isn`t it possible to make
- // it simpler? (Lgb)
- LyXText * txt = owner->view()->text;
- bool is_rtl = txt->cursor.par()->isRightToLeftPar(owner->buffer()->params);
- if (!txt->mark_set) owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
- LyXCursor cur = txt->cursor;
- if (!is_rtl)
- txt->CursorLeft(owner->view(), false);
- if ((is_rtl || cur != txt->cursor) && // only if really moved!
- txt->cursor.pos() < txt->cursor.par()->Last() &&
- (txt->cursor.par()->GetChar(txt->cursor.pos()) ==
- LyXParagraph::META_INSET) &&
- txt->cursor.par()->GetInset(txt->cursor.pos()) &&
- (txt->cursor.par()->GetInset(txt->cursor.pos())->Editable()
- == Inset::HIGHLY_EDITABLE))
- {
- Inset * tmpinset = txt->cursor.par()->GetInset(txt->cursor.pos());
- setMessage(tmpinset->EditMessage());
- LyXFont font = txt->GetFont(owner->view()->buffer(),
- txt->cursor.par(),
- txt->cursor.pos());
- int y = is_rtl ? 0
- : tmpinset->descent(owner->view(),font);
- tmpinset->Edit(owner->view(),
- tmpinset->x() +
- tmpinset->width(owner->view(),font),
- y, 0);
- break;
- }
- if (is_rtl)
- txt->CursorRight(owner->view(), false);
+ char file_name[100];
+ int row;
+ ::sscanf(argument.c_str(), " %s %d", file_name, &row);
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
+ // Must replace extension of the file to be .lyx and get full path
+ string s = ChangeExtension(string(file_name), ".lyx");
+
+ // Either change buffer or load the file
+ if (bufferlist.exists(s))
+ owner->view()->buffer(bufferlist.getBuffer(s));
+ else
+ owner->view()->buffer(bufferlist.loadLyXFile(s));
+
+ // Set the cursor
+ owner->view()->setCursorFromRow(row);
+
+ // Recenter screen
+ owner->view()->center();
}
break;
-
- case LFUN_UP:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::UPDATE);
- owner->view()->text->CursorUp(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
- case LFUN_DOWN:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::UPDATE);
- owner->view()->text->CursorDown(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
- case LFUN_UP_PARAGRAPH:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::UPDATE);
- owner->view()->text->CursorUpParagraph(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
- case LFUN_DOWN_PARAGRAPH:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::UPDATE);
- owner->view()->text->CursorDownParagraph(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
- case LFUN_PRIOR:
- if (!text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::UPDATE);
- owner->view()->cursorPrevious(text);
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, false);
- else
-#endif
- moveCursorUpdate(text, false);
- owner->showState();
- break;
-
- case LFUN_NEXT:
- if (!text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::UPDATE);
- owner->view()->cursorNext(text);
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, false);
- else
-#endif
- moveCursorUpdate(text, false);
- owner->showState();
- break;
-
- case LFUN_HOME:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorHome(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
- case LFUN_END:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorEnd(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
- case LFUN_SHIFT_TAB:
- case LFUN_TAB:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorTab(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
- case LFUN_WORDRIGHT:
- if (!text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
- text->CursorLeftOneWord(owner->view());
- else
- text->CursorRightOneWord(owner->view());
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- moveCursorUpdate(text, false);
- owner->showState();
- break;
-
- case LFUN_WORDLEFT:
- if (!text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
- text->CursorRightOneWord(owner->view());
- else
- text->CursorLeftOneWord(owner->view());
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- moveCursorUpdate(text, false);
- owner->showState();
- break;
-
- case LFUN_BEGINNINGBUF:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorTop(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
- case LFUN_ENDBUF:
- if (!owner->view()->text->mark_set)
- owner->view()->beforeChange();
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorBottom(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- break;
-
-
- /* cursor selection ---------------------------- */
- case LFUN_RIGHTSEL:
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
- owner->view()->text->CursorLeft(owner->view());
- else
- owner->view()->text->CursorRight(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- case LFUN_LEFTSEL:
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
- owner->view()->text->CursorRight(owner->view());
- else
- owner->view()->text->CursorLeft(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- case LFUN_UPSEL:
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorUp(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- case LFUN_DOWNSEL:
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorDown(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- case LFUN_UP_PARAGRAPHSEL:
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorUpParagraph(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- case LFUN_DOWN_PARAGRAPHSEL:
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorDownParagraph(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- case LFUN_PRIORSEL:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- owner->view()->cursorPrevious(text);
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner) {
- text->SetSelection();
- owner->view()->updateInset(text->inset_owner, false);
- } else
-#endif
- moveCursorUpdate(text, true);
- owner->showState();
- break;
-
- case LFUN_NEXTSEL:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- owner->view()->cursorNext(text);
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, false);
- else
-#endif
- moveCursorUpdate(text, true);
- owner->showState();
- break;
-
- case LFUN_HOMESEL:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->CursorHome(owner->view());
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner) {
- text->SetSelection();
- owner->view()->updateInset(text->inset_owner, false);
- } else
-#endif
- moveCursorUpdate(text, true);
- owner->showState();
- break;
-
- case LFUN_ENDSEL:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->CursorEnd(owner->view());
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner) {
- text->SetSelection();
- owner->view()->updateInset(text->inset_owner, false);
- } else
-#endif
- moveCursorUpdate(text, true);
- owner->showState();
- break;
-
- case LFUN_WORDRIGHTSEL:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
- text->CursorLeftOneWord(owner->view());
- else
- text->CursorRightOneWord(owner->view());
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner) {
- text->SetSelection();
- owner->view()->updateInset(text->inset_owner, false);
- } else
-#endif
- moveCursorUpdate(text, true);
- owner->showState();
- break;
-
- case LFUN_WORDLEFTSEL:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
- text->CursorRightOneWord(owner->view());
- else
- text->CursorLeftOneWord(owner->view());
- owner->view()->text->FinishUndo();
-#if 0
- if (text->inset_owner) {
- text->SetSelection();
- owner->view()->updateInset(text->inset_owner, false);
- } else
-#endif
- moveCursorUpdate(text, true);
- owner->showState();
- break;
-
- case LFUN_BEGINNINGBUFSEL:
- if (text->inset_owner)
- break;
- owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorTop(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- case LFUN_ENDBUFSEL:
- if (text->inset_owner)
- break;
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR);
- owner->view()->text->CursorBottom(owner->view());
- owner->view()->text->FinishUndo();
- moveCursorUpdate(owner->view()->text, true);
- owner->showState();
- break;
-
- // --- text changing commands ------------------------
- case LFUN_BREAKLINE:
- owner->view()->beforeChange();
- owner->view()->text->InsertChar(owner->view(), LyXParagraph::META_NEWLINE);
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- moveCursorUpdate(owner->view()->text, false);
- break;
-
- case LFUN_PROTECTEDSPACE:
- {
- LyXLayout const & style =
- textclasslist.Style(owner->view()->buffer()->params.textclass,
- text->cursor.par()->GetLayout());
-
- if (style.free_spacing) {
- text->InsertChar(owner->view(), ' ');
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- } else {
- owner->view()->protectedBlank(text);
- }
- moveCursorUpdate(text, false);
- }
- break;
-
- case LFUN_SETMARK:
- if (text->mark_set) {
- owner->view()->beforeChange();
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- setMessage(N_("Mark removed"));
- } else {
- owner->view()->beforeChange();
- text->mark_set = 1;
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- setMessage(N_("Mark set"));
- }
- text->sel_cursor = text->cursor;
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- break;
-
- case LFUN_DELETE:
- if (!owner->view()->text->selection) {
- owner->view()->text->Delete(owner->view());
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- // It is possible to make it a lot faster still
- // just comment out the line below...
- owner->view()->showCursor();
- } else {
- owner->view()->cut();
- }
- moveCursorUpdate(owner->view()->text, false);
- owner->showState();
- owner->view()->setState();
- break;
-
- case LFUN_DELETE_SKIP:
- {
- // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
-
- LyXCursor cursor = owner->view()->text->cursor;
-
- if (!owner->view()->text->selection) {
- if (cursor.pos() == cursor.par()->Last()) {
- owner->view()->text->CursorRight(owner->view());
- cursor = owner->view()->text->cursor;
- if (cursor.pos() == 0
- && !(cursor.par()->added_space_top
- == VSpace (VSpace::NONE))) {
- owner->view()->text->SetParagraph
- (owner->view(),
- cursor.par()->line_top,
- cursor.par()->line_bottom,
- cursor.par()->pagebreak_top,
- cursor.par()->pagebreak_bottom,
- VSpace(VSpace::NONE),
- cursor.par()->added_space_bottom,
- cursor.par()->align,
- cursor.par()->labelwidthstring, 0);
- owner->view()->text->CursorLeft(owner->view());
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- } else {
- owner->view()->text->CursorLeft(owner->view());
- owner->view()->text->Delete(owner->view());
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- } else {
- owner->view()->text->Delete(owner->view());
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- } else {
- owner->view()->cut();
- }
- }
- break;
-
- /* -------> Delete word forward. */
- case LFUN_DELETE_WORD_FORWARD:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->DeleteWordForward(owner->view());
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- moveCursorUpdate(text, false);
- owner->showState();
- break;
-
- /* -------> Delete word backward. */
- case LFUN_DELETE_WORD_BACKWARD:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->DeleteWordBackward(owner->view());
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- moveCursorUpdate(text, false);
- owner->showState();
- break;
-
- /* -------> Kill to end of line. */
- case LFUN_DELETE_LINE_FORWARD:
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->DeleteLineForward(owner->view());
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- moveCursorUpdate(text, false);
- break;
-
- /* -------> Set mark off. */
- case LFUN_MARK_OFF:
- owner->view()->beforeChange();
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->sel_cursor = text->cursor;
- setMessage(N_("Mark off"));
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- break;
-
- /* -------> Set mark on. */
- case LFUN_MARK_ON:
- owner->view()->beforeChange();
- text->mark_set = 1;
- owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->sel_cursor = text->cursor;
-#if 0
- if (text->inset_owner)
- owner->view()->updateInset(text->inset_owner, true);
-#endif
- setMessage(N_("Mark on"));
- break;
-
- case LFUN_BACKSPACE:
- {
- if (!owner->view()->text->selection) {
- if (owner->getIntl()->getTrans().backspace()) {
- owner->view()->text->Backspace(owner->view());
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- // It is possible to make it a lot faster still
- // just comment out the line below...
- owner->view()->showCursor();
- }
- } else {
- owner->view()->cut();
- }
- owner->showState();
- owner->view()->setState();
- }
- break;
-
- case LFUN_BACKSPACE_SKIP:
- {
- // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
-
- LyXCursor cursor = owner->view()->text->cursor;
-
- if (!owner->view()->text->selection) {
- if (cursor.pos() == 0
- && !(cursor.par()->added_space_top
- == VSpace (VSpace::NONE))) {
- owner->view()->text->SetParagraph
- (owner->view(),
- cursor.par()->line_top,
- cursor.par()->line_bottom,
- cursor.par()->pagebreak_top,
- cursor.par()->pagebreak_bottom,
- VSpace(VSpace::NONE), cursor.par()->added_space_bottom,
- cursor.par()->align,
- cursor.par()->labelwidthstring, 0);
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- } else {
- owner->view()->text->Backspace(owner->view());
- owner->view()->text->sel_cursor
- = cursor;
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- } else
- owner->view()->cut();
- }
- break;
-
- case LFUN_BREAKPARAGRAPH:
- {
- owner->view()->beforeChange();
- owner->view()->text->BreakParagraph(owner->view(), 0);
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- owner->view()->setState();
- owner->showState();
- break;
- }
-
- case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- {
- owner->view()->beforeChange();
- owner->view()->text->BreakParagraph(owner->view(), 1);
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- owner->view()->setState();
- owner->showState();
- break;
- }
-
- case LFUN_BREAKPARAGRAPH_SKIP:
- {
- // When at the beginning of a paragraph, remove
- // indentation and add a "defskip" at the top.
- // Otherwise, do the same as LFUN_BREAKPARAGRAPH.
-
- LyXCursor cursor = owner->view()->text->cursor;
-
- owner->view()->beforeChange();
- if (cursor.pos() == 0) {
- if (cursor.par()->added_space_top == VSpace(VSpace::NONE)) {
- owner->view()->text->SetParagraph
- (owner->view(),
- cursor.par()->line_top,
- cursor.par()->line_bottom,
- cursor.par()->pagebreak_top,
- cursor.par()->pagebreak_bottom,
- VSpace(VSpace::DEFSKIP), cursor.par()->added_space_bottom,
- cursor.par()->align,
- cursor.par()->labelwidthstring, 1);
- //owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- }
- else {
- owner->view()->text->BreakParagraph(owner->view(), 0);
- //owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
-
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- owner->view()->text->sel_cursor = cursor;
- owner->view()->setState();
- owner->showState();
- }
- break;
-
- case LFUN_PARAGRAPH_SPACING:
- {
- LyXParagraph * par = owner->view()->text->cursor.par();
- Spacing::Space cur_spacing = par->spacing.getSpace();
- float cur_value = 1.0;
- if (cur_spacing == Spacing::Other) {
- cur_value = par->spacing.getValue();
- }
-
- istringstream istr(argument.c_str());
-
- string tmp;
- istr >> tmp;
- Spacing::Space new_spacing = cur_spacing;
- float new_value = cur_value;
- if (tmp.empty()) {
- lyxerr << "Missing argument to `paragraph-spacing'"
- << endl;
- } else if (tmp == "single") {
- new_spacing = Spacing::Single;
- } else if (tmp == "onehalf") {
- new_spacing = Spacing::Onehalf;
- } else if (tmp == "double") {
- new_spacing = Spacing::Double;
- } else if (tmp == "other") {
- new_spacing = Spacing::Other;
- float tmpval = 0.0;
- istr >> tmpval;
- lyxerr << "new_value = " << tmpval << endl;
- if (tmpval != 0.0)
- new_value = tmpval;
- } else if (tmp == "default") {
- new_spacing = Spacing::Default;
- } else {
- lyxerr << _("Unknown spacing argument: ")
- << argument << endl;
- }
- if (cur_spacing != new_spacing || cur_value != new_value) {
- par->spacing.set(new_spacing, new_value);
- owner->view()->text->RedoParagraph(owner->view());
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- }
- break;
-
- case LFUN_QUOTE:
- owner->view()->beforeChange();
- owner->view()->text->InsertChar(owner->view(), '\"'); // This " matches the single quote in the code
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- moveCursorUpdate(owner->view()->text, false);
- break;
-
- case LFUN_HTMLURL:
- case LFUN_URL:
- {
- InsetCommandParams p;
- if (action == LFUN_HTMLURL)
- p.setCmdName("htmlurl");
- else
- p.setCmdName("url");
- owner->getDialogs()->createUrl( p.getAsString() );
- }
- break;
-
- case LFUN_INSERT_URL:
- {
- InsetCommandParams p;
- p.setFromString( argument );
-
- InsetUrl * inset = new InsetUrl( p );
- if (!owner->view()->insertInset(inset))
- delete inset;
- else
- owner->view()->updateInset( inset, true );
- }
- break;
-
- case LFUN_INSET_TEXT:
- {
- InsetText * new_inset = new InsetText;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_ERT:
- {
- InsetERT * new_inset = new InsetERT;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_EXTERNAL:
- {
- InsetExternal * new_inset = new InsetExternal;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_FOOTNOTE:
- {
- InsetFoot * new_inset = new InsetFoot;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_MARGINAL:
- {
- InsetMarginal * new_inset = new InsetMarginal;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_MINIPAGE:
- {
- InsetMinipage * new_inset = new InsetMinipage;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_FLOAT:
- {
- // check if the float type exist
- if (floatList.typeExist(argument)) {
- InsetFloat * new_inset = new InsetFloat(argument);
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- } else {
- lyxerr << "Non-existant float type: "
- << argument << endl;
- }
-
- }
- break;
-
- case LFUN_INSET_LIST:
- {
- InsetList * new_inset = new InsetList;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_THEOREM:
- {
- InsetTheorem * new_inset = new InsetTheorem;
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
- case LFUN_INSET_CAPTION:
- {
- // Do we have a locking inset...
- if (owner->view()->theLockingInset()) {
- lyxerr << "Locking inset code: "
- << static_cast<int>(owner->view()->theLockingInset()->LyxCode());
- InsetCaption * new_inset = new InsetCaption;
- new_inset->setOwner(owner->view()->theLockingInset());
- new_inset->SetAutoBreakRows(true);
- new_inset->SetDrawFrame(0, InsetText::LOCKED);
- new_inset->SetFrameColor(0, LColor::footnoteframe);
- if (owner->view()->insertInset(new_inset))
- new_inset->Edit(owner->view(), 0, 0, 0);
- else
- delete new_inset;
- }
- }
- break;
-
- case LFUN_INSET_TABULAR:
- {
- int r = 2, c = 2;
- if (!argument.empty())
- ::sscanf(argument.c_str(),"%d%d", &r, &c);
- InsetTabular * new_inset =
- new InsetTabular(*owner->buffer(), r, c);
- bool rtl =
- owner->view()->getLyXText()->real_current_font.isRightToLeft();
- if (!owner->view()->open_new_inset(new_inset, rtl))
- delete new_inset;
- }
- break;
-
- // --- lyxserver commands ----------------------------
-
- case LFUN_CHARATCURSOR:
- {
- LyXParagraph::size_type pos =
- owner->view()->text->cursor.pos();
- if (pos < owner->view()->text->cursor.par()->size())
- //dispatch_buffer = owner->view()->text->
- // cursor.par()->text[pos];
- dispatch_buffer =
- owner->view()->text->
- cursor.par()->GetChar(pos);
- else
- dispatch_buffer = "EOF";
- }
- break;
-
- case LFUN_GETXY:
- dispatch_buffer =
- tostr(owner->view()->text->cursor.x()) + ' '
- + tostr(owner->view()->text->cursor.y());
- break;
-
- case LFUN_SETXY:
- {
- int x;
- int y;
- ::sscanf(argument.c_str(), " %d %d", &x, &y);
- owner->view()->text->SetCursorFromCoordinates(owner->view(), x, y);
- }
- break;
-
- case LFUN_GETLAYOUT:
- dispatch_buffer =
- tostr(owner->view()->text->cursor.par()->layout);
- break;
-
- case LFUN_GETFONT:
- {
- LyXFont & font = owner->view()->text->current_font;
- if (font.shape() == LyXFont::ITALIC_SHAPE)
- dispatch_buffer = 'E';
- else if (font.shape() == LyXFont::SMALLCAPS_SHAPE)
- dispatch_buffer = 'N';
- else
- dispatch_buffer = '0';
-
- }
- break;
-
- case LFUN_GETLATEX:
- {
- LyXFont & font = owner->view()->text->current_font;
- if (font.latex() == LyXFont::ON)
- dispatch_buffer = 'L';
- else
- dispatch_buffer = '0';
- }
- break;
-
- case LFUN_GETNAME:
- setMessage(owner->buffer()->fileName());
- lyxerr.debug() << "FNAME["
- << owner->buffer()->fileName()
- << "] " << endl;
- break;
-
- case LFUN_NOTIFY:
- {
- string buf;
- keyseq.print(buf);
- dispatch_buffer = buf;
- lyxserver->notifyClient(dispatch_buffer);
- }
- break;
-
- case LFUN_GOTOFILEROW:
- {
- char file_name[100];
- int row;
- ::sscanf(argument.c_str(), " %s %d", file_name, &row);
-
- // Must replace extension of the file to be .lyx and get full path
- string s = ChangeExtension(string(file_name), ".lyx");
-
- // Either change buffer or load the file
- if (bufferlist.exists(s))
- owner->view()->buffer(bufferlist.getBuffer(s));
- else
- owner->view()->buffer(bufferlist.loadLyXFile(s));
-
- // Set the cursor
- owner->view()->setCursorFromRow(row);
-
- // Recenter screen
- owner->view()->center();
- }
- break;
-
- case LFUN_GOTO_PARAGRAPH:
- {
- istringstream istr(argument.c_str());
-
- int id;
- istr >> id;
- LyXParagraph * par = owner->view()->text->GetParFromID(id);
-
- // Set the cursor
- owner->view()->text->SetCursor(owner->view(), par, 0);
- owner->view()->setState();
+ case LFUN_GOTO_PARAGRAPH:
+ {
+ istringstream istr(argument.c_str());
+
+ int id;
+ istr >> id;
+ LyXParagraph * par = TEXT()->GetParFromID(id);
+
+ // Set the cursor
+ TEXT()->SetCursor(owner->view(), par, 0);
+ owner->view()->setState();
owner->showState();
// Recenter screen
}
break;
- // --- accented characters ---------------------------
-
- case LFUN_UMLAUT:
- case LFUN_CIRCUMFLEX:
- case LFUN_GRAVE:
- case LFUN_ACUTE:
- case LFUN_TILDE:
- case LFUN_CEDILLA:
- case LFUN_MACRON:
- case LFUN_DOT:
- case LFUN_UNDERDOT:
- case LFUN_UNDERBAR:
- case LFUN_CARON:
- case LFUN_SPECIAL_CARON:
- case LFUN_BREVE:
- case LFUN_TIE:
- case LFUN_HUNG_UMLAUT:
- case LFUN_CIRCLE:
- case LFUN_OGONEK:
- {
- char c = 0;
-
- if (keyseq.length == -1 && keyseq.getiso() != 0)
- c = keyseq.getiso();
-
- owner->getIntl()->getTrans()
- .deadkey(c, get_accent(action).accent,
- owner->view()->text);
-
- // Need to reset, in case the minibuffer calls these
- // actions
- keyseq.reset();
- keyseq.length = 0;
-
- // copied verbatim from do_accent_char
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- }
- break;
-
// --- toolbar ----------------------------------
case LFUN_PUSH_TOOLBAR:
{
}
break;
- case LFUN_MATH_DELIM:
- case LFUN_INSERT_MATRIX:
- {
- if (owner->view()->available()) {
- if (owner->view()->
- open_new_inset(new InsetFormula(false)))
- {
- owner->view()->theLockingInset()
- ->LocalDispatch(owner->view(),
- action,
- argument);
- }
- }
- }
- break;
-
- case LFUN_INSERT_MATH:
- {
- math_insert_symbol(owner->view(), argument);
- }
- break;
-
- case LFUN_MATH_DISPLAY:
- {
- if (owner->view()->available())
- owner->view()->open_new_inset(new InsetFormula(true));
- break;
- }
-
- case LFUN_MATH_MACRO:
- {
- if (owner->view()->available()) {
- string s(argument);
- if (s.empty())
- setErrorMessage(N_("Missing argument"));
- else {
- string const s1 = token(s, ' ', 1);
- int const na = s1.empty() ? 0 : lyx::atoi(s1);
- owner->view()->
- open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na));
- }
- }
- }
- break;
-
- case LFUN_MATH_MODE: // Open or create a math inset
- {
- if (owner->view()->available())
- owner->view()->open_new_inset(new InsetFormula);
- setMessage(N_("Math editor mode"));
- }
- break;
-
case LFUN_MATH_NUMBER:
case LFUN_MATH_LIMITS:
{
break;
case LFUN_MATH_PANEL:
- {
- show_symbols_form(this);
- }
- break;
+ owner->getDialogs()->showMathPanel();
+ break;
case LFUN_CITATION_CREATE:
{
}
break;
- case LFUN_CITATION_INSERT:
- {
- InsetCommandParams p;
- p.setFromString( argument );
-
- InsetCitation * inset = new InsetCitation( p );
- if (!owner->view()->insertInset(inset))
- delete inset;
- else
- owner->view()->updateInset( inset, true );
- }
- break;
-
- case LFUN_INSERT_BIBTEX:
- {
- // ale970405+lasgoutt970425
- // The argument can be up to two tokens separated
- // by a space. The first one is the bibstyle.
- string const db = token(argument, ' ', 0);
- string bibstyle = token(argument, ' ', 1);
- if (bibstyle.empty())
- bibstyle = "plain";
-
- InsetCommandParams p( "BibTeX", db, bibstyle );
- InsetBibtex * inset = new InsetBibtex(p);
-
- if (owner->view()->insertInset(inset)) {
- if (argument.empty())
- inset->Edit(owner->view(), 0, 0, 0);
- } else
- delete inset;
- }
- break;
-
- // BibTeX data bases
- case LFUN_BIBDB_ADD:
- {
- InsetBibtex * inset =
- static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
- if (inset) {
- inset->addDatabase(argument);
- }
- }
- break;
-
- case LFUN_BIBDB_DEL:
- {
- InsetBibtex * inset =
- static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
- if (inset) {
- inset->delDatabase(argument);
- }
- }
- break;
-
- case LFUN_BIBTEX_STYLE:
- {
- InsetBibtex * inset =
- static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
- if (inset) {
- inset->setOptions(argument);
- }
- }
- break;
-
- case LFUN_INDEX_CREATE:
- {
- InsetCommandParams p( "index" );
-
- if (argument.empty()) {
- // Get the word immediately preceding the cursor
- LyXParagraph::size_type curpos =
- owner->view()->text->cursor.pos() - 1;
-
- string curstring;
- if (curpos >= 0 )
- curstring = owner->view()->text
- ->cursor.par()->GetWord(curpos);
-
- p.setContents( curstring );
- } else {
- p.setContents( argument );
- }
-
- owner->getDialogs()->createIndex( p.getAsString() );
- }
- break;
-
- case LFUN_INDEX_INSERT:
- {
- InsetCommandParams p;
- p.setFromString(argument);
- InsetIndex * inset = new InsetIndex(p);
-
- if (!owner->view()->insertInset(inset))
- delete inset;
- else
- owner->view()->updateInset(inset, true);
- }
- break;
-
- case LFUN_INDEX_INSERT_LAST:
- {
- // Get word immediately preceding the cursor
- LyXParagraph::size_type curpos =
- owner->view()->text->cursor.pos() - 1;
- // Can't do that at the beginning of a paragraph
- if (curpos < 0) break;
-
- string const curstring(owner->view()->text
- ->cursor.par()->GetWord(curpos));
-
- InsetCommandParams p("index", curstring);
- InsetIndex * inset = new InsetIndex(p);
-
- if (!owner->view()->insertInset(inset))
- delete inset;
- else
- owner->view()->updateInset(inset, true);
- }
- break;
-
- case LFUN_INDEX_PRINT:
- {
- InsetCommandParams p("printindex");
- Inset * inset = new InsetPrintIndex(p);
- if (!owner->view()->insertInset(inset, "Standard", true))
- delete inset;
- }
- break;
-
- case LFUN_PARENTINSERT:
- {
- lyxerr << "arg " << argument << endl;
- InsetCommandParams p( "lyxparent", argument );
- Inset * inset = new InsetParent(p, *owner->buffer());
- if (!owner->view()->insertInset(inset, "Standard", true))
- delete inset;
- }
- break;
-
- case LFUN_CHILD_CREATE:
- {
- InsetCommandParams p("include");
-
- if (!argument.empty()) {
- if (contains(argument, "|")) {
- p.setContents(token(argument, '|', 0));
- p.setOptions(token(argument, '|', 1));
- } else
- p.setContents(argument);
- Dispatch(LFUN_CHILD_INSERT, p.getAsString());
- } else
- owner->getDialogs()->createInclude(p.getAsString());
- }
- break;
-
- case LFUN_CHILD_INSERT:
- {
- InsetCommandParams p;
- p.setFromString(argument);
-
- InsetInclude * inset = new InsetInclude(p, *owner->buffer());
- if (!owner->view()->insertInset(inset))
- delete inset;
- else
- owner->view()->updateInset(inset, true);
- }
- break;
-
case LFUN_CHILDOPEN:
{
string const filename =
}
break;
- case LFUN_INSERT_NOTE:
- owner->view()->insertNote();
- break;
#ifndef NEW_INSETS
case LFUN_INSERTFOOTNOTE:
{
setErrorMessage(N_("Unknown kind of footnote"));
break;
}
- owner->view()->text->InsertFootnoteEnvironment(owner->view(), kind);
- owner->view()->update(owner->view()->text,
+ TEXT()->InsertFootnoteEnvironment(owner->view(), kind);
+ owner->view()->update(TEXT(),
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
owner->view()->setState();
}
owner->getIntl()->ToggleKeyMap();
break;
- case LFUN_SELFINSERT:
- {
- LyXFont const old_font(owner->view()->text->real_current_font);
- for (string::size_type i = 0; i < argument.length(); ++i) {
- owner->view()->text->InsertChar(owner->view(), argument[i]);
- // This needs to be in the loop, or else we
- // won't break lines correctly. (Asger)
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- moveCursorUpdate(owner->view()->text, false);
-
- // real_current_font.number can change so we need to
- // update the minibuffer
- if (old_font != owner->view()->text->real_current_font)
- owner->showState();
- }
- break;
-
case LFUN_SEQUENCE:
{
// argument contains ';'-terminated commands
}
break;
- case LFUN_DATE_INSERT: // jdblair: date-insert cmd
- {
- struct tm * now_tm;
-
- time_t now_time_t = time(NULL);
- now_tm = localtime(&now_time_t);
- setlocale(LC_TIME, "");
- string arg;
- if (!argument.empty())
- arg = argument;
- else
- arg = lyxrc.date_insert_format;
- char datetmp[32];
- int const datetmp_len =
- ::strftime(datetmp, 32, arg.c_str(), now_tm);
- for (int i = 0; i < datetmp_len; i++) {
- owner->view()->text->InsertChar(owner->view(), datetmp[i]);
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
-
- owner->view()->text->sel_cursor = owner->view()->text->cursor;
- moveCursorUpdate(owner->view()->text, false);
- }
- break;
-
case LFUN_DIALOG_PREFERENCES:
owner->getDialogs()->showPreferences();
break;
break;
}
- case LFUN_UNKNOWN_ACTION:
- {
- if (!owner->buffer()) {
- setErrorMessage(N_("No document open"));
- break;
- }
-
- if (owner->buffer()->isReadonly()) {
- setErrorMessage(N_("Document is read only"));
- break;
- }
-
- if (!argument.empty()) {
-
- /* Automatically delete the currently selected
- * text and replace it with what is being
- * typed in now. Depends on lyxrc settings
- * "auto_region_delete", which defaults to
- * true (on). */
-
- if (lyxrc.auto_region_delete) {
- if (owner->view()->text->selection){
- owner->view()->text->CutSelection(owner->view(), false);
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
- }
-
- owner->view()->beforeChange();
- LyXFont const old_font(owner->view()->text->real_current_font);
- for (string::size_type i = 0;
- i < argument.length(); ++i) {
- if (greek_kb_flag) {
- if (!math_insert_greek(owner->view(),
- argument[i]))
-#if 0
- owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
- owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
- } else
-#if 0
- owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
- owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
- }
-
- owner->view()->update(owner->view()->text,
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- owner->view()->text->sel_cursor =
- owner->view()->text->cursor;
- moveCursorUpdate(owner->view()->text, false);
-
- // real_current_font.number can change so we need to
- // update the minibuffer
- if (old_font != owner->view()->text->real_current_font)
- owner->showState();
- return string();
- } else {
- // why is an "Unknown action" with empty
- // argument even dispatched in the first
- // place? I`ll probably change that. (Lgb)
- setErrorMessage(N_("Unknown action"));
- }
- break;
- }
-
default:
- lyxerr << "A truly unknown func!" << endl;
+ // Then if it was none of the above
+ if (!owner->view()->Dispatch(action, argument))
+ lyxerr << "A truly unknown func!" << endl;
break;
} // end of switch
- exit_with_message:
+
+exit_with_message:
string const res = getMessage();
void LyXFunc::setupLocalKeymap()
{
- keyseq.stdmap = keyseq.curmap = toplevel_keymap;
- cancel_meta_seq.stdmap = cancel_meta_seq.curmap = toplevel_keymap;
+ keyseq.stdmap = keyseq.curmap = toplevel_keymap.get();
+ cancel_meta_seq.stdmap = cancel_meta_seq.curmap = toplevel_keymap.get();
}
void LyXFunc::MenuNew(bool fromTemplate)
{
string initpath = lyxrc.document_path;
- LyXFileDlg fileDlg;
if (owner->view()->available()) {
string const trypath = owner->buffer()->filepath;
string s;
if (lyxrc.new_ask_filename) {
- ProhibitInput(owner->view());
- fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
- fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
- string fname = fileDlg.Select(_("Enter Filename for new document"),
- initpath, "*.lyx", _("newfile"));
- AllowInput(owner->view());
+ FileDialog fileDlg(owner, _("Enter filename for new document"),
+ LFUN_SELECT_FILE_SYNC,
+ make_pair(string(_("Documents")), string(lyxrc.document_path)),
+ make_pair(string(_("Templates")), string(lyxrc.template_path)));
+
+ FileDialog::Result result = fileDlg.Select(initpath, _("*.lyx|LyX Documents (*.lyx)"), _("newfile"));
- if (fname.empty()) {
+ if (result.second.empty()) {
owner->getMiniBuffer()->Set(_("Canceled."));
lyxerr.debug() << "New Document Cancelled." << endl;
return;
// get absolute path of file and make sure the filename ends
// with .lyx
- s = MakeAbsPath(fname);
+ s = MakeAbsPath(result.second);
if (!IsLyXFilename(s))
s += ".lyx";
// The template stuff
string templname;
if (fromTemplate) {
- ProhibitInput(owner->view());
- string const fname = fileDlg.Select(_("Choose template"),
- lyxrc.template_path,
- "*.lyx");
- AllowInput(owner->view());
- if (fname.empty()) return;
+ FileDialog fileDlg(owner, _("Select template file"),
+ LFUN_SELECT_FILE_SYNC,
+ make_pair(string(_("Documents")), string(lyxrc.document_path)),
+ make_pair(string(_("Templates")), string(lyxrc.template_path)));
+
+ FileDialog::Result result = fileDlg.Select(initpath, _("*.lyx|LyX Documents (*.lyx)"));
+
+ if (result.first == FileDialog::Later)
+ return;
+
+ string const fname = result.second;
+
+ if (fname.empty())
+ return;
templname = fname;
}
}
-void LyXFunc::MenuOpen()
+void LyXFunc::Open(string const & fname)
{
string initpath = lyxrc.document_path;
- LyXFileDlg fileDlg;
if (owner->view()->available()) {
string const trypath = owner->buffer()->filepath;
initpath = trypath;
}
- // launches dialog
- ProhibitInput(owner->view());
- fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
- fileDlg.SetButton(1, _("Examples"),
- AddPath(system_lyxdir, "examples"));
- string filename = fileDlg.Select(_("Select Document to Open"),
- initpath, "*.lyx");
- AllowInput(owner->view());
+ string filename;
- // check selected filename
- if (filename.empty()) {
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
- }
+ if (fname.empty()) {
+ FileDialog fileDlg(owner, _("Select document to open"),
+ LFUN_FILE_OPEN,
+ make_pair(string(_("Documents")), string(lyxrc.document_path)),
+ make_pair(string(_("Examples")), string(AddPath(system_lyxdir, "examples"))));
+
+ FileDialog::Result result = fileDlg.Select(initpath, "*.lyx|LyX Documents (*.lyx)");
+
+ if (result.first == FileDialog::Later)
+ return;
+
+ filename = result.second;
+
+ // check selected filename
+ if (filename.empty()) {
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
+ } else
+ filename = fname;
// get absolute path of file and make sure the filename ends
// with .lyx
if (filename.empty()) { // need user interaction
string initpath = lyxrc.document_path;
- LyXFileDlg fileDlg;
if (owner->view()->available()) {
string const trypath = owner->buffer()->filepath;
initpath = trypath;
}
- // launches dialog
- ProhibitInput(owner->view());
- fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
- fileDlg.SetButton(1, _("Examples"),
- AddPath(system_lyxdir, "examples"));
string const text = _("Select ") + formats.PrettyName(format)
+ _(" file to import");
- string const extension = "*." + formats.Extension(format);
- filename = fileDlg.Select(text, initpath, extension);
- AllowInput(owner->view());
+
+ FileDialog fileDlg(owner, text,
+ LFUN_IMPORT,
+ make_pair(string(_("Documents")), string(lyxrc.document_path)),
+ make_pair(string(_("Examples")), string(AddPath(system_lyxdir, "examples"))));
+
+ string const extension = "*." + formats.Extension(format) + "| " +
+ formats.PrettyName(format) + " (*." + formats.Extension(format) + ")";
+
+ FileDialog::Result result = fileDlg.Select(initpath, extension);
+
+ if (result.first == FileDialog::Later)
+ return;
+
+ filename = result.second;
// check selected filename
if (filename.empty())
}
-void LyXFunc::MenuInsertLyXFile(string const & filen)
-{
- string filename = filen;
-
- if (filename.empty()) {
- // Launch a file browser
- string initpath = lyxrc.document_path;
- LyXFileDlg fileDlg;
-
- if (owner->view()->available()) {
- string const trypath = owner->buffer()->filepath;
- // If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
- initpath = trypath;
- }
-
- // launches dialog
- ProhibitInput(owner->view());
- fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
- fileDlg.SetButton(1, _("Examples"),
- AddPath(system_lyxdir, "examples"));
- filename = fileDlg.Select(_("Select Document to Insert"),
- initpath, "*.lyx");
- AllowInput(owner->view());
-
- // check selected filename
- if (filename.empty()) {
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
- }
- }
-
- // get absolute path of file and make sure the filename ends
- // with .lyx
- filename = MakeAbsPath(filename);
- if (!IsLyXFilename(filename))
- filename += ".lyx";
-
- // Inserts document
- owner->getMiniBuffer()->Set(_("Inserting document"),
- MakeDisplayPath(filename), "...");
- bool const res = owner->view()->insertLyXFile(filename);
- if (res) {
- owner->getMiniBuffer()->Set(_("Document"),
- MakeDisplayPath(filename),
- _("inserted."));
- } else {
- owner->getMiniBuffer()->Set(_("Could not insert document"),
- MakeDisplayPath(filename));
- }
-}
-
-
void LyXFunc::reloadBuffer()
{
string const fn = owner->buffer()->fileName();
}
-Inset * LyXFunc::getInsetByCode(Inset::Code code)
-{
- LyXCursor cursor = owner->view()->text->cursor;
- Buffer * buffer = owner->view()->buffer();
- Buffer::inset_iterator it =
- find_if(Buffer::inset_iterator(cursor.par(),
- cursor.pos()),
- buffer->inset_iterator_end(),
- compare_memfun(&Inset::LyxCode, code));
- return it != buffer->inset_iterator_end() ? (*it) : 0;
-}
-
-
// Each "owner" should have it's own message method. lyxview and
// the minibuffer would use the minibuffer, but lyxserver would
// send an ERROR signal to its client. Alejandro 970603
projects / lyx.git / blobdiff