From 98f106f2caba893a42654bf4ff53422c936e160d Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Fri, 16 Apr 2010 08:09:07 +0000 Subject: [PATCH] Guify forward search. No viewer set by default, which keeps context menu clean for uninterested users. Settings are hinted at combobox. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34149 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ui/stdcontext.inc | 1 + lib/ui/stdmenus.inc | 1 + src/LyXRC.cpp | 2 +- src/frontends/qt4/GuiPrefs.cpp | 13 +++++ src/frontends/qt4/GuiView.cpp | 2 + src/frontends/qt4/ui/PrefOutputUi.ui | 87 +++++++++++++++++++++++++++- 6 files changed, 102 insertions(+), 4 deletions(-) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 29f4026926..bd60e597e2 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -299,6 +299,7 @@ Menuset Submenu "Paste Recent|e" "edit_pasterecent" Separator Item "Jump Back to Saved Bookmark|B" "bookmark-goto 0" + OptItem "Forward search|F" "forward-search" Separator Item "Move Paragraph Up|o" "paragraph-move-up" Item "Move Paragraph Down|v" "paragraph-move-down" diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 192b863e59..edd9de6a98 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -508,6 +508,7 @@ Menuset Item "Next Change|C" "change-next" Item "Next Cross-Reference|R" "reference-next" OptItem "Go to Label|L" "label-goto" + Item "Forward search|F" "forward-search" Separator Toc End diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index c0eeda2add..5d2a52ae8c 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -328,7 +328,7 @@ void LyXRC::setDefaults() user_email = to_utf8(support::user_email()); open_buffers_in_tabs = true; single_close_tab_button = false; - forward_search_dvi = "xdvi -sourceposition $$n:$$t $$o"; + forward_search_dvi = string(); forward_search_pdf = string(); // Fullscreen settings diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index d782b6f5af..41fa9ab772 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -368,6 +368,15 @@ PrefOutput::PrefOutput(GuiPreferences * form) this, SIGNAL(changed())); connect(plaintextLinelengthSB, SIGNAL(valueChanged(int)), this, SIGNAL(changed())); + connect(dviCB, SIGNAL(textChanged(QString)), + this, SIGNAL(changed())); + connect(pdfCB, SIGNAL(textChanged(QString)), + this, SIGNAL(changed())); + dviCB->addItem(""); + dviCB->addItem("xdvi -sourceposition $$n:$$t $$o"); + dviCB->addItem("yap -1 -s $$n$$t $$o"); + pdfCB->addItem(""); + pdfCB->addItem("CMCDDE SUMATRA control [ForwardSearch(\\\"$$o\\\",\\\"$$t\\\",$$n,0,0,1)]"); } @@ -385,6 +394,8 @@ void PrefOutput::apply(LyXRC & rc) const { rc.date_insert_format = fromqstr(DateED->text()); rc.plaintext_linelen = plaintextLinelengthSB->value(); + rc.forward_search_dvi = fromqstr(dviCB->currentText()); + rc.forward_search_pdf = fromqstr(pdfCB->currentText()); } @@ -392,6 +403,8 @@ void PrefOutput::update(LyXRC const & rc) { DateED->setText(toqstr(rc.date_insert_format)); plaintextLinelengthSB->setValue(rc.plaintext_linelen); + dviCB->setEditText(toqstr(rc.forward_search_dvi)); + pdfCB->setEditText(toqstr(rc.forward_search_pdf)); } diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 57ff7c8492..c6817af7e5 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1657,7 +1657,9 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) break; case LFUN_SERVER_GOTO_FILE_ROW: + break; case LFUN_FORWARD_SEARCH: + enable = !(lyxrc.forward_search_dvi.empty() && lyxrc.forward_search_pdf.empty()); break; default: diff --git a/src/frontends/qt4/ui/PrefOutputUi.ui b/src/frontends/qt4/ui/PrefOutputUi.ui index a4da043ee5..68cbc2783a 100644 --- a/src/frontends/qt4/ui/PrefOutputUi.ui +++ b/src/frontends/qt4/ui/PrefOutputUi.ui @@ -5,14 +5,14 @@ 0 0 - 270 - 128 + 307 + 234 - + @@ -96,6 +96,87 @@ + + + + Forward search + + + true + + + false + + + + + + + + + 0 + 0 + + + + DV&I command: + + + dviCB + + + + + + + + 0 + 0 + + + + true + + + + + + + + + + + + 0 + 0 + + + + &PDF command: + + + pdfCB + + + + + + + + 0 + 0 + + + + true + + + + + + + + -- 2.39.5