From: Richard Heck <rgheck@lyx.org>
Date: Mon, 2 Apr 2018 02:18:04 +0000 (-0400)
Subject: Fix bug 11099.
X-Git-Tag: 2.3.1~133^2~8
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2bb9d495276b43db58c0eb1783df0cd47eac164b;p=features.git

Fix bug 11099.

Adds simple search/find functionality to preamble.
---

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 4020f17fa9..f5af06ede0 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -469,6 +469,29 @@ PreambleModule::PreambleModule(QWidget * parent)
 	preambleTE->setWordWrapMode(QTextOption::NoWrap);
 	setFocusProxy(preambleTE);
 	connect(preambleTE, SIGNAL(textChanged()), this, SIGNAL(changed()));
+	connect(findLE, SIGNAL(textEdited(const QString &)), this, SLOT(checkFindButton()));
+	connect(findButtonPB, SIGNAL(clicked()), this, SLOT(findText()));
+	connect(findLE, SIGNAL(returnPressed()), this, SLOT(findText()));
+	checkFindButton();
+}
+
+
+void PreambleModule::checkFindButton()
+{
+	findButtonPB->setEnabled(!findLE->text().isEmpty());
+}
+
+
+void PreambleModule::findText()
+{
+	bool const found = preambleTE->find(findLE->text());
+	if (!found) {
+		// wrap
+		QTextCursor qtcur = preambleTE->textCursor();
+		qtcur.movePosition(QTextCursor::Start);
+		preambleTE->setTextCursor(qtcur);
+		preambleTE->find(findLE->text());
+	}
 }
 
 
diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 1fe1dc74a1..e4f32e2570 100644
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -332,10 +332,14 @@ private:
 	void closeEvent(QCloseEvent *);
 	void on_preambleTE_textChanged() { changed(); }
 
-private:
 	typedef std::map<BufferId, std::pair<int,int> > Coords;
 	Coords preamble_coords_;
 	BufferId current_id_;
+
+private Q_SLOTS:
+	///
+	void checkFindButton();
+	void findText();
 };
 
 
diff --git a/src/frontends/qt4/ui/PreambleUi.ui b/src/frontends/qt4/ui/PreambleUi.ui
index b39f26173d..1bc1c52879 100644
--- a/src/frontends/qt4/ui/PreambleUi.ui
+++ b/src/frontends/qt4/ui/PreambleUi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PreambleUi</class>
- <widget class="QWidget" name="PreambleUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PreambleUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,19 +10,38 @@
     <height>278</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>11</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin">
+    <number>11</number>
+   </property>
+   <property name="rightMargin">
+    <number>11</number>
+   </property>
+   <property name="bottomMargin">
+    <number>11</number>
+   </property>
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QTextEdit" name="preambleTE" >
-     <property name="acceptRichText" >
+   <item row="1" column="0">
+    <widget class="QLineEdit" name="findLE"/>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="findButtonPB">
+     <property name="text">
+      <string>Find</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QTextEdit" name="preambleTE">
+     <property name="acceptRichText">
       <bool>false</bool>
      </property>
     </widget>
@@ -29,7 +49,7 @@
   </layout>
  </widget>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>