fixed --disable-webkit

src/qtgui/recoll.pro.in

@@ -2,7 +2,7 @@ TEMPLATE        = app
 LANGUAGE        = C++
 
 @QMAKE_ENABLE_WEBKIT@QT += webkit
-@QMAKE_DISABLE_WEBKIT@QMAKE_CXXFLAGS += -DRESLIST_TEXTBROWSER
+@QMAKE_DISABLE_WEBKIT@QMAKE_CXXFLAGS += -DRESLIST_TEXTBROWSER -DSNIPPETS_TEXTBROWSER
 
 @QMAKE_ENABLE_ZEITGEIST@QT += dbus
 @QMAKE_ENABLE_ZEITGEIST@QMAKE_CXXFLAGS += -DUSE_ZEITGEIST

src/qtgui/reslist.cpp

@@ -671,9 +671,9 @@ bool ResList::scrollIsAtTop()
 	LOGDEB(("Scrollattop: cur %d min %d\n", cur, min));
 	ret = (cur == min);
     }
-#endif
     LOGDEB2(("scrollIsAtTop: returning %d\n", ret));
     return ret;
+#endif
 }
 
 // Show previous page of results. We just set the current number back

src/qtgui/snippets.ui

@@ -17,12 +17,7 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QWebView" name="browser">
+      <widget class="QWidget" name="browserw">
-       <property name="url">
-        <url>
-         <string>about:blank</string>
-        </url>
-       </property>
       </widget>
      </item>
      <item>

src/qtgui/snippets_w.cpp

@@ -16,11 +16,6 @@
  */
 #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>
 
@@ -29,12 +24,12 @@
 #include <sstream>
 using namespace std;
 
-#ifdef SNIPPETS_WEBKIT
+#ifdef SNIPPETS_TEXTBROWSER
+#include <QTextBrowser>
+#else
 #include <QWebSettings>
 #include <QWebFrame>
 #include <QUrl>
-#else
-#include <QTextBrowser>
 #endif
 #include <QShortcut>
 
@@ -46,6 +41,14 @@ using namespace std;
 #include "rclhelp.h"
 #include "plaintorich.h"
 
+// Note: the internal search currently does not work with QTextBrowser. To be
+// fixed by looking at the preview code if someone asks for it...
+#ifdef SNIPPETS_TEXTBROWSER
+#define browser ((QTextBrowser*)browserw)
+#else
+#define browser ((QWebView*)browserw)
+#endif
+
 class PlainToRichQtSnippets : public PlainToRich {
 public:
     virtual string startMatch(unsigned int)
@@ -90,20 +93,9 @@ void SnippetsW::init()
     connect(nextPB, SIGNAL(clicked()), this, SLOT(slotEditFindNext()));
     connect(prevPB, SIGNAL(clicked()), this, SLOT(slotEditFindPrevious()));
 
-#ifdef SNIPPETS_WEBKIT
+#ifdef SNIPPETS_TEXTBROWSER
-    connect(browser, SIGNAL(linkClicked(const QUrl &)), 
+    browserw = new QTextBrowser(this);
-	    this, SLOT(linkWasClicked(const QUrl &)));
+    verticalLayout->insertWidget(0, browserw);
-    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);
-    }
-    if (!prefs.snipCssFile.isEmpty())
-	ws->setUserStyleSheetUrl(QUrl::fromLocalFile(prefs.snipCssFile));
-#else
     connect(browser, SIGNAL(anchorClicked(const QUrl &)), 
 	    this, SLOT(linkWasClicked(const QUrl &)));
     browser->setReadOnly(TRUE);
@@ -116,6 +108,22 @@ void SnippetsW::init()
     } else {
 	browser->setFont(QFont());
     }
+#else
+    browserw = new QWebView(this);
+    verticalLayout->insertWidget(0, browserw);
+    browser->setUrl(QUrl(QString::fromUtf8("about:blank")));
+    connect(browser, SIGNAL(linkClicked(const QUrl &)), 
+	    this, SLOT(linkWasClicked(const QUrl &)));
+    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);
+    }
+    if (!prefs.snipCssFile.isEmpty())
+	ws->setUserStyleSheetUrl(QUrl::fromLocalFile(prefs.snipCssFile));
 #endif
 
     // Make title out of file name if none yet
@@ -176,10 +184,10 @@ void SnippetsW::init()
 	    "and the snippets generator got lost in a maze...</p>" << endl;
     }
     oss << "</body></html>";
-#ifdef SNIPPETS_WEBKIT
+#ifdef SNIPPETS_TEXTBROWSER
-    browser->setHtml(QString::fromUtf8(oss.str().c_str()));
-#else
     browser->insertHtml(QString::fromUtf8(oss.str().c_str()));
+#else
+    browser->setHtml(QString::fromUtf8(oss.str().c_str()));
 #endif
 }
 
@@ -195,10 +203,10 @@ void SnippetsW::slotEditFindNext()
     if (!searchFM->isVisible())
 	slotEditFind();
 
-#ifdef SNIPPETS_WEBKIT
+#ifdef SNIPPETS_TEXTBROWSER
-    browser->findText(searchLE->text());
-#else
     browser->find(searchLE->text(), 0);
+#else
+    browser->findText(searchLE->text());
 #endif
 
 }
@@ -207,18 +215,18 @@ void SnippetsW::slotEditFindPrevious()
     if (!searchFM->isVisible())
 	slotEditFind();
 
-#ifdef SNIPPETS_WEBKIT
+#ifdef SNIPPETS_TEXTBROWSER
-    browser->findText(searchLE->text(), QWebPage::FindBackward);
-#else
     browser->find(searchLE->text(), QTextDocument::FindBackward);
+#else
+    browser->findText(searchLE->text(), QWebPage::FindBackward);
 #endif
 }
 void SnippetsW::slotSearchTextChanged(const QString& txt)
 {
-#ifdef SNIPPETS_WEBKIT
+#ifdef SNIPPETS_TEXTBROWSER
-    browser->findText(txt);
-#else
     browser->find(txt, 0);
+#else
+    browser->findText(txt);
 #endif
 }