1 files changed, 50 insertions, 4 deletions

diff --git a/noncore/apps/opie-reader/CFilter.cpp b/noncore/apps/opie-reader/CFilter.cpp
index ab98829..25cdfae 100644
--- a/noncore/apps/opie-reader/CFilter.cpp
+++ b/noncore/apps/opie-reader/CFilter.cpp
@@ -4,2 +4,3 @@
 #include <qdir.h>
+
 #ifdef USEQPE
@@ -10,3 +11,2 @@
 #include "hrule.h"
-#include "util.h"
 
@@ -667,4 +667,13 @@ ExternFilter::ExternFilter(const QString& nm, const QString& optional) : filt(NU
 {
-  QString filterpath(QTReaderUtil::getPluginPath("filters"));
-  filterpath += "/lib";
+#ifdef USEQPE
+#ifdef OPIE
+  QString filterpath(getenv("OPIEDIR"));
+#else
+  QString filterpath(getenv("QTDIR"));
+#endif
+  filterpath += "/plugins/reader/filters/lib";
+#else
+  QString filterpath(getenv("READERDIR"));
+  filterpath += "/filters/lib";
+#endif
   filterpath += nm;
@@ -694,3 +703,3 @@ ExternFilter::ExternFilter(const QString& nm, const QString& optional) : filt(NU
     {
-      qDebug("No filter path");
+      qDebug("No filter path:%s", (const char*)filterpath);
       filt = new ErrorFilter(QString("No filter plugins installed:")+nm);
@@ -815 +824,38 @@ void repara::getch(tchar& ch, CStyle& sty, unsigned long& pos)
 }
+
+void tableLink::getch(tchar& ch, CStyle& sty, unsigned long& pos)
+{
+  if (offset >= (int)text.length())
+    {
+      offset = -1;
+      sty.setColour(m_r, m_g, m_b);
+      do
+	{
+	  parent->getch(ch, sty, pos);
+	}
+      while (sty.isTable());
+      return;
+    }
+  if (offset >= 0)
+    {
+      ch = text[offset++].unicode();
+      return;
+    }
+  parent->getch(ch, sty, pos);
+  if (sty.isTable())
+    {
+      offset = 1;
+      ch = text[0].unicode();
+      m_r = sty.Red(), m_g = sty.Green(), m_b = sty.Blue();
+      sty.setColour(255, 0, 0);
+    }
+  return;      
+}
+
+void underlineLink::getch(tchar& ch, CStyle& sty, unsigned long& pos)
+{
+  parent->getch(ch, sty, pos);
+  if (sty.getLink()) sty.setUnderline();
+  //if (isLink && !sty.getLink()) sty.unsetUnderline();
+  //isLink = sty.getLink();
+}