new opie-reader sources with support for ArriereGo, Reb input and flite output plugins

1 files changed, 176 insertions, 70 deletions

diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 876b65a..6753698 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -18,4 +18,5 @@
 **
 **********************************************************************/
+
 #include <qregexp.h>
 #include <qclipboard.h>
@@ -67,8 +68,10 @@
 #include "util.h"
 #include <qfontdatabase.h>
+
 #ifdef USEQPE
 #include <qpe/resource.h>
 #ifdef OPIE
-//#include <qpe/applnk.h>
+#if defined(OPIEFILEDIALOG)
+#include <qpe/applnk.h>
 #include <opie2/ofiledialog.h>
 using namespace Opie::Ui;
@@ -77,4 +80,7 @@ using namespace Opie::Ui;
 #endif
 #else
+#include "fileBrowser.h"
+#endif
+#else
 #include "qfiledialog.h"
 #endif
@@ -89,5 +95,5 @@ using namespace Opie::Ui;
 #include "ButtonPrefs.h"
 
-bool CheckVersion(int&, int&, char&);
+bool CheckVersion(int&, int&, char&, QWidget*);
 
 #ifdef _WINDOWS
@@ -154,9 +160,7 @@ void QTReaderApp::listBkmkFiles()
         QFileInfoListIterator it( *list );      // create list iterator
         QFileInfo *fi;                          // pointer for traversing
-
         while ( (fi=it.current()) ) {           // for each file...
   
-		    bkmkselector->insertItem(fi->fileName());
-		    cnt++;
+		    bkmkselector->insertItem(fi->fileName(), cnt++);
 			
 			//qDebug( "%10li %s", fi->size(), fi->fileName().data() );
@@ -178,6 +182,5 @@ void QTReaderApp::listBkmkFiles()
 	if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
 	{
-	    bkmkselector->insertItem(de->d_name);
-	    cnt++;
+	    bkmkselector->insertItem(de->d_name, cnt++);
 	}
     }
@@ -203,5 +206,5 @@ void QTReaderApp::hidetoolbars()
   if (m_prog != NULL) m_prog->hide();
 
-#ifdef USEQPE
+#if defined(USEQPE)
     menubar->hide();
 #endif
@@ -334,5 +337,5 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 //    QToolBar* markBar = new QToolBar("File", this);
 
-#ifdef USEQPE
+#if defined(USEQPE)
     menubar = new QToolBar("Menus", this, m_tbposition);
     mb = new QPEMenuBar( menubar );
@@ -341,5 +344,5 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 #endif
 
-#ifdef USEQPE
+#if defined(USEQPE)
     QPopupMenu* tmp = new QPopupMenu(mb);
     mb->insertItem( geticon( "AppsIcon" ), tmp );
@@ -437,4 +440,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 //  Config config( APPDIR );
   config.setGroup( "View" );
+#if defined(USEQPE) && defined(USENEWFULLSCREEN)
+  m_usenewfullscreen = config.readBoolEntry("NewFullScreen", false);
+#endif
   m_debounce = config.readNumEntry("Debounce", 0);
   m_buttonprefs->Debounce(m_debounce);
@@ -457,4 +463,5 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
   reader->bautofmt = config.readBoolEntry( "AutoFmt", true );
   reader->bstriphtml = config.readBoolEntry( "StripHtml", false );
+  reader->bNoInlineTables = config.readBoolEntry( "NoInlineTables", false );
   reader->bpeanut = config.readBoolEntry( "Peanut", false );
   reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );
@@ -472,4 +479,6 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
   reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);
   reader->m_scrollstep = config.readNumEntry( "ScrollStep", 1);
+  reader->m_outputName = config.readEntry( "OutputCodec", "");
+
 
   reader->m_lastfile = config.readEntry( "LastFile", QString::null );
@@ -501,10 +510,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 
   m_scrollishidden = config.readBoolEntry( "HideScrollBar", false );
