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

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 29f4026926e7a80fd838b28d19a083729cf39d3d..bd60e597e2322ed3b1c03f9b437173d4c8513a9c 100644 (file)
--- 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 192b863e59f3ee8a7352c3efc99a03053ded6786..edd9de6a98f779d3a4a97a37f2ac91e2ac1c36e6 100644 (file)
--- 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 c0eeda2addc8688e7e2b5b455033ddfdb2de1d85..5d2a52ae8ca2bfb1e32fcf08f451ee29efafbf2f 100644 (file)
--- 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 d782b6f5afb4b4ae9e03d6e2a95dff3b5b12e318..41fa9ab77266d9e329ca5c0fd2861a7a59d565a3 100644 (file)
--- 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 57ff7c8492dcf4229627bf5e69ffbcd48c0edc3e..c6817af7e5297649b57893c15738d3e2fcee15bf 100644 (file)
--- 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 a4da043ee5d47c968ea78c1cc37ceb134c7120c6..68cbc2783a0e85cece9482aaca722f4507f1bfcd 100644 (file)
--- a/src/frontends/qt4/ui/PrefOutputUi.ui
+++ b/src/frontends/qt4/ui/PrefOutputUi.ui
@@ -5,14 +5,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>270</width>
-    <height>128</height>
+    <width>307</width>
+    <height>234</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout_2" >
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2" >
      <item>
@@ -96,6 +96,87 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Forward search</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <property name="checkable" >
+      <bool>false</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout" >
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3" >
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>DV&amp;I command:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>dviCB</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="dviCB" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="editable" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_5" >
+        <item>
+         <widget class="QLabel" name="label_2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>&amp;PDF command:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>pdfCB</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="pdfCB" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="editable" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer" >
      <property name="orientation" >