From 09ff4ef39351a33e5c9f09f35d85d0ce4b2cee1a Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 29 Oct 2012 18:47:10 +0100
Subject: [PATCH] Fixed UI crash by replacing snippets QDialog with a
 QWidget...

---
 src/qtgui/snippets.ui    |  7 ++--
 src/qtgui/snippets_w.cpp | 72 +++++++++++++++++++++++++++++++---------
 2 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/qtgui/snippets.ui b/src/qtgui/snippets.ui
index 8ba30831..253ccf8d 100644
--- a/src/qtgui/snippets.ui
+++ b/src/qtgui/snippets.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Snippets</class>
- <widget class="QDialog" name="Snippets">
+ <widget class="QWidget" name="Snippets">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,14 +13,11 @@
   <property name="windowTitle">
    <string>Snippets</string>
   </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
-      <widget class="QWebView" name="webView">
+      <widget class="QWebView" name="browser">
        <property name="url">
         <url>
          <string>about:blank</string>
diff --git a/src/qtgui/snippets_w.cpp b/src/qtgui/snippets_w.cpp
index bb078d0a..27766eca 100644
--- a/src/qtgui/snippets_w.cpp
+++ b/src/qtgui/snippets_w.cpp
@@ -16,6 +16,11 @@
  */
 #include "autoconfig.h"
 
+// Use textBrowser or webview. Tried using textbrowser to solve a
+// crash at a point, kept the code. Search did not work, but this
+// should be easy to fix by looking at the preview code.
+#define SNIPPETS_WEBKIT
+
 #include <unistd.h>
 #include <stdio.h>
 
@@ -24,8 +29,12 @@
 #include <sstream>
 using namespace std;
 
+#ifdef SNIPPETS_WEBKIT
 #include <QWebSettings>
 #include <QWebFrame>
+#else
+#include <QTextBrowser>
+#endif
 #include <QShortcut>
 
 #include "debuglog.h"
@@ -56,9 +65,6 @@ void SnippetsW::init()
 	return;
 
     searchFM->hide();
-    webView->page()->currentFrame()->setScrollBarPolicy(Qt::Horizontal,
-							Qt::ScrollBarAlwaysOff);
-
 
     new QShortcut(QKeySequence::Find, this, SLOT(slotEditFind()));
     new QShortcut(QKeySequence(Qt::Key_Slash), this, SLOT(slotEditFind()));
@@ -70,9 +76,32 @@ void SnippetsW::init()
     connect(nextPB, SIGNAL(clicked()), this, SLOT(slotEditFindNext()));
     new QShortcut(QKeySequence(Qt::Key_F3), this, SLOT(slotEditFindNext()));
     connect(prevPB, SIGNAL(clicked()), this, SLOT(slotEditFindPrevious()));
-    connect(webView, SIGNAL(linkClicked(const QUrl &)), 
+
+#ifdef SNIPPETS_WEBKIT
+    connect(browser, SIGNAL(linkClicked(const QUrl &)), 
 	    this, SLOT(linkWasClicked(const QUrl &)));
-    webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+    browser->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+    browser->page()->currentFrame()->setScrollBarPolicy(Qt::Horizontal,
+							Qt::ScrollBarAlwaysOff);
+    QWebSettings *ws = browser->page()->settings();
+    if (prefs.reslistfontfamily != "") {
+	ws->setFontFamily(QWebSettings::StandardFont, prefs.reslistfontfamily);
+	ws->setFontSize(QWebSettings::DefaultFontSize, prefs.reslistfontsize);
+    }
+#else
+    connect(browser, SIGNAL(anchorClicked(const QUrl &)), 
+	    this, SLOT(linkWasClicked(const QUrl &)));
+    browser->setReadOnly(TRUE);
+    browser->setUndoRedoEnabled(FALSE);
+    browser->setOpenLinks(FALSE);
+    browser->setTabChangesFocus(true);
+    if (prefs.reslistfontfamily.length()) {
+	QFont nfont(prefs.reslistfontfamily, prefs.reslistfontsize);
+	browser->setFont(nfont);
+    } else {
+	browser->setFont(QFont());
+    }
+#endif
 
     // Make title out of file name if none yet
     string titleOrFilename;
@@ -116,14 +145,11 @@ void SnippetsW::init()
 	oss << "</td><td>" << lr.front().c_str() << "</td></tr>" << endl;
     }
     oss << "</body></html>";
-
-    QWebSettings *ws = webView->page()->settings();
-    if (prefs.reslistfontfamily != "") {
-	ws->setFontFamily(QWebSettings::StandardFont, prefs.reslistfontfamily);
-	ws->setFontSize(QWebSettings::DefaultFontSize, prefs.reslistfontsize);
-    }
-
-    webView->setHtml(QString::fromUtf8(oss.str().c_str()));
+#ifdef SNIPPETS_WEBKIT
+    browser->setHtml(QString::fromUtf8(oss.str().c_str()));
+#else
+    browser->insertHtml(QString::fromUtf8(oss.str().c_str()));
+#endif
 }
 
 void SnippetsW::slotEditFind()
@@ -132,17 +158,31 @@ void SnippetsW::slotEditFind()
     searchLE->selectAll();
     searchLE->setFocus();
 }
+
 void SnippetsW::slotEditFindNext()
 {
-    webView->findText(searchLE->text());
+#ifdef SNIPPETS_WEBKIT
+    browser->findText(searchLE->text());
+#else
+    browser->find(searchLE->text(), 0);
+#endif
+
 }
 void SnippetsW::slotEditFindPrevious()
 {
-    webView->findText(searchLE->text(), QWebPage::FindBackward);
+#ifdef SNIPPETS_WEBKIT
+    browser->findText(searchLE->text(), QWebPage::FindBackward);
+#else
+    browser->find(searchLE->text(), QTextDocument::FindBackward);
+#endif
 }
 void SnippetsW::slotSearchTextChanged(const QString& txt)
 {
-    webView->findText(txt);
+#ifdef SNIPPETS_WEBKIT
+    browser->findText(txt);
+#else
+    browser->find(txt, 0);
+#endif
 }
 
 void SnippetsW::linkWasClicked(const QUrl &url)