+  m_hidebars = config.readBoolEntry( "HideToolBar", false );
 
   reader->brepalm = config.readBoolEntry( "Repalm", false );
+  reader->bunderlineLink = config.readBoolEntry( "UnderlineLink", true );
   reader->bkern = config.readBoolEntry( "Kern", false );
   reader->bremap = config.readBoolEntry( "Remap", true );
   reader->bmakebold = config.readBoolEntry( "MakeBold", false );
   reader->setContinuous(config.readBoolEntry( "Continuous", true ));
+  reader->setDoubleBuffer(config.readBoolEntry("DoubleBuffer", true));
   m_targetapp = config.readEntry( "TargetApp", QString::null );
   m_targetmsg = config.readEntry( "TargetMsg", QString::null );
@@ -517,4 +529,5 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
   m_doDictionary = config.readBoolEntry( "Dictionary", false);
   m_doClipboard = config.readBoolEntry( "Clipboard", false);
+  m_doOutput = config.readBoolEntry( "OutputTgt", false);
   /*
   m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);
@@ -843,4 +856,16 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     setToolBarsMovable(m_tbmove);
     addtoolbars(&config);
+    if (m_hidebars)
+      {
+#if defined(USEQPE)
+	menubar->hide();
+#endif
+	if (fileBar != NULL) fileBar->hide();
+	if (viewBar != NULL) viewBar->hide();
+	if (navBar != NULL) navBar->hide();
+	if (markBar != NULL) markBar->hide();
+	mb->hide();
+      }
+
 
     pbar = new QProgressBar(this);
@@ -973,4 +998,5 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     m_prog->setFont( progfont );
     if (m_statusishidden) m_prog->hide();
+    showEditTools();
     if (!reader->m_lastfile.isEmpty())
     {
@@ -1033,11 +1059,11 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 	reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;
       }
-    reader->bDoUpdates = true;
-    reader->update();
+    //    reader->bDoUpdates = true;
+    //    reader->update();
     config.setGroup("Version");
     int major = config.readNumEntry("Major", 0);
     int bkmktype = config.readNumEntry("BkmkType", 0);
     char minor = config.readNumEntry("Minor", 0);
-    if (CheckVersion(major, bkmktype, minor))
+    if (CheckVersion(major, bkmktype, minor, this))
     {
 	config.writeEntry("Major", major);
@@ -1066,5 +1092,5 @@ void QTReaderApp::addtoolbars(Config* config)
     if (fileBar != NULL)
     {
-#ifdef USEQPE
+#if defined(USEQPE)
 	if (fileBar != menubar)
 	{
@@ -1094,5 +1120,5 @@ void QTReaderApp::addtoolbars(Config* config)
     if (navBar != NULL)
     {
-#ifdef USEQPE
+#if defined(USEQPE)
 	if ((navBar == fileBar) && (fileBar == menubar))
 #else
@@ -1133,5 +1159,5 @@ void QTReaderApp::addtoolbars(Config* config)
     if (viewBar != NULL)
     {
-#ifdef USEQPE
+#if defined(USEQPE)
 	if ((viewBar == fileBar) && (fileBar == menubar))
 #else
@@ -1165,5 +1191,5 @@ void QTReaderApp::addtoolbars(Config* config)
     if (markBar != NULL)
     {
-#ifdef USEQPE
+#if defined(USEQPE)
 	if ((markBar == fileBar) && (fileBar == menubar))
 #else
@@ -1234,5 +1260,5 @@ QToolBar* QTReaderApp::filebar()
 	switch (m_tbpol)
 	{
-#ifdef USEQPE
+#if defined(USEQPE)
 	    case cesSingle:
 //		qDebug("Setting filebar to menubar");
@@ -1718,5 +1744,4 @@ void QTReaderApp::setrotated(bool sfs)
 	  }
 	//	reader->repaint(0, reader->m_left_border, reader->width(), reader->height()-2*reader->m_border);
-	reader->repaint();
       }
     else
@@ -1734,7 +1759,6 @@ void QTReaderApp::setrotated(bool sfs)
 	  }
 	//	reader->repaint(reader->m_border, 0, reader->width()-2*reader->m_border, reader->height());
-	reader->repaint();
       }
-    //    reader->update();
+    reader->refresh();
 }
 
@@ -1929,5 +1953,5 @@ void QTReaderApp::fileOpen2()
     {
 	m_nBkmkAction = cOpenFile;
-	if (listbkmk(pOpenlist, "Browse")) usebrowser = false;
+	if (listbkmk(pOpenlist, "Browse", true)) usebrowser = false;
     }
     if (usebrowser)
@@ -1952,5 +1976,5 @@ QString QTReaderApp::usefilebrowser()
 #else
     QString fn;
-#ifdef OPIE
+#if defined(OPIE) && defined(OPIEFILEDIALOG)
     QMap<QString, QStringList> mimeTypes;
     QStringList etypes;
@@ -2004,4 +2028,5 @@ void QTReaderApp::showprefs()
     prefwin->bgtype(m_bgtype);
     prefwin->repalm(reader->brepalm);
+    prefwin->UnderlineLink(reader->bunderlineLink);
     prefwin->kern(reader->bkern);
     prefwin->hyphenate(reader->hyphenate);
@@ -2016,4 +2041,5 @@ void QTReaderApp::showprefs()
     prefwin->propfontchange(m_propogatefontchange);
     prefwin->StripCR(reader->bstripcr);
+    prefwin->InlineTables(!reader->bNoInlineTables);
     prefwin->Dehyphen(reader->bdehyphen);
     prefwin->SingleSpace(reader->bonespace);
@@ -2057,4 +2083,5 @@ void QTReaderApp::showprefs()
     prefwin->Dejpluck(reader->bdejpluck);
     prefwin->Continuous(reader->m_continuousDocument);
+    prefwin->DoubleBuffer(reader->m_doubleBuffered);
 
     prefwin->dictApplication(m_targetapp);
@@ -2071,4 +2098,5 @@ void QTReaderApp::showprefs()
     prefwin->miscdictionary(m_doDictionary);
     prefwin->miscclipboard(m_doClipboard);
+    prefwin->miscoutput(m_doOutput);
 
     prefwin->SwapMouse(reader->m_swapmouse);
@@ -2086,8 +2114,12 @@ void QTReaderApp::showprefs()
     prefwin->ideogramwidth(reader->m_charpc);
 
+    prefwin->outcodec(reader->m_outputName);
+
     if (prefwin->exec())
     {
       //      m_debounce = prefwin->Debounce();
       reader->brepalm = prefwin->repalm();
+      reader->bunderlineLink = prefwin->UnderlineLink();
+
       reader->bkern = prefwin->kern();
       reader->hyphenate = prefwin->hyphenate();
@@ -2108,4 +2140,5 @@ void QTReaderApp::showprefs()
 
 	reader->bstripcr = prefwin->StripCR();
+	reader->bNoInlineTables = !prefwin->InlineTables();
 	reader->bdehyphen = prefwin->Dehyphen();
 	reader->bonespace = prefwin->SingleSpace();
@@ -2150,4 +2183,5 @@ void QTReaderApp::showprefs()
 	reader->bdejpluck = prefwin->Dejpluck();
 	reader->setContinuous(prefwin->Continuous());
+	reader->setDoubleBuffer(prefwin->DoubleBuffer());
 
 	/*
@@ -2163,4 +2197,5 @@ void QTReaderApp::showprefs()
 	m_doDictionary = prefwin->miscdictionary();
 	m_doClipboard = prefwin->miscclipboard();
+	m_doOutput = prefwin->miscoutput();
 	reader->m_swapmouse = prefwin->SwapMouse();
 	reader->setBaseSize(prefwin->gfxsize());
@@ -2184,4 +2219,13 @@ void QTReaderApp::showprefs()
 	    setBackgroundBitmap();
 	  }
+	qDebug("OutCodec:%s", (const char*)prefwin->outcodec());
+	if (reader->m_outputName != prefwin->outcodec())
+	  {
+	    if (reader->m_output != NULL)
+	      {
+		QMessageBox::warning(this, PROGNAME, "Change of output codec\nrequires a restart");
+	      }
+	    reader->m_outputName = prefwin->outcodec();
+	  }
 	delete prefwin;
 	reader->setfilter(reader->getfilter());
@@ -2291,10 +2335,34 @@ void QTReaderApp::showinfo()
 	m_infoWin->setFileSize(fs);
 	m_infoWin->setTextSize(ts);
-	m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
+	if (fs > UINT_MAX/100)
+	  {
+	    unsigned long t1 = (ts+50)/100;
+	    m_infoWin->setRatio(100-(fs + (t1 >> 1))/t1);
+	  }
+	else
+	  {
+	    m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
+	  }
 	m_infoWin->setLocation(pl);
-	m_infoWin->setRead((100*pl + (ts >> 1))/ts);
+	if (pl > UINT_MAX/100)
+	  {
+	    unsigned long t1 = (ts+50)/100;
+	    m_infoWin->setRead((pl + (t1 >> 1))/t1);
+	  }
+	else
+	  {
+	    m_infoWin->setRead((100*pl + (ts >> 1))/ts);
+	  }
 	m_infoWin->setDocSize(ds);
 	m_infoWin->setDocLocation(dl);
-	m_infoWin->setDocRead((100*dl + (ds >> 1))/ds);
+	if (dl > UINT_MAX/100)
+	  {
+	    unsigned long d1 = (ds+50)/100;
+	    m_infoWin->setDocRead((dl + (d1 >> 1))/d1);
+	  }
+	else
+	  {
+	    m_infoWin->setDocRead((100*dl + (ds >> 1))/ds);
+	  }
 	m_infoWin->setZoom(reader->m_fontControl.currentsize()*10);
 	m_infoWin->setAbout(QString("\nApplication (c) Tim Wentford\n")+reader->about());
@@ -2743,5 +2811,5 @@ void QTReaderApp::search()
 #endif
 
-void QTReaderApp::openFile( const QString &f )
+void QTReaderApp::openFile( const QString &f, unsigned int loc )
 {
 //    qDebug("File:%s", (const char*)f);
@@ -2766,5 +2834,5 @@ void QTReaderApp::openFile( const QString &f )
 #endif
       clear();
-      reader->setText(fm.baseName(), fm.absFilePath());
+      reader->setText(fm.baseName(), fm.absFilePath(), loc);
       m_loadedconfig = readconfig(APPDIR "/configs", reader->m_string, false);
       qDebug("Showing tools");
@@ -2807,5 +2875,5 @@ void QTReaderApp::handlekey(QKeyEvent* e)
     {
 	case Key_Escape:
-//	    qDebug("escape event");
+	    qDebug("escape event");
 	    if (m_disableesckey)
 	    {
@@ -2892,27 +2960,28 @@ void QTReaderApp::handlekey(QKeyEvent* e)
 }
 
-#ifdef NEWFULLSCREEN
-void QTReaderApp::enableFullscreen()
-{
-    setFixedSize(qApp->desktop()->size());
-    showNormal();
-    reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
-    showFullScreen();
-}
-
-void QTReaderApp::resizeEvent(QResizeEvent *)
+#if defined(USEQPE) && defined(USENEWFULLSCREEN)
+void QTReaderApp::focusInEvent(QFocusEvent *)
 {
-    if (m_fullscreen && (size() != qApp->desktop()->size()))
+  if (m_usenewfullscreen && m_fullscreen && (editorStack->visibleWidget() == reader))
     {
-	enableFullscreen();
+      m_usenewfullscreen = false;
+      reader->bDoUpdates = false;
+      showEditTools();
+      reader->bDoUpdates = true;
+      reader->update();
+      m_usenewfullscreen = true;
     }
 }
 
-void QTReaderApp::focusInEvent(QFocusEvent*)
+void QTReaderApp::resizeEvent(QResizeEvent *)
 {
-    if (m_fullscreen)
+  if (m_usenewfullscreen && m_fullscreen && (editorStack->visibleWidget() == reader))
     {
-	enableFullscreen();
-	raise();
+      m_usenewfullscreen = false;
+      reader->bDoUpdates = false;
+      showEditTools();
+      reader->bDoUpdates = true;
+      reader->update();
+      m_usenewfullscreen = true;
     }
 }
@@ -2925,5 +2994,5 @@ void QTReaderApp::showEditTools()
     if (m_fullscreen)
     {
-#ifdef USEQPE
+#if defined(USEQPE)
 	if (menubar != NULL) menubar->hide();
 #endif
@@ -2945,10 +3014,6 @@ void QTReaderApp::showEditTools()
 	m_fontBar->hide();
 //	showNormal();
-#ifdef NEWFULLSCREEN
-	enableFullscreen();
-#else
 	showFullScreen();
-#endif
-    }
+  }
     else
     {
@@ -2971,5 +3036,5 @@ void QTReaderApp::showEditTools()
 	if (!m_hidebars)
 	  {
-#ifdef USEQPE
+#if defined(USEQPE)
 	    menubar->show();
 #endif
@@ -3005,5 +3070,5 @@ void QTReaderApp::showEditTools()
 	showNormal();
 //	qDebug("sm");
-#ifdef USEQPE
+#if defined(USEQPE) && !defined(SIMPAD) 
 	showMaximized();
 #endif
@@ -3018,5 +3083,5 @@ void QTReaderApp::showEditTools()
     reader->setFocus();
     //    qDebug("ref");
-    reader->refresh(true);
+    //reader->refresh(true);
     //    qDebug("done");
 }
@@ -3175,5 +3240,5 @@ void QTReaderApp::do_delmark()
 }
 
-bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
+bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab, bool presel)
 {
     bkmkselector->clear();
@@ -3183,15 +3248,24 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
 	bkmkselector->setText(_lab);
     int cnt = 0;
+    int slt = -1;
     if (plist != NULL)
       {
 	for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
 	  {
+	    if (presel)
+	      {
+		Bkmk* p = i.pContent();
+		if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
+		  {
+		    slt = cnt;
+		  }
+	      }
 #ifdef _UNICODE
 //	      qDebug("Item:%s", (const char*)toQString(i->name()));
-	    bkmkselector->insertItem(toQString(i->name()));
+	    bkmkselector->insertItem(toQString(i->name()), cnt++);
 #else
-	    bkmkselector->insertItem(i->name());
+	    bkmkselector->insertItem(i->name(), cnt++);
 #endif
-	    cnt++;
+
 	  }
       }
@@ -3200,4 +3274,5 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
 	  hidetoolbars();
         editorStack->raiseWidget( bkmkselector );
+	if (slt != -1) bkmkselector->setCurrentItem(slt);
 	return true;
       }
@@ -3239,7 +3314,6 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
     {
 //	qDebug("Opening");
-	openFile(fn);
 	struct stat fnstat;
-	stat((const char *)reader->m_lastfile, &fnstat);
+	stat((const char *)fn, &fnstat);
 	
 	if (CFiledata(bk->anno()).date()
@@ -3249,4 +3323,6 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
 	    fd.setdate(fnstat.st_mtime);
 	    bk->value(0);
+	    reader->m_lastposn = 0;
+	    openFile(fn);
 	}
 	else
@@ -3254,4 +3330,5 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
 	    unsigned short svlen = bk->filedatalen();
 	    unsigned char* svdata = bk->filedata();
+	    openFile(fn, bk->value());
 	    reader->putSaveData(svdata, svlen);
 //	    setstate(svdata, svlen);
@@ -3262,5 +3339,4 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
 //	    qDebug("updating");
 //	    showEditTools();
-	    reader->locate(bk->value());
 	}
 	return true;
@@ -3367,5 +3443,5 @@ void QTReaderApp::gotobkmk(int ind)
 	    {
 		bool allok = false;
-#ifdef OPIE
+#if defined(OPIE) && defined(OPIEFILEDIALOG)
 		QString outfile = OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null, QString::null, MimeTypes(), 0, "OpieReader");
 		if (!outfile.isEmpty())
@@ -3704,7 +3780,8 @@ void QTReaderApp::do_autogen(const QString& regText)
   int lastpc = 0;
   int i = 0;
+  unsigned int llcn = reader->locate();
   while (i >= 0)
     {
-      unsigned int lcn = reader->locate();
+      unsigned int lcn = llcn;
       int pc = (100*lcn)/ts;
       if (pc != lastpc)
@@ -3723,4 +3800,12 @@ void QTReaderApp::do_autogen(const QString& regText)
 #endif
 	pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn));
+      /*
+      llcn = reader->locate();
+      if ((i == 0) && (llcn+1 < ts))
+	{
+	  reader->jumpto(++llcn);
+	  i = 1;
+	}
+      */
     }
   pBkmklist->sort();
@@ -4033,4 +4118,8 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, size_t posn2,
 ////    qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
 
+    if (m_doOutput && reader->checkoutput())
+      {
+	reader->doOutput(wrd);
+      }
     if (m_doClipboard)
     {
@@ -4117,5 +4206,5 @@ void QTReaderApp::doAction(QKeyEvent* e)
 	  if (m_hidebars)
 	    {
-#ifdef USEQPE
+#if defined(USEQPE)
 	      menubar->hide();
 #endif
@@ -4128,5 +4217,5 @@ void QTReaderApp::doAction(QKeyEvent* e)
 	  else
 	    {
-#ifdef USEQPE
+#if defined(USEQPE)
 	      menubar->show();
 #endif
@@ -4341,4 +4430,5 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
 
     config.writeEntry( "StripCr", reader->bstripcr );
+    config.writeEntry( "NoInlineTables", reader->bNoInlineTables );
     config.writeEntry( "AutoFmt", reader->bautofmt );
     config.writeEntry( "TextFmt", reader->btextfmt );
@@ -4366,4 +4456,5 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
 	config.writeEntry( "LastFile", reader->m_lastfile );
 	config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );
+	config.writeEntry( "OutputCodec", reader->m_outputName);
     }
     config.writeEntry( "PageMode", reader->m_bpagemode );
@@ -4397,4 +4488,5 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
     config.writeEntry( "Dictionary", m_doDictionary);
     config.writeEntry( "Clipboard", m_doClipboard);
+    config.writeEntry( "OutputTgt", m_doOutput);
     /*
     config.writeEntry( "SpaceTarget", m_spaceTarget);
@@ -4411,5 +4503,7 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
     */
     config.writeEntry( "Repalm", reader->brepalm );
+    config.writeEntry( "UnderlineLink", reader->bunderlineLink );
     config.writeEntry( "HideScrollBar", m_scrollishidden );
+    config.writeEntry( "HideToolBar", m_hidebars );
     config.writeEntry( "Kern", reader->bkern );
     config.writeEntry( "Remap", reader->bremap );
@@ -4417,4 +4511,5 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
     config.writeEntry( "MakeBold", reader->bmakebold );
     config.writeEntry( "Continuous", reader->m_continuousDocument );
+    config.writeEntry( "DoubleBuffer", reader->m_doubleBuffered);
     config.writeEntry( "FullJust", reader->bfulljust );
     //    config.writeEntry( "Negative", reader->bNegative );
@@ -4520,4 +4615,5 @@ bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool f
     m_bFloatingDialog = config.readBoolEntry("FloatDialogs", m_bFloatingDialog);
     reader->bstripcr = config.readBoolEntry( "StripCr", reader->bstripcr );
+    reader->bNoInlineTables = config.readBoolEntry( "NoInlineTables", reader->bNoInlineTables );
     reader->bfulljust = config.readBoolEntry( "FullJust", reader->bfulljust );
     reader->bInverse = config.readBoolEntry( "Inverse", reader->bInverse );
@@ -4575,9 +4671,12 @@ bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool f
     reader->m_absright_border = config.readNumEntry( "Right Margin", reader->m_absright_border );
     m_scrollishidden = config.readBoolEntry( "HideScrollBar", m_scrollishidden );
+    m_hidebars = config.readBoolEntry( "HideToolBar", m_hidebars );
     reader->brepalm = config.readBoolEntry( "Repalm", reader->brepalm );
+    reader->bunderlineLink = config.readBoolEntry( "UnderlineLink", reader->bunderlineLink );
     reader->bkern = config.readBoolEntry( "Kern", reader->bkern );
     reader->bremap = config.readBoolEntry( "Remap", reader->bremap );
     reader->bmakebold = config.readBoolEntry( "MakeBold", reader->bmakebold );
     reader->setContinuous(config.readBoolEntry( "Continuous", reader->m_continuousDocument ));
+    reader->setDoubleBuffer(config.readBoolEntry("DoubleBuffer", reader->m_doubleBuffered));
     m_targetapp = config.readEntry( "TargetApp", m_targetapp );
     m_targetmsg = config.readEntry( "TargetMsg", m_targetmsg );
@@ -4590,4 +4689,5 @@ bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool f
     m_doDictionary = config.readBoolEntry( "Dictionary", m_doDictionary);
     m_doClipboard = config.readBoolEntry( "Clipboard", m_doClipboard);
+    m_doOutput = config.readBoolEntry( "OutputTgt", m_doOutput);
 #ifdef USEQPE
     m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", m_grabkeyboard);
@@ -4596,4 +4696,6 @@ bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool f
     reader->setBaseSize(config.readNumEntry( "Basesize", reader->getBaseSize() ));
     reader->setTwoTouch(m_twoTouch);
+    
+    reader->m_outputName = config.readEntry( "OutputCodec", reader->m_outputName);
 
     m_touch_action->setOn(m_twoTouch);
@@ -4638,6 +4740,5 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir, bool usedirs)
     while ( (fi=it.current()) ) {           // for each file...
   
-	bkmkselector->insertItem(fi->fileName());
-	cnt++;
+	bkmkselector->insertItem(fi->fileName(), cnt++);
 			
 	//qDebug( "%10li %s", fi->size(), fi->fileName().data() );
@@ -4664,6 +4765,5 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir, bool usedirs)
 	if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && ((usedirs && S_ISDIR(buf.st_mode)) || (!usedirs && S_ISREG(buf.st_mode))))
 	{
-	    bkmkselector->insertItem(de->d_name);
-	    cnt++;
+	    bkmkselector->insertItem(de->d_name, cnt++);
 	}
     }
@@ -4736,4 +4836,6 @@ void QTReaderApp::OnURLSelected(const QString& href, const size_t tgt)
       qDebug("No type");
     }
+  QString msg = "External URL\n" + href;
+  QMessageBox::information(this, PROGNAME, msg);
 #else
   if (href.isEmpty())
@@ -4902,5 +5004,5 @@ void QTReaderApp::forceopen(const QString& filename)
     QString flnm = fi.absFilePath();
   */
-  if (!filename.isEmpty())
+  if (!filename.isEmpty() && QFileInfo(filename).exists())
     {
       updatefileinfo();
@@ -4919,4 +5021,8 @@ void QTReaderApp::forceopen(const QString& filename)
       reader->setFocus();
     }
+  else
+    {
+      OnURLSelected(filename, 0);
+    }
 }