20 files changed, 4221 insertions, 4291 deletions

diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 889c6d8..16bc1f1 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -1,30 +1,28 @@
 #include <qmessagebox.h>
 
 #include "Bkmks.h"
 
-#include "StyleConsts.h"
-#include "Markups.h"
 #include "my_list.h"
 #include "version.h"
 #include "names.h"
 
 const unsigned long BkmkFile::magic = ((unsigned long)'q' << 24) | ((unsigned long)'t' << 16) | ((unsigned long)'r' << 8) | ((unsigned long)BKMKTYPE);
 
 Bkmk::Bkmk(const unsigned char* _nm, unsigned short _nmlen, const unsigned char* _anno, unsigned short _annolen, unsigned int _p) : m_position(_p)
 {
     init(_nm, _nmlen, _anno, _annolen, _p);
 }
 
 Bkmk::Bkmk(const tchar* _nm, const unsigned char* _anno, unsigned short annolen, unsigned int _p) : m_position(_p)
 {
     init(_nm, sizeof(tchar)*(ustrlen(_nm)+1), _anno, annolen, _p);
 }
 
 Bkmk::Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p) : m_position(_p)
 {
 
     if (_anno == NULL)
     {
         tchar t = 0;
         init(_nm, sizeof(tchar)*(ustrlen(_nm)+1), &t, sizeof(t), _p);
     }
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index 2402904..4fbab93 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -1,34 +1,30 @@
-#include "names.h"
 
 #define NEWLINEBREAK
 
 #include "BuffDoc.h"
 //#include <FL/fl_draw.h>
-#include "config.h"
-#include "CDrawBuffer.h"
 #include "plucker.h"
-#include "usenef.h"
 #ifdef USENEF
 #include "nef.h"
 #include "arrierego.h"
 #endif
 
 linkType BuffDoc::hyperlink(unsigned int n, QString& wrd)
 {
     linkType bRet = eNone;
     if (exp != NULL)
     {
         bRet = exp->hyperlink(n, wrd);
         if (bRet == eLink)
         {
             lastword.empty();
             lastsizes[0] = laststartline = n;
 #ifdef NEWLINEBREAK
             lastispara = true;
 #else
             lastispara = false;
 #endif
             lastsizes[0] = laststartline = exp->locate();
         }
     }
     return bRet;
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index 77b76fb..ec36fb2 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -1,32 +1,28 @@
 #include "CDrawBuffer.h"
 #include "FontControl.h"
-#include <qfontmetrics.h>
 #include <qpainter.h>
-#include <qpixmap.h>
 #include <qimage.h>
-#include "useqpe.h"
-#include "opie.h"
 
 CDrawBuffer::~CDrawBuffer()
 {
     while (!segs.isEmpty()) segs.erase(0);
 }
 
 void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
 {
   int i;
   len = rhs.len;
   fc = rhs.fc;
   m_maxstyle = m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
   while (!segs.isEmpty())
   {
       segs.erase(0);
   }
   for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); )
   {
       CList<textsegment>::iterator next = iter;
       iter++;
       if (iter == rhs.segs.end() || iter->start > f)
       {
           int st = next->start-f;
           if (st < 0) st = 0;
diff --git a/noncore/apps/opie-reader/CEncoding_tables.cpp b/noncore/apps/opie-reader/CEncoding_tables.cpp
index 667bda0..e335819 100644
--- a/noncore/apps/opie-reader/CEncoding_tables.cpp
+++ b/noncore/apps/opie-reader/CEncoding_tables.cpp
@@ -1,26 +1,25 @@
 #include "CEncoding_tables.h"
-#include "config.h"
 
 static const unicodetable unicodevalues[] = {
     // from RFC 1489, ftp://ftp.isi.edu/in-notes/rfc1489.txt
     { "KOI8-R", "KOI8-R", 2084,
       { 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
         0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
         0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219/**/, 0x221A, 0x2248,
         0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
         0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556,
         0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E,
         0x255F, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565,
         0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x00A9,
         0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
         0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
         0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
         0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
         0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
         0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
         0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
         0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A } },
     // /**/  - The BULLET OPERATOR is confused.  Some people think
     //          it should be 0x2022 (BULLET).
 
     // from RFC 2319, ftp://ftp.isi.edu/in-notes/rfc2319.txt
diff --git a/noncore/apps/opie-reader/CFilter.cpp b/noncore/apps/opie-reader/CFilter.cpp
index 73a0872..0422ba6 100644
--- a/noncore/apps/opie-reader/CFilter.cpp
+++ b/noncore/apps/opie-reader/CFilter.cpp
@@ -1,25 +1,24 @@
-#include "CDrawBuffer.h"
 #include "CFilter.h"
 
 unsigned short striphtml::skip_ws()
 {
     tchar ch;
     CStyle sty;
     do
     {
         parent->getch(ch, sty);
     }
     while (ch < 33);
     return ch;
 }
 
 unsigned short striphtml::skip_ws_end()
 {
     tchar ch;
     CStyle sty;
     parent->getch(ch, sty);
     if (ch == ' ')
     {
         do
         {
             parent->getch(ch, sty);
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp
index e03bf64..cfa8534 100644
--- a/noncore/apps/opie-reader/FontControl.cpp
+++ b/noncore/apps/opie-reader/FontControl.cpp
@@ -1,26 +1,24 @@
-#include "opie.h"
-#include "useqpe.h"
 #include "FontControl.h"
 
 int FontControl::gzoom()
 {
     int ret;
     if (m_size == g_size)
     {
         ret = m_fontsizes[m_size]*m_basesize;
     }
     else if (g_size < 0)
     {
         int f = -g_size;
         ret = (m_fontsizes[0]*m_basesize) >> (f/2);
         if (f%2) ret = (2*ret/3);
     }
     else
     {
         int f = g_size - m_maxsize + 1;
         ret = (m_fontsizes[m_maxsize-1]*m_basesize) << (f/2);
         if (f%2) ret = (3*ret/2);
     }
     return ret;
 }
 
diff --git a/noncore/apps/opie-reader/Palm2QImage.cpp b/noncore/apps/opie-reader/Palm2QImage.cpp
index bf5ece3..9339595 100644
--- a/noncore/apps/opie-reader/Palm2QImage.cpp
+++ b/noncore/apps/opie-reader/Palm2QImage.cpp
@@ -1,26 +1,25 @@
 /* -*- mode: c; indent-tabs-mode: nil; -*- */
-#include "useqpe.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifndef _WINDOWS
 #include <unistd.h>     /* for link */
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdarg.h>
 
 #include <qimage.h>
 
 /***********************************************************************/
 /***********************************************************************/
 /*****                                                             *****/
 /*****   Code to decode the Palm image format to JPEG              *****/
 /*****                                                             *****/
 /***********************************************************************/
 /***********************************************************************/
 
 #define READ_BIGENDIAN_SHORT(p) (((p)[0] << 8)|((p)[1]))
 #define READ_BIGENDIAN_LONG(p)  (((p)[0] << 24)|((p)[1] << 16)|((p)[2] << 8)|((p)[3]))
 
 #define PALM_IS_COMPRESSED_FLAG        0x8000
diff --git a/noncore/apps/opie-reader/Prefs.cpp b/noncore/apps/opie-reader/Prefs.cpp
index 5150ca5..72eefba 100644
--- a/noncore/apps/opie-reader/Prefs.cpp
+++ b/noncore/apps/opie-reader/Prefs.cpp
@@ -1,46 +1,37 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'Prefs.ui'
 **
 ** Created: Tue Feb 11 23:53:35 2003
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
-#include "useqpe.h"
 #include "Prefs.h"
 
-#include <qcheckbox.h>
 #include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qcombobox.h>
 #include <qbuttongroup.h>
-#include <qlineedit.h>
 #ifdef USEQPE
 #include <qpe/menubutton.h>
 #include <qpe/fontdatabase.h>
 #else
 #include <qfontdatabase.h>
 #endif
 
 #include <qpe/qpeapplication.h>
 
 CLayoutPrefs::CLayoutPrefs( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     QHBoxLayout* hb = new QHBoxLayout(this);
     QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, tr("Text"), this);
     hb->addWidget(bg);
 
     StripCR = new QCheckBox( bg );
     StripCR->setText( tr( "Strip CR" ) );
 
     Dehyphen = new QCheckBox( bg );
     Dehyphen->setText( tr( "Dehyphen" ) );
 
     SingleSpace = new QCheckBox( bg );
     SingleSpace->setText( tr( "Single Space" ) );
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index 03c8fbe..d64abb4 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -1,55 +1,48 @@
 /****************************************************************************
 ** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
-#include "useqpe.h"
-#include <qpainter.h>
-#include <qimage.h>
-#include <qtimer.h>
-#include "config.h"
 #include "QTReader.h"
 #include "QTReaderApp.h"
-#include "CDrawBuffer.h"
 #ifdef USEQPE
 #include <qpe/qpeapplication.h>
 #endif
 #include <math.h>
 #include <ctype.h>
 #include <stdio.h> //for sprintf
 #ifdef USEQPE
 #include <qpe/config.h>
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #include <qpe/qcopenvelope_qws.h>
 #endif
-#include <qfontdatabase.h>
 
 #ifdef _UNICODE
 const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 };
 #else
 const char *QTReader::fonts[] = { "Helvetica", "Courier", "Times", 0 };
 #endif
 //const int   QTReader::fontsizes[] = { 8, 10, 12, 14, 18, 24, 30, 40, 50, 60, 70, 80, 90, 100, 0 };
 
 //const tchar *QTReader::fonts[] = { "unifont", "fixed", "micro", "smoothtimes", "Courier", "Times", 0 };
 //const int   QTReader::fontsizes[] = {10,16,17,22,0};
 //const tchar *QTReader::fonts[] = { "verdana", "Courier", "Times", 0 };
 //const int   QTReader::fontsizes[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,0};
 
 tchar QTReader::pluckernextpart[] = { 'C','l','i','c','k',' ','h','e','r','e',' ','f','o','r',' ','t','h','e',' ','n','e','x','t',' ','p','a','r','t',0 };
 tchar QTReader::jplucknextpart[] = { 'N','e','x','t',' ','P','a','r','t',' ','>','>',0 };
 //tchar QTReader::jplucknextpart[] = { 10,'#',10,'N','e','x','t',' ','P','a','r','t',' ','>','>',0 };
 
 QTReader::QTReader( QWidget *parent, const char *name, WFlags f) :
   QWidget(parent, name, f),
   m_delay(100),
   m_scrolldy1(0),
   m_scrolldy2(0),
   m_autoScroll(false),
   //textarray(NULL),
@@ -427,50 +420,48 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
             }
         }
         else
         {
             mouseUpOn = true;
         }
     }
 }
 
 void QTReader::focusInEvent(QFocusEvent* e)
 {
     if (m_autoScroll) timer->start(real_delay(), false);
     update();
 }
 
 void QTReader::focusOutEvent(QFocusEvent* e)
 {
     if (m_autoScroll)
     {
         timer->stop();
         //m_scrolldy1 = m_scrolldy2 = 0;
     }
 }
 
-#include <qapplication.h>
-#include <qdrawutil.h>
 #ifndef _WINDOWS
 #include <unistd.h>
 #endif
 
 void QTReader::goDown()
 {
     if (m_bpagemode)
     {
         dopagedn();
     }
     else
     {
         lineDown();
     }
 }
 
 void QTReader::goUp()
 {
     if (m_bpagemode)
     {
         dopageup();
     }
     else
     {
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 07af597..e759249 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -1,4222 +1,4221 @@
-/**********************************************************************

-** Copyright (C) 2000 Trolltech AS.  Allrights reserved.

-**

-** This file is part of Qt Palmtop Environment.

-**

-** This file may be distributed and/or modified under the terms of the

-** GNU General Public License version 2 as published by the Free Software

-** Foundation and appearing in the file LICENSE.GPL included in the

-** packaging of this file.

-**

-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

-**

-** See http://www.trolltech.com/gpl/ for GPL licensing information.

-**

-** Contact info@trolltech.com if any conditions of this licensing are

-** not clear to you.

-**

-**********************************************************************/

-#include "useqpe.h"

-#include <qregexp.h>

-#include <qclipboard.h>

-#include <qwidgetstack.h>

-#ifdef USEQPE

-#include <qmenubar.h>

-#include <qpe/qpetoolbar.h>

-#endif

-#include <qmenubar.h>

-#include <qtoolbar.h>

-#ifdef USEQPE

-#include <qpe/menubutton.h>

-#include <qpe/fontdatabase.h>

-#endif

-#include <qcombobox.h>

-#include <qpopupmenu.h>

-#include <qaction.h>

-#include <qapplication.h>

-#include <qlineedit.h>

-#include <qtoolbutton.h>

-#include <qspinbox.h>

-#include <qobjectlist.h>

-#ifdef USEQPE

-#include <qpe/global.h>

-#include <qpe/applnk.h>

-#endif

-#include <qfileinfo.h>

-#include <stdlib.h> //getenv

-#include <qprogressbar.h>

-#ifdef USEQPE

-#include <qpe/config.h>

-#endif

-#include <qbuttongroup.h>

-#include <qradiobutton.h>

-#ifdef USEQPE

-#include <qpe/qcopenvelope_qws.h>

-#endif

-#include "QTReader.h"

-#include "GraphicWin.h"

-#include "Bkmks.h"

-#include "cbkmkselector.h"

-#include "infowin.h"

-#include "ToolbarPrefs.h"

-#include "Prefs.h"

-#include "CAnnoEdit.h"

-#include "QFloatBar.h"

-#include "FixedFont.h"

-#include "URLDialog.h"

-//#include <qpe/fontdatabase.h>

-

-#ifdef USEQPE

-#include <qpe/resource.h>

-#include <qpe/qpeapplication.h>

-#include "fileBrowser.h"

-#else

-#include "qfiledialog.h"

-#endif

-

-#include "QTReaderApp.h"

-#include "CDrawBuffer.h"

-#include "Filedata.h"

-#include "opie.h"

-#include "useqpe.h"

-#include "names.h"

-#include "CEncoding_tables.h"

-#include "CloseDialog.h"

-

-bool CheckVersion(int&, int&, char&);

-

-#ifdef _WINDOWS

-#define PICDIR "c:\\uqtreader\\pics\\"

-#else

-#ifdef USEQPE

-#define PICDIR "opie-reader/"

-#else

-#define PICDIR "/home/tim/uqtreader/pics/"

-#endif

-#endif

-

-unsigned long QTReaderApp::m_uid = 0;

-

-void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); }

-

-#ifdef USEQPE

-#define geticon(iconname) Resource::loadPixmap( iconname )

-#define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname )

-#else

-#define geticon(iconname) QPixmap(PICDIR iconname ".png")

-#define getmyicon(iconname) geticon(iconname)

-//#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) )

-#endif

-

-#ifndef _WINDOWS

-#include <unistd.h>

-#endif

-#include <stddef.h>

-#ifndef _WINDOWS

-#include <dirent.h>

-#endif

-

-void QTReaderApp::listBkmkFiles()

-{

-    bkmkselector->clear();

-    bkmkselector->setText("Cancel");

-#ifndef USEQPE

-    int cnt = 0;

-

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-                d = QDir::home();

-                d.mkdir(APPDIR);

-                d.cd(APPDIR);

-    }

-

-

-

-

-        d.setFilter( QDir::Files | QDir::NoSymLinks );

-//        d.setSorting( QDir::Size | QDir::Reversed );

-

-        const QFileInfoList *list = d.entryInfoList();

-        QFileInfoListIterator it( *list );      // create list iterator

-        QFileInfo *fi;                          // pointer for traversing

-

-        while ( (fi=it.current()) ) {           // for each file...

-

-                    bkmkselector->insertItem(fi->fileName());

-                    cnt++;

-

-                        //qDebug( "%10li %s", fi->size(), fi->fileName().data() );

-            ++it;                               // goto next list element

-        }

-

-#else /* USEQPE */

-    int cnt = 0;

-    DIR *d;

-    d = opendir((const char *)Global::applicationFileName(APPDIR,""));

-

-    while(1)

-    {

-        struct dirent* de;

-        struct stat buf;

-        de = readdir(d);

-        if (de == NULL) break;

-

-        if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))

-        {

-            bkmkselector->insertItem(de->d_name);

-            cnt++;

-        }

-    }

-

-    closedir(d);

-#endif

-    if (cnt > 0)

-      {

-//tjw        menu->hide();

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-        m_nBkmkAction = cRmBkmkFile;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No bookmark files");

-}

-

-void QTReaderApp::hidetoolbars()

-{

-    menubar->hide();

-    if (fileBar != NULL) fileBar->hide();

-    if (viewBar != NULL) viewBar->hide();

-    if (navBar != NULL) navBar->hide();

-    if (markBar != NULL) markBar->hide();

-    if (m_fontVisible) m_fontBar->hide();

-    if (regVisible)

-    {

-#ifdef USEQPE

-                Global::hideInputMethod();

-#endif

-        regBar->hide();

-    }

-    if (searchVisible)

-    {

-#ifdef USEQPE

-                Global::hideInputMethod();

-#endif

-        searchBar->hide();

-    }

-}

-

-QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )

-    : QMainWindow( parent, name, f ), bFromDocView( FALSE ), m_dontSave(false),

-      fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL)

-{

-        m_url_clipboard = false;

-        m_url_localfile = false;

-        m_url_globalfile = false;

-                ftime(&m_lastkeytime);

-////  qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir());

-////  qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml"));

-

-    m_bcloseDisabled = true;

-    m_disableesckey = false;

-    pBkmklist = NULL;

-    pOpenlist = NULL;

-//    doc = 0;

-

-        m_fBkmksChanged = false;

-    

-  QString lang = getenv( "LANG" );

-  QString rot = getenv( "QWS_DISPLAY" );

-

-/*

-  int m_rot = 0;

-  if (rot.contains("Rot90"))

-  {

-      m_rot = 90;

-  }

-  else if (rot.contains("Rot180"))

-  {

-      m_rot = 180;

-  }

-  else if (rot.contains("Rot270"))

-  {

-      m_rot = 270;

-  }

-

-//  qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);

-*/

-  m_autogenstr = "^ *[A-Z].*[a-z] *$";

-

-#ifdef USEQPE

-    setIcon( Resource::loadPixmap( PICDIR  "uqtreader") );

-#else

-    setIcon( QPixmap (PICDIR  "uqtreader.png") );

-#endif /* USEQPE */

-

-//    QToolBar *bar = new QToolBar( this );

-//    menubar = new QToolBar( this );

-#ifdef USEQPE

-  Config config( APPDIR );

-#else

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-                d = QDir::home();

-                d.mkdir(APPDIR);

-                d.cd(APPDIR);

-    }

-    QFileInfo fi(d, INIFILE);

-//    qDebug("Path:%s", (const char*)fi.absFilePath());

-    Config config(fi.absFilePath());

-#endif

-    config.setGroup("Toolbar");

-    m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);

-    m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);

-    m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);

-    menubar = new QToolBar("Menus", this, m_tbposition);

-

-//    fileBar = new QToolBar("File", this);

-//    QToolBar* viewBar = new QToolBar("File", this);

-//    QToolBar* navBar = new QToolBar("File", this);

-//    QToolBar* markBar = new QToolBar("File", this);

-

-#ifdef USEQPE

-    mb = new QMenuBar( menubar );

-#else

-    mb = new QMenuBar( menubar );

-#endif

-

-//#ifdef USEQPE

-    QPopupMenu* tmp = new QPopupMenu(mb);

-    mb->insertItem( geticon( "AppsIcon" ), tmp );

-//#else

-//    QMenuBar* tmp = mb;

-//#endif

-

-    QPopupMenu *file = new QPopupMenu( mb );

-    tmp->insertItem( tr( "File" ), file );

-

-    QPopupMenu *navigation = new QPopupMenu(mb);

-    tmp->insertItem( tr( "Navigation" ), navigation );

-

-    QPopupMenu *view = new QPopupMenu( mb );

-    tmp->insertItem( tr( "View" ), view );

-

-    QPopupMenu *marks = new QPopupMenu( this );

-    tmp->insertItem( tr( "Marks" ), marks );

-

-    QPopupMenu *settings = new QPopupMenu( this );

-    tmp->insertItem( tr( "Settings" ), settings );

-

-//    addToolBar(menubar, "Menus",QMainWindow::Top);

-//    addToolBar(fileBar, "Toolbar",QMainWindow::Top);

-

-    //    QPopupMenu *edit = new QPopupMenu( this );

-

-    /*

-    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );

-    a->addTo( bar );

-    a->addTo( file );

-    */

-

-    editorStack = new QWidgetStack( this );

-    setCentralWidget( editorStack );

-

-    searchVisible = FALSE;

-    regVisible = FALSE;

-    m_fontVisible = false;

-

-    m_annoWin = new CAnnoEdit(editorStack);

-    editorStack->addWidget(m_annoWin, get_unique_id());

-    connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) );

-    connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) );

-

-    m_infoWin = new infowin(editorStack);

-    editorStack->addWidget(m_infoWin, get_unique_id());

-    connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) );

-

-    m_graphicwin = new GraphicWin(editorStack);

-    editorStack->addWidget(m_graphicwin, get_unique_id());

-    connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) );

-

-//    bkmkselector = new QListBox(editorStack, "Bookmarks");

-    bkmkselector = new CBkmkSelector(editorStack, "Bookmarks");

-    //    connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) );

-    connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) );

-    connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) );

-    editorStack->addWidget( bkmkselector, get_unique_id() );

-

-/*

-    importSelector = new FileSelector( "*", editorStack, "importselector", false );

-    connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) );

-

-    editorStack->addWidget( importSelector, get_unique_id() );

-

-    // don't need the close visible, it is redundant...

-    importSelector->setCloseVisible( FALSE );

-*/    

-//    qDebug("Reading file list");

-    readfilelist();

-

-    reader = new QTReader( editorStack );

-

-    reader->bDoUpdates = false;

-

-#ifdef USEQPE

-    ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);

-#endif

-

-//    qDebug("Reading config");

-//  Config config( APPDIR );

-  config.setGroup( "View" );

-  m_debounce = config.readNumEntry("Debounce", 0);

-#ifdef USEQPE

-  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);

-#else

-  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", true);

-#endif

-  reader->bstripcr = config.readBoolEntry( "StripCr", true );

-  reader->bfulljust = config.readBoolEntry( "FullJust", false );

-  reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 ));

-  reader->setlead(config.readNumEntry( "ExtraLead", 0 ));

-  reader->btextfmt = config.readBoolEntry( "TextFmt", false );

-  reader->bautofmt = config.readBoolEntry( "AutoFmt", true );

-  reader->bstriphtml = config.readBoolEntry( "StripHtml", false );

-  reader->bpeanut = config.readBoolEntry( "Peanut", false );

-  reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );

-  reader->bdepluck = config.readBoolEntry( "Depluck", false );

-  reader->bdejpluck = config.readBoolEntry( "Dejpluck", false );

-  reader->bonespace = config.readBoolEntry( "OneSpace", false );

-  reader->bunindent = config.readBoolEntry( "Unindent", false );

-  reader->brepara = config.readBoolEntry( "Repara", false );

-  reader->bdblspce = config.readBoolEntry( "DoubleSpace", false );

-  reader->bindenter = config.readNumEntry( "Indent", 0 );

-  reader->m_textsize = config.readNumEntry( "FontSize", 12 );

-  reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);

-  reader->m_lastfile = config.readEntry( "LastFile", QString::null );

-  reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );

-  reader->m_bpagemode = config.readBoolEntry( "PageMode", true );

-  reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false);

-  reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false);

-  reader->m_fontname = config.readEntry( "Fontname", "helvetica" );

-  reader->m_encd = config.readNumEntry( "Encoding", 0 );

-  reader->m_charpc = config.readNumEntry( "CharSpacing", 100 );

-  reader->m_overlap = config.readNumEntry( "Overlap", 0 );

-  reader->m_border = config.readNumEntry( "Margin", 6 );

-#ifdef REPALM

-  reader->brepalm = config.readBoolEntry( "Repalm", true );

-#endif

-  reader->bremap = config.readBoolEntry( "Remap", true );

-  reader->bmakebold = config.readBoolEntry( "MakeBold", false );

-  reader->setContinuous(config.readBoolEntry( "Continuous", true ));

-  m_targetapp = config.readEntry( "TargetApp", QString::null );

-  m_targetmsg = config.readEntry( "TargetMsg", QString::null );

-#ifdef _SCROLLPIPE

-  reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null );

-  reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true );

-#endif

-  m_twoTouch = config.readBoolEntry( "TwoTouch", false);

-  m_doAnnotation = config.readBoolEntry( "Annotation", false);

-  m_doDictionary = config.readBoolEntry( "Dictionary", false);

-  m_doClipboard = config.readBoolEntry( "Clipboard", false);

-  m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);

-  m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone);

-  m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen);

-  m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut);

-  m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn);

-  m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp);

-  m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown);

-

-  m_leftScroll = config.readBoolEntry("LeftScroll", false);

-  m_rightScroll = config.readBoolEntry("RightScroll", false);

-  m_upScroll = config.readBoolEntry("UpScroll", true);

-  m_downScroll = config.readBoolEntry("DownScroll", true);

-

-  m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);

-  reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));

-

-#ifndef USEQPE

-        config.setGroup( "Geometry" );

-        setGeometry(0,0,

-        config.readNumEntry( "width", QApplication::desktop()->width()/2 ),

-        config.readNumEntry( "height", QApplication::desktop()->height()/2 ));

-        move(

-        config.readNumEntry( "x", 20 ),

-        config.readNumEntry( "y", 20 ));

-#endif

-

-

-

-  setTwoTouch(m_twoTouch);

-

-    connect( reader, SIGNAL( OnShowPicture(QImage&) ), this, SLOT( showgraphic(QImage&) ) );

-

-    connect( reader, SIGNAL( OnRedraw() ), this, SLOT( OnRedraw() ) );

-    connect( reader, SIGNAL( OnWordSelected(const QString&, size_t, const QString&) ), this, SLOT( OnWordSelected(const QString&, size_t, const QString&) ) );

-    connect( reader, SIGNAL( OnURLSelected(const QString&) ), this, SLOT( OnURLSelected(const QString&) ) );

-    editorStack->addWidget( reader, get_unique_id() );

-

-    m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL);

-    connect( m_preferences_action, SIGNAL( activated() ), this, SLOT( showprefs() ) );

-    m_preferences_action->addTo( settings );

-

-    m_saveconfig_action = new QAction( tr( "Save Config" ), QString::null, 0, this, NULL);

-    connect( m_saveconfig_action, SIGNAL( activated() ), this, SLOT( SaveConfig() ) );

-    m_saveconfig_action->addTo( settings );

-

-    m_loadconfig_action = new QAction( tr( "Load Config" ), QString::null, 0, this, NULL);

-    connect( m_loadconfig_action, SIGNAL( activated() ), this, SLOT( LoadConfig() ) );

-    m_loadconfig_action->addTo( settings );

-

-    m_tidyconfig_action = new QAction( tr( "Delete Config" ), QString::null, 0, this, NULL);

-    connect( m_tidyconfig_action, SIGNAL( activated() ), this, SLOT( TidyConfig() ) );

-    m_tidyconfig_action->addTo( settings );

-

-    settings->insertSeparator();

-    m_toolbarprefs_action = new QAction( tr( "Toolbars" ), QString::null, 0, this, NULL);

-    connect( m_toolbarprefs_action, SIGNAL( activated() ), this, SLOT( showtoolbarprefs() ) );

-    m_toolbarprefs_action->addTo( settings );

-

-    m_open_action = new QAction( tr( "Open" ), geticon( "fileopen" ), QString::null, 0, this, 0 );

-    connect( m_open_action, SIGNAL( activated() ), this, SLOT( fileOpen() ) );

-    m_open_action->addTo( file );

-

-    m_close_action = new QAction( tr( "Close" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( m_close_action, SIGNAL( activated() ), this, SLOT( fileClose() ) );

-    m_close_action->addTo( file );

-

-#ifdef _SCRIPT

-    a = new QAction( tr( "Run Script" ), QString::null, 0, this, NULL);

-    connect( a, SIGNAL( activated() ), this, SLOT( RunScript() ) );

-    a->addTo( file );

-#endif

-    /*

-    a = new QAction( tr( "Revert" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( fileRevert() ) );

-    a->addTo( file );

-

-    a = new QAction( tr( "Cut" ), geticon( "cut" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );

-    a->addTo( filebar() );

-    a->addTo( edit );

-    */

-

-    m_info_action = new QAction( tr( "Info" ), geticon( "UtilsIcon" ), QString::null, 0, this, NULL);

-    connect( m_info_action, SIGNAL( activated() ), this, SLOT( showinfo() ) );

-    m_info_action->addTo( file );

-

-    m_touch_action = new QAction( tr( "Two/One Touch" ), geticon( "1to1" ), QString::null, 0, this, NULL, true );

-    connect( m_touch_action, SIGNAL( toggled(bool) ), this, SLOT( setTwoTouch(bool) ) );

-    m_touch_action->setOn(m_twoTouch);

-    m_touch_action->addTo( file );

-

-    m_find_action = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, NULL);

-     connect( m_find_action, SIGNAL( activated() ), this, SLOT( editFind() ) );

-     file->insertSeparator();

-//     a->addTo( bar );

-     m_find_action->addTo( file );

-

-    m_exportlinks_action = new QAction( tr( "Export Links" ), QString::null, 0, this, NULL);

-    connect( m_exportlinks_action, SIGNAL( activated() ), this, SLOT( ExportLinks() ) );

-    m_exportlinks_action->addTo( file );

-

-    m_scrollButton = new QAction( tr( "Scroll" ), getmyicon( "panel-arrow-down" ), QString::null, 0, this, 0, true );

-    connect( m_scrollButton, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) );

-    m_scrollButton->addTo(navigation);

-    m_scrollButton->setOn(false);

-

-    m_start_action = new QAction( tr( "Goto Start" ), geticon( "start" ), QString::null, 0, this, NULL);

-    connect( m_start_action, SIGNAL( activated() ), this, SLOT( gotoStart() ) );

-    m_start_action->addTo(navigation);

-

-    m_end_action = new QAction( tr( "Goto End" ), geticon( "finish" ), QString::null, 0, this, NULL);

-    connect( m_end_action, SIGNAL( activated() ), this, SLOT( gotoEnd() ) );

-    m_end_action->addTo(navigation);

-

-    m_jump_action = new QAction( tr( "Jump" ), geticon( "rotate" ), QString::null, 0, this, NULL);

-    connect( m_jump_action, SIGNAL( activated() ), this, SLOT( jump() ) );

-    m_jump_action->addTo(navigation);

-

-    m_pageline_action = new QAction( tr( "Page/Line Scroll" ), geticon( "pass" ), QString::null, 0, this, NULL, true );

-    connect( m_pageline_action, SIGNAL( toggled(bool) ), this, SLOT( pagemode(bool) ) );

-    m_pageline_action->addTo(navigation);

-    m_pageline_action->setOn(reader->m_bpagemode);

-

-    m_pageup_action = new QAction( tr( "Up" ), geticon( "up" ), QString::null, 0, this, 0 );

-    connect( m_pageup_action, SIGNAL( activated() ), this, SLOT( pageup() ) );

-    m_pageup_action->addTo( navigation );

-    

-    m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 );

-    connect( m_pagedn_action, SIGNAL( activated() ), this, SLOT( pagedn() ) );

-    m_pagedn_action->addTo( navigation );

-

-    m_back_action = new QAction( tr( "Back" ), geticon( "back" ), QString::null, 0, this, 0 );

-    connect( m_back_action, SIGNAL( activated() ), reader, SLOT( goBack() ) );

-    m_back_action->addTo( navigation );

-

-    m_home_action = new QAction( tr( "Home" ), geticon( "home" ), QString::null, 0, this, 0 );

-    connect( m_home_action, SIGNAL( activated() ), reader, SLOT( goHome() ) );

-    m_home_action->addTo( navigation );

-

-    m_forward_action = new QAction( tr( "Forward" ), geticon( "forward" ), QString::null, 0, this, 0 );

-    connect( m_forward_action, SIGNAL( activated() ), reader, SLOT( goForward() ) );

-    m_forward_action->addTo( navigation );

-

-    /*

-    a = new QAction( tr( "Find" ), QString::null, 0, this, NULL, true );

-    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );

-    a->addTo( file );

-

-    a = new QAction( tr( "Find Again" ), QString::null, 0, this, NULL, true );

-    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );

-    a->addTo( file );

-    */

-

-//    file->insertSeparator();

-

-#ifdef _SCROLLPIPE

-

-    QActionGroup* ag = new QActionGroup(this);

-    ag->setExclusive(false);

-    spacemenu = new QPopupMenu(this);

-    file->insertItem( tr( "Scrolling" ), spacemenu );

-

-    a = new QAction( tr( "Set Target" ), QString::null, 0, ag, NULL);

-    connect( a, SIGNAL( activated() ), this, SLOT( setpipetarget() ) );

-

-    a = new QAction( tr( "Pause Paras" ), QString::null, 0, ag, NULL, true );

-    connect( a, SIGNAL( toggled(bool) ), this, SLOT( setpause(bool) ) );

-    a->setOn(reader->m_pauseAfterEachPara);

-

-    ag->addTo(spacemenu);

-//    file->insertSeparator();

-

-#endif

-

-/*

-    a = new QAction( tr( "Import" ), QString::null, 0, this, NULL );

-    connect( a, SIGNAL( activated() ), this, SLOT( importFiles() ) );

-    a->addTo( file );

-*/

-

-    /*

-    a = new QAction( tr( "Paste" ), geticon( "paste" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );

-    a->addTo( fileBar );

-    a->addTo( edit );

-    */

-

-//     a = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, 0 );

-

-     m_fullscreen = false;

-    m_actFullscreen = new QAction( tr( "Fullscreen" ), geticon( "fullscreen" ), QString::null, 0, this, NULL, true );

-    connect( m_actFullscreen, SIGNAL( toggled(bool) ), this, SLOT( setfullscreen(bool) ) );

-    m_actFullscreen->setOn(m_fullscreen);

-    m_actFullscreen->addTo( view );

-

-    view->insertSeparator();

-

-    m_zoomin_action = new QAction( tr( "Zoom In" ), geticon( "zoom" ), QString::null, 0, this);

-    connect( m_zoomin_action, SIGNAL( activated() ), this, SLOT( zoomin() ) );

-    m_zoomin_action->addTo( view );

-

-    m_zoomout_action = new QAction( tr( "Zoom Out" ), geticon( "mag" ), QString::null, 0, this);

-    connect( m_zoomout_action, SIGNAL( activated() ), this, SLOT( zoomout() ) );

-    m_zoomout_action->addTo( view );

-

-    view->insertSeparator();

-    m_setfont_action = new QAction( tr( "Set Font" ), getmyicon( "font" ), QString::null, 0, this);

-    connect( m_setfont_action, SIGNAL( activated() ), this, SLOT( setfont() ) );

-    m_setfont_action->addTo( view );

-

-    view->insertSeparator();

-    m_setenc_action = new QAction( tr( "Set Encoding" ), getmyicon( "charset" ), QString::null, 0, this);

-    connect( m_setenc_action, SIGNAL( activated() ), this, SLOT( chooseencoding() ) );

-    m_setenc_action->addTo( view );

-

-    m_setmono_action = new QAction( tr( "Ideogram" ), getmyicon( "ideogram" ), QString::null, 0, this, NULL, true);

-    connect( m_setmono_action, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );

-    m_setmono_action->addTo( view );

-    m_setmono_action->setOn(reader->m_bMonoSpaced);

-

-

-    //    a = new QAction( tr( "Zoom" ), QString::null, 0, this, NULL, true );

-    //    a = new QAction( tr( "Zoom" ), geticon( "mag" ), QString::null, 0, this, 0 );

-

-

-

-    //    a->addTo( filebar() );

-//     view->insertSeparator();

-

-/*

-    a = new QAction( tr( "Ideogram/Word" ), QString::null, 0, this, NULL, true );

-    connect( a, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );

-    a->setOn(reader->m_bMonoSpaced);

-    a->addTo( view );

-*/

-/*

-    a = new QAction( tr( "Set Width" ), QString::null, 0, this, NULL);

-    connect( a, SIGNAL( activated() ), this, SLOT( setspacing() ) );

-    a->addTo( view );

-*/

-

-    m_mark_action = new QAction( tr( "Bookmark" ), getmyicon( "bookmark" ), QString::null, 0, this, NULL);

-    connect( m_mark_action, SIGNAL( activated() ), this, SLOT( addbkmk() ) );

-    m_mark_action->addTo( marks );

-

-    m_annotate_action = new QAction( tr( "Annotate" ), getmyicon( "annotate" ), QString::null, 0, this, NULL);

-    connect( m_annotate_action, SIGNAL( activated() ), this, SLOT( addanno() ) );

-    m_annotate_action->addTo( marks );

-

-    m_goto_action = new QAction( tr( "Goto" ), getmyicon( "bookmark_goto" ), QString::null, 0, this, NULL, false );

-    connect( m_goto_action, SIGNAL( activated() ), this, SLOT( do_gotomark() ) );

-    m_goto_action->addTo( marks );

-

-    m_delete_action = new QAction( tr( "Delete" ), getmyicon( "bookmark_delete" ), QString::null, 0, this, NULL);

-    connect( m_delete_action, SIGNAL( activated() ), this, SLOT( do_delmark() ) );

-    m_delete_action->addTo( marks );

-

-    m_autogen_action = new QAction( tr( "Autogen" ), geticon( "exec" ), QString::null, 0, this, NULL, false );

-    connect( m_autogen_action, SIGNAL( activated() ), this, SLOT( do_autogen() ) );

-     marks->insertSeparator();

-    m_autogen_action->addTo( marks );

-

-    m_clear_action = new QAction( tr( "Clear" ), getmyicon( "bookmark_clear" ), QString::null, 0, this, NULL);

-    connect( m_clear_action, SIGNAL( activated() ), this, SLOT( clearBkmkList() ) );

-    m_clear_action->addTo( marks );

-

-    m_save_action = new QAction( tr( "Save" ), getmyicon( "bookmark_save" ), QString::null, 0, this, NULL );

-    connect( m_save_action, SIGNAL( activated() ), this, SLOT( savebkmks() ) );

-    m_save_action->addTo( marks );

-

-    m_tidy_action = new QAction( tr( "Tidy" ), getmyicon( "bookmark_tidy" ), QString::null, 0, this, NULL);

-    connect( m_tidy_action, SIGNAL( activated() ), this, SLOT( listBkmkFiles() ) );

-     marks->insertSeparator();

-    m_tidy_action->addTo( marks );

-

-    m_startBlock_action = new QAction( tr( "Start Block" ), geticon( "new" ), QString::null, 0, this, NULL);

-    connect( m_startBlock_action, SIGNAL( activated() ), this, SLOT( editMark() ) );

-    marks->insertSeparator();

-    m_startBlock_action->addTo( marks );

-

-    m_endBlock_action = new QAction( tr( "Copy Block" ), geticon( "copy" ), QString::null, 0, this, NULL);

-    connect( m_endBlock_action, SIGNAL( activated() ), this, SLOT( editCopy() ) );

-    m_endBlock_action->addTo( marks );

-

-    m_bkmkAvail = NULL;

-

-

-    setToolBarsMovable(m_tbmove);

-    addtoolbars(&config);

-

-    pbar = new QProgressBar(this);

-    pbar->hide();

-

-    searchBar = new QFloatBar( "Search", this, QMainWindow::Top, TRUE );

-

-    searchBar->setHorizontalStretchable( TRUE );

-

-    connect(searchBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));

-

-    searchEdit = new QLineEdit( searchBar, "searchEdit" );

-//      QFont f("unifont", 16 /*, QFont::Bold*/);

-//      searchEdit->setFont( f );

-    searchBar->setStretchableWidget( searchEdit );

-

-

-#ifdef __ISEARCH

-    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),

-             this, SLOT( search( const QString& ) ) );

-#else

-    connect( searchEdit, SIGNAL( returnPressed( ) ),

-             this, SLOT( search( ) ) );

-#endif

-     QAction*a = new QAction( tr( "Find Next" ), geticon( "next" ), QString::null, 0, this, 0 );

-     connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );

-     a->addTo( searchBar );

-

-    a = new QAction( tr( "Close Find" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );

-    a->addTo( searchBar );

-

-    searchBar->hide();

-

-    regBar = new QFloatBar( "Autogen", this, QMainWindow::Top, TRUE );

-    connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));

-

-    regBar->setHorizontalStretchable( TRUE );

-

-    regEdit = new QLineEdit( regBar, "regEdit" );

-//    regEdit->setFont( f );

-

-    regBar->setStretchableWidget( regEdit );

-

-    connect( regEdit, SIGNAL( returnPressed( ) ),

-             this, SLOT( do_regaction() ) );

-

-    a = new QAction( tr( "Do Reg" ), geticon( "enter" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );

-    a->addTo( regBar );

-

-    a = new QAction( tr( "Close Edit" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( regClose() ) );

-    a->addTo( regBar );

-

-    regBar->hide();

-

-    m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );

-

-    m_fontBar->setHorizontalStretchable( TRUE );

-

-//    qDebug("Font selector");

-    m_fontSelector = new QComboBox(false, m_fontBar);

-    m_fontBar->setStretchableWidget( m_fontSelector );

-    {

-#ifndef USEQPE

-        QFontDatabase f;

-#else

-        FontDatabase f;

-#endif

-        QStringList flist = f.families();

-        bool realfont = false;

-        for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++)

-        {

-            if (reader->m_fontname == *nm)

-            {

-                realfont = true;

-            }

-            if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm);

-        }

-        if (!realfont) reader->m_fontname = flist[0];

-    } // delete the FontDatabase!!!

-    connect( m_fontSelector, SIGNAL( activated(const QString& ) ),

-             this, SLOT( do_setfont(const QString&) ) );

-    connect( m_fontSelector, SIGNAL( activated(int ) ),

-             this, SLOT( do_setencoding(int) ) );

-

-    m_fontBar->hide();

-    m_fontVisible = false;

-#ifdef USEMSGS

-    connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ),

-             this, SLOT( msgHandler(const QCString&, const QByteArray&) ) );

-#endif

-//    qDebug("Initing");

-  reader->init();

-//    qDebug("Inited");

-//    m_buttonAction[m_spaceTarget]->setOn(true);

-//    qDebug("fonting");

-    do_setfont(reader->m_fontname);

-    if (!reader->m_lastfile.isEmpty())

-    {

-        //qDebug("doclnk");

-        //doc = new DocLnk(reader->m_lastfile);

-        //qDebug("doclnk done");

-        if (pOpenlist != NULL)

-        {

-

-/*

-            int ind = 0;

-            Bkmk* p = (*pOpenlist)[ind];

-            while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)

-            {

-                p = (*pOpenlist)[++ind];

-            }

-*/

-            Bkmk* p = NULL;

-            for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)

-            {

-                p = iter.pContent();

-                if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)

-                {

-                    break;

-                }

-        //      qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));

-                p = NULL;

-            }

-            if (p != NULL)

-            {

-        //qDebug("openfrombkmk");

-                if (!openfrombkmk(p))

-                    showEditTools();

-            }

-            else

-            {

-        //qDebug("openfile");

-                openFile( reader->m_lastfile );

-            }

-        }

-        else

-        {

-        //    qDebug("Openfile 2");

-            if (!reader->m_lastfile.isEmpty())

-                openFile( reader->m_lastfile );

-        }

-    }

-    else

-    {

-      showEditTools();

-    }

-//    qApp->processEvents();

-    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))

-    {

-        config.writeEntry("Major", major);

-        config.writeEntry("BkmkType", bkmktype);

-        config.writeEntry("Minor", (int)minor);

-    }

-//    qDebug("finished update");

-}

-

-void QTReaderApp::addtoolbars(Config* config)

-{

-    config->setGroup("Toolbar");

-

-    if (fileBar != NULL)

-    {

-        if (fileBar != menubar)

-        {

-            fileBar->clear();

-        }

-        else

-        {

-            m_preferences_action->removeFrom( filebar() );

-            m_open_action->removeFrom( filebar() );

-            m_close_action->removeFrom( filebar() );

-            m_info_action->removeFrom( filebar() );

-            m_touch_action->removeFrom( filebar() );

-            m_find_action->removeFrom( filebar() );

-        }

-    }

-

-    m_preferences_action->addTo( filebar() );

-    addfilebar(config, "Open", m_open_action);

-    addfilebar(config, "Close", m_close_action);

-    addfilebar(config, "Info", m_info_action);

-    addfilebar(config, "Two/One Touch", m_touch_action);

-    addfilebar(config, "Find", m_find_action);

-

-    if (navBar != NULL)

-    {

-        if ((navBar == fileBar) && (fileBar == menubar))

-        {

-            m_scrollButton->removeFrom( navbar() );

-            m_start_action->removeFrom( navbar() );

-            m_end_action->removeFrom( navbar() );

-            m_jump_action->removeFrom( navbar() );

-            m_pageline_action->removeFrom( navbar() );

-            m_pageup_action->removeFrom( navbar() );

-            m_pagedn_action->removeFrom( navbar() );

-            m_back_action->removeFrom( navbar() );

-            m_home_action->removeFrom( navbar() );

-            m_forward_action->removeFrom( navbar() );

-        }

-        else if (navBar != fileBar)

-        {

-            navBar->clear();

-        }

-    }

-

-    addnavbar(config, "Scroll", m_scrollButton);

-    addnavbar(config, "Goto Start", m_start_action);

-    addnavbar(config, "Goto End", m_end_action);

-

-    addnavbar(config, "Jump", m_jump_action);

-    addnavbar(config, "Page/Line Scroll", m_pageline_action);

-

-    addnavbar(config, "Page Up", m_pageup_action);

-    addnavbar(config, "Page Down", m_pagedn_action);

-

-    addnavbar(config, "Back", m_back_action);

-    addnavbar(config, "Home", m_home_action);

-    addnavbar(config, "Forward", m_forward_action);

-

-    if (viewBar != NULL)

-    {

-        if ((viewBar == fileBar) && (fileBar == menubar))

-        {

-            m_actFullscreen->removeFrom( filebar() );

-            m_zoomin_action->removeFrom( viewbar() );

-            m_zoomout_action->removeFrom( viewbar() );

-            m_setfont_action->removeFrom( viewbar() );

-            m_setenc_action->removeFrom( viewbar() );

-            m_setmono_action->removeFrom( viewbar() );

-        }

-        else if (viewBar != fileBar)

-        {

-            viewBar->clear();

-        }

-    }

-

-    addviewbar(config, "Fullscreen", m_actFullscreen);

-    addviewbar(config, "Zoom In", m_zoomin_action);

-    addviewbar(config, "Zoom Out", m_zoomout_action);

-    addviewbar(config, "Set Font", m_setfont_action);

-    addviewbar(config, "Encoding Select", m_setenc_action);

-    addviewbar(config, "Ideogram Mode", m_setmono_action);

-

-    if (markBar != NULL)

-    {

-        if ((markBar == fileBar) && (fileBar == menubar))

-        {

-            m_mark_action->removeFrom( markbar() );

-            m_annotate_action->removeFrom( markbar());

-            m_goto_action->removeFrom( markbar() );

-            m_delete_action->removeFrom( markbar() );

-            m_autogen_action->removeFrom( markbar() );

-            m_clear_action->removeFrom( markbar() );

-            m_save_action->removeFrom( markbar() );

-            m_tidy_action->removeFrom( markbar() );

-            m_startBlock_action->removeFrom( markbar() );

-            m_endBlock_action->removeFrom( markbar() );

-        }

-        else if (markBar != fileBar)

-        {

-            markBar->clear();

-        }

-    }

-    addmarkbar(config, "Mark", m_mark_action);

-    addmarkbar(config, "Annotate", m_annotate_action);

-    addmarkbar(config, "Goto", m_goto_action);

-    addmarkbar(config, "Delete", m_delete_action);

-    addmarkbar(config, "Autogen", m_autogen_action);

-    addmarkbar(config, "Clear", m_clear_action);

-    addmarkbar(config, "Save", m_save_action);

-    addmarkbar(config, "Tidy", m_tidy_action);

-    addmarkbar(config, "Start Block", m_startBlock_action);

-    addmarkbar(config, "Copy Block", m_endBlock_action);

-    if (checkbar(config, "Annotation indicator"))

-    {

-        if (m_bkmkAvail == NULL)

-        {

-            m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 );

-            connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) );

-        

-            m_bkmkAvail->setEnabled(false);

-        }

-        QLabel *spacer = new QLabel(markBar, "");

-        markbar()->setStretchableWidget(spacer);

-        m_bkmkAvail->removeFrom( markbar() );

-        m_bkmkAvail->addTo( markbar() );

-    }

-    else

-    {

-        if (m_bkmkAvail != NULL)

-        {

-            m_bkmkAvail->removeFrom( markbar() );

-            delete m_bkmkAvail;

-            m_bkmkAvail = NULL;

-        }

-    }

-}

-

-bool QTReaderApp::checkbar(Config* _config, const QString& key)

-{

-    return _config->readBoolEntry(key, false);

-}

-

-

-QToolBar* QTReaderApp::filebar()

-{

-    if (fileBar == NULL)

-    {

-        switch (m_tbpol)

-        {

-            case cesSingle:

-        //      qDebug("Setting filebar to menubar");

-                fileBar = menubar;

-                break;

-            default:

-                qDebug("Incorrect toolbar policy set");

-            case cesMenuTool:

-            case cesMultiple:

-        //      qDebug("Creating new file bar");

-                fileBar = new QToolBar("File", this, m_tbposition);

-                break;

-        }

-        //fileBar->setHorizontalStretchable( true );

-    }

-    return fileBar;

-}

-QToolBar* QTReaderApp::viewbar()

-{

-    if (viewBar == NULL)

-    {

-        switch (m_tbpol)

-        {

-            case cesMultiple:

-                viewBar = new QToolBar("View", this, m_tbposition);

-                break;

-            default:

-                qDebug("Incorrect toolbar policy set");

-            case cesSingle:

-            case cesMenuTool:

-                viewBar = fileBar;

-                break;

-        }

-    }

-    return viewBar;

-}

-QToolBar* QTReaderApp::navbar()

-{

-    if (navBar == NULL)

-    {

-        switch (m_tbpol)

-        {

-            case cesMultiple:

-        //      qDebug("Creating new nav bar");

-                navBar = new QToolBar("Navigation", this, m_tbposition);

-                break;

-            default:

-                qDebug("Incorrect toolbar policy set");

-            case cesSingle:

-            case cesMenuTool:

-                navBar = fileBar;

-        //      qDebug("Setting navbar to filebar");

-                break;

-        }

-    }

-    return navBar;

-}

-QToolBar* QTReaderApp::markbar()

-{

-    if (markBar == NULL)

-    {

-        switch (m_tbpol)

-        {

-            case cesMultiple:

-                markBar = new QToolBar("Marks", this, m_tbposition);

-                break;

-            default:

-                qDebug("Incorrect toolbar policy set");

-            case cesSingle:

-            case cesMenuTool:

-                markBar = fileBar;

-                break;

-        }

-    }

-    return markBar;

-}

-

-void QTReaderApp::addfilebar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( filebar() );

-}

-void QTReaderApp::addnavbar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( navbar() );

-}

-void QTReaderApp::addmarkbar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( markbar() );

-}

-void QTReaderApp::addviewbar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( viewbar() );

-}

-

-void QTReaderApp::suspend() { reader->suspend(); }

-

-#ifdef USEMSGS

-void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)

-{

-    QString msg = QString::fromUtf8(_msg);

-

-////    qDebug("Received:%s", (const char*)msg);

-

-    QDataStream stream( _data, IO_ReadOnly );

-    if ( msg == "info(QString)" )

-    {

-        QString info;

-        stream >> info;

-        QMessageBox::information(this, PROGNAME, info);

-    }

-    else if ( msg == "Update(int)" )

-    {

-        int info;

-        stream >> info;

-        if (info)

-        {

-            reader->bDoUpdates = true;

-            reader->refresh();

-        }

-        else

-        {

-            reader->bDoUpdates = false;

-        }

-    }

-    else if ( msg == "warn(QString)" )

-    {

-        QString info;

-        stream >> info;

-        QMessageBox::warning(this, PROGNAME, info);

-    }

-    else if ( msg == "exit()" )

-    {

-        m_dontSave = true;

-        close();

-    }

-    else if ( msg == "pageDown()" )

-    {

-        reader->dopagedn();

-    }

-    else if ( msg == "pageUp()" )

-    {

-        reader->dopageup();

-    }

-    else if ( msg == "lineDown()" )

-    {

-        reader->lineDown();

-    }

-    else if ( msg == "lineUp()" )

-    {

-        reader->lineUp();

-    }

-    else if ( msg == "showText()" )

-    {

-        showEditTools();

-    }

-    else if ( msg == "home()" )

-    {

-        reader->goHome();

-    }

-    else if ( msg == "back()" )

-    {

-        reader->goBack();

-    }

-    else if ( msg == "forward()" )

-    {

-        reader->goForward();

-    }

-    else if ( msg == "File/Open(QString)" )

-    {

-        QString info;

-        stream >> info;

-        openFile( info );

-    }

-    else if ( msg == "File/Info()" )

-    {

-        showinfo();

-    }

-    else if ( msg == "File/Action(QString)" )

-    {

-        QString info;

-        stream >> info;

-        m_spaceTarget = ActNameToInt(info);

-    }

-    else if ( msg == "Navigation/Scroll(int)" )

-    {

-        int info;

-        stream >> info;

-        autoScroll(info);

-    }

-

-    else if ( msg == "Navigation/GotoStart()" )

-    {

-        gotoStart();

-    }

-    else if ( msg == "Navigation/GotoEnd()" )

-    {

-        gotoEnd();

-    }

-    else if ( msg == "Navigation/Jump(int)" )

-    {

-        int info;

-        stream >> info;

-        reader->locate(info);

-    }

-    else if ( msg == "Navigation/Page/LineScroll(int)" )

-    {

-        int info;

-        stream >> info;

-        pagemode(info);

-    }

-    else if ( msg == "Navigation/SetOverlap(int)" )

-    {

-        int info;

-        stream >> info;

-        reader->m_overlap = info;

-    }

-    else if ( msg == "Navigation/SetMargin(int)" )

-    {

-        int info;

-        stream >> info;

-        do_margin(info);

-    }

-    else if ( msg == "File/SetDictionary(QString)" )

-    {

-        QString info;

-        stream >> info;

-        do_settarget(info);

-    }

-#ifdef _SCROLLPIPE

-    else if ( msg == "File/SetScrollTarget(QString)" )

-    {

-        QString info;

-        stream >> info;

-        reader->m_pipetarget = info;

-    }

-#endif

-    else if ( msg == "File/Two/OneTouch(int)" )

-    {

-        int info;

-        stream >> info;

-        setTwoTouch(info);

-    }

-    else if ( msg == "Target/Annotation(int)" )

-    {

-        int info;

-        stream >> info;

-        OnAnnotation(info);

-    }

-    else if ( msg == "Target/Dictionary(int)" )

-    {

-        int info;

-        stream >> info;

-        OnDictionary(info);

-    }

-    else if ( msg == "Target/Clipboard(int)" )

-    {

-        int info;

-        stream >> info;

-        OnClipboard(info);

-    }

-    else if ( msg == "File/Find(QString)" )

-    {

-        QString info;

-        stream >> info;

-        QRegExp arg(info);

-        size_t pos = reader->pagelocate();

-        size_t start = pos;

-        CDrawBuffer test(&(reader->m_fontControl));

-        reader->getline(&test);

-        while (arg.match(toQString(test.data())) == -1)

-        {

-            pos = reader->locate();

-            if (!reader->getline(&test))

-            {

-                QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info);

-                pos = start;

-                break;

-            }

-        }

-        reader->locate(pos);

-    }

-    else if ( msg == "File/Fullscreen(int)" )

-    {

-        int info;

-        stream >> info;

-        setfullscreen(info);

-    }

-    else if ( msg == "File/Continuous(int)" )

-    {

-        int info;

-        stream >> info;

-        setcontinuous(info);

-    }

-    else if ( msg == "Markup(QString)" )

-    {

-        QString info;

-        stream >> info;

-        if (info == "Auto")

-        {

-            autofmt(true);

-        }

-        if (info == "None")

-        {

-            autofmt(false);

-            textfmt(false);

-            striphtml(false);

-            peanut(false);

-        }

-        if (info == "Text")

-        {

-            textfmt(true);

-        }

-        if (info == "HTML")

-        {

-            striphtml(true);

-        }

-        if (info == "Peanut/PML")

-        {

-            peanut(true);

-        }

-    }

-    else if ( msg == "Layout/StripCR(int)" )

-    {

-        int info;

-        stream >> info;

-        stripcr(info);

-    }

-    else if ( msg == "Layout/Dehyphen(int)" )

-    {

-        int info;

-        stream >> info;

-        dehyphen(info);

-    }

-    else if ( msg == "Layout/Depluck(int)" )

-    {

-        int info;

-        stream >> info;

-        depluck(info);

-    }

-    else if ( msg == "Layout/Dejpluck(int)" )

-    {

-        int info;

-        stream >> info;

-        dejpluck(info);

-    }

-    else if ( msg == "Layout/SingleSpace(int)" )

-    {

-        int info;

-        stream >> info;

-        onespace(info);

-    }

-#ifdef REPALM

-    else if ( msg == "Layout/Repalm(int)" )

-    {

-        int info;

-        stream >> info;

-        repalm(info);

-    }

-#endif

-    else if ( msg == "Layout/Unindent(int)" )

-    {

-        int info;

-        stream >> info;

-        unindent(info);

-    }

-    else if ( msg == "Layout/Re-paragraph(int)" )

-    {

-        int info;

-        stream >> info;

-        repara(info);

-    }

-    else if ( msg == "Layout/DoubleSpace(int)" )

-    {

-        int info;

-        stream >> info;

-        dblspce(info);

-    }

-    else if ( msg == "Layout/Indent(int)" )

-    {

-        int info;

-        stream >> info;

-        reader->bindenter = info;

-        reader->setfilter(reader->getfilter());

-    }

-    else if ( msg == "Layout/Remap(int)" )

-    {

-        int info;

-        stream >> info;

-        remap(info);

-    }

-    else if ( msg == "Layout/Embolden(int)" )

-    {

-        int info;

-        stream >> info;

-        embolden(info);

-    }

-    else if ( msg == "Format/Ideogram/Word(int)" )

-    {

-        int info;

-        stream >> info;

-        monospace(info);

-    }

-    else if ( msg == "Format/SetWidth(int)" )

-    {

-        int info;

-        stream >> info;

-        reader->m_charpc = info;

-        reader->setfont();

-        reader->refresh();

-    }

-    else if ( msg == "Format/SetFont(QString,int)" )

-    {

-        QString fontname;

-        int size;

-        stream >> fontname;

-        stream >> size;

-        setfontHelper(fontname, size);

-    }

-    else if ( msg == "Marks/Autogen(QString)" )

-    {

-        QString info;

-        stream >> info;

-        do_autogen(info);

-    }

-    else if ( msg == "File/StartBlock()" )

-    {

-        editMark();

-    }

-    else if ( msg == "File/CopyBlock()" )

-    {

-        editCopy();

-    }

-}

-#endif

-ActionTypes QTReaderApp::ActNameToInt(const QString& _enc)

-{

-    for (int i = 0; i < MAX_ACTIONS; i++)

-    {

-        if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i;

-    }

-    return cesAutoScroll;

-}

-

-void QTReaderApp::setfullscreen(bool sfs)

-{

-    reader->bDoUpdates = false;

-    m_fullscreen = sfs;

-    showEditTools();

-//    qApp->processEvents();

-    reader->bDoUpdates = true;

-    reader->update();

-}

-

-void QTReaderApp::buttonActionSelected(QAction* _a)

-{

-////    qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));

-    m_spaceTarget = ActNameToInt(_a->text());

-}

-

-QTReaderApp::~QTReaderApp()

-{

-}

-

-void QTReaderApp::autoScroll(bool _b)

-{

-    reader->setautoscroll(_b);

-    setScrollState(reader->m_autoScroll);

-}

-

-void QTReaderApp::zoomin()

-{

-    reader->zoomin();

-}

-

-void QTReaderApp::zoomout()

-{

-    reader->zoomout();

-}

-

-void QTReaderApp::clearBkmkList()

-{

-        delete pBkmklist;

-        pBkmklist = NULL;

-        m_fBkmksChanged = false;

-}

-

-void QTReaderApp::fileClose()

-{

-    CCloseDialog* cd = new CCloseDialog(reader->m_string, false, this);

-    if (cd->exec())

-    {

-        if (pOpenlist != NULL)

-        {

-            int ind = 0;

-            Bkmk* p = (*pOpenlist)[ind];

-            while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)

-            {

-                p = (*pOpenlist)[++ind];

-            }

-            if (p != NULL) pOpenlist->erase(ind);

-            if (cd->delFile())

-            {

-                unlink((const char*)reader->m_lastfile);

-            }

-            if (cd->delMarks())

-            {

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR);

-                d.remove(reader->m_string);

-#else /* USEQPE */

-                unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));

-#endif /* USEQPE */

-            }

-            if (cd->delConfig())

-            {

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR "/configs");

-                d.remove(reader->m_string);

-#else /* USEQPE */

-                unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string));

-#endif /* USEQPE */

-            }

-        }

-    

-        fileOpen2();

-    }

-    delete cd;

-}

-

-void QTReaderApp::updatefileinfo()

-{

-    if (reader->m_string.isEmpty()) return;

-    if (reader->m_lastfile.isEmpty()) return;

-    tchar* nm = fromQString(reader->m_string);

-    tchar* fl = fromQString(reader->m_lastfile);

-//    qDebug("Lastfile:%x", fl);

-    bool notadded = true;

-    if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;

-    else

-    {

-        for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)

-        {

-            if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0)

-            {

-                iter->value(reader->pagelocate());

-                unsigned short dlen;

-                unsigned char* data;

-                CFiledata fd(iter->anno());

-                reader->setSaveData(data, dlen, fd.content(), fd.length());

-        //      qDebug("Filedata(1):%u, %u", fd.length(), dlen);

-        //      getstate(data, dlen);

-                iter->setAnno(data, dlen);

-                notadded = false;

-                delete [] data;

-                break;

-            }

-        }

-    }

-//    qDebug("Added?:%x", notadded);

-    if (notadded)

-    {

-        struct stat fnstat;

-        stat((const char *)reader->m_lastfile, &fnstat);

-        CFiledata fd(fnstat.st_mtime, fl);

-        unsigned short dlen;

-        unsigned char* data;

-        reader->setSaveData(data, dlen, fd.content(), fd.length());

-        pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate()));

-        //qDebug("Filedata(2):%u, %u", fd.length(), dlen);

-        delete [] data;

-    }

-    delete [] nm;

-    delete [] fl;

-}

-

-void QTReaderApp::fileOpen()

-{

-/*

-    menu->hide();

-    fileBar->hide();

-    if (regVisible) regBar->hide();

-    if (searchVisible) searchBar->hide();

-*/

-//    qDebug("fileOpen");

-//    if (!reader->m_lastfile.isEmpty())

-    updatefileinfo();

-    fileOpen2();

-}

-

-void QTReaderApp::fileOpen2()

-{

-    if (pBkmklist != NULL)

-    {

-        if (m_fBkmksChanged)

-        {

-            if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)

-                savebkmks();

-        }     

-        delete pBkmklist;

-        pBkmklist = NULL;

-        m_fBkmksChanged = false;

-    }

-    reader->disableAutoscroll();

-/*

-    editorStack->raiseWidget( fileSelector );

-    fileSelector->reread();

-*/

-    bool usebrowser = true;

-    if (pOpenlist != NULL)

-    {

-        m_nBkmkAction = cOpenFile;

-        if (listbkmk(pOpenlist, "Browse")) usebrowser = false;

-    }

-    if (usebrowser)

-    {

-        QString fn = usefilebrowser();

-        //qApp->processEvents();

-        if (!fn.isEmpty() && QFileInfo(fn).isFile())

-        {

-            openFile(fn);

-        }

-        reader->setFocus();

-    }

-//    reader->refresh();

-//    qDebug("HEIGHT:%d", reader->m_lastheight);

-}

-

-QString QTReaderApp::usefilebrowser()

-{

-#ifndef USEQPE

-    QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) );

-    return s;

-#else

-    fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog,

-                                      0,

-        //                            WStyle_Customize | WStyle_NoBorderEx,

-                                      "*", QFileInfo(reader->m_lastfile).dirPath(true));

-

-

-    QString fn;

-    if (fb->exec())

-    {

-        fn = fb->getCurrentFile();

-    }

-//    qDebug("Selected %s", (const char*)fn);

-    delete fb;

-    showEditTools();

-    return fn;

-#endif

-}

-

-void QTReaderApp::showgraphic(QImage& pm)

-{

-    QPixmap pc;

-    pc.convertFromImage(pm);

-    m_graphicwin->setPixmap(pc);

-    editorStack->raiseWidget( m_graphicwin );

-    m_graphicwin->setFocus();

-}

-

-

-void QTReaderApp::showprefs()

-{

-    CPrefs* prefwin = new CPrefs(!m_bFloatingDialog, this);

-

-    prefwin->twotouch(m_twoTouch); 

-    prefwin->propfontchange(m_propogatefontchange);

-    prefwin->StripCR(reader->bstripcr);

-    prefwin->Dehyphen(reader->bdehyphen);

-    prefwin->SingleSpace(reader->bonespace);

-    prefwin->Unindent(reader->bunindent);

-    prefwin->Reparagraph(reader->brepara);

-    prefwin->DoubleSpace(reader->bdblspce);

-    prefwin->Remap(reader->bremap);

-    prefwin->Embolden(reader->bmakebold);

-    prefwin->FullJustify(reader->bfulljust);

-    prefwin->ParaLead(reader->getextraspace());

-    prefwin->LineLead(reader->getlead());

-    prefwin->Margin(reader->m_border);

-    prefwin->Indent(reader->bindenter);

-    if (reader->bautofmt)

-    {

-        prefwin->Markup(0);

-    }

-    else if (reader->btextfmt)

-    {

-        prefwin->Markup(2);

-    }

-    else if (reader->bstriphtml)

-    {

-        prefwin->Markup(3);

-    }

-    else if (reader->bpeanut)

-    {

-        prefwin->Markup(4);

-    }

-    else

-    {

-        prefwin->Markup(1);

-    }

-    prefwin->Depluck(reader->bdepluck);

-    prefwin->Dejpluck(reader->bdejpluck);

-    prefwin->Continuous(reader->m_continuousDocument);

-

-    prefwin->dictApplication(m_targetapp);

-    prefwin->dictMessage(m_targetmsg);

-

-    prefwin->spaceAction(m_spaceTarget);

-    prefwin->escapeAction(m_escapeTarget);

-    prefwin->returnAction(m_returnTarget);

-    prefwin->leftAction(m_leftTarget);

-    prefwin->rightAction(m_rightTarget);

-    prefwin->upAction(m_upTarget);

-    prefwin->downAction(m_downTarget);

-

-    prefwin->leftScroll(m_leftScroll);

-    prefwin->rightScroll(m_rightScroll);

-    prefwin->upScroll(m_upScroll);

-    prefwin->downScroll(m_downScroll);

-

-    prefwin->miscannotation(m_doAnnotation);

-    prefwin->miscdictionary(m_doDictionary);

-    prefwin->miscclipboard(m_doClipboard);

-

-    prefwin->SwapMouse(reader->m_swapmouse);

-

-    prefwin->Font(reader->m_fontname);

-

-    prefwin->gfxsize(reader->getBaseSize());

-

-    prefwin->pageoverlap(reader->m_overlap);

-

-    prefwin->ideogram(reader->m_bMonoSpaced);

-

-    prefwin->encoding(reader->m_encd);

-

-    prefwin->ideogramwidth(reader->m_charpc);

-

-    if (prefwin->exec())

-    {

-        m_twoTouch = prefwin->twotouch();

-        reader->setTwoTouch(m_twoTouch);

-        m_touch_action->setOn(m_twoTouch);

-

-        reader->bstripcr = prefwin->StripCR();

-        reader->bdehyphen = prefwin->Dehyphen();

-        reader->bonespace = prefwin->SingleSpace();

-        reader->bunindent = prefwin->Unindent();

-        reader->brepara = prefwin->Reparagraph();

-        reader->bdblspce = prefwin->DoubleSpace();

-        reader->bremap = prefwin->Remap();

-        reader->bmakebold = prefwin->Embolden();

-        reader->bfulljust = prefwin->FullJustify();

-        reader->setextraspace(prefwin->ParaLead());

-        reader->setlead(prefwin->LineLead());

-        reader->m_border = prefwin->Margin();

-        reader->bindenter = prefwin->Indent();

-        reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false;

-        switch (prefwin->Markup())

-        {

-            case 0:

-                reader->bautofmt = true;

-                break;

-            case 1:

-                break;

-            case 2:

-                reader->btextfmt = true;

-                break;

-            case 3:

-                reader->bstriphtml = true;

-                break;

-            case 4:

-                reader->bpeanut = true;

-                break;

-            default:

-                qDebug("Format out of range");

-        }

-        reader->bdepluck = prefwin->Depluck();

-        reader->bdejpluck = prefwin->Dejpluck();

-        reader->setContinuous(prefwin->Continuous());

-

-        m_spaceTarget = (ActionTypes)prefwin->spaceAction();

-        m_escapeTarget = (ActionTypes)prefwin->escapeAction();

-        m_returnTarget = (ActionTypes)prefwin->returnAction();

-        m_leftTarget = (ActionTypes)prefwin->leftAction();

-        m_rightTarget = (ActionTypes)prefwin->rightAction();

-        m_upTarget = (ActionTypes)prefwin->upAction();

-        m_downTarget = (ActionTypes)prefwin->downAction();

-        m_leftScroll = prefwin->leftScroll();

-        m_rightScroll = prefwin->rightScroll();

-        m_upScroll = prefwin->upScroll();

-        m_downScroll = prefwin->downScroll();

-

-        m_targetapp = prefwin->dictApplication();

-        m_targetmsg = prefwin->dictMessage();

-

-        m_doAnnotation = prefwin->miscannotation();

-        m_doDictionary = prefwin->miscdictionary();

-        m_doClipboard = prefwin->miscclipboard();

-        reader->m_swapmouse = prefwin->SwapMouse();

-        reader->setBaseSize(prefwin->gfxsize());

-        reader->m_overlap = prefwin->pageoverlap();

-        reader->m_bMonoSpaced = prefwin->ideogram();

-        m_setmono_action->setOn(reader->m_bMonoSpaced);

-        reader->m_encd = prefwin->encoding();

-        reader->m_charpc = prefwin->ideogramwidth();

-

-        if (

-            reader->m_fontname != prefwin->Font()

-            ||

-            m_propogatefontchange != prefwin->propfontchange())

-        {

-            m_propogatefontchange = prefwin->propfontchange();

-            setfontHelper(prefwin->Font());

-        }

-        delete prefwin;

-        reader->setfilter(reader->getfilter());

-        reader->refresh();

-

-    }

-    else

-    {

-        delete prefwin;

-    }

-}

-

-void QTReaderApp::showtoolbarprefs()

-{

-#ifdef USEQPE

-    CBarPrefs* prefwin = new CBarPrefs(APPDIR, !m_bFloatingDialog, this);

-#else

-        QFileInfo fi;

-    QDir d = QDir::home();                      // "/"

-        if ( !d.cd(APPDIR) )

-        {                       // "/tmp"

-                qWarning( "Cannot find the \"~/%s\" directory", APPDIR );

-                d = QDir::home();

-                d.mkdir(APPDIR);

-                d.cd(APPDIR);

-        }

-        fi.setFile(d, INIFILE);

-    CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);

-#endif

-    prefwin->tbpolicy(m_tbpolsave);

-    prefwin->tbposition(m_tbposition-2);

-    prefwin->tbmovable(m_tbmovesave);

-    prefwin->floating(m_bFloatingDialog);

-    if (prefwin->exec())

-    {

-        m_bFloatingDialog = prefwin->floating();

-        if (

-            m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy()

-            ||

-            m_tbposition != (ToolBarDock)(prefwin->tbposition()+2)

-            ||

-            m_tbmovesave != prefwin->tbmovable()

-            )

-        {

-            QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started");

-        }

-        m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy();

-        m_tbposition = (ToolBarDock)(prefwin->tbposition()+2);

-        m_tbmovesave = prefwin->tbmovable();

-        bool isChanged = prefwin->isChanged();

-        delete prefwin;

-#ifdef USEQPE

-        Config config( APPDIR );

-#else

-        QFileInfo fi;

-    QDir d = QDir::home();                      // "/"

-        if ( !d.cd(APPDIR) )

-        {                       // "/tmp"

-                qWarning( "Cannot find the \"~/%s\" directory", APPDIR );

-                d = QDir::home();

-                d.mkdir(APPDIR);

-                d.cd(APPDIR);

-        }

-        fi.setFile(d, INIFILE);

-        Config config( fi.absFilePath() );

-#endif

-        if (isChanged) addtoolbars(&config);

-    }

-    else

-    {

-        delete prefwin;

-    }

-}

-

-void QTReaderApp::showinfo()

-{

-    unsigned long fs, ts, pl;

-    if (reader->empty())

-    {

-        QMessageBox::information(this, PROGNAME, "No file loaded", 1);

-    }

-    else

-    {

-        reader->sizes(fs,ts);

-        pl = reader->pagelocate();

-        m_infoWin->setFileSize(fs);

-        m_infoWin->setTextSize(ts);

-        m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);

-        m_infoWin->setLocation(pl);

-        m_infoWin->setRead((100*pl + (ts >> 1))/ts);

-        editorStack->raiseWidget( m_infoWin );

-        m_infoWin->setFocus();

-    }

-}

-

-void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn)

-{

-    if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;

-#ifdef _UNICODE

-    CBuffer buff(name.length()+1);

-    int i;

-    for (i = 0; i < name.length(); i++)

-    {

-        buff[i] = name[i].unicode();

-    }

-    buff[i] = 0;

-    CBuffer buff2(text.length()+1);

-    for (i = 0; i < text.length(); i++)

-    {

-        buff2[i] = text[i].unicode();

-    }

-    buff2[i] = 0;

-    pBkmklist->push_front(Bkmk(buff.data(), buff2.data(), posn));

-#else

-    pBkmklist->push_front(Bkmk((const tchar*)text,posn));

-#endif

-    m_fBkmksChanged = true;

-    pBkmklist->sort();

-}

-

-void QTReaderApp::addAnno(const QString& name, const QString& text)

-{

-    if (m_annoIsEditing)

-    {

-        if (name.isEmpty())

-        {

-            QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1);

-        }

-        else

-        {

-            addAnno(name, text, m_annoWin->getPosn());

-        }

-        showEditTools();

-    }

-    else

-    {

-        if (m_annoWin->edited())

-        {

-            CBuffer buff(text.length()+1);

-            int i;

-            for (i = 0; i < text.length(); i++)

-            {

-                buff[i] = text[i].unicode();

-            }

-            buff[i] = 0;

-            m_fBkmksChanged = true;

-            m_anno->setAnno(buff.data());

-        }

-        bool found = findNextBookmark(m_anno->value()+1);

-        if (found)

-        {

-            m_annoWin->setName(toQString(m_anno->name()));

-            m_annoWin->setAnno(toQString(m_anno->anno()));

-        }

-        else

-        {

-            showEditTools();

-        }

-    }

-}

-

-bool QTReaderApp::findNextBookmark(size_t start)

-{

-    bool found = false;

-    for (CList<Bkmk>::iterator iter = pBkmklist->begin(); iter != pBkmklist->end(); iter++)

-    {

-        if (iter->value() >= start)

-        {

-            if (iter->value() < reader->locate())

-            {

-                found = true;

-                m_anno = iter.pContent();

-            }

-            break;

-        }

-    }

-    return found;

-}

-

-void QTReaderApp::addanno()

-{

-    if (reader->empty())

-    {

-        QMessageBox::information(this, PROGNAME, "No file loaded", 1);

-    }

-    else

-    {

-        m_annoWin->setName("");

-        m_annoWin->setAnno("");

-        m_annoWin->setPosn(reader->pagelocate());

-        m_annoIsEditing = true;

-        editorStack->raiseWidget( m_annoWin );

-#ifdef USEQPE

-        Global::showInputMethod();

-#endif

-        m_annoWin->setFocus();

-    }

-}

-

-void QTReaderApp::infoClose()

-{

-    showEditTools();

-}

-

-/*

-void QTReaderApp::fileRevert()

-{

-    clear();

-    fileOpen();

-}

-

-void QTReaderApp::editCut()

-{

-#ifndef QT_NO_CLIPBOARD

-    editor->cut();

-#endif

-}

-*/

-void QTReaderApp::editMark()

-{

-    m_savedpos = reader->pagelocate();

-}

-

-void QTReaderApp::editCopy()

-{

-        QClipboard* cb = QApplication::clipboard();

-        QString text;

-        int ch;

-        unsigned long currentpos = reader->pagelocate();

-        unsigned long endpos = reader->locate();

-        if (m_savedpos == 0xffffffff)

-        {

-            m_savedpos = currentpos;

-        }

-        reader->jumpto(m_savedpos);

-        while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)

-        {

-            text += ch;

-        }

-        cb->setText(text);

-        reader->locate(currentpos);

-        m_savedpos = 0xffffffff;

-}

-

-void QTReaderApp::gotoStart()

-{

-    reader->locate(reader->buffdoc.startSection());

-}

-

-void QTReaderApp::gotoEnd()

-{

-    reader->dopageup(reader->buffdoc.endSection());

-}

-

-void QTReaderApp::pageup()

-{

-    reader->NavUp();

-}

-

-void QTReaderApp::pagedn()

-{

-    reader->NavDown();

-}

-

-void QTReaderApp::pagemode(bool _b)

-{

-    reader->setpagemode(_b);

-}

-

-/*

-void QTReaderApp::setspacing()

-{

-    m_nRegAction = cMonoSpace;

-    char lcn[20];

-    sprintf(lcn, "%lu", reader->m_charpc);

-    regEdit->setText(lcn);

-    do_regedit();

-}

-*/

-void QTReaderApp::settarget()

-{

-    m_nRegAction = cSetTarget;

-    QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp)

-        + "/"

-        + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg);

-    regEdit->setText(text);

-    do_regedit();

-}

-

-/*

-void QTReaderApp::do_mono(const QString& lcn)

-{

-    bool ok;

-    unsigned long ulcn = lcn.toULong(&ok);

-    if (ok)

-    {

-        reader->m_charpc = ulcn;

-        reader->setfont();

-        reader->refresh();

-        //reader->setmono(true);

-    }

-    else

-        QMessageBox::information(this, PROGNAME, "Must be a number");

-}

-*/

-/*

-void QTReaderApp::editPaste()

-{

-#ifndef QT_NO_CLIPBOARD

-    editor->paste();

-#endif

-}

-*/

-

-void QTReaderApp::editFind()

-{

-  searchStart = reader->pagelocate();

-#ifdef __ISEARCH

-  searchStack = new QStack<searchrecord>;

-#endif

-#ifdef USEQPE

-  Global::showInputMethod();

-#endif

-  searchBar->show();

-  searchVisible = TRUE;

-  searchEdit->setFocus();

-#ifdef __ISEARCH

-  searchStack->push(new searchrecord("",reader->pagelocate()));

-#endif

-}

-

-void QTReaderApp::findNext()

-{

-//  //  qDebug("findNext called\n");

-#ifdef __ISEARCH

-  QString arg = searchEdit->text();

-#else

-  QRegExp arg = searchEdit->text();

-#endif

-  CDrawBuffer test(&(reader->m_fontControl));

-  size_t start = reader->pagelocate();

-  reader->jumpto(start);

-  reader->getline(&test);

-  dosearch(start, test, arg);

-}

-

-void QTReaderApp::findClose()

-{

-  searchVisible = FALSE;

-  searchEdit->setText("");

-#ifdef USEQPE

-  Global::hideInputMethod();

-#endif

-  searchBar->hide();

-#ifdef __ISEARCH

-//  searchStack = new QStack<searchrecord>;

-  while (!searchStack->isEmpty())

-    {

-      delete searchStack->pop();

-    }

-  delete searchStack;

-#endif

-  reader->setFocus();

-}

-

-void QTReaderApp::regClose()

-{

-  regVisible = FALSE;

-  regEdit->setText("");

-  regBar->hide();

-#ifdef USEQPE

-  Global::hideInputMethod();

-#endif

-  reader->setFocus();

-}

-

-#ifdef __ISEARCH

-bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QString& arg)

-#else

-bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)

-#endif

-{

-  bool ret = true;

-    unsigned long fs, ts;

-    reader->sizes(fs,ts);

-  size_t pos = reader->locate();

-  pbar->setGeometry(searchBar->x(),searchBar->y(),searchBar->width(), searchBar->height());

-  pbar->show();

-  pbar->raise();

-  pbar->reset();

-  int offset;

-  int lastpc = (100*pos)/ts;

-  pbar->setProgress(lastpc);

-//  qApp->processEvents();

-  if (reader->buffdoc.getpara(test) >= 0)

-  {

-      reader->setFocus();

-#ifdef __ISEARCH

-      while (strstr(test.data(),(const tchar*)arg) == NULL)

-#else

-#ifdef _UNICODE

-      while ((offset = arg.match(toQString(test.data()))) == -1)

-#else

-      while (arg.match(test.data()) == -1)

-#endif

-#endif

-      {

-          pos = reader->locate();

-          int pc = (100*pos)/ts;

-          if (pc != lastpc)

-          {

-              pbar->setProgress(pc);

-              qApp->processEvents();

-              reader->setFocus();

-              lastpc = pc;

-          }

-          

-          if (reader->buffdoc.getpara(test) < 0)

-          {

-              if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)

-                  pos = searchStart;

-              else

-                  pos = start;

-              findClose();

-              pbar->hide();

-              reader->locate(pos);

-              return false;

-          }

-      }

-//      qDebug("Found it at %u:%u", pos, offset);

-      pbar->hide();

-//      qDebug("Hid");

-      reader->locate(pos+offset);

-//      qDebug("Loacted");

-//      qDebug("page up");

-      ret = true;

-  }

-  else

-  {

-              if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)

-                  pos = searchStart;

-              else

-                  pos = start;

-              ret = false;

-              findClose();

-  }

-  return ret;

-}

-

-#ifdef __ISEARCH

-void QTReaderApp::search(const QString & arg)

-{

-  searchrecord* ss = searchStack->top();

-  CBuffer test;

-  size_t start = reader->pagelocate();

-  bool haspopped = false;

-  while (arg.left(ss->s.length()) != ss->s)

-  {

-      haspopped = true;

-      start = ss->pos;

-//      reader->locate(start);

-      searchStack->pop();

-      delete ss;

-  }

-  if (haspopped) reader->locate(start);

-/*

-  if (arg.length() < ss->len)

-    {

-      start = ss->pos;

-      reader->locate(start);

-      searchStack->pop();

-      delete ss;

-    }

-*/

-  else

-    {

-      start = reader->pagelocate();

-      reader->jumpto(start);

-      searchStack->push(new searchrecord(arg,start));

-    }

-    dosearch(start, test, arg);

-}

-#else

-void QTReaderApp::search()

-{

-    findNext();

-}

-#endif

-

-void QTReaderApp::openFile( const QString &f )

-{

-//    qDebug("File:%s", (const char*)f);

-//    openFile(DocLnk(f));

-//}

-//

-//void QTReaderApp::openFile( const DocLnk &f )

-//{

-  clear();

-  QFileInfo fm(f);

-  if ( fm.exists() )

-    {

-//      QMessageBox::information(0, "Progress", "Calling fileNew()");

-#ifdef USEQPE

-        if (fm.extension( FALSE ) == "desktop")

-        {

-            DocLnk d(f);

-            QFileInfo fnew(d.file());

-            fm = fnew;

-            if (!fm.exists()) return;

-        }

-#endif

-      clear();

-

-      reader->setText(fm.baseName(), fm.absFilePath());

-      m_loadedconfig = readconfig(reader->m_string, false);

-      showEditTools();

-      readbkmks();

-      m_savedpos = 0xffffffff;

-    }

-  else

-    {

-      QMessageBox::information(this, PROGNAME, "File does not exist");

-      reader->m_lastfile = QString::null;

-    }

-        

-}

-/*

-void QTReaderApp::resizeEvent(QResizeEvent* e)

-{

-    if (m_fullscreen)

-    {

-        showNormal();

-        showFullScreen();

-    }

-}

-*/

-void QTReaderApp::handlekey(QKeyEvent* e)

-{

-//    qDebug("Keypress event");

-    timeb now;

-    ftime(&now);

-    unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;

-    if (etime < m_debounce)

-    {

-        return;

-    }

-    m_lastkeytime = now;

-    switch(e->key())

-    {

-        case Key_Escape:

-        //    qDebug("escape event");

-            if (m_disableesckey)

-            {

-                m_disableesckey = false;

-            }

-            else

-            {

-                m_bcloseDisabled = true;

-                if (m_fullscreen)

-                {

-                    m_actFullscreen->setOn(false);

-                    e->accept();

-                }

-                else

-                {

-        //      qDebug("escape action");

-                    doAction(m_escapeTarget, e);

-                }

-            }

-            break;

-        case Key_Space:

-        {

-            doAction(m_spaceTarget, e);

-        }

-        break;

-        case Key_Return:

-        {

-            doAction(m_returnTarget, e);

-        }

-        break;

-        case Key_Left:

-        {

-            if (reader->m_autoScroll && m_leftScroll)

-            {

-                reader->reduceScroll();

-            }

-            else

-            {

-                doAction(m_leftTarget, e);

-            }

-        }

-        break;

-        case Key_Right:

-        {

-            if (reader->m_autoScroll && m_rightScroll)

-            {

-                reader->increaseScroll();

-            }

-            else

-            {

-                doAction(m_rightTarget, e);

-            }

-        }

-        break;

-        case Key_Up:

-        {

-            if (reader->m_autoScroll && m_upScroll)

-            {

-                reader->increaseScroll();

-            }

-            else

-            {

-                doAction(m_upTarget, e);

-            }

-        }

-        break;

-        case Key_Down:

-        {

-            if (reader->m_autoScroll && m_downScroll)

-            {

-                reader->reduceScroll();

-            }

-            else

-            {

-                doAction(m_downTarget, e);

-            }

-        }

-        break;

-        default:

-        {

-            e->ignore();

-        }

-        

-/*

-        QString msg("Key press was:");

-        QString key;

-        msg += key.setNum(e->key());

-        QMessageBox::information(this, PROGNAME, msg);

-*/

-    }

-}

-

-void QTReaderApp::showEditTools()

-{

-//    if ( !doc )

-        //close();

-    if (m_fullscreen)

-    {

-        if (menubar != NULL) menubar->hide();

-        if (fileBar != NULL) fileBar->hide();

-        if (viewBar != NULL) viewBar->hide();

-        if (navBar != NULL) navBar->hide();

-        if (markBar != NULL) markBar->hide();

-        searchBar->hide();

-        regBar->hide();

-#ifdef USEQPE

-        Global::hideInputMethod();

-#endif

-        m_fontBar->hide();

-        //showNormal();

-        showFullScreen();

-    }

-    else

-    {

-        //qDebug("him");

-#ifdef USEQPE

-        Global::hideInputMethod();

-#endif

-        //qDebug("eb");

-        menubar->show();

-        if (fileBar != NULL) fileBar->show();

-        if (viewBar != NULL) viewBar->show();

-        if (navBar != NULL) navBar->show();

-        if (markBar != NULL) markBar->show();

-        mb->show();

-        if ( searchVisible )

-        {

-#ifdef USEQPE

-            Global::showInputMethod();

-#endif

-                searchBar->show();

-        }

-        if ( regVisible )

-        {

-#ifdef USEQPE

-            Global::showInputMethod();

-#endif

-                regBar->show();

-        }

-        if (m_fontVisible) m_fontBar->show();

-        //qDebug("sn");

-        showNormal();

-        //qDebug("sm");

-#ifdef USEQPE

-        showMaximized();

-#endif

-        //setCentralWidget(reader);

-    }

-

-//    qDebug("uc");

-    updateCaption();

-//    qDebug("rw");

-    editorStack->raiseWidget( reader );

-//    qDebug("sf");

-    reader->setFocus();

-    reader->refresh();

-}

-/*

-void QTReaderApp::save()

-{

-    if ( !doc )

-        return;

-    if ( !editor->edited() )

-        return;

-

-    QString rt = editor->text();

-    QString pt = rt;

-

-    if ( doc->name().isEmpty() ) {

-        unsigned ispace = pt.find( ' ' );

-        unsigned ienter = pt.find( '\n' );

-        int i = (ispace < ienter) ? ispace : ienter;

-        QString docname;

-        if ( i == -1 ) {

-            if ( pt.isEmpty() )

-                docname = "Empty Text";

-            else

-                docname = pt;

-        } else {

-            docname = pt.left( i );

-        }

-        doc->setName(docname);

-    }

-    FileManager fm;

-    fm.saveFile( *doc, rt );

-}

-*/

-

-void QTReaderApp::clear()

-{

-//    if (doc != 0)

-//      {

-//  QMessageBox::information(this, PROGNAME, "Deleting doc", 1);

-        //delete doc;

-//  QMessageBox::information(this, PROGNAME, "Deleted doc", 1);

-        //doc = 0;

-    //     }

-    reader->clear();

-}

-

-void QTReaderApp::updateCaption()

-{

-//    if ( !doc )

-        //setCaption( tr("QTReader") );

-//    else {

-        //QString s = doc->name();

-        //if ( s.isEmpty() )

-        //    s = tr( "Unnamed" );

-        setCaption( reader->m_string + " - " + tr("Reader") );

-//    }

-}

-

-void QTReaderApp::setDocument(const QString& fileref)

-{

-    bFromDocView = TRUE;

-//QMessageBox::information(0, "setDocument", fileref);

-    openFile(fileref);

-//    showEditTools();

-}

-

-void QTReaderApp::closeEvent( QCloseEvent *e )

-{

-//    qDebug("Close event");

-    if (m_fullscreen)

-    {

-        m_fullscreen = false;

-        showEditTools();

-        e->accept();

-    }

-    else if (m_dontSave)

-    {

-        e->accept();

-    }

-    else

-    {

-        if (editorStack->visibleWidget() == reader)

-        {

-            if ((m_escapeTarget != cesNone) && m_bcloseDisabled)

-            {

-        //qDebug("Close disabled");

-                m_bcloseDisabled = false;

-                e->ignore();

-            }

-            else

-            {

-                if (m_fontVisible)

-                {

-                    m_fontBar->hide();

-                    m_fontVisible = false;

-                }

-                if (regVisible)

-                {

-                    regBar->hide();

-#ifdef USEQPE

-                    Global::hideInputMethod();

-#endif

-                    regVisible = false;

-                    return;

-                }

-                if (searchVisible)

-                {

-                    searchBar->hide();

-#ifdef USEQPE

-                    Global::hideInputMethod();

-#endif

-                    searchVisible = false;

-                    return;

-                }

-                if (m_fBkmksChanged && pBkmklist != NULL)

-                {

-                    if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)

-                        savebkmks();

-                    delete pBkmklist;

-                    pBkmklist = NULL;

-                    m_fBkmksChanged = false;

-                }

-                bFromDocView = FALSE;

-                updatefileinfo();

-                saveprefs();

-                e->accept();

-            }

-        }

-        else

-        {

-            showEditTools();

-            m_disableesckey = true;

-        }

-    }

-}

-

-void QTReaderApp::do_gotomark()

-{

-    m_nBkmkAction = cGotoBkmk;

-    if (!listbkmk(pBkmklist))

-        QMessageBox::information(this, PROGNAME, "No bookmarks in memory");

-}

-

-void QTReaderApp::do_delmark()

-{

-    m_nBkmkAction = cDelBkmk;

-    if (!listbkmk(pBkmklist))

-        QMessageBox::information(this, PROGNAME, "No bookmarks in memory");

-}

-

-bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)

-{

-    bkmkselector->clear();

-    if (_lab.isEmpty())

-        bkmkselector->setText("Cancel");

-    else

-        bkmkselector->setText(_lab);

-    int cnt = 0;

-    if (plist != NULL)

-      {

-        for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)

-          {

-#ifdef _UNICODE

-        //      qDebug("Item:%s", (const char*)toQString(i->name()));

-            bkmkselector->insertItem(toQString(i->name()));

-#else

-            bkmkselector->insertItem(i->name());

-#endif

-            cnt++;

-          }

-      }

-    if (cnt > 0)

-      {

-          hidetoolbars();

-        editorStack->raiseWidget( bkmkselector );

-        return true;

-      }

-    else

-        return false;

-}

-

-void QTReaderApp::do_autogen()

-{

-  m_nRegAction = cAutoGen;

-  regEdit->setText(m_autogenstr);

-  do_regedit();

-}

-

-void QTReaderApp::do_regedit()

-{

-//    fileBar->hide();

-    reader->bDoUpdates = false;

-//    qDebug("Showing regbar");

-  regBar->show();

-//    qDebug("Showing kbd");

-#ifdef USEQPE

-  Global::showInputMethod();

-#endif

-  regVisible = true;

-  regEdit->setFocus();

-//  qApp->processEvents();

-    reader->bDoUpdates = true;

-    reader->update();

-}

-

-bool QTReaderApp::openfrombkmk(Bkmk* bk)

-{

-    QString fn = toQString(

-        CFiledata(bk->anno()).name()

-        );

-        //qDebug("fileinfo");

-    if (!fn.isEmpty() && QFileInfo(fn).isFile())

-    {

-        //qDebug("Opening");

-        openFile(fn);

-        struct stat fnstat;

-        stat((const char *)reader->m_lastfile, &fnstat);

-        

-        if (CFiledata(bk->anno()).date()

-            != fnstat.st_mtime)

-        {

-            CFiledata fd(bk->anno());

-            fd.setdate(fnstat.st_mtime);

-            bk->value(0);

-        }

-        else

-        {

-            unsigned short svlen = bk->filedatalen();

-            unsigned char* svdata = bk->filedata();

-            reader->putSaveData(svdata, svlen);

-        //    setstate(svdata, svlen);

-            if (svlen != 0)

-            {

-                QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");

-            }

-        //    qDebug("updating");

-        //    showEditTools();

-            reader->locate(bk->value());

-        }

-        return true;

-    }

-    else

-    {

-        return false;

-    }

-}

-

-void QTReaderApp::gotobkmk(int ind)

-{

-    showEditTools();

-    switch (m_nBkmkAction)

-    {

-        case cOpenFile:

-        {

-        //    qApp->processEvents();

-            if (!openfrombkmk((*pOpenlist)[ind]))

-            {

-                pOpenlist->erase(ind);

-                QMessageBox::information(this, PROGNAME, "Can't find file");

-            }

-        }

-        break;

-        case cGotoBkmk:

-            reader->locate((*pBkmklist)[ind]->value());

-            break;

-        case cDelBkmk:

-        ////    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());

-            pBkmklist->erase(ind);

-            m_fBkmksChanged = true;

-        //    pBkmklist->sort();

-            break;

-        case cRmBkmkFile:

-                {

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR);

-                d.remove(bkmkselector->text(ind));

-#else /* USEQPE */

-                unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind)));

-#endif /* USEQPE */

-                }

-            break;

-        case cLdConfig:

-            readconfig(bkmkselector->text(ind), false);

-            break;

-        case cRmConfig:

-                {

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR "/configs");

-                d.remove(bkmkselector->text(ind));

-#else /* USEQPE */

-                unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind)));

-#endif /* USEQPE */

-                }

-            break;

-        case cExportLinks:

-        {

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-            d.cd(APPDIR "/urls");

-            QFileInfo fi(d, bkmkselector->text(ind));

-            if (fi.exists())

-            {

-                QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) );

-                if (!outfile.isEmpty())

-                {

-                    FILE* fout = fopen((const char *)outfile, "w");

-                    if (fout != NULL)

-                    {

-                        FILE* fin = fopen((const char *)fi.absFilePath(), "r");

-                        if (fin != NULL)

-                        {

-                            fprintf(fout, "<html><body>\n");

-                            int ch = 0;

-                            while ((ch = fgetc(fin)) != EOF)

-                            {

-                                fputc(ch, fout);

-                            }

-                            fclose(fin);

-                            fprintf(fout, "</html></body>\n");

-                            d.remove(bkmkselector->text(ind));

-                        }

-                        fclose(fout);

-                    }

-                    else

-                        QMessageBox::information(this, PROGNAME, "Couldn't open output");

-                }

-            }

-#else /* USEQPE */

-            FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");

-            if (fin != NULL)

-            {

-                bool allok = false;

-                fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null);

-                if (fb->exec())

-                {

-                    QString outfile = fb->getCurrentFile();

-                    FILE* fout = fopen((const char *)outfile, "w");

-                    if (fout != NULL)

-                    {

-                        fprintf(fout, "<html><body>\n");

-                        int ch = 0;

-                        while ((ch = fgetc(fin)) != EOF)

-                        {

-                            fputc(ch, fout);

-                        }

-                        fprintf(fout, "</html></body>\n");

-                        fclose(fout);

-                        allok = true;

-                    }

-                    else

-                        QMessageBox::information(this, PROGNAME, "Couldn't open output");

-                }

-                delete fb;

-                fclose(fin);

-                if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));

-            }

-            else

-            {

-                QMessageBox::information(this, PROGNAME, "Couldn't open input");

-            }

-

-/*

-            CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );

-            int ret = f->exec();

-            qDebug("Return:%d", ret);

-            DocLnk* doc = f->getDoc();

-            if (doc != NULL)

-            {

-                FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");

-                QString rt;

-                rt = "<html><body>\n";

-                int ch = 0;

-                while ((ch = fgetc(fin)) != EOF)

-                {

-                    rt += (char)ch;

-                }

-                fclose(fin);

-                rt += "</html></body>\n";

-                if ( doc->name().isEmpty() )

-                {

-                    doc->setName(bkmkselector->text(ind));

-                }

-                FileManager fm;

-                fm.saveFile( *doc, rt );

-                qDebug("YES");

-            }

-            else

-            {

-                qDebug("NO");

-            }

-            delete f;

-*/

-

-#endif /* USEQPE */

-        }

-        break;

-    }

-}

-

-void QTReaderApp::cancelbkmk()

-{

-    if (m_nBkmkAction == cOpenFile)

-    {

-        QString fn = usefilebrowser();

-        if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);

-    }

-  showEditTools();

-}

-

-void QTReaderApp::jump()

-{

-  m_nRegAction = cJump;

-  char lcn[20];

-  sprintf(lcn, "%lu", reader->pagelocate());

-  regEdit->setText(lcn);

-  do_regedit();

-}

-

-void QTReaderApp::do_jump(const QString& lcn)

-{

-    bool ok;

-    unsigned long ulcn = lcn.toULong(&ok);

-    if (ok)

-        reader->locate(ulcn);

-    else

-        QMessageBox::information(this, PROGNAME, "Must be a number");

-}

-

-void QTReaderApp::do_regaction()

-{

-    reader->bDoUpdates = false;

-  regBar->hide();

-#ifdef USEQPE

-  Global::hideInputMethod();

-#endif

-  regVisible = false;

-  switch(m_nRegAction)

-  {

-      case cAutoGen:

-          do_autogen(regEdit->text());

-          break;

-      case cAddBkmk:

-          do_addbkmk(regEdit->text());

-          break;

-      case cJump:

-          do_jump(regEdit->text());

-          break;

-/*

-      case cMonoSpace:

-          do_mono(regEdit->text());

-          break;

-*/

-      case cSetTarget:

-          do_settarget(regEdit->text());

-          break;

-#ifdef _SCROLLPIPE

-      case cSetPipeTarget:

-          do_setpipetarget(regEdit->text());

-          break;

-#endif

-      case cSetConfigName:

-        //  qDebug("Saving config");

-          do_saveconfig(regEdit->text(), false);

-          break;

-  }

-//  reader->restore();

-//    fileBar->show();

-  reader->setFocus();

-//    qApp->processEvents();

-    reader->bDoUpdates = true;

-    reader->update();

-}

-

-void QTReaderApp::do_settarget(const QString& _txt)

-{

-    int ind = _txt.find('/');

-    if (ind == -1)

-    {

-        m_targetapp = "";

-        m_targetmsg = "";

-        QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename");

-    }

-    else

-    {

-        m_targetapp = _txt.left(ind);

-        m_targetmsg = _txt.right(_txt.length()-ind-1);

-    }

-}

-

-void QTReaderApp::chooseencoding()

-{

-    m_fontSelector->clear();

-    m_fontSelector->insertItem("Ascii");

-    m_fontSelector->insertItem("UTF-8");

-    m_fontSelector->insertItem("UCS-2(BE)");

-    m_fontSelector->insertItem("USC-2(LE)");

-    m_fontSelector->insertItem("Palm");

-    for (unicodetable::iterator iter = unicodetable::begin(); iter != unicodetable::end(); iter++)

-    {

-        m_fontSelector->insertItem(iter->mime);

-    } // delete the FontDatabase!!!

-    m_fontSelector->setCurrentItem (reader->m_encd);

-    m_fontAction = cChooseEncoding;

-    m_fontBar->show();

-    m_fontVisible = true;

-}

-

-void QTReaderApp::setfont()

-{

-    m_fontSelector->clear();

-    {

-#ifdef USEQPE

-        FontDatabase f;

-#else

-        QFontDatabase f;

-#endif

-        QStringList flist = f.families();

-        m_fontSelector->insertStringList(flist);

-    } // delete the FontDatabase!!!

-

-    for (int i = 1; i <= m_fontSelector->count(); i++)

-    {

-        if (m_fontSelector->text(i) == reader->m_fontname)

-        {

-            m_fontSelector->setCurrentItem(i);

-            break;

-        }

-    }

-    m_fontAction = cChooseFont;

-    m_fontBar->show();

-    m_fontVisible = true;

-}

-

-void QTReaderApp::setfontHelper(const QString& lcn, int size)

-{

-    if (size == 0) size = reader->m_fontControl.currentsize();

-    if (m_propogatefontchange)

-    {

-        QFont f(lcn, 10);

-        bkmkselector->setFont( f );

-        regEdit->setFont( f );

-        searchEdit->setFont( f );

-        m_annoWin->setFont( f );

-    }

-    reader->m_fontname = lcn;

-    if (!reader->ChangeFont(size))

-    {

-        reader->ChangeFont(size);

-    }

-}

-

-void QTReaderApp::do_setencoding(int i)

-{

-//    qDebug("setencoding:%d", i);

-    if (m_fontAction == cChooseEncoding)

-    {

-        reader->setencoding(i);

-    }

-    reader->refresh();

-    m_fontBar->hide();

-    m_fontVisible = false;

-//    qDebug("showedit");

-    if (reader->isVisible()) showEditTools();

-//    qDebug("showeditdone");

-}

-

-void QTReaderApp::do_setfont(const QString& lcn)

-{

-    if (m_fontAction == cChooseFont)

-    {

-        setfontHelper(lcn);

-    }

-    reader->refresh();

-    m_fontBar->hide();

-    m_fontVisible = false;

-//    qDebug("showedit");

-    //if (reader->isVisible())

-    showEditTools();

-//    qDebug("showeditdone");

-}

-

-void QTReaderApp::do_autogen(const QString& regText)

-{

-    unsigned long fs, ts;

-    reader->sizes(fs,ts);

-//  //  qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));

-  m_autogenstr = regText;

-  QRegExp re(regText);

-  CBuffer buff;

-  if (pBkmklist != NULL) delete pBkmklist;

-  pBkmklist = new CList<Bkmk>;

-  m_fBkmksChanged = true;

-

-  pbar->setGeometry(regBar->x(),regBar->y(),regBar->width(), regBar->height());

-  pbar->show();

-  pbar->raise();

-  pbar->reset();

-  reader->update();

-  qApp->processEvents();

-  reader->setFocus();

-  reader->jumpto(0);

-  int lastpc = 0;

-  int i = 0;

-  while (i >= 0)

-    {

-      unsigned int lcn = reader->locate();

-      int pc = (100*lcn)/ts;

-      if (pc != lastpc)

-      {

-        pbar->setProgress(pc);

-        qApp->processEvents();

-        if (reader->locate() != lcn) reader->jumpto(lcn);

-        reader->setFocus();

-        lastpc = pc;

-      }

-      i = reader->buffdoc.getpara(buff);

-#ifdef _UNICODE

-      if (re.match(toQString(buff.data())) != -1)

-#else

-      if (re.match(buff.data()) != -1)

-#endif

-        pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn));

-    }

-  pBkmklist->sort();

-  pbar->setProgress(100);

-  qApp->processEvents();

-  pbar->hide();

-  reader->refresh();

-}

-

-void QTReaderApp::saveprefs()

-{

-//    qDebug("saveprefs");

-//  reader->saveprefs("uqtreader");

-//    if (!m_loadedconfig)

-        do_saveconfig( APPDIR, true );

-

-/*    

-    Config config( APPDIR );

-    config.setGroup( "View" );

-    

-    reader->m_lastposn = reader->pagelocate();

-    

-    config.writeEntry("FloatDialogs", m_bFloatingDialog);

-    config.writeEntry( "StripCr", reader->bstripcr );

-    config.writeEntry( "AutoFmt", reader->bautofmt );

-    config.writeEntry( "TextFmt", reader->btextfmt );

-    config.writeEntry( "StripHtml", reader->bstriphtml );

-    config.writeEntry( "Dehyphen", reader->bdehyphen );

-    config.writeEntry( "Depluck", reader->bdepluck );

-    config.writeEntry( "Dejpluck", reader->bdejpluck );

-    config.writeEntry( "OneSpace", reader->bonespace );

-    config.writeEntry( "Unindent", reader->bunindent );

-    config.writeEntry( "Repara", reader->brepara );

-    config.writeEntry( "DoubleSpace", reader->bdblspce );

-    config.writeEntry( "Indent", reader->bindenter );

-    config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) );

-    config.writeEntry( "ScrollDelay", reader->m_delay);

-    config.writeEntry( "LastFile", reader->m_lastfile );

-    config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );

-    config.writeEntry( "PageMode", reader->m_bpagemode );

-    config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced );

-    config.writeEntry( "SwapMouse", reader->m_swapmouse);

-    config.writeEntry( "Fontname", reader->m_fontname );

-    config.writeEntry( "Encoding", reader->m_encd );

-    config.writeEntry( "CharSpacing", reader->m_charpc );

-    config.writeEntry( "Overlap", (int)(reader->m_overlap) );

-    config.writeEntry( "Margin", (int)reader->m_border );

-    config.writeEntry( "TargetApp", m_targetapp );

-    config.writeEntry( "TargetMsg", m_targetmsg );

-#ifdef _SCROLLPIPE

-    config.writeEntry( "PipeTarget", reader->m_pipetarget );

-    config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );

-#endif

-    config.writeEntry( "TwoTouch", m_twoTouch );

-    config.writeEntry( "Annotation", m_doAnnotation);

-    config.writeEntry( "Dictionary", m_doDictionary);

-    config.writeEntry( "Clipboard", m_doClipboard);

-    config.writeEntry( "SpaceTarget", m_spaceTarget);

-    config.writeEntry( "EscapeTarget", m_escapeTarget);

-    config.writeEntry( "ReturnTarget", m_returnTarget);

-    config.writeEntry( "LeftTarget", m_leftTarget);

-    config.writeEntry( "RightTarget", m_rightTarget);

-    config.writeEntry( "UpTarget", m_upTarget);

-    config.writeEntry( "DownTarget", m_downTarget);

-    config.writeEntry("LeftScroll", m_leftScroll);

-    config.writeEntry("RightScroll", m_rightScroll);

-    config.writeEntry("UpScroll", m_upScroll);

-    config.writeEntry("DownScroll", m_downScroll);

-#ifdef REPALM

-    config.writeEntry( "Repalm", reader->brepalm );

-#endif

-    config.writeEntry( "Remap", reader->bremap );

-    config.writeEntry( "Peanut", reader->bpeanut );

-    config.writeEntry( "MakeBold", reader->bmakebold );

-    config.writeEntry( "Continuous", reader->m_continuousDocument );

-    config.writeEntry( "FullJust", reader->bfulljust );

-    config.writeEntry( "ExtraSpace", reader->getextraspace() );

-    config.writeEntry( "ExtraLead", reader->getlead() );

-    config.writeEntry( "Basesize",  (int)reader->getBaseSize());

-    config.writeEntry( "RequestorFontChange", m_propogatefontchange);

-

-    config.setGroup( "Toolbar" );

-    config.writeEntry("Movable", m_tbmovesave);

-    config.writeEntry("Policy", m_tbpolsave);

-    config.writeEntry("Position", m_tbposition);

-*/

-    savefilelist();

-}

-

-/*

-void QTReaderApp::oldFile()

-{

-//  qDebug("oldFile called");

-  reader->setText(true);

-//  qDebug("settext called");

-  showEditTools();

-//  qDebug("showedit called");

-}

-*/

-

-/*

-void info_cb(Fl_Widget* o, void* _data)

-{

-

-    if (infowin == NULL)

-    {

-        

-        infowin = new Fl_Window(160,240);

-        filename = new Fl_Output(45,5,110,14,"Filename");

-        filesize = new Fl_Output(45,25,110,14,"Filesize");

-        textsize = new Fl_Output(45,45,110,14,"Textsize");

-        comprat = new CBar(45,65,110,14,"Ratio %");

-        posn = new Fl_Output(45,85,110,14,"Location");

-        frcn = new CBar(45,105,110,14,"% Read");

-        about = new Fl_Multiline_Output(5,125,150,90);

-        about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");

-        Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");

-        infowin->set_modal();

-    }

-    if (((reader_ui *)_data)->g_filename[0] != '\0')

-    {

-        unsigned long fs,ts;

-        tchar sz[20];

-        ((reader_ui *)_data)->input->sizes(fs,ts);

-        unsigned long pl = ((reader_ui *)_data)->input->locate();

-

-        filename->value(((reader_ui *)_data)->g_filename);

-

-        sprintf(sz,"%u",fs);

-        filesize->value(sz);

-

-        sprintf(sz,"%u",ts);

-        textsize->value(sz);

-

-        comprat->value(100-(100*fs + (ts >> 1))/ts);

-

-        sprintf(sz,"%u",pl);

-        posn->value(sz);

-

-        frcn->value((100*pl + (ts >> 1))/ts);

-    }

-    infowin->show();

-}

-*/

-

-void QTReaderApp::savebkmks()

-{

-    if (pBkmklist != NULL)

-    {

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR);

-                QFileInfo fi(d, reader->m_string);

-        BkmkFile bf((const char *)fi.absFilePath(), true);

-#else /* USEQPE */

-        BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true);

-#endif /* USEQPE */

-        bf.write(*pBkmklist);

-    }

-        m_fBkmksChanged = false;

-}

-

-void QTReaderApp::readfilelist()

-{

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR);

-                QFileInfo fi(d, ".openfiles");

-    BkmkFile bf((const char *)fi.absFilePath());

-#else /* USEQPE */

-    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"));

-#endif /* USEQPE */

-//    qDebug("Reading open files");

-    pOpenlist = bf.readall();

-//    if (pOpenlist != NULL) qDebug("...with success");

-//    else qDebug("...without success!");

-}

-

-void QTReaderApp::savefilelist()

-{

-    if (pOpenlist != NULL)

-    {

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR);

-                QFileInfo fi(d, ".openfiles");

-        BkmkFile bf((const char *)fi.absFilePath(), true);

-#else /* USEQPE */

-        BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true);

-#endif /* USEQPE */

-        //qDebug("Writing open files");

-        bf.write(*pOpenlist);

-    }

-}

-

-void QTReaderApp::readbkmks()

-{

-    if (pBkmklist != NULL)

-    {

-            delete pBkmklist;

-    }

-    struct stat fnstat;

-    struct stat bkstat;

-#ifndef USEQPE

-            QDir d = QDir::home();                      // "/"

-                d.cd(APPDIR);

-                QFileInfo fi(d, reader->m_string);

-#endif /* ! USEQPE */

-    if (

-        stat((const char *)reader->m_lastfile, &fnstat) == 0

-        &&

-#ifndef USEQPE

-        stat((const char *)fi.absFilePath(), &bkstat) == 0

-#else /* USEQPE */

-        stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0

-#endif /* USEQPE */

-        )

-    {

-        if (bkstat.st_mtime < fnstat.st_mtime)

-        {

-#ifndef USEQPE

-            unlink((const char *)fi.absFilePath());

-#else /* USEQPE */

-            unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));

-#endif /* USEQPE */

-        }

-    }

-

-#ifndef USEQPE

-    BkmkFile bf((const char *)fi.absFilePath());

-#else /* USEQPE */

-    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string));

-#endif /* USEQPE */

-

-    pBkmklist = bf.readall();

-    m_fBkmksChanged = bf.upgraded();

-    if (pBkmklist == NULL)

-    {

-        pBkmklist = reader->getbkmklist();

-    }

-    if (pBkmklist != NULL)

-        pBkmklist->sort();

-}

-

-void QTReaderApp::addbkmk()

-{

-  m_nRegAction = cAddBkmk;

-  regEdit->setText(reader->firstword());

-  do_regedit();

-}

-

-void QTReaderApp::do_addbkmk(const QString& text)

-{

-        if (text.isEmpty())

-        {

-          QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1);

-        }

-        else

-        {

-                if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;

-#ifdef _UNICODE

-                CBuffer buff;

-                int i = 0;

-                for (i = 0; i < text.length(); i++)

-                {

-                    buff[i] = text[i].unicode();

-                }

-                buff[i] = 0;

-                pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate()));

-#else

-                pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate()));

-#endif

-                m_fBkmksChanged = true;

-                pBkmklist->sort();

-        }

-}

-

-void QTReaderApp::OnRedraw()

-{

-    if ((pBkmklist != NULL) && (m_bkmkAvail != NULL))

-    {

-        bool found = findNextBookmark(reader->pagelocate());

-        m_bkmkAvail->setEnabled(found);

-    }

-}

-

-void QTReaderApp::showAnnotation()

-{

-    m_annoWin->setName(toQString(m_anno->name()));

-    m_annoWin->setAnno(toQString(m_anno->anno()));

-    m_annoIsEditing = false;

-#ifdef USEQPE

-    Global::showInputMethod();

-#endif

-    editorStack->raiseWidget( m_annoWin );

-    m_annoWin->setFocus();

-}

-

-void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& line)

-{

-////    qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);

-

-    if (m_doClipboard)

-    {

-        QClipboard* cb = QApplication::clipboard();

-        cb->setText(wrd);

-#ifdef USEQPE

-        if (wrd.length() > 10)

-        {

-            Global::statusMessage(wrd.left(8) + "..");

-        }

-        else

-        {

-            Global::statusMessage(wrd);

-        }

-#endif

-    }

-    if (m_doAnnotation)

-    {

-        //addAnno(wrd, "Need to be able to edit this", posn);

-        m_annoWin->setName(line);

-        m_annoWin->setAnno("");

-        m_annoWin->setPosn(posn);

-        m_annoIsEditing = true;

-#ifdef USEQPE

-        Global::showInputMethod();

-#endif

-        editorStack->raiseWidget( m_annoWin );

-    }

-#ifdef USEQPE

-    if (m_doDictionary)

-    {

-        if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty())

-        {

-            QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8());

-            e << wrd;

-        }

-    }

-#endif

-}

-

-void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)

-{

-    if (a == 0)

-    {

-        e->ignore();

-    }

-    else

-    {

-        e->accept();

-        //qDebug("Accepted");

-        switch (a)

-        {

-            case cesOpenFile:

-            {

-                fileOpen();

-            }

-            break;

-            case cesAutoScroll:

-            {

-                reader->setautoscroll(!reader->m_autoScroll);

-                setScrollState(reader->m_autoScroll);

-            }

-            break;

-            case cesActionMark:

-            {

-                addbkmk();

-            }

-            break;

-            case cesFullScreen:

-            {

-                m_actFullscreen->setOn(!m_fullscreen);

-            }

-            break;

-            case cesActionAnno:

-            {

-                addanno();

-            }

-            break;

-            case cesZoomIn:

-                zoomin();

-                break;

-            case cesZoomOut:

-                zoomout();

-                break;

-            case cesBack:

-                reader->goBack();

-                break;

-            case cesForward:

-                reader->goForward();

-                break;

-            case cesHome:

-                reader->goHome();

-                break;

-            case cesPageUp:

-                reader->dopageup();

-                break;

-            case cesPageDown:

-                reader->dopagedn();

-                break;

-            case cesLineUp:

-                reader->lineUp();

-                break;

-            case cesLineDown:

-                reader->lineDown();

-                break;

-            case cesStartDoc:

-                gotoStart();

-                break;

-            case cesEndDoc:

-                gotoEnd();

-                break;

-            default:

-                qDebug("Unknown ActionType:%u", a);

-                break;

-        }

-    }

-}

-

-void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }

-void QTReaderApp::restoreFocus() { reader->setFocus(); } 

-

-void QTReaderApp::SaveConfig()

-{

-    m_nRegAction = cSetConfigName;

-    regEdit->setText(reader->m_string);

-    do_regedit();

-}

-

-void QTReaderApp::do_saveconfig(const QString& _txt, bool full)

-{

-//    qDebug("do_saveconfig:%s", (const char*)_txt);

-#ifdef USEQPE

-    QString configname;

-    Config::Domain dom;

-

-    if (full)

-    {

-        configname = _txt;

-        dom = Config::User;

-    }

-    else

-    {

-        configname = Global::applicationFileName(APPDIR "/configs", _txt);

-        dom = Config::File;

-    }

-

-    Config config(configname, dom);

-    config.setGroup( "View" );

-

-#else

-        QFileInfo fi;

-        if (full)

-        {

-        //    qDebug("full:%s", (const char*)_txt);

-            QDir d = QDir::home();                      // "/"

-                if ( !d.cd(_txt) )

-                {                       // "/tmp"

-                        qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );

-                        d = QDir::home();

-                        d.mkdir(_txt);

-                        d.cd(_txt);

-                }

-                fi.setFile(d, INIFILE);

-        }

-        else

-        {

-            QDir d = QDir::home();                      // "/"

-                if ( !d.cd(APPDIR) )

-                {                       // "/tmp"

-                        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-                        d = QDir::home();

-                        d.mkdir(APPDIR);

-                        d.cd(APPDIR);

-                }

-                if ( !d.cd("configs") )

-                {                       // "/tmp"

-                        qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );

-                        d = QDir::home();

-                        d.cd(APPDIR);

-                        d.mkdir("configs");

-                        d.cd("configs");

-                }

-                fi.setFile(d, _txt);

-        }

-        //qDebug("Path:%s", (const char*)fi.absFilePath());

-        Config config(fi.absFilePath());

-#endif

-

-

-    config.writeEntry( "StripCr", reader->bstripcr );

-    config.writeEntry( "AutoFmt", reader->bautofmt );

-    config.writeEntry( "TextFmt", reader->btextfmt );

-    config.writeEntry( "StripHtml", reader->bstriphtml );

-    config.writeEntry( "Dehyphen", reader->bdehyphen );

-    config.writeEntry( "Depluck", reader->bdepluck );

-    config.writeEntry( "Dejpluck", reader->bdejpluck );

-    config.writeEntry( "OneSpace", reader->bonespace );

-    config.writeEntry( "Unindent", reader->bunindent );

-    config.writeEntry( "Repara", reader->brepara );

-    config.writeEntry( "DoubleSpace", reader->bdblspce );

-    config.writeEntry( "Indent", reader->bindenter );

-    config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) );

-    config.writeEntry( "ScrollDelay", reader->m_delay);

-    if (full)

-    {

-        config.writeEntry("Debounce", m_debounce);

-        config.writeEntry("FloatDialogs", m_bFloatingDialog);

-        reader->m_lastposn = reader->pagelocate();

-        config.writeEntry( "LastFile", reader->m_lastfile );

-        config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );

-    }

-    config.writeEntry( "PageMode", reader->m_bpagemode );

-    config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced );

-    config.writeEntry( "SwapMouse", reader->m_swapmouse);

-    config.writeEntry( "Fontname", reader->m_fontname );

-    config.writeEntry( "Encoding", reader->m_encd );

-    config.writeEntry( "CharSpacing", reader->m_charpc );

-    config.writeEntry( "Overlap", (int)(reader->m_overlap) );

-    config.writeEntry( "Margin", (int)reader->m_border );

-    config.writeEntry( "TargetApp", m_targetapp );

-    config.writeEntry( "TargetMsg", m_targetmsg );

-#ifdef _SCROLLPIPE

-    config.writeEntry( "PipeTarget", reader->m_pipetarget );

-    config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );

-#endif

-    config.writeEntry( "TwoTouch", m_twoTouch );

-    config.writeEntry( "Annotation", m_doAnnotation);

-    config.writeEntry( "Dictionary", m_doDictionary);

-    config.writeEntry( "Clipboard", m_doClipboard);

-    config.writeEntry( "SpaceTarget", m_spaceTarget);

-    config.writeEntry( "EscapeTarget", m_escapeTarget);

-    config.writeEntry( "ReturnTarget", m_returnTarget);

-    config.writeEntry( "LeftTarget", m_leftTarget);

-    config.writeEntry( "RightTarget", m_rightTarget);

-    config.writeEntry( "UpTarget", m_upTarget);

-    config.writeEntry( "DownTarget", m_downTarget);

-    config.writeEntry("LeftScroll", m_leftScroll);

-    config.writeEntry("RightScroll", m_rightScroll);

-    config.writeEntry("UpScroll", m_upScroll);

-    config.writeEntry("DownScroll", m_downScroll);

-#ifdef REPALM

-    config.writeEntry( "Repalm", reader->brepalm );

-#endif

-    config.writeEntry( "Remap", reader->bremap );

-    config.writeEntry( "Peanut", reader->bpeanut );

-    config.writeEntry( "MakeBold", reader->bmakebold );

-    config.writeEntry( "Continuous", reader->m_continuousDocument );

-    config.writeEntry( "FullJust", reader->bfulljust );

-    config.writeEntry( "ExtraSpace", reader->getextraspace() );

-    config.writeEntry( "ExtraLead", reader->getlead() );

-    config.writeEntry( "Basesize",  (int)reader->getBaseSize());

-    config.writeEntry( "RequestorFontChange", m_propogatefontchange);

-    if (full)

-    {

-        config.setGroup( "Toolbar" );

-        config.writeEntry("Movable", m_tbmovesave);

-        config.writeEntry("Policy", m_tbpolsave);

-        config.writeEntry("Position", m_tbposition);

-#ifndef USEQPE

-        config.setGroup( "Geometry" );

-        config.writeEntry( "x", x() );

-        config.writeEntry( "y", y() );

-        config.writeEntry( "width", width() );

-        config.writeEntry( "height", height() );

-#endif

-    }

-}

-

-/*

-void QTReaderApp::setstate(unsigned char* _sd, unsigned short _sdlen)

-{

-    unsigned short sdlen;

-    memcpy(&sdlen, _sd, sizeof(sdlen));

-    sdlen -= sizeof(sdlen);

-    _sd += sizeof(sdlen);

-    statedata* sd;

-    char* data;

-    if (sdlen < sizeof(statedata)+1)

-    {

-        sdlen = sizeof(statedata)+1;

-    }

-    data = new char[sdlen];

-    sd = (statedata*)data;

-    memcpy(sd, _sd, sdlen);

-    data[sdlen] = 0;

-    reader->setstate(*sd);

-    delete [] data;

-}

-

-void QTReaderApp::getstate(unsigned char*& data, unsigned short& len)

-{

-    unsigned char* olddata = data;

-    unsigned short oldlen = len;

-    len = oldlen+sizeof(unsigned short)+sizeof(statedata)+reader->m_fontname.length();

-    data = new unsigned char[len];

-    memcpy(data, olddata, oldlen);

-    delete [] olddata;

-    memcpy(data+oldlen, &len, sizeof(len));

-    statedata* sd = (statedata*)(data+oldlen+sizeof(unsigned short));

-

-    sd->bstripcr = reader->bstripcr;

-    sd->btextfmt = reader->btextfmt;

-    sd->bautofmt = reader->bautofmt;

-    sd->bstriphtml = reader->bstriphtml;

-    sd->bpeanut = reader->bpeanut;

-    sd->bdehyphen = reader->bdehyphen;

-    sd->bdepluck = reader->bdepluck;

-    sd->bdejpluck = reader->bdejpluck;

-    sd->bonespace = reader->bonespace;

-    sd->bunindent = reader->bunindent;

-    sd->brepara = reader->brepara;

-    sd->bdblspce = reader->bdblspce;

-    sd->m_bpagemode = reader->m_bpagemode;

-    sd->m_bMonoSpaced = reader->m_bMonoSpaced;

-    sd->bremap = reader->bremap;

-    sd->bmakebold = reader->bmakebold;

-    sd->Continuous = reader->m_continuousDocument;

-#ifdef REPALM

-    sd->brepalm = reader->brepalm;

-#endif

-    sd->bindenter = reader->bindenter;

-    sd->m_textsize = reader->m_textsize; //reader->m_fontControl.currentsize()

-    sd->m_encd = reader->m_encd;

-    sd->m_charpc = reader->m_charpc;

-    strcpy(sd->m_fontname, reader->m_fontname.latin1());

-}

-*/

-#ifdef _SCRIPT

-void QTReaderApp::RunScript()

-{

-    fileBrowser* fb = new fileBrowser(this,"OpieReader",!m_bFloatingDialog,

-                                      0,

-        //                            WStyle_Customize | WStyle_NoBorderEx,

-                                      "*", Global::applicationFileName(APPDIR "/scripts", ""));

-

-    QString fn;

-    if (fb->exec())

-    {

-        fn = fb->fileList[0];

-    }

-    delete fb;

-    if ( !fn.isEmpty() && fork() == 0 )

-    {

-        execlp((const char *)fn,(const char *)fn,NULL);

-    }

-}

-

-void QTReaderApp::SaveScript(const char* sname)

-{

-    FILE* f = fopen(sname,"w");

-    if (f != NULL)

-    {

-#ifdef OPIE

-        fprintf(f, "#!/bin/sh\nmsg() {\n\tqcop QPE/Application/reader \"$1\" \"$2\" \"$3\"\n}\n");

-#else

-        fprintf(f, "#!/bin/bash\nmsg() {\n\tqcop QPE/Application/uqtreader \"$1\" \"$2\" \"$3\"\n}\n");

-#endif

-        fprintf(f, "msg \"Update(int)\" 0\n");

-        fprintf(f, "msg \"Layout/StripCR(int)\" %d\n", (reader->bstripcr) ? 1:0);

-        if (reader->btextfmt) fprintf(f, "msg \"Markup(QString)\" \"Text\"\n");

-        else if (reader->bautofmt) fprintf(f, "msg \"Markup(QString)\" \"Auto\"\n");

-        else if (reader->bstriphtml) fprintf(f, "msg \"Markup(QString)\" \"HTML\"\n");

-        else if (reader->bpeanut) fprintf(f, "msg \"Markup(QString)\" \"Peanut/PML\"\n");

-        else fprintf(f, "msg \"Markup(QString)\" \"None\"\n");

-        fprintf(f, "msg \"Layout/Dehyphen(int)\" %d\n", (reader->bdehyphen) ? 1:0);

-        fprintf(f, "msg \"Layout/Depluck(int)\" %d\n", (reader->bdepluck) ? 1:0);

-        fprintf(f, "msg \"Layout/Dejpluck(int)\" %d\n", (reader->bdejpluck) ? 1:0);

-        fprintf(f, "msg \"Layout/SingleSpace(int)\" %d\n", (reader->bonespace) ? 1:0);

-        fprintf(f, "msg \"Layout/Unindent(int)\" %d\n", (reader->bunindent) ? 1:0);

-        fprintf(f, "msg \"Layout/Re-paragraph(int)\" %d\n", (reader->brepara) ? 1:0);

-        fprintf(f, "msg \"Layout/DoubleSpace(int)\" %d\n", (reader->bdblspce) ? 1:0);

-        fprintf(f, "msg \"Layout/Indent(int)\" %d\n", reader->bindenter);

-        fprintf(f, "msg \"Format/SetFont(QString,int)\" \"%s\" %d\n", (const char*)reader->m_fontname, reader->m_textsize);

-        fprintf(f, "msg \"Navigation/Page/LineScroll(int)\" %d\n", (reader->m_bpagemode) ? 1:0);

-        fprintf(f, "msg \"Format/Ideogram/Word(int)\" %d\n", (reader->m_bMonoSpaced) ? 1:0);

-        fprintf(f, "msg \"Format/Encoding(QString)\" \"%s\"\n", (const char*)m_EncodingAction[reader->m_encd]->text());

-        fprintf(f, "msg \"Format/SetWidth(int)\" %d\n", reader->m_charpc);

-        fprintf(f, "msg \"Navigation/SetOverlap(int)\" %d\n", reader->m_overlap);

-        fprintf(f, "msg \"Layout/Remap(int)\" %d\n", (reader->bremap) ? 1:0);

-        fprintf(f, "msg \"Layout/Embolden(int)\" %d\n", (reader->bmakebold) ? 1:0);

-        fprintf(f, "msg \"File/Continuous(int)\" %d\n", (reader->m_continuousDocument) ? 1:0);

-        fprintf(f, "msg \"File/SetDictionary(QString)\" \"%s/%s\"\n", (const char *)m_targetapp, (const char *)m_targetmsg);

-#ifdef _SCROLLPIPE

-        fprintf(f, "msg \"File/SetScrollTarget(QString)\" \"%s\"\n", (const char *)reader->m_pipetarget);

-#endif

-        fprintf(f, "msg \"File/Two/OneTouch(int)\" %d\n", (m_twoTouch) ? 1:0);

-        fprintf(f, "msg \"Target/Annotation(int)\" %d\n", (m_doAnnotation) ? 1:0);

-        fprintf(f, "msg \"Target/Dictionary(int)\" %d\n", (m_doDictionary) ? 1:0);

-        fprintf(f, "msg \"Target/Clipboard(int)\" %d\n", (m_doClipboard) ? 1:0);

-        fprintf(f, "msg \"File/Action(QString)\" \"%s\"\n", (const char *)m_buttonAction[m_spaceTarget]->text());

-        fprintf(f, "msg \"Update(int)\" 1\n");

-        fprintf(f, "msg \"info(QString)\" \"All Done\"\n");

-        fclose(f);

-        chmod(sname, S_IXUSR | S_IXGRP | S_IXOTH);

-    }

-}

-

-void QTReaderApp::SaveConfig()

-{

-    m_nRegAction = cSetConfigName;

-    regEdit->setText("");

-    do_regedit();

-}

-

-void QTReaderApp::do_saveconfig(const QString& _txt)

-{

-    SaveScript(Global::applicationFileName(APPDIR "/scripts", _txt));

-}

-#endif

-

-#ifdef _SCROLLPIPE

-void QTReaderApp::setpipetarget()

-{

-    m_nRegAction = cSetPipeTarget;

-    QString text = (reader->m_pipetarget.isEmpty()) ? QString("") : reader->m_pipetarget;

-    regEdit->setText(text);

-    do_regedit();

-}

-

-void QTReaderApp::do_setpipetarget(const QString& _txt)

-{

-    reader->m_pipetarget = _txt;

-}

-

-void QTReaderApp::setpause(bool sfs)

-{

-    reader->m_pauseAfterEachPara = sfs;

-}

-#endif

-

-void QTReaderApp::monospace(bool _b)

-{

-    reader->setmono(_b);

-}

-

-bool QTReaderApp::readconfig(const QString& _txt, bool full=false)

-{

-#ifdef USEQPE

-    QString configname;

-    Config::Domain dom;

-

-    if (full)

-    {

-        configname = _txt;

-        dom = Config::User;

-    }

-    else

-    {

-        configname = Global::applicationFileName(APPDIR "/configs", _txt);

-        QFileInfo fm(configname);

-        if ( !fm.exists() ) return false;

-        dom = Config::File;

-    }

-

-    Config config(configname, dom);

-    config.setGroup( "View" );

-

-#else

-        QFileInfo fi;

-        if (full)

-        {

-            QDir d = QDir::home();                      // "/"

-                if ( !d.cd(_txt) )

-                {                       // "/tmp"

-                        qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );

-                        d = QDir::home();

-                        d.mkdir(_txt);

-                        d.cd(_txt);

-                }

-                fi.setFile(d, INIFILE);

-        }

-        else

-        {

-            QDir d = QDir::home();                      // "/"

-                if ( !d.cd(APPDIR) )

-                {                       // "/tmp"

-                        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-                        d = QDir::home();

-                        d.mkdir(APPDIR);

-                        d.cd(APPDIR);

-                }

-                if ( !d.cd("configs") )

-                {                       // "/tmp"

-                        qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );

-                        d = QDir::home();

-                        d.mkdir("configs");

-                        d.cd("configs");

-                }

-                fi.setFile(d, _txt);

-        }

-#ifdef _WINDOWS

-        struct stat fnstat;

-    if (stat((const char *)reader->m_lastfile, &fnstat) == 0) return false; // get round fileinfo bug on windows

-#else

-        if (!fi.exists()) return false;

-#endif

-        Config config(fi.absFilePath());

-#endif

-    if (full)

-    {

-        config.setGroup("Toolbar");

-        m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);

-        m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);

-        m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);

-    }

-    config.setGroup( "View" );

-    m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);

-    reader->bstripcr = config.readBoolEntry( "StripCr", true );

-    reader->bfulljust = config.readBoolEntry( "FullJust", false );

-    reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 ));

-    reader->setlead(config.readNumEntry( "ExtraLead", 0 ));

-    reader->btextfmt = config.readBoolEntry( "TextFmt", false );

-    reader->bautofmt = config.readBoolEntry( "AutoFmt", true );

-    reader->bstriphtml = config.readBoolEntry( "StripHtml", false );

-    reader->bpeanut = config.readBoolEntry( "Peanut", false );

-    reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );

-    reader->bdepluck = config.readBoolEntry( "Depluck", false );

-    reader->bdejpluck = config.readBoolEntry( "Dejpluck", false );

-    reader->bonespace = config.readBoolEntry( "OneSpace", false );

-    reader->bunindent = config.readBoolEntry( "Unindent", false );

-    reader->brepara = config.readBoolEntry( "Repara", false );

-    reader->bdblspce = config.readBoolEntry( "DoubleSpace", false );

-    reader->bindenter = config.readNumEntry( "Indent", 0 );

-    reader->m_textsize = config.readNumEntry( "FontSize", 12 );

-    reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);

-    if (full)

-    {

-        reader->m_lastfile = config.readEntry( "LastFile", QString::null );

-        reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );

-    }

-    reader->m_bpagemode = config.readBoolEntry( "PageMode", true );

-    reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false);

-    reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false);

-     reader->m_fontname = config.readEntry( "Fontname", "helvetica" );

-    reader->m_encd = config.readNumEntry( "Encoding", 0 );

-    reader->m_charpc = config.readNumEntry( "CharSpacing", 100 );

-    reader->m_overlap = config.readNumEntry( "Overlap", 0 );

-    reader->m_border = config.readNumEntry( "Margin", 6 );

-#ifdef REPALM

-    reader->brepalm = config.readBoolEntry( "Repalm", true );

-#endif

-    reader->bremap = config.readBoolEntry( "Remap", true );

-    reader->bmakebold = config.readBoolEntry( "MakeBold", false );

-    reader->setContinuous(config.readBoolEntry( "Continuous", true ));

-    m_targetapp = config.readEntry( "TargetApp", QString::null );

-    m_targetmsg = config.readEntry( "TargetMsg", QString::null );

-#ifdef _SCROLLPIPE

-    reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null );

-    reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true );

-#endif

-    m_twoTouch = config.readBoolEntry( "TwoTouch", false);

-    m_doAnnotation = config.readBoolEntry( "Annotation", false);

-    m_doDictionary = config.readBoolEntry( "Dictionary", false);

-    m_doClipboard = config.readBoolEntry( "Clipboard", false);

-    m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);

-    m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone);

-    m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen);

-    m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut);

-    m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn);

-    m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp);

-    m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown);

-

-    m_leftScroll = config.readBoolEntry("LeftScroll", false);

-    m_rightScroll = config.readBoolEntry("RightScroll", false);

-    m_upScroll = config.readBoolEntry("UpScroll", true);

-    m_downScroll = config.readBoolEntry("DownScroll", true);

-    m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);

-    reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));

-    reader->setTwoTouch(m_twoTouch);

-

-    m_touch_action->setOn(m_twoTouch);

-    m_setmono_action->setOn(reader->m_bMonoSpaced);

-    setfontHelper(reader->m_fontname);

-    if (full)

-    {

-        addtoolbars(&config);

-    }

-    reader->setfilter(reader->getfilter());

-    reader->refresh();

-    return true;

-}

-

-bool QTReaderApp::PopulateConfig(const char* tgtdir)

-{

-    bkmkselector->clear();

-    bkmkselector->setText("Cancel");

-#ifndef USEQPE

-    int cnt = 0;

-

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-        d = QDir::home();

-        d.mkdir(APPDIR);

-        d.cd(APPDIR);

-    }

-    if ( !d.cd(tgtdir) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );

-        d = QDir::home();

-        d.mkdir(tgtdir);

-        d.cd(tgtdir);

-    }

-    d.setFilter( QDir::Files | QDir::NoSymLinks );

-//        d.setSorting( QDir::Size | QDir::Reversed );

-

-    const QFileInfoList *list = d.entryInfoList();

-    QFileInfoListIterator it( *list );      // create list iterator

-    QFileInfo *fi;                          // pointer for traversing

-

-    while ( (fi=it.current()) ) {           // for each file...

-  

-        bkmkselector->insertItem(fi->fileName());

-        cnt++;

-                        

-        //qDebug( "%10li %s", fi->size(), fi->fileName().data() );

-        ++it;                               // goto next list element

-    }

- 

-#else /* USEQPE */

-    int cnt = 0;

-    DIR *d;

-    char* finaldir;

-    finaldir = new char[strlen(APPDIR)+1+strlen(tgtdir)+1];

-    strcpy(finaldir, APPDIR);

-    strcat(finaldir, "/");

-    strcat(finaldir, tgtdir);

-    d = opendir((const char *)Global::applicationFileName(finaldir,""));

-

-    while(1)

-    {

-        struct dirent* de;

-        struct stat buf;

-        de = readdir(d);

-        if (de == NULL) break;

-

-        if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))

-        {

-            bkmkselector->insertItem(de->d_name);

-            cnt++;

-        }

-    }

-    delete [] finaldir;

-    closedir(d);

-#endif

-    return (cnt > 0);

-}

-

-void QTReaderApp::LoadConfig()

-{

-    if (PopulateConfig("configs"))

-      {

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-        m_nBkmkAction = cLdConfig;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No config files");

-}

-

-void QTReaderApp::TidyConfig()

-{

-    if (PopulateConfig("configs"))

-      {

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-        m_nBkmkAction = cRmConfig;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No config files");

-}

-

-void QTReaderApp::ExportLinks()

-{

-    if (PopulateConfig("urls"))

-      {

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-        m_nBkmkAction = cExportLinks;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No url files");

-}

-

-void QTReaderApp::OnURLSelected(const QString& href)

-{

-    CURLDialog* urld = new CURLDialog(href, false, this);

-    urld->clipboard(m_url_clipboard);

-    urld->localfile(m_url_localfile);

-    urld->globalfile(m_url_globalfile);

-    if (urld->exec())

-    {

-        m_url_clipboard = urld->clipboard();

-        m_url_localfile = urld->localfile();

-        m_url_globalfile = urld->globalfile();

-        if (m_url_clipboard)

-        {

-            QClipboard* cb = QApplication::clipboard();

-            cb->setText(href);

-            qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href);

-        }

-        if (m_url_localfile)

-        {

-            writeUrl(reader->m_string, href);

-        }

-        if (m_url_globalfile)

-        {

-            writeUrl("GlobalURLFile", href);

-        }

-    }

-    delete urld;

-}

-

-void QTReaderApp::writeUrl(const QString& file, const QString& href)

-{

-    QString filename;

-#ifdef USEQPE

-    filename = Global::applicationFileName(APPDIR "/urls", file);

-#else

-    QFileInfo fi;

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) )

-    {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-        d = QDir::home();

-        d.mkdir(APPDIR);

-        d.cd(APPDIR);

-    }

-    if ( !d.cd("urls") )

-    {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );

-        d = QDir::home();

-        d.cd(APPDIR);

-        d.mkdir("urls");

-        d.cd("urls");

-    }

-    fi.setFile(d, file);

-    filename = fi.absFilePath();

-#endif

-    FILE* fout = fopen(filename, "a");

-    if (fout != NULL)

-    {

-        fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href);

-        fclose(fout);

-    }

-    else

-    {

-        QMessageBox::warning(this, PROGNAME, "Problem with writing URL");

-    }

-}

+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS.  Allrights reserved.
+**
+** This file is part of Qt Palmtop Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#include "useqpe.h"
+#include <qregexp.h>
+#include <qclipboard.h>
+#include <qwidgetstack.h>
+#ifdef USEQPE
+#include <qmenubar.h>
+#include <qpe/qpetoolbar.h>
+#endif
+#include <qmenubar.h>
+#include <qtoolbar.h>
+#ifdef USEQPE
+#include <qpe/menubutton.h>
+#include <qpe/fontdatabase.h>
+#endif
+#include <qcombobox.h>
+#include <qpopupmenu.h>
+#include <qaction.h>
+#include <qapplication.h>
+#include <qlineedit.h>
+#include <qtoolbutton.h>
+#include <qspinbox.h>
+#include <qobjectlist.h>
+#ifdef USEQPE
+#include <qpe/global.h>
+#include <qpe/applnk.h>
+#endif
+#include <qfileinfo.h>
+#include <stdlib.h> //getenv
+#include <qprogressbar.h>
+#ifdef USEQPE
+#include <qpe/config.h>
+#endif
+#include <qbuttongroup.h>
+#include <qradiobutton.h>
+#ifdef USEQPE
+#include <qpe/qcopenvelope_qws.h>
+#endif
+#include "QTReader.h"
+#include "GraphicWin.h"
+#include "Bkmks.h"
+#include "cbkmkselector.h"
+#include "infowin.h"
+#include "ToolbarPrefs.h"
+#include "Prefs.h"
+#include "CAnnoEdit.h"
+#include "QFloatBar.h"
+#include "FixedFont.h"
+#include "URLDialog.h"
+//#include <qpe/fontdatabase.h>
+
+#ifdef USEQPE
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+#include "fileBrowser.h"
+#else
+#include "qfiledialog.h"
+#endif
+
+#include "QTReaderApp.h"
+#include "CDrawBuffer.h"
+#include "Filedata.h"
+#include "opie.h"
+#include "names.h"
+#include "CEncoding_tables.h"
+#include "CloseDialog.h"
+
+bool CheckVersion(int&, int&, char&);
+
+#ifdef _WINDOWS
+#define PICDIR "c:\\uqtreader\\pics\\"
+#else
+#ifdef USEQPE
+#define PICDIR "opie-reader/"
+#else
+#define PICDIR "/home/tim/uqtreader/pics/"
+#endif
+#endif
+
+unsigned long QTReaderApp::m_uid = 0;
+
+void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); }
+
+#ifdef USEQPE
+#define geticon(iconname) Resource::loadPixmap( iconname )
+#define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname )
+#else
+#define geticon(iconname) QPixmap(PICDIR iconname ".png")
+#define getmyicon(iconname) geticon(iconname)
+//#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) )
+#endif
+
+#ifndef _WINDOWS
+#include <unistd.h>
+#endif
+#include <stddef.h>
+#ifndef _WINDOWS
+#include <dirent.h>
+#endif
+
+void QTReaderApp::listBkmkFiles()
+{
+    bkmkselector->clear();
+    bkmkselector->setText("Cancel");
+#ifndef USEQPE
+    int cnt = 0;
+
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+                d = QDir::home();
+                d.mkdir(APPDIR);
+                d.cd(APPDIR);
+    }
+
+
+
+
+        d.setFilter( QDir::Files | QDir::NoSymLinks );
+//        d.setSorting( QDir::Size | QDir::Reversed );
+
+        const QFileInfoList *list = d.entryInfoList();
+        QFileInfoListIterator it( *list );      // create list iterator
+        QFileInfo *fi;                          // pointer for traversing
+
+        while ( (fi=it.current()) ) {           // for each file...
+
+                    bkmkselector->insertItem(fi->fileName());
+                    cnt++;
+
+                        //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+            ++it;                               // goto next list element
+        }
+
+#else /* USEQPE */
+    int cnt = 0;
+    DIR *d;
+    d = opendir((const char *)Global::applicationFileName(APPDIR,""));
+
+    while(1)
+    {
+        struct dirent* de;
+        struct stat buf;
+        de = readdir(d);
+        if (de == NULL) break;
+
+        if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
+        {
+            bkmkselector->insertItem(de->d_name);
+            cnt++;
+        }
+    }
+
+    closedir(d);
+#endif
+    if (cnt > 0)
+      {
+//tjw        menu->hide();
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+        m_nBkmkAction = cRmBkmkFile;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No bookmark files");
+}
+
+void QTReaderApp::hidetoolbars()
+{
+    menubar->hide();
+    if (fileBar != NULL) fileBar->hide();
+    if (viewBar != NULL) viewBar->hide();
+    if (navBar != NULL) navBar->hide();
+    if (markBar != NULL) markBar->hide();
+    if (m_fontVisible) m_fontBar->hide();
+    if (regVisible)
+    {
+#ifdef USEQPE
+                Global::hideInputMethod();
+#endif
+        regBar->hide();
+    }
+    if (searchVisible)
+    {
+#ifdef USEQPE
+                Global::hideInputMethod();
+#endif
+        searchBar->hide();
+    }
+}
+
+QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
+    : QMainWindow( parent, name, f ), bFromDocView( FALSE ), m_dontSave(false),
+      fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL)
+{
+        m_url_clipboard = false;
+        m_url_localfile = false;
+        m_url_globalfile = false;
+                ftime(&m_lastkeytime);
+////  qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir());
+////  qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml"));
+
+    m_bcloseDisabled = true;
+    m_disableesckey = false;
+    pBkmklist = NULL;
+    pOpenlist = NULL;
+//    doc = 0;
+
+        m_fBkmksChanged = false;
+    
+  QString lang = getenv( "LANG" );
+  QString rot = getenv( "QWS_DISPLAY" );
+
+/*
+  int m_rot = 0;
+  if (rot.contains("Rot90"))
+  {
+      m_rot = 90;
+  }
+  else if (rot.contains("Rot180"))
+  {
+      m_rot = 180;
+  }
+  else if (rot.contains("Rot270"))
+  {
+      m_rot = 270;
+  }
+
+//  qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
+*/
+  m_autogenstr = "^ *[A-Z].*[a-z] *$";
+
+#ifdef USEQPE
+    setIcon( Resource::loadPixmap( PICDIR  "uqtreader") );
+#else
+    setIcon( QPixmap (PICDIR  "uqtreader.png") );
+#endif /* USEQPE */
+
+//    QToolBar *bar = new QToolBar( this );
+//    menubar = new QToolBar( this );
+#ifdef USEQPE
+  Config config( APPDIR );
+#else
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+                d = QDir::home();
+                d.mkdir(APPDIR);
+                d.cd(APPDIR);
+    }
+    QFileInfo fi(d, INIFILE);
+//    qDebug("Path:%s", (const char*)fi.absFilePath());
+    Config config(fi.absFilePath());
+#endif
+    config.setGroup("Toolbar");
+    m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);
+    m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);
+    m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);
+    menubar = new QToolBar("Menus", this, m_tbposition);
+
+//    fileBar = new QToolBar("File", this);
+//    QToolBar* viewBar = new QToolBar("File", this);
+//    QToolBar* navBar = new QToolBar("File", this);
+//    QToolBar* markBar = new QToolBar("File", this);
+
+#ifdef USEQPE
+    mb = new QMenuBar( menubar );
+#else
+    mb = new QMenuBar( menubar );
+#endif
+
+//#ifdef USEQPE
+    QPopupMenu* tmp = new QPopupMenu(mb);
+    mb->insertItem( geticon( "AppsIcon" ), tmp );
+//#else
+//    QMenuBar* tmp = mb;
+//#endif
+
+    QPopupMenu *file = new QPopupMenu( mb );
+    tmp->insertItem( tr( "File" ), file );
+
+    QPopupMenu *navigation = new QPopupMenu(mb);
+    tmp->insertItem( tr( "Navigation" ), navigation );
+
+    QPopupMenu *view = new QPopupMenu( mb );
+    tmp->insertItem( tr( "View" ), view );
+
+    QPopupMenu *marks = new QPopupMenu( this );
+    tmp->insertItem( tr( "Marks" ), marks );
+
+    QPopupMenu *settings = new QPopupMenu( this );
+    tmp->insertItem( tr( "Settings" ), settings );
+
+//    addToolBar(menubar, "Menus",QMainWindow::Top);
+//    addToolBar(fileBar, "Toolbar",QMainWindow::Top);
+
+    //    QPopupMenu *edit = new QPopupMenu( this );
+
+    /*
+    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
+    a->addTo( bar );
+    a->addTo( file );
+    */
+
+    editorStack = new QWidgetStack( this );
+    setCentralWidget( editorStack );
+
+    searchVisible = FALSE;
+    regVisible = FALSE;
+    m_fontVisible = false;
+
+    m_annoWin = new CAnnoEdit(editorStack);
+    editorStack->addWidget(m_annoWin, get_unique_id());
+    connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) );
+    connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) );
+
+    m_infoWin = new infowin(editorStack);
+    editorStack->addWidget(m_infoWin, get_unique_id());
+    connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) );
+
+    m_graphicwin = new GraphicWin(editorStack);
+    editorStack->addWidget(m_graphicwin, get_unique_id());
+    connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) );
+
+//    bkmkselector = new QListBox(editorStack, "Bookmarks");
+    bkmkselector = new CBkmkSelector(editorStack, "Bookmarks");
+    //    connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) );
+    connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) );
+    connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) );
+    editorStack->addWidget( bkmkselector, get_unique_id() );
+
+/*
+    importSelector = new FileSelector( "*", editorStack, "importselector", false );
+    connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) );
+
+    editorStack->addWidget( importSelector, get_unique_id() );
+
+    // don't need the close visible, it is redundant...
+    importSelector->setCloseVisible( FALSE );
+*/    
+//    qDebug("Reading file list");
+    readfilelist();
+
+    reader = new QTReader( editorStack );
+
+    reader->bDoUpdates = false;
+
+#ifdef USEQPE
+    ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
+#endif
+
+//    qDebug("Reading config");
+//  Config config( APPDIR );
+  config.setGroup( "View" );
+  m_debounce = config.readNumEntry("Debounce", 0);
+#ifdef USEQPE
+  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
+#else
+  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", true);
+#endif
+  reader->bstripcr = config.readBoolEntry( "StripCr", true );
+  reader->bfulljust = config.readBoolEntry( "FullJust", false );
+  reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 ));
+  reader->setlead(config.readNumEntry( "ExtraLead", 0 ));
+  reader->btextfmt = config.readBoolEntry( "TextFmt", false );
+  reader->bautofmt = config.readBoolEntry( "AutoFmt", true );
+  reader->bstriphtml = config.readBoolEntry( "StripHtml", false );
+  reader->bpeanut = config.readBoolEntry( "Peanut", false );
+  reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );
+  reader->bdepluck = config.readBoolEntry( "Depluck", false );
+  reader->bdejpluck = config.readBoolEntry( "Dejpluck", false );
+  reader->bonespace = config.readBoolEntry( "OneSpace", false );
+  reader->bunindent = config.readBoolEntry( "Unindent", false );
+  reader->brepara = config.readBoolEntry( "Repara", false );
+  reader->bdblspce = config.readBoolEntry( "DoubleSpace", false );
+  reader->bindenter = config.readNumEntry( "Indent", 0 );
+  reader->m_textsize = config.readNumEntry( "FontSize", 12 );
+  reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);
+  reader->m_lastfile = config.readEntry( "LastFile", QString::null );
+  reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );
+  reader->m_bpagemode = config.readBoolEntry( "PageMode", true );
+  reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false);
+  reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false);
+  reader->m_fontname = config.readEntry( "Fontname", "helvetica" );
+  reader->m_encd = config.readNumEntry( "Encoding", 0 );
+  reader->m_charpc = config.readNumEntry( "CharSpacing", 100 );
+  reader->m_overlap = config.readNumEntry( "Overlap", 0 );
+  reader->m_border = config.readNumEntry( "Margin", 6 );
+#ifdef REPALM
+  reader->brepalm = config.readBoolEntry( "Repalm", true );
+#endif
+  reader->bremap = config.readBoolEntry( "Remap", true );
+  reader->bmakebold = config.readBoolEntry( "MakeBold", false );
+  reader->setContinuous(config.readBoolEntry( "Continuous", true ));
+  m_targetapp = config.readEntry( "TargetApp", QString::null );
+  m_targetmsg = config.readEntry( "TargetMsg", QString::null );
+#ifdef _SCROLLPIPE
+  reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null );
+  reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true );
+#endif
+  m_twoTouch = config.readBoolEntry( "TwoTouch", false);
+  m_doAnnotation = config.readBoolEntry( "Annotation", false);
+  m_doDictionary = config.readBoolEntry( "Dictionary", false);
+  m_doClipboard = config.readBoolEntry( "Clipboard", false);
+  m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);
+  m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone);
+  m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen);
+  m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut);
+  m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn);
+  m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp);
+  m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown);
+
+  m_leftScroll = config.readBoolEntry("LeftScroll", false);
+  m_rightScroll = config.readBoolEntry("RightScroll", false);
+  m_upScroll = config.readBoolEntry("UpScroll", true);
+  m_downScroll = config.readBoolEntry("DownScroll", true);
+
+  m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);
+  reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));
+
+#ifndef USEQPE
+        config.setGroup( "Geometry" );
+        setGeometry(0,0,
+        config.readNumEntry( "width", QApplication::desktop()->width()/2 ),
+        config.readNumEntry( "height", QApplication::desktop()->height()/2 ));
+        move(
+        config.readNumEntry( "x", 20 ),
+        config.readNumEntry( "y", 20 ));
+#endif
+
+
+
+  setTwoTouch(m_twoTouch);
+
+    connect( reader, SIGNAL( OnShowPicture(QImage&) ), this, SLOT( showgraphic(QImage&) ) );
+
+    connect( reader, SIGNAL( OnRedraw() ), this, SLOT( OnRedraw() ) );
+    connect( reader, SIGNAL( OnWordSelected(const QString&, size_t, const QString&) ), this, SLOT( OnWordSelected(const QString&, size_t, const QString&) ) );
+    connect( reader, SIGNAL( OnURLSelected(const QString&) ), this, SLOT( OnURLSelected(const QString&) ) );
+    editorStack->addWidget( reader, get_unique_id() );
+
+    m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL);
+    connect( m_preferences_action, SIGNAL( activated() ), this, SLOT( showprefs() ) );
+    m_preferences_action->addTo( settings );
+
+    m_saveconfig_action = new QAction( tr( "Save Config" ), QString::null, 0, this, NULL);
+    connect( m_saveconfig_action, SIGNAL( activated() ), this, SLOT( SaveConfig() ) );
+    m_saveconfig_action->addTo( settings );
+
+    m_loadconfig_action = new QAction( tr( "Load Config" ), QString::null, 0, this, NULL);
+    connect( m_loadconfig_action, SIGNAL( activated() ), this, SLOT( LoadConfig() ) );
+    m_loadconfig_action->addTo( settings );
+
+    m_tidyconfig_action = new QAction( tr( "Delete Config" ), QString::null, 0, this, NULL);
+    connect( m_tidyconfig_action, SIGNAL( activated() ), this, SLOT( TidyConfig() ) );
+    m_tidyconfig_action->addTo( settings );
+
+    settings->insertSeparator();
+    m_toolbarprefs_action = new QAction( tr( "Toolbars" ), QString::null, 0, this, NULL);
+    connect( m_toolbarprefs_action, SIGNAL( activated() ), this, SLOT( showtoolbarprefs() ) );
+    m_toolbarprefs_action->addTo( settings );
+
+    m_open_action = new QAction( tr( "Open" ), geticon( "fileopen" ), QString::null, 0, this, 0 );
+    connect( m_open_action, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
+    m_open_action->addTo( file );
+
+    m_close_action = new QAction( tr( "Close" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( m_close_action, SIGNAL( activated() ), this, SLOT( fileClose() ) );
+    m_close_action->addTo( file );
+
+#ifdef _SCRIPT
+    a = new QAction( tr( "Run Script" ), QString::null, 0, this, NULL);
+    connect( a, SIGNAL( activated() ), this, SLOT( RunScript() ) );
+    a->addTo( file );
+#endif
+    /*
+    a = new QAction( tr( "Revert" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( fileRevert() ) );
+    a->addTo( file );
+
+    a = new QAction( tr( "Cut" ), geticon( "cut" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
+    a->addTo( filebar() );
+    a->addTo( edit );
+    */
+
+    m_info_action = new QAction( tr( "Info" ), geticon( "UtilsIcon" ), QString::null, 0, this, NULL);
+    connect( m_info_action, SIGNAL( activated() ), this, SLOT( showinfo() ) );
+    m_info_action->addTo( file );
+
+    m_touch_action = new QAction( tr( "Two/One Touch" ), geticon( "1to1" ), QString::null, 0, this, NULL, true );
+    connect( m_touch_action, SIGNAL( toggled(bool) ), this, SLOT( setTwoTouch(bool) ) );
+    m_touch_action->setOn(m_twoTouch);
+    m_touch_action->addTo( file );
+
+    m_find_action = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, NULL);
+     connect( m_find_action, SIGNAL( activated() ), this, SLOT( editFind() ) );
+     file->insertSeparator();
+//     a->addTo( bar );
+     m_find_action->addTo( file );
+
+    m_exportlinks_action = new QAction( tr( "Export Links" ), QString::null, 0, this, NULL);
+    connect( m_exportlinks_action, SIGNAL( activated() ), this, SLOT( ExportLinks() ) );
+    m_exportlinks_action->addTo( file );
+
+    m_scrollButton = new QAction( tr( "Scroll" ), getmyicon( "panel-arrow-down" ), QString::null, 0, this, 0, true );
+    connect( m_scrollButton, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) );
+    m_scrollButton->addTo(navigation);
+    m_scrollButton->setOn(false);
+
+    m_start_action = new QAction( tr( "Goto Start" ), geticon( "start" ), QString::null, 0, this, NULL);
+    connect( m_start_action, SIGNAL( activated() ), this, SLOT( gotoStart() ) );
+    m_start_action->addTo(navigation);
+
+    m_end_action = new QAction( tr( "Goto End" ), geticon( "finish" ), QString::null, 0, this, NULL);
+    connect( m_end_action, SIGNAL( activated() ), this, SLOT( gotoEnd() ) );
+    m_end_action->addTo(navigation);
+
+    m_jump_action = new QAction( tr( "Jump" ), geticon( "rotate" ), QString::null, 0, this, NULL);
+    connect( m_jump_action, SIGNAL( activated() ), this, SLOT( jump() ) );
+    m_jump_action->addTo(navigation);
+
+    m_pageline_action = new QAction( tr( "Page/Line Scroll" ), geticon( "pass" ), QString::null, 0, this, NULL, true );
+    connect( m_pageline_action, SIGNAL( toggled(bool) ), this, SLOT( pagemode(bool) ) );
+    m_pageline_action->addTo(navigation);
+    m_pageline_action->setOn(reader->m_bpagemode);
+
+    m_pageup_action = new QAction( tr( "Up" ), geticon( "up" ), QString::null, 0, this, 0 );
+    connect( m_pageup_action, SIGNAL( activated() ), this, SLOT( pageup() ) );
+    m_pageup_action->addTo( navigation );
+    
+    m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 );
+    connect( m_pagedn_action, SIGNAL( activated() ), this, SLOT( pagedn() ) );
+    m_pagedn_action->addTo( navigation );
+
+    m_back_action = new QAction( tr( "Back" ), geticon( "back" ), QString::null, 0, this, 0 );
+    connect( m_back_action, SIGNAL( activated() ), reader, SLOT( goBack() ) );
+    m_back_action->addTo( navigation );
+
+    m_home_action = new QAction( tr( "Home" ), geticon( "home" ), QString::null, 0, this, 0 );
+    connect( m_home_action, SIGNAL( activated() ), reader, SLOT( goHome() ) );
+    m_home_action->addTo( navigation );
+
+    m_forward_action = new QAction( tr( "Forward" ), geticon( "forward" ), QString::null, 0, this, 0 );
+    connect( m_forward_action, SIGNAL( activated() ), reader, SLOT( goForward() ) );
+    m_forward_action->addTo( navigation );
+
+    /*
+    a = new QAction( tr( "Find" ), QString::null, 0, this, NULL, true );
+    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );
+    a->addTo( file );
+
+    a = new QAction( tr( "Find Again" ), QString::null, 0, this, NULL, true );
+    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );
+    a->addTo( file );
+    */
+
+//    file->insertSeparator();
+
+#ifdef _SCROLLPIPE
+
+    QActionGroup* ag = new QActionGroup(this);
+    ag->setExclusive(false);
+    spacemenu = new QPopupMenu(this);
+    file->insertItem( tr( "Scrolling" ), spacemenu );
+
+    a = new QAction( tr( "Set Target" ), QString::null, 0, ag, NULL);
+    connect( a, SIGNAL( activated() ), this, SLOT( setpipetarget() ) );
+
+    a = new QAction( tr( "Pause Paras" ), QString::null, 0, ag, NULL, true );
+    connect( a, SIGNAL( toggled(bool) ), this, SLOT( setpause(bool) ) );
+    a->setOn(reader->m_pauseAfterEachPara);
+
+    ag->addTo(spacemenu);
+//    file->insertSeparator();
+
+#endif
+
+/*
+    a = new QAction( tr( "Import" ), QString::null, 0, this, NULL );
+    connect( a, SIGNAL( activated() ), this, SLOT( importFiles() ) );
+    a->addTo( file );
+*/
+
+    /*
+    a = new QAction( tr( "Paste" ), geticon( "paste" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
+    a->addTo( fileBar );
+    a->addTo( edit );
+    */
+
+//     a = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, 0 );
+
+     m_fullscreen = false;
+    m_actFullscreen = new QAction( tr( "Fullscreen" ), geticon( "fullscreen" ), QString::null, 0, this, NULL, true );
+    connect( m_actFullscreen, SIGNAL( toggled(bool) ), this, SLOT( setfullscreen(bool) ) );
+    m_actFullscreen->setOn(m_fullscreen);
+    m_actFullscreen->addTo( view );
+
+    view->insertSeparator();
+
+    m_zoomin_action = new QAction( tr( "Zoom In" ), geticon( "zoom" ), QString::null, 0, this);
+    connect( m_zoomin_action, SIGNAL( activated() ), this, SLOT( zoomin() ) );
+    m_zoomin_action->addTo( view );
+
+    m_zoomout_action = new QAction( tr( "Zoom Out" ), geticon( "mag" ), QString::null, 0, this);
+    connect( m_zoomout_action, SIGNAL( activated() ), this, SLOT( zoomout() ) );
+    m_zoomout_action->addTo( view );
+
+    view->insertSeparator();
+    m_setfont_action = new QAction( tr( "Set Font" ), getmyicon( "font" ), QString::null, 0, this);
+    connect( m_setfont_action, SIGNAL( activated() ), this, SLOT( setfont() ) );
+    m_setfont_action->addTo( view );
+
+    view->insertSeparator();
+    m_setenc_action = new QAction( tr( "Set Encoding" ), getmyicon( "charset" ), QString::null, 0, this);
+    connect( m_setenc_action, SIGNAL( activated() ), this, SLOT( chooseencoding() ) );
+    m_setenc_action->addTo( view );
+
+    m_setmono_action = new QAction( tr( "Ideogram" ), getmyicon( "ideogram" ), QString::null, 0, this, NULL, true);
+    connect( m_setmono_action, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );
+    m_setmono_action->addTo( view );
+    m_setmono_action->setOn(reader->m_bMonoSpaced);
+
+
+    //    a = new QAction( tr( "Zoom" ), QString::null, 0, this, NULL, true );
+    //    a = new QAction( tr( "Zoom" ), geticon( "mag" ), QString::null, 0, this, 0 );
+
+
+
+    //    a->addTo( filebar() );
+//     view->insertSeparator();
+
+/*
+    a = new QAction( tr( "Ideogram/Word" ), QString::null, 0, this, NULL, true );
+    connect( a, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );
+    a->setOn(reader->m_bMonoSpaced);
+    a->addTo( view );
+*/
+/*
+    a = new QAction( tr( "Set Width" ), QString::null, 0, this, NULL);
+    connect( a, SIGNAL( activated() ), this, SLOT( setspacing() ) );
+    a->addTo( view );
+*/
+
+    m_mark_action = new QAction( tr( "Bookmark" ), getmyicon( "bookmark" ), QString::null, 0, this, NULL);
+    connect( m_mark_action, SIGNAL( activated() ), this, SLOT( addbkmk() ) );
+    m_mark_action->addTo( marks );
+
+    m_annotate_action = new QAction( tr( "Annotate" ), getmyicon( "annotate" ), QString::null, 0, this, NULL);
+    connect( m_annotate_action, SIGNAL( activated() ), this, SLOT( addanno() ) );
+    m_annotate_action->addTo( marks );
+
+    m_goto_action = new QAction( tr( "Goto" ), getmyicon( "bookmark_goto" ), QString::null, 0, this, NULL, false );
+    connect( m_goto_action, SIGNAL( activated() ), this, SLOT( do_gotomark() ) );
+    m_goto_action->addTo( marks );
+
+    m_delete_action = new QAction( tr( "Delete" ), getmyicon( "bookmark_delete" ), QString::null, 0, this, NULL);
+    connect( m_delete_action, SIGNAL( activated() ), this, SLOT( do_delmark() ) );
+    m_delete_action->addTo( marks );
+
+    m_autogen_action = new QAction( tr( "Autogen" ), geticon( "exec" ), QString::null, 0, this, NULL, false );
+    connect( m_autogen_action, SIGNAL( activated() ), this, SLOT( do_autogen() ) );
+     marks->insertSeparator();
+    m_autogen_action->addTo( marks );
+
+    m_clear_action = new QAction( tr( "Clear" ), getmyicon( "bookmark_clear" ), QString::null, 0, this, NULL);
+    connect( m_clear_action, SIGNAL( activated() ), this, SLOT( clearBkmkList() ) );
+    m_clear_action->addTo( marks );
+
+    m_save_action = new QAction( tr( "Save" ), getmyicon( "bookmark_save" ), QString::null, 0, this, NULL );
+    connect( m_save_action, SIGNAL( activated() ), this, SLOT( savebkmks() ) );
+    m_save_action->addTo( marks );
+
+    m_tidy_action = new QAction( tr( "Tidy" ), getmyicon( "bookmark_tidy" ), QString::null, 0, this, NULL);
+    connect( m_tidy_action, SIGNAL( activated() ), this, SLOT( listBkmkFiles() ) );
+     marks->insertSeparator();
+    m_tidy_action->addTo( marks );
+
+    m_startBlock_action = new QAction( tr( "Start Block" ), geticon( "new" ), QString::null, 0, this, NULL);
+    connect( m_startBlock_action, SIGNAL( activated() ), this, SLOT( editMark() ) );
+    marks->insertSeparator();
+    m_startBlock_action->addTo( marks );
+
+    m_endBlock_action = new QAction( tr( "Copy Block" ), geticon( "copy" ), QString::null, 0, this, NULL);
+    connect( m_endBlock_action, SIGNAL( activated() ), this, SLOT( editCopy() ) );
+    m_endBlock_action->addTo( marks );
+
+    m_bkmkAvail = NULL;
+
+
+    setToolBarsMovable(m_tbmove);
+    addtoolbars(&config);
+
+    pbar = new QProgressBar(this);
+    pbar->hide();
+
+    searchBar = new QFloatBar( "Search", this, QMainWindow::Top, TRUE );
+
+    searchBar->setHorizontalStretchable( TRUE );
+
+    connect(searchBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
+
+    searchEdit = new QLineEdit( searchBar, "searchEdit" );
+//      QFont f("unifont", 16 /*, QFont::Bold*/);
+//      searchEdit->setFont( f );
+    searchBar->setStretchableWidget( searchEdit );
+
+
+#ifdef __ISEARCH
+    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
+             this, SLOT( search( const QString& ) ) );
+#else
+    connect( searchEdit, SIGNAL( returnPressed( ) ),
+             this, SLOT( search( ) ) );
+#endif
+     QAction*a = new QAction( tr( "Find Next" ), geticon( "next" ), QString::null, 0, this, 0 );
+     connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
+     a->addTo( searchBar );
+
+    a = new QAction( tr( "Close Find" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
+    a->addTo( searchBar );
+
+    searchBar->hide();
+
+    regBar = new QFloatBar( "Autogen", this, QMainWindow::Top, TRUE );
+    connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
+
+    regBar->setHorizontalStretchable( TRUE );
+
+    regEdit = new QLineEdit( regBar, "regEdit" );
+//    regEdit->setFont( f );
+
+    regBar->setStretchableWidget( regEdit );
+
+    connect( regEdit, SIGNAL( returnPressed( ) ),
+             this, SLOT( do_regaction() ) );
+
+    a = new QAction( tr( "Do Reg" ), geticon( "enter" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );
+    a->addTo( regBar );
+
+    a = new QAction( tr( "Close Edit" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( regClose() ) );
+    a->addTo( regBar );
+
+    regBar->hide();
+
+    m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );
+
+    m_fontBar->setHorizontalStretchable( TRUE );
+
+//    qDebug("Font selector");
+    m_fontSelector = new QComboBox(false, m_fontBar);
+    m_fontBar->setStretchableWidget( m_fontSelector );
+    {
+#ifndef USEQPE
+        QFontDatabase f;
+#else
+        FontDatabase f;
+#endif
+        QStringList flist = f.families();
+        bool realfont = false;
+        for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++)
+        {
+            if (reader->m_fontname == *nm)
+            {
+                realfont = true;
+            }
+            if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm);
+        }
+        if (!realfont) reader->m_fontname = flist[0];
+    } // delete the FontDatabase!!!
+    connect( m_fontSelector, SIGNAL( activated(const QString& ) ),
+             this, SLOT( do_setfont(const QString&) ) );
+    connect( m_fontSelector, SIGNAL( activated(int ) ),
+             this, SLOT( do_setencoding(int) ) );
+
+    m_fontBar->hide();
+    m_fontVisible = false;
+#ifdef USEMSGS
+    connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ),
+             this, SLOT( msgHandler(const QCString&, const QByteArray&) ) );
+#endif
+//    qDebug("Initing");
+  reader->init();
+//    qDebug("Inited");
+//    m_buttonAction[m_spaceTarget]->setOn(true);
+//    qDebug("fonting");
+    do_setfont(reader->m_fontname);
+    if (!reader->m_lastfile.isEmpty())
+    {
+        //qDebug("doclnk");
+        //doc = new DocLnk(reader->m_lastfile);
+        //qDebug("doclnk done");
+        if (pOpenlist != NULL)
+        {
+
+/*
+            int ind = 0;
+            Bkmk* p = (*pOpenlist)[ind];
+            while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
+            {
+                p = (*pOpenlist)[++ind];
+            }
+*/
+            Bkmk* p = NULL;
+            for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
+            {
+                p = iter.pContent();
+                if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
+                {
+                    break;
+                }
+        //      qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));
+                p = NULL;
+            }
+            if (p != NULL)
+            {
+        //qDebug("openfrombkmk");
+                if (!openfrombkmk(p))
+                    showEditTools();
+            }
+            else
+            {
+        //qDebug("openfile");
+                openFile( reader->m_lastfile );
+            }
+        }
+        else
+        {
+        //    qDebug("Openfile 2");
+            if (!reader->m_lastfile.isEmpty())
+                openFile( reader->m_lastfile );
+        }
+    }
+    else
+    {
+      showEditTools();
+    }
+//    qApp->processEvents();
+    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))
+    {
+        config.writeEntry("Major", major);
+        config.writeEntry("BkmkType", bkmktype);
+        config.writeEntry("Minor", (int)minor);
+    }
+//    qDebug("finished update");
+}
+
+void QTReaderApp::addtoolbars(Config* config)
+{
+    config->setGroup("Toolbar");
+
+    if (fileBar != NULL)
+    {
+        if (fileBar != menubar)
+        {
+            fileBar->clear();
+        }
+        else
+        {
+            m_preferences_action->removeFrom( filebar() );
+            m_open_action->removeFrom( filebar() );
+            m_close_action->removeFrom( filebar() );
+            m_info_action->removeFrom( filebar() );
+            m_touch_action->removeFrom( filebar() );
+            m_find_action->removeFrom( filebar() );
+        }
+    }
+
+    m_preferences_action->addTo( filebar() );
+    addfilebar(config, "Open", m_open_action);
+    addfilebar(config, "Close", m_close_action);
+    addfilebar(config, "Info", m_info_action);
+    addfilebar(config, "Two/One Touch", m_touch_action);
+    addfilebar(config, "Find", m_find_action);
+
+    if (navBar != NULL)
+    {
+        if ((navBar == fileBar) && (fileBar == menubar))
+        {
+            m_scrollButton->removeFrom( navbar() );
+            m_start_action->removeFrom( navbar() );
+            m_end_action->removeFrom( navbar() );
+            m_jump_action->removeFrom( navbar() );
+            m_pageline_action->removeFrom( navbar() );
+            m_pageup_action->removeFrom( navbar() );
+            m_pagedn_action->removeFrom( navbar() );
+            m_back_action->removeFrom( navbar() );
+            m_home_action->removeFrom( navbar() );
+            m_forward_action->removeFrom( navbar() );
+        }
+        else if (navBar != fileBar)
+        {
+            navBar->clear();
+        }
+    }
+
+    addnavbar(config, "Scroll", m_scrollButton);
+    addnavbar(config, "Goto Start", m_start_action);
+    addnavbar(config, "Goto End", m_end_action);
+
+    addnavbar(config, "Jump", m_jump_action);
+    addnavbar(config, "Page/Line Scroll", m_pageline_action);
+
+    addnavbar(config, "Page Up", m_pageup_action);
+    addnavbar(config, "Page Down", m_pagedn_action);
+
+    addnavbar(config, "Back", m_back_action);
+    addnavbar(config, "Home", m_home_action);
+    addnavbar(config, "Forward", m_forward_action);
+
+    if (viewBar != NULL)
+    {
+        if ((viewBar == fileBar) && (fileBar == menubar))
+        {
+            m_actFullscreen->removeFrom( filebar() );
+            m_zoomin_action->removeFrom( viewbar() );
+            m_zoomout_action->removeFrom( viewbar() );
+            m_setfont_action->removeFrom( viewbar() );
+            m_setenc_action->removeFrom( viewbar() );
+            m_setmono_action->removeFrom( viewbar() );
+        }
+        else if (viewBar != fileBar)
+        {
+            viewBar->clear();
+        }
+    }
+
+    addviewbar(config, "Fullscreen", m_actFullscreen);
+    addviewbar(config, "Zoom In", m_zoomin_action);
+    addviewbar(config, "Zoom Out", m_zoomout_action);
+    addviewbar(config, "Set Font", m_setfont_action);
+    addviewbar(config, "Encoding Select", m_setenc_action);
+    addviewbar(config, "Ideogram Mode", m_setmono_action);
+
+    if (markBar != NULL)
+    {
+        if ((markBar == fileBar) && (fileBar == menubar))
+        {
+            m_mark_action->removeFrom( markbar() );
+            m_annotate_action->removeFrom( markbar());
+            m_goto_action->removeFrom( markbar() );
+            m_delete_action->removeFrom( markbar() );
+            m_autogen_action->removeFrom( markbar() );
+            m_clear_action->removeFrom( markbar() );
+            m_save_action->removeFrom( markbar() );
+            m_tidy_action->removeFrom( markbar() );
+            m_startBlock_action->removeFrom( markbar() );
+            m_endBlock_action->removeFrom( markbar() );
+        }
+        else if (markBar != fileBar)
+        {
+            markBar->clear();
+        }
+    }
+    addmarkbar(config, "Mark", m_mark_action);
+    addmarkbar(config, "Annotate", m_annotate_action);
+    addmarkbar(config, "Goto", m_goto_action);
+    addmarkbar(config, "Delete", m_delete_action);
+    addmarkbar(config, "Autogen", m_autogen_action);
+    addmarkbar(config, "Clear", m_clear_action);
+    addmarkbar(config, "Save", m_save_action);
+    addmarkbar(config, "Tidy", m_tidy_action);
+    addmarkbar(config, "Start Block", m_startBlock_action);
+    addmarkbar(config, "Copy Block", m_endBlock_action);
+    if (checkbar(config, "Annotation indicator"))
+    {
+        if (m_bkmkAvail == NULL)
+        {
+            m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 );
+            connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) );
+        
+            m_bkmkAvail->setEnabled(false);
+        }
+        QLabel *spacer = new QLabel(markBar, "");
+        markbar()->setStretchableWidget(spacer);
+        m_bkmkAvail->removeFrom( markbar() );
+        m_bkmkAvail->addTo( markbar() );
+    }
+    else
+    {
+        if (m_bkmkAvail != NULL)
+        {
+            m_bkmkAvail->removeFrom( markbar() );
+            delete m_bkmkAvail;
+            m_bkmkAvail = NULL;
+        }
+    }
+}
+
+bool QTReaderApp::checkbar(Config* _config, const QString& key)
+{
+    return _config->readBoolEntry(key, false);
+}
+
+
+QToolBar* QTReaderApp::filebar()
+{
+    if (fileBar == NULL)
+    {
+        switch (m_tbpol)
+        {
+            case cesSingle:
+        //      qDebug("Setting filebar to menubar");
+                fileBar = menubar;
+                break;
+            default:
+                qDebug("Incorrect toolbar policy set");
+            case cesMenuTool:
+            case cesMultiple:
+        //      qDebug("Creating new file bar");
+                fileBar = new QToolBar("File", this, m_tbposition);
+                break;
+        }
+        //fileBar->setHorizontalStretchable( true );
+    }
+    return fileBar;
+}
+QToolBar* QTReaderApp::viewbar()
+{
+    if (viewBar == NULL)
+    {
+        switch (m_tbpol)
+        {
+            case cesMultiple:
+                viewBar = new QToolBar("View", this, m_tbposition);
+                break;
+            default:
+                qDebug("Incorrect toolbar policy set");
+            case cesSingle:
+            case cesMenuTool:
+                viewBar = fileBar;
+                break;
+        }
+    }
+    return viewBar;
+}
+QToolBar* QTReaderApp::navbar()
+{
+    if (navBar == NULL)
+    {
+        switch (m_tbpol)
+        {
+            case cesMultiple:
+        //      qDebug("Creating new nav bar");
+                navBar = new QToolBar("Navigation", this, m_tbposition);
+                break;
+            default:
+                qDebug("Incorrect toolbar policy set");
+            case cesSingle:
+            case cesMenuTool:
+                navBar = fileBar;
+        //      qDebug("Setting navbar to filebar");
+                break;
+        }
+    }
+    return navBar;
+}
+QToolBar* QTReaderApp::markbar()
+{
+    if (markBar == NULL)
+    {
+        switch (m_tbpol)
+        {
+            case cesMultiple:
+                markBar = new QToolBar("Marks", this, m_tbposition);
+                break;
+            default:
+                qDebug("Incorrect toolbar policy set");
+            case cesSingle:
+            case cesMenuTool:
+                markBar = fileBar;
+                break;
+        }
+    }
+    return markBar;
+}
+
+void QTReaderApp::addfilebar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( filebar() );
+}
+void QTReaderApp::addnavbar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( navbar() );
+}
+void QTReaderApp::addmarkbar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( markbar() );
+}
+void QTReaderApp::addviewbar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( viewbar() );
+}
+
+void QTReaderApp::suspend() { reader->suspend(); }
+
+#ifdef USEMSGS
+void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
+{
+    QString msg = QString::fromUtf8(_msg);
+
+////    qDebug("Received:%s", (const char*)msg);
+
+    QDataStream stream( _data, IO_ReadOnly );
+    if ( msg == "info(QString)" )
+    {
+        QString info;
+        stream >> info;
+        QMessageBox::information(this, PROGNAME, info);
+    }
+    else if ( msg == "Update(int)" )
+    {
+        int info;
+        stream >> info;
+        if (info)
+        {
+            reader->bDoUpdates = true;
+            reader->refresh();
+        }
+        else
+        {
+            reader->bDoUpdates = false;
+        }
+    }
+    else if ( msg == "warn(QString)" )
+    {
+        QString info;
+        stream >> info;
+        QMessageBox::warning(this, PROGNAME, info);
+    }
+    else if ( msg == "exit()" )
+    {
+        m_dontSave = true;
+        close();
+    }
+    else if ( msg == "pageDown()" )
+    {
+        reader->dopagedn();
+    }
+    else if ( msg == "pageUp()" )
+    {
+        reader->dopageup();
+    }
+    else if ( msg == "lineDown()" )
+    {
+        reader->lineDown();
+    }
+    else if ( msg == "lineUp()" )
+    {
+        reader->lineUp();
+    }
+    else if ( msg == "showText()" )
+    {
+        showEditTools();
+    }
+    else if ( msg == "home()" )
+    {
+        reader->goHome();
+    }
+    else if ( msg == "back()" )
+    {
+        reader->goBack();
+    }
+    else if ( msg == "forward()" )
+    {
+        reader->goForward();
+    }
+    else if ( msg == "File/Open(QString)" )
+    {
+        QString info;
+        stream >> info;
+        openFile( info );
+    }
+    else if ( msg == "File/Info()" )
+    {
+        showinfo();
+    }
+    else if ( msg == "File/Action(QString)" )
+    {
+        QString info;
+        stream >> info;
+        m_spaceTarget = ActNameToInt(info);
+    }
+    else if ( msg == "Navigation/Scroll(int)" )
+    {
+        int info;
+        stream >> info;
+        autoScroll(info);
+    }
+
+    else if ( msg == "Navigation/GotoStart()" )
+    {
+        gotoStart();
+    }
+    else if ( msg == "Navigation/GotoEnd()" )
+    {
+        gotoEnd();
+    }
+    else if ( msg == "Navigation/Jump(int)" )
+    {
+        int info;
+        stream >> info;
+        reader->locate(info);
+    }
+    else if ( msg == "Navigation/Page/LineScroll(int)" )
+    {
+        int info;
+        stream >> info;
+        pagemode(info);
+    }
+    else if ( msg == "Navigation/SetOverlap(int)" )
+    {
+        int info;
+        stream >> info;
+        reader->m_overlap = info;
+    }
+    else if ( msg == "Navigation/SetMargin(int)" )
+    {
+        int info;
+        stream >> info;
+        do_margin(info);
+    }
+    else if ( msg == "File/SetDictionary(QString)" )
+    {
+        QString info;
+        stream >> info;
+        do_settarget(info);
+    }
+#ifdef _SCROLLPIPE
+    else if ( msg == "File/SetScrollTarget(QString)" )
+    {
+        QString info;
+        stream >> info;
+        reader->m_pipetarget = info;
+    }
+#endif
+    else if ( msg == "File/Two/OneTouch(int)" )
+    {
+        int info;
+        stream >> info;
+        setTwoTouch(info);
+    }
+    else if ( msg == "Target/Annotation(int)" )
+    {
+        int info;
+        stream >> info;
+        OnAnnotation(info);
+    }
+    else if ( msg == "Target/Dictionary(int)" )
+    {
+        int info;
+        stream >> info;
+        OnDictionary(info);
+    }
+    else if ( msg == "Target/Clipboard(int)" )
+    {
+        int info;
+        stream >> info;
+        OnClipboard(info);
+    }
+    else if ( msg == "File/Find(QString)" )
+    {
+        QString info;
+        stream >> info;
+        QRegExp arg(info);
+        size_t pos = reader->pagelocate();
+        size_t start = pos;
+        CDrawBuffer test(&(reader->m_fontControl));
+        reader->getline(&test);
+        while (arg.match(toQString(test.data())) == -1)
+        {
+            pos = reader->locate();
+            if (!reader->getline(&test))
+            {
+                QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info);
+                pos = start;
+                break;
+            }
+        }
+        reader->locate(pos);
+    }
+    else if ( msg == "File/Fullscreen(int)" )
+    {
+        int info;
+        stream >> info;
+        setfullscreen(info);
+    }
+    else if ( msg == "File/Continuous(int)" )
+    {
+        int info;
+        stream >> info;
+        setcontinuous(info);
+    }
+    else if ( msg == "Markup(QString)" )
+    {
+        QString info;
+        stream >> info;
+        if (info == "Auto")
+        {
+            autofmt(true);
+        }
+        if (info == "None")
+        {
+            autofmt(false);
+            textfmt(false);
+            striphtml(false);
+            peanut(false);
+        }
+        if (info == "Text")
+        {
+            textfmt(true);
+        }
+        if (info == "HTML")
+        {
+            striphtml(true);
+        }
+        if (info == "Peanut/PML")
+        {
+            peanut(true);
+        }
+    }
+    else if ( msg == "Layout/StripCR(int)" )
+    {
+        int info;
+        stream >> info;
+        stripcr(info);
+    }
+    else if ( msg == "Layout/Dehyphen(int)" )
+    {
+        int info;
+        stream >> info;
+        dehyphen(info);
+    }
+    else if ( msg == "Layout/Depluck(int)" )
+    {
+        int info;
+        stream >> info;
+        depluck(info);
+    }
+    else if ( msg == "Layout/Dejpluck(int)" )
+    {
+        int info;
+        stream >> info;
+        dejpluck(info);
+    }
+    else if ( msg == "Layout/SingleSpace(int)" )
+    {
+        int info;
+        stream >> info;
+        onespace(info);
+    }
+#ifdef REPALM
+    else if ( msg == "Layout/Repalm(int)" )
+    {
+        int info;
+        stream >> info;
+        repalm(info);
+    }
+#endif
+    else if ( msg == "Layout/Unindent(int)" )
+    {
+        int info;
+        stream >> info;
+        unindent(info);
+    }
+    else if ( msg == "Layout/Re-paragraph(int)" )
+    {
+        int info;
+        stream >> info;
+        repara(info);
+    }
+    else if ( msg == "Layout/DoubleSpace(int)" )
+    {
+        int info;
+        stream >> info;
+        dblspce(info);
+    }
+    else if ( msg == "Layout/Indent(int)" )
+    {
+        int info;
+        stream >> info;
+        reader->bindenter = info;
+        reader->setfilter(reader->getfilter());
+    }
+    else if ( msg == "Layout/Remap(int)" )
+    {
+        int info;
+        stream >> info;
+        remap(info);
+    }
+    else if ( msg == "Layout/Embolden(int)" )
+    {
+        int info;
+        stream >> info;
+        embolden(info);
+    }
+    else if ( msg == "Format/Ideogram/Word(int)" )
+    {
+        int info;
+        stream >> info;
+        monospace(info);
+    }
+    else if ( msg == "Format/SetWidth(int)" )
+    {
+        int info;
+        stream >> info;
+        reader->m_charpc = info;
+        reader->setfont();
+        reader->refresh();
+    }
+    else if ( msg == "Format/SetFont(QString,int)" )
+    {
+        QString fontname;
+        int size;
+        stream >> fontname;
+        stream >> size;
+        setfontHelper(fontname, size);
+    }
+    else if ( msg == "Marks/Autogen(QString)" )
+    {
+        QString info;
+        stream >> info;
+        do_autogen(info);
+    }
+    else if ( msg == "File/StartBlock()" )
+    {
+        editMark();
+    }
+    else if ( msg == "File/CopyBlock()" )
+    {
+        editCopy();
+    }
+}
+#endif
+ActionTypes QTReaderApp::ActNameToInt(const QString& _enc)
+{
+    for (int i = 0; i < MAX_ACTIONS; i++)
+    {
+        if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i;
+    }
+    return cesAutoScroll;
+}
+
+void QTReaderApp::setfullscreen(bool sfs)
+{
+    reader->bDoUpdates = false;
+    m_fullscreen = sfs;
+    showEditTools();
+//    qApp->processEvents();
+    reader->bDoUpdates = true;
+    reader->update();
+}
+
+void QTReaderApp::buttonActionSelected(QAction* _a)
+{
+////    qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));
+    m_spaceTarget = ActNameToInt(_a->text());
+}
+
+QTReaderApp::~QTReaderApp()
+{
+}
+
+void QTReaderApp::autoScroll(bool _b)
+{
+    reader->setautoscroll(_b);
+    setScrollState(reader->m_autoScroll);
+}
+
+void QTReaderApp::zoomin()
+{
+    reader->zoomin();
+}
+
+void QTReaderApp::zoomout()
+{
+    reader->zoomout();
+}
+
+void QTReaderApp::clearBkmkList()
+{
+        delete pBkmklist;
+        pBkmklist = NULL;
+        m_fBkmksChanged = false;
+}
+
+void QTReaderApp::fileClose()
+{
+    CCloseDialog* cd = new CCloseDialog(reader->m_string, false, this);
+    if (cd->exec())
+    {
+        if (pOpenlist != NULL)
+        {
+            int ind = 0;
+            Bkmk* p = (*pOpenlist)[ind];
+            while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
+            {
+                p = (*pOpenlist)[++ind];
+            }
+            if (p != NULL) pOpenlist->erase(ind);
+            if (cd->delFile())
+            {
+                unlink((const char*)reader->m_lastfile);
+            }
+            if (cd->delMarks())
+            {
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR);
+                d.remove(reader->m_string);
+#else /* USEQPE */
+                unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
+#endif /* USEQPE */
+            }
+            if (cd->delConfig())
+            {
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR "/configs");
+                d.remove(reader->m_string);
+#else /* USEQPE */
+                unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string));
+#endif /* USEQPE */
+            }
+        }
+    
+        fileOpen2();
+    }
+    delete cd;
+}
+
+void QTReaderApp::updatefileinfo()
+{
+    if (reader->m_string.isEmpty()) return;
+    if (reader->m_lastfile.isEmpty()) return;
+    tchar* nm = fromQString(reader->m_string);
+    tchar* fl = fromQString(reader->m_lastfile);
+//    qDebug("Lastfile:%x", fl);
+    bool notadded = true;
+    if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;
+    else
+    {
+        for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
+        {
+            if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0)
+            {
+                iter->value(reader->pagelocate());
+                unsigned short dlen;
+                unsigned char* data;
+                CFiledata fd(iter->anno());
+                reader->setSaveData(data, dlen, fd.content(), fd.length());
+        //      qDebug("Filedata(1):%u, %u", fd.length(), dlen);
+        //      getstate(data, dlen);
+                iter->setAnno(data, dlen);
+                notadded = false;
+                delete [] data;
+                break;
+            }
+        }
+    }
+//    qDebug("Added?:%x", notadded);
+    if (notadded)
+    {
+        struct stat fnstat;
+        stat((const char *)reader->m_lastfile, &fnstat);
+        CFiledata fd(fnstat.st_mtime, fl);
+        unsigned short dlen;
+        unsigned char* data;
+        reader->setSaveData(data, dlen, fd.content(), fd.length());
+        pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate()));
+        //qDebug("Filedata(2):%u, %u", fd.length(), dlen);
+        delete [] data;
+    }
+    delete [] nm;
+    delete [] fl;
+}
+
+void QTReaderApp::fileOpen()
+{
+/*
+    menu->hide();
+    fileBar->hide();
+    if (regVisible) regBar->hide();
+    if (searchVisible) searchBar->hide();
+*/
+//    qDebug("fileOpen");
+//    if (!reader->m_lastfile.isEmpty())
+    updatefileinfo();
+    fileOpen2();
+}
+
+void QTReaderApp::fileOpen2()
+{
+    if (pBkmklist != NULL)
+    {
+        if (m_fBkmksChanged)
+        {
+            if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
+                savebkmks();
+        }     
+        delete pBkmklist;
+        pBkmklist = NULL;
+        m_fBkmksChanged = false;
+    }
+    reader->disableAutoscroll();
+/*
+    editorStack->raiseWidget( fileSelector );
+    fileSelector->reread();
+*/
+    bool usebrowser = true;
+    if (pOpenlist != NULL)
+    {
+        m_nBkmkAction = cOpenFile;
+        if (listbkmk(pOpenlist, "Browse")) usebrowser = false;
+    }
+    if (usebrowser)
+    {
+        QString fn = usefilebrowser();
+        //qApp->processEvents();
+        if (!fn.isEmpty() && QFileInfo(fn).isFile())
+        {
+            openFile(fn);
+        }
+        reader->setFocus();
+    }
+//    reader->refresh();
+//    qDebug("HEIGHT:%d", reader->m_lastheight);
+}
+
+QString QTReaderApp::usefilebrowser()
+{
+#ifndef USEQPE
+    QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) );
+    return s;
+#else
+    fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog,
+                                      0,
+        //                            WStyle_Customize | WStyle_NoBorderEx,
+                                      "*", QFileInfo(reader->m_lastfile).dirPath(true));
+
+
+    QString fn;
+    if (fb->exec())
+    {
+        fn = fb->getCurrentFile();
+    }
+//    qDebug("Selected %s", (const char*)fn);
+    delete fb;
+    showEditTools();
+    return fn;
+#endif
+}
+
+void QTReaderApp::showgraphic(QImage& pm)
+{
+    QPixmap pc;
+    pc.convertFromImage(pm);
+    m_graphicwin->setPixmap(pc);
+    editorStack->raiseWidget( m_graphicwin );
+    m_graphicwin->setFocus();
+}
+
+
+void QTReaderApp::showprefs()
+{
+    CPrefs* prefwin = new CPrefs(!m_bFloatingDialog, this);
+
+    prefwin->twotouch(m_twoTouch); 
+    prefwin->propfontchange(m_propogatefontchange);
+    prefwin->StripCR(reader->bstripcr);
+    prefwin->Dehyphen(reader->bdehyphen);
+    prefwin->SingleSpace(reader->bonespace);
+    prefwin->Unindent(reader->bunindent);
+    prefwin->Reparagraph(reader->brepara);
+    prefwin->DoubleSpace(reader->bdblspce);
+    prefwin->Remap(reader->bremap);
+    prefwin->Embolden(reader->bmakebold);
+    prefwin->FullJustify(reader->bfulljust);
+    prefwin->ParaLead(reader->getextraspace());
+    prefwin->LineLead(reader->getlead());
+    prefwin->Margin(reader->m_border);
+    prefwin->Indent(reader->bindenter);
+    if (reader->bautofmt)
+    {
+        prefwin->Markup(0);
+    }
+    else if (reader->btextfmt)
+    {
+        prefwin->Markup(2);
+    }
+    else if (reader->bstriphtml)
+    {
+        prefwin->Markup(3);
+    }
+    else if (reader->bpeanut)
+    {
+        prefwin->Markup(4);
+    }
+    else
+    {
+        prefwin->Markup(1);
+    }
+    prefwin->Depluck(reader->bdepluck);
+    prefwin->Dejpluck(reader->bdejpluck);
+    prefwin->Continuous(reader->m_continuousDocument);
+
+    prefwin->dictApplication(m_targetapp);
+    prefwin->dictMessage(m_targetmsg);
+
+    prefwin->spaceAction(m_spaceTarget);
+    prefwin->escapeAction(m_escapeTarget);
+    prefwin->returnAction(m_returnTarget);
+    prefwin->leftAction(m_leftTarget);
+    prefwin->rightAction(m_rightTarget);
+    prefwin->upAction(m_upTarget);
+    prefwin->downAction(m_downTarget);
+
+    prefwin->leftScroll(m_leftScroll);
+    prefwin->rightScroll(m_rightScroll);
+    prefwin->upScroll(m_upScroll);
+    prefwin->downScroll(m_downScroll);
+
+    prefwin->miscannotation(m_doAnnotation);
+    prefwin->miscdictionary(m_doDictionary);
+    prefwin->miscclipboard(m_doClipboard);
+
+    prefwin->SwapMouse(reader->m_swapmouse);
+
+    prefwin->Font(reader->m_fontname);
+
+    prefwin->gfxsize(reader->getBaseSize());
+
+    prefwin->pageoverlap(reader->m_overlap);
+
+    prefwin->ideogram(reader->m_bMonoSpaced);
+
+    prefwin->encoding(reader->m_encd);
+
+    prefwin->ideogramwidth(reader->m_charpc);
+
+    if (prefwin->exec())
+    {
+        m_twoTouch = prefwin->twotouch();
+        reader->setTwoTouch(m_twoTouch);
+        m_touch_action->setOn(m_twoTouch);
+
+        reader->bstripcr = prefwin->StripCR();
+        reader->bdehyphen = prefwin->Dehyphen();
+        reader->bonespace = prefwin->SingleSpace();
+        reader->bunindent = prefwin->Unindent();
+        reader->brepara = prefwin->Reparagraph();
+        reader->bdblspce = prefwin->DoubleSpace();
+        reader->bremap = prefwin->Remap();
+        reader->bmakebold = prefwin->Embolden();
+        reader->bfulljust = prefwin->FullJustify();
+        reader->setextraspace(prefwin->ParaLead());
+        reader->setlead(prefwin->LineLead());
+        reader->m_border = prefwin->Margin();
+        reader->bindenter = prefwin->Indent();
+        reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false;
+        switch (prefwin->Markup())
+        {
+            case 0:
+                reader->bautofmt = true;
+                break;
+            case 1:
+                break;
+            case 2:
+                reader->btextfmt = true;
+                break;
+            case 3:
+                reader->bstriphtml = true;
+                break;
+            case 4:
+                reader->bpeanut = true;
+                break;
+            default:
+                qDebug("Format out of range");
+        }
+        reader->bdepluck = prefwin->Depluck();
+        reader->bdejpluck = prefwin->Dejpluck();
+        reader->setContinuous(prefwin->Continuous());
+
+        m_spaceTarget = (ActionTypes)prefwin->spaceAction();
+        m_escapeTarget = (ActionTypes)prefwin->escapeAction();
+        m_returnTarget = (ActionTypes)prefwin->returnAction();
+        m_leftTarget = (ActionTypes)prefwin->leftAction();
+        m_rightTarget = (ActionTypes)prefwin->rightAction();
+        m_upTarget = (ActionTypes)prefwin->upAction();
+        m_downTarget = (ActionTypes)prefwin->downAction();
+        m_leftScroll = prefwin->leftScroll();
+        m_rightScroll = prefwin->rightScroll();
+        m_upScroll = prefwin->upScroll();
+        m_downScroll = prefwin->downScroll();
+
+        m_targetapp = prefwin->dictApplication();
+        m_targetmsg = prefwin->dictMessage();
+
+        m_doAnnotation = prefwin->miscannotation();
+        m_doDictionary = prefwin->miscdictionary();
+        m_doClipboard = prefwin->miscclipboard();
+        reader->m_swapmouse = prefwin->SwapMouse();
+        reader->setBaseSize(prefwin->gfxsize());
+        reader->m_overlap = prefwin->pageoverlap();
+        reader->m_bMonoSpaced = prefwin->ideogram();
+        m_setmono_action->setOn(reader->m_bMonoSpaced);
+        reader->m_encd = prefwin->encoding();
+        reader->m_charpc = prefwin->ideogramwidth();
+
+        if (
+            reader->m_fontname != prefwin->Font()
+            ||
+            m_propogatefontchange != prefwin->propfontchange())
+        {
+            m_propogatefontchange = prefwin->propfontchange();
+            setfontHelper(prefwin->Font());
+        }
+        delete prefwin;
+        reader->setfilter(reader->getfilter());
+        reader->refresh();
+
+    }
+    else
+    {
+        delete prefwin;
+    }
+}
+
+void QTReaderApp::showtoolbarprefs()
+{
+#ifdef USEQPE
+    CBarPrefs* prefwin = new CBarPrefs(APPDIR, !m_bFloatingDialog, this);
+#else
+        QFileInfo fi;
+    QDir d = QDir::home();                      // "/"
+        if ( !d.cd(APPDIR) )
+        {                       // "/tmp"
+                qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+                d = QDir::home();
+                d.mkdir(APPDIR);
+                d.cd(APPDIR);
+        }
+        fi.setFile(d, INIFILE);
+    CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);
+#endif
+    prefwin->tbpolicy(m_tbpolsave);
+    prefwin->tbposition(m_tbposition-2);
+    prefwin->tbmovable(m_tbmovesave);
+    prefwin->floating(m_bFloatingDialog);
+    if (prefwin->exec())
+    {
+        m_bFloatingDialog = prefwin->floating();
+        if (
+            m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy()
+            ||
+            m_tbposition != (ToolBarDock)(prefwin->tbposition()+2)
+            ||
+            m_tbmovesave != prefwin->tbmovable()
+            )
+        {
+            QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started");
+        }
+        m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy();
+        m_tbposition = (ToolBarDock)(prefwin->tbposition()+2);
+        m_tbmovesave = prefwin->tbmovable();
+        bool isChanged = prefwin->isChanged();
+        delete prefwin;
+#ifdef USEQPE
+        Config config( APPDIR );
+#else
+        QFileInfo fi;
+    QDir d = QDir::home();                      // "/"
+        if ( !d.cd(APPDIR) )
+        {                       // "/tmp"
+                qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+                d = QDir::home();
+                d.mkdir(APPDIR);
+                d.cd(APPDIR);
+        }
+        fi.setFile(d, INIFILE);
+        Config config( fi.absFilePath() );
+#endif
+        if (isChanged) addtoolbars(&config);
+    }
+    else
+    {
+        delete prefwin;
+    }
+}
+
+void QTReaderApp::showinfo()
+{
+    unsigned long fs, ts, pl;
+    if (reader->empty())
+    {
+        QMessageBox::information(this, PROGNAME, "No file loaded", 1);
+    }
+    else
+    {
+        reader->sizes(fs,ts);
+        pl = reader->pagelocate();
+        m_infoWin->setFileSize(fs);
+        m_infoWin->setTextSize(ts);
+        m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
+        m_infoWin->setLocation(pl);
+        m_infoWin->setRead((100*pl + (ts >> 1))/ts);
+        editorStack->raiseWidget( m_infoWin );
+        m_infoWin->setFocus();
+    }
+}
+
+void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn)
+{
+    if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;
+#ifdef _UNICODE
+    CBuffer buff(name.length()+1);
+    int i;
+    for (i = 0; i < name.length(); i++)
+    {
+        buff[i] = name[i].unicode();
+    }
+    buff[i] = 0;
+    CBuffer buff2(text.length()+1);
+    for (i = 0; i < text.length(); i++)
+    {
+        buff2[i] = text[i].unicode();
+    }
+    buff2[i] = 0;
+    pBkmklist->push_front(Bkmk(buff.data(), buff2.data(), posn));
+#else
+    pBkmklist->push_front(Bkmk((const tchar*)text,posn));
+#endif
+    m_fBkmksChanged = true;
+    pBkmklist->sort();
+}
+
+void QTReaderApp::addAnno(const QString& name, const QString& text)
+{
+    if (m_annoIsEditing)
+    {
+        if (name.isEmpty())
+        {
+            QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1);
+        }
+        else
+        {
+            addAnno(name, text, m_annoWin->getPosn());
+        }
+        showEditTools();
+    }
+    else
+    {
+        if (m_annoWin->edited())
+        {
+            CBuffer buff(text.length()+1);
+            int i;
+            for (i = 0; i < text.length(); i++)
+            {
+                buff[i] = text[i].unicode();
+            }
+            buff[i] = 0;
+            m_fBkmksChanged = true;
+            m_anno->setAnno(buff.data());
+        }
+        bool found = findNextBookmark(m_anno->value()+1);
+        if (found)
+        {
+            m_annoWin->setName(toQString(m_anno->name()));
+            m_annoWin->setAnno(toQString(m_anno->anno()));
+        }
+        else
+        {
+            showEditTools();
+        }
+    }
+}
+
+bool QTReaderApp::findNextBookmark(size_t start)
+{
+    bool found = false;
+    for (CList<Bkmk>::iterator iter = pBkmklist->begin(); iter != pBkmklist->end(); iter++)
+    {
+        if (iter->value() >= start)
+        {
+            if (iter->value() < reader->locate())
+            {
+                found = true;
+                m_anno = iter.pContent();
+            }
+            break;
+        }
+    }
+    return found;
+}
+
+void QTReaderApp::addanno()
+{
+    if (reader->empty())
+    {
+        QMessageBox::information(this, PROGNAME, "No file loaded", 1);
+    }
+    else
+    {
+        m_annoWin->setName("");
+        m_annoWin->setAnno("");
+        m_annoWin->setPosn(reader->pagelocate());
+        m_annoIsEditing = true;
+        editorStack->raiseWidget( m_annoWin );
+#ifdef USEQPE
+        Global::showInputMethod();
+#endif
+        m_annoWin->setFocus();
+    }
+}
+
+void QTReaderApp::infoClose()
+{
+    showEditTools();
+}
+
+/*
+void QTReaderApp::fileRevert()
+{
+    clear();
+    fileOpen();
+}
+
+void QTReaderApp::editCut()
+{
+#ifndef QT_NO_CLIPBOARD
+    editor->cut();
+#endif
+}
+*/
+void QTReaderApp::editMark()
+{
+    m_savedpos = reader->pagelocate();
+}
+
+void QTReaderApp::editCopy()
+{
+        QClipboard* cb = QApplication::clipboard();
+        QString text;
+        int ch;
+        unsigned long currentpos = reader->pagelocate();
+        unsigned long endpos = reader->locate();
+        if (m_savedpos == 0xffffffff)
+        {
+            m_savedpos = currentpos;
+        }
+        reader->jumpto(m_savedpos);
+        while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)
+        {
+            text += ch;
+        }
+        cb->setText(text);
+        reader->locate(currentpos);
+        m_savedpos = 0xffffffff;
+}
+
+void QTReaderApp::gotoStart()
+{
+    reader->locate(reader->buffdoc.startSection());
+}
+
+void QTReaderApp::gotoEnd()
+{
+    reader->dopageup(reader->buffdoc.endSection());
+}
+
+void QTReaderApp::pageup()
+{
+    reader->NavUp();
+}
+
+void QTReaderApp::pagedn()
+{
+    reader->NavDown();
+}
+
+void QTReaderApp::pagemode(bool _b)
+{
+    reader->setpagemode(_b);
+}
+
+/*
+void QTReaderApp::setspacing()
+{
+    m_nRegAction = cMonoSpace;
+    char lcn[20];
+    sprintf(lcn, "%lu", reader->m_charpc);
+    regEdit->setText(lcn);
+    do_regedit();
+}
+*/
+void QTReaderApp::settarget()
+{
+    m_nRegAction = cSetTarget;
+    QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp)
+        + "/"
+        + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg);
+    regEdit->setText(text);
+    do_regedit();
+}
+
+/*
+void QTReaderApp::do_mono(const QString& lcn)
+{
+    bool ok;
+    unsigned long ulcn = lcn.toULong(&ok);
+    if (ok)
+    {
+        reader->m_charpc = ulcn;
+        reader->setfont();
+        reader->refresh();
+        //reader->setmono(true);
+    }
+    else
+        QMessageBox::information(this, PROGNAME, "Must be a number");
+}
+*/
+/*
+void QTReaderApp::editPaste()
+{
+#ifndef QT_NO_CLIPBOARD
+    editor->paste();
+#endif
+}
+*/
+
+void QTReaderApp::editFind()
+{
+  searchStart = reader->pagelocate();
+#ifdef __ISEARCH
+  searchStack = new QStack<searchrecord>;
+#endif
+#ifdef USEQPE
+  Global::showInputMethod();
+#endif
+  searchBar->show();
+  searchVisible = TRUE;
+  searchEdit->setFocus();
+#ifdef __ISEARCH
+  searchStack->push(new searchrecord("",reader->pagelocate()));
+#endif
+}
+
+void QTReaderApp::findNext()
+{
+//  //  qDebug("findNext called\n");
+#ifdef __ISEARCH
+  QString arg = searchEdit->text();
+#else
+  QRegExp arg = searchEdit->text();
+#endif
+  CDrawBuffer test(&(reader->m_fontControl));
+  size_t start = reader->pagelocate();
+  reader->jumpto(start);
+  reader->getline(&test);
+  dosearch(start, test, arg);
+}
+
+void QTReaderApp::findClose()
+{
+  searchVisible = FALSE;
+  searchEdit->setText("");
+#ifdef USEQPE
+  Global::hideInputMethod();
+#endif
+  searchBar->hide();
+#ifdef __ISEARCH
+//  searchStack = new QStack<searchrecord>;
+  while (!searchStack->isEmpty())
+    {
+      delete searchStack->pop();
+    }
+  delete searchStack;
+#endif
+  reader->setFocus();
+}
+
+void QTReaderApp::regClose()
+{
+  regVisible = FALSE;
+  regEdit->setText("");
+  regBar->hide();
+#ifdef USEQPE
+  Global::hideInputMethod();
+#endif
+  reader->setFocus();
+}
+
+#ifdef __ISEARCH
+bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QString& arg)
+#else
+bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
+#endif
+{
+  bool ret = true;
+    unsigned long fs, ts;
+    reader->sizes(fs,ts);
+  size_t pos = reader->locate();
+  pbar->setGeometry(searchBar->x(),searchBar->y(),searchBar->width(), searchBar->height());
+  pbar->show();
+  pbar->raise();
+  pbar->reset();
+  int offset;
+  int lastpc = (100*pos)/ts;
+  pbar->setProgress(lastpc);
+//  qApp->processEvents();
+  if (reader->buffdoc.getpara(test) >= 0)
+  {
+      reader->setFocus();
+#ifdef __ISEARCH
+      while (strstr(test.data(),(const tchar*)arg) == NULL)
+#else
+#ifdef _UNICODE
+      while ((offset = arg.match(toQString(test.data()))) == -1)
+#else
+      while (arg.match(test.data()) == -1)
+#endif
+#endif
+      {
+          pos = reader->locate();
+          int pc = (100*pos)/ts;
+          if (pc != lastpc)
+          {
+              pbar->setProgress(pc);
+              qApp->processEvents();
+              reader->setFocus();
+              lastpc = pc;
+          }
+          
+          if (reader->buffdoc.getpara(test) < 0)
+          {
+              if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
+                  pos = searchStart;
+              else
+                  pos = start;
+              findClose();
+              pbar->hide();
+              reader->locate(pos);
+              return false;
+          }
+      }
+//      qDebug("Found it at %u:%u", pos, offset);
+      pbar->hide();
+//      qDebug("Hid");
+      reader->locate(pos+offset);
+//      qDebug("Loacted");
+//      qDebug("page up");
+      ret = true;
+  }
+  else
+  {
+              if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
+                  pos = searchStart;
+              else
+                  pos = start;
+              ret = false;
+              findClose();
+  }
+  return ret;
+}
+
+#ifdef __ISEARCH
+void QTReaderApp::search(const QString & arg)
+{
+  searchrecord* ss = searchStack->top();
+  CBuffer test;
+  size_t start = reader->pagelocate();
+  bool haspopped = false;
+  while (arg.left(ss->s.length()) != ss->s)
+  {
+      haspopped = true;
+      start = ss->pos;
+//      reader->locate(start);
+      searchStack->pop();
+      delete ss;
+  }
+  if (haspopped) reader->locate(start);
+/*
+  if (arg.length() < ss->len)
+    {
+      start = ss->pos;
+      reader->locate(start);
+      searchStack->pop();
+      delete ss;
+    }
+*/
+  else
+    {
+      start = reader->pagelocate();
+      reader->jumpto(start);
+      searchStack->push(new searchrecord(arg,start));
+    }
+    dosearch(start, test, arg);
+}
+#else
+void QTReaderApp::search()
+{
+    findNext();
+}
+#endif
+
+void QTReaderApp::openFile( const QString &f )
+{
+//    qDebug("File:%s", (const char*)f);
+//    openFile(DocLnk(f));
+//}
+//
+//void QTReaderApp::openFile( const DocLnk &f )
+//{
+  clear();
+  QFileInfo fm(f);
+  if ( fm.exists() )
+    {
+//      QMessageBox::information(0, "Progress", "Calling fileNew()");
+#ifdef USEQPE
+        if (fm.extension( FALSE ) == "desktop")
+        {
+            DocLnk d(f);
+            QFileInfo fnew(d.file());
+            fm = fnew;
+            if (!fm.exists()) return;
+        }
+#endif
+      clear();
+
+      reader->setText(fm.baseName(), fm.absFilePath());
+      m_loadedconfig = readconfig(reader->m_string, false);
+      showEditTools();
+      readbkmks();
+      m_savedpos = 0xffffffff;
+    }
+  else
+    {
+      QMessageBox::information(this, PROGNAME, "File does not exist");
+      reader->m_lastfile = QString::null;
+    }
+        
+}
+/*
+void QTReaderApp::resizeEvent(QResizeEvent* e)
+{
+    if (m_fullscreen)
+    {
+        showNormal();
+        showFullScreen();
+    }
+}
+*/
+void QTReaderApp::handlekey(QKeyEvent* e)
+{
+//    qDebug("Keypress event");
+    timeb now;
+    ftime(&now);
+    unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;
+    if (etime < m_debounce)
+    {
+        return;
+    }
+    m_lastkeytime = now;
+    switch(e->key())
+    {
+        case Key_Escape:
+        //    qDebug("escape event");
+            if (m_disableesckey)
+            {
+                m_disableesckey = false;
+            }
+            else
+            {
+                m_bcloseDisabled = true;
+                if (m_fullscreen)
+                {
+                    m_actFullscreen->setOn(false);
+                    e->accept();
+                }
+                else
+                {
+        //      qDebug("escape action");
+                    doAction(m_escapeTarget, e);
+                }
+            }
+            break;
+        case Key_Space:
+        {
+            doAction(m_spaceTarget, e);
+        }
+        break;
+        case Key_Return:
+        {
+            doAction(m_returnTarget, e);
+        }
+        break;
+        case Key_Left:
+        {
+            if (reader->m_autoScroll && m_leftScroll)
+            {
+                reader->reduceScroll();
+            }
+            else
+            {
+                doAction(m_leftTarget, e);
+            }
+        }
+        break;
+        case Key_Right:
+        {
+            if (reader->m_autoScroll && m_rightScroll)
+            {
+                reader->increaseScroll();
+            }
+            else
+            {
+                doAction(m_rightTarget, e);
+            }
+        }
+        break;
+        case Key_Up:
+        {
+            if (reader->m_autoScroll && m_upScroll)
+            {
+                reader->increaseScroll();
+            }
+            else
+            {
+                doAction(m_upTarget, e);
+            }
+        }
+        break;
+        case Key_Down:
+        {
+            if (reader->m_autoScroll && m_downScroll)
+            {
+                reader->reduceScroll();
+            }
+            else
+            {
+                doAction(m_downTarget, e);
+            }
+        }
+        break;
+        default:
+        {
+            e->ignore();
+        }
+        
+/*
+        QString msg("Key press was:");
+        QString key;
+        msg += key.setNum(e->key());
+        QMessageBox::information(this, PROGNAME, msg);
+*/
+    }
+}
+
+void QTReaderApp::showEditTools()
+{
+//    if ( !doc )
+        //close();
+    if (m_fullscreen)
+    {
+        if (menubar != NULL) menubar->hide();
+        if (fileBar != NULL) fileBar->hide();
+        if (viewBar != NULL) viewBar->hide();
+        if (navBar != NULL) navBar->hide();
+        if (markBar != NULL) markBar->hide();
+        searchBar->hide();
+        regBar->hide();
+#ifdef USEQPE
+        Global::hideInputMethod();
+#endif
+        m_fontBar->hide();
+        //showNormal();
+        showFullScreen();
+    }
+    else
+    {
+        //qDebug("him");
+#ifdef USEQPE
+        Global::hideInputMethod();
+#endif
+        //qDebug("eb");
+        menubar->show();
+        if (fileBar != NULL) fileBar->show();
+        if (viewBar != NULL) viewBar->show();
+        if (navBar != NULL) navBar->show();
+        if (markBar != NULL) markBar->show();
+        mb->show();
+        if ( searchVisible )
+        {
+#ifdef USEQPE
+            Global::showInputMethod();
+#endif
+                searchBar->show();
+        }
+        if ( regVisible )
+        {
+#ifdef USEQPE
+            Global::showInputMethod();
+#endif
+                regBar->show();
+        }
+        if (m_fontVisible) m_fontBar->show();
+        //qDebug("sn");
+        showNormal();
+        //qDebug("sm");
+#ifdef USEQPE
+        showMaximized();
+#endif
+        //setCentralWidget(reader);
+    }
+
+//    qDebug("uc");
+    updateCaption();
+//    qDebug("rw");
+    editorStack->raiseWidget( reader );
+//    qDebug("sf");
+    reader->setFocus();
+    reader->refresh();
+}
+/*
+void QTReaderApp::save()
+{
+    if ( !doc )
+        return;
+    if ( !editor->edited() )
+        return;
+
+    QString rt = editor->text();
+    QString pt = rt;
+
+    if ( doc->name().isEmpty() ) {
+        unsigned ispace = pt.find( ' ' );
+        unsigned ienter = pt.find( '\n' );
+        int i = (ispace < ienter) ? ispace : ienter;
+        QString docname;
+        if ( i == -1 ) {
+            if ( pt.isEmpty() )
+                docname = "Empty Text";
+            else
+                docname = pt;
+        } else {
+            docname = pt.left( i );
+        }
+        doc->setName(docname);
+    }
+    FileManager fm;
+    fm.saveFile( *doc, rt );
+}
+*/
+
+void QTReaderApp::clear()
+{
+//    if (doc != 0)
+//      {
+//  QMessageBox::information(this, PROGNAME, "Deleting doc", 1);
+        //delete doc;
+//  QMessageBox::information(this, PROGNAME, "Deleted doc", 1);
+        //doc = 0;
+    //     }
+    reader->clear();
+}
+
+void QTReaderApp::updateCaption()
+{
+//    if ( !doc )
+        //setCaption( tr("QTReader") );
+//    else {
+        //QString s = doc->name();
+        //if ( s.isEmpty() )
+        //    s = tr( "Unnamed" );
+        setCaption( reader->m_string + " - " + tr("Reader") );
+//    }
+}
+
+void QTReaderApp::setDocument(const QString& fileref)
+{
+    bFromDocView = TRUE;
+//QMessageBox::information(0, "setDocument", fileref);
+    openFile(fileref);
+//    showEditTools();
+}
+
+void QTReaderApp::closeEvent( QCloseEvent *e )
+{
+//    qDebug("Close event");
+    if (m_fullscreen)
+    {
+        m_fullscreen = false;
+        showEditTools();
+        e->accept();
+    }
+    else if (m_dontSave)
+    {
+        e->accept();
+    }
+    else
+    {
+        if (editorStack->visibleWidget() == reader)
+        {
+            if ((m_escapeTarget != cesNone) && m_bcloseDisabled)
+            {
+        //qDebug("Close disabled");
+                m_bcloseDisabled = false;
+                e->ignore();
+            }
+            else
+            {
+                if (m_fontVisible)
+                {
+                    m_fontBar->hide();
+                    m_fontVisible = false;
+                }
+                if (regVisible)
+                {
+                    regBar->hide();
+#ifdef USEQPE
+                    Global::hideInputMethod();
+#endif
+                    regVisible = false;
+                    return;
+                }
+                if (searchVisible)
+                {
+                    searchBar->hide();
+#ifdef USEQPE
+                    Global::hideInputMethod();
+#endif
+                    searchVisible = false;
+                    return;
+                }
+                if (m_fBkmksChanged && pBkmklist != NULL)
+                {
+                    if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
+                        savebkmks();
+                    delete pBkmklist;
+                    pBkmklist = NULL;
+                    m_fBkmksChanged = false;
+                }
+                bFromDocView = FALSE;
+                updatefileinfo();
+                saveprefs();
+                e->accept();
+            }
+        }
+        else
+        {
+            showEditTools();
+            m_disableesckey = true;
+        }
+    }
+}
+
+void QTReaderApp::do_gotomark()
+{
+    m_nBkmkAction = cGotoBkmk;
+    if (!listbkmk(pBkmklist))
+        QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
+}
+
+void QTReaderApp::do_delmark()
+{
+    m_nBkmkAction = cDelBkmk;
+    if (!listbkmk(pBkmklist))
+        QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
+}
+
+bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
+{
+    bkmkselector->clear();
+    if (_lab.isEmpty())
+        bkmkselector->setText("Cancel");
+    else
+        bkmkselector->setText(_lab);
+    int cnt = 0;
+    if (plist != NULL)
+      {
+        for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
+          {
+#ifdef _UNICODE
+        //      qDebug("Item:%s", (const char*)toQString(i->name()));
+            bkmkselector->insertItem(toQString(i->name()));
+#else
+            bkmkselector->insertItem(i->name());
+#endif
+            cnt++;
+          }
+      }
+    if (cnt > 0)
+      {
+          hidetoolbars();
+        editorStack->raiseWidget( bkmkselector );
+        return true;
+      }
+    else
+        return false;
+}
+
+void QTReaderApp::do_autogen()
+{
+  m_nRegAction = cAutoGen;
+  regEdit->setText(m_autogenstr);
+  do_regedit();
+}
+
+void QTReaderApp::do_regedit()
+{
+//    fileBar->hide();
+    reader->bDoUpdates = false;
+//    qDebug("Showing regbar");
+  regBar->show();
+//    qDebug("Showing kbd");
+#ifdef USEQPE
+  Global::showInputMethod();
+#endif
+  regVisible = true;
+  regEdit->setFocus();
+//  qApp->processEvents();
+    reader->bDoUpdates = true;
+    reader->update();
+}
+
+bool QTReaderApp::openfrombkmk(Bkmk* bk)
+{
+    QString fn = toQString(
+        CFiledata(bk->anno()).name()
+        );
+        //qDebug("fileinfo");
+    if (!fn.isEmpty() && QFileInfo(fn).isFile())
+    {
+        //qDebug("Opening");
+        openFile(fn);
+        struct stat fnstat;
+        stat((const char *)reader->m_lastfile, &fnstat);
+        
+        if (CFiledata(bk->anno()).date()
+            != fnstat.st_mtime)
+        {
+            CFiledata fd(bk->anno());
+            fd.setdate(fnstat.st_mtime);
+            bk->value(0);
+        }
+        else
+        {
+            unsigned short svlen = bk->filedatalen();
+            unsigned char* svdata = bk->filedata();
+            reader->putSaveData(svdata, svlen);
+        //    setstate(svdata, svlen);
+            if (svlen != 0)
+            {
+                QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
+            }
+        //    qDebug("updating");
+        //    showEditTools();
+            reader->locate(bk->value());
+        }
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+void QTReaderApp::gotobkmk(int ind)
+{
+    showEditTools();
+    switch (m_nBkmkAction)
+    {
+        case cOpenFile:
+        {
+        //    qApp->processEvents();
+            if (!openfrombkmk((*pOpenlist)[ind]))
+            {
+                pOpenlist->erase(ind);
+                QMessageBox::information(this, PROGNAME, "Can't find file");
+            }
+        }
+        break;
+        case cGotoBkmk:
+            reader->locate((*pBkmklist)[ind]->value());
+            break;
+        case cDelBkmk:
+        ////    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
+            pBkmklist->erase(ind);
+            m_fBkmksChanged = true;
+        //    pBkmklist->sort();
+            break;
+        case cRmBkmkFile:
+                {
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR);
+                d.remove(bkmkselector->text(ind));
+#else /* USEQPE */
+                unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind)));
+#endif /* USEQPE */
+                }
+            break;
+        case cLdConfig:
+            readconfig(bkmkselector->text(ind), false);
+            break;
+        case cRmConfig:
+                {
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR "/configs");
+                d.remove(bkmkselector->text(ind));
+#else /* USEQPE */
+                unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind)));
+#endif /* USEQPE */
+                }
+            break;
+        case cExportLinks:
+        {
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+            d.cd(APPDIR "/urls");
+            QFileInfo fi(d, bkmkselector->text(ind));
+            if (fi.exists())
+            {
+                QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) );
+                if (!outfile.isEmpty())
+                {
+                    FILE* fout = fopen((const char *)outfile, "w");
+                    if (fout != NULL)
+                    {
+                        FILE* fin = fopen((const char *)fi.absFilePath(), "r");
+                        if (fin != NULL)
+                        {
+                            fprintf(fout, "<html><body>\n");
+                            int ch = 0;
+                            while ((ch = fgetc(fin)) != EOF)
+                            {
+                                fputc(ch, fout);
+                            }
+                            fclose(fin);
+                            fprintf(fout, "</html></body>\n");
+                            d.remove(bkmkselector->text(ind));
+                        }
+                        fclose(fout);
+                    }
+                    else
+                        QMessageBox::information(this, PROGNAME, "Couldn't open output");
+                }
+            }
+#else /* USEQPE */
+            FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
+            if (fin != NULL)
+            {
+                bool allok = false;
+                fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null);
+                if (fb->exec())
+                {
+                    QString outfile = fb->getCurrentFile();
+                    FILE* fout = fopen((const char *)outfile, "w");
+                    if (fout != NULL)
+                    {
+                        fprintf(fout, "<html><body>\n");
+                        int ch = 0;
+                        while ((ch = fgetc(fin)) != EOF)
+                        {
+                            fputc(ch, fout);
+                        }
+                        fprintf(fout, "</html></body>\n");
+                        fclose(fout);
+                        allok = true;
+                    }
+                    else
+                        QMessageBox::information(this, PROGNAME, "Couldn't open output");
+                }
+                delete fb;
+                fclose(fin);
+                if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
+            }
+            else
+            {
+                QMessageBox::information(this, PROGNAME, "Couldn't open input");
+            }
+
+/*
+            CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );
+            int ret = f->exec();
+            qDebug("Return:%d", ret);
+            DocLnk* doc = f->getDoc();
+            if (doc != NULL)
+            {
+                FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
+                QString rt;
+                rt = "<html><body>\n";
+                int ch = 0;
+                while ((ch = fgetc(fin)) != EOF)
+                {
+                    rt += (char)ch;
+                }
+                fclose(fin);
+                rt += "</html></body>\n";
+                if ( doc->name().isEmpty() )
+                {
+                    doc->setName(bkmkselector->text(ind));
+                }
+                FileManager fm;
+                fm.saveFile( *doc, rt );
+                qDebug("YES");
+            }
+            else
+            {
+                qDebug("NO");
+            }
+            delete f;
+*/
+
+#endif /* USEQPE */
+        }
+        break;
+    }
+}
+
+void QTReaderApp::cancelbkmk()
+{
+    if (m_nBkmkAction == cOpenFile)
+    {
+        QString fn = usefilebrowser();
+        if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
+    }
+  showEditTools();
+}
+
+void QTReaderApp::jump()
+{
+  m_nRegAction = cJump;
+  char lcn[20];
+  sprintf(lcn, "%lu", reader->pagelocate());
+  regEdit->setText(lcn);
+  do_regedit();
+}
+
+void QTReaderApp::do_jump(const QString& lcn)
+{
+    bool ok;
+    unsigned long ulcn = lcn.toULong(&ok);
+    if (ok)
+        reader->locate(ulcn);
+    else
+        QMessageBox::information(this, PROGNAME, "Must be a number");
+}
+
+void QTReaderApp::do_regaction()
+{
+    reader->bDoUpdates = false;
+  regBar->hide();
+#ifdef USEQPE
+  Global::hideInputMethod();
+#endif
+  regVisible = false;
+  switch(m_nRegAction)
+  {
+      case cAutoGen:
+          do_autogen(regEdit->text());
+          break;
+      case cAddBkmk:
+          do_addbkmk(regEdit->text());
+          break;
+      case cJump:
+          do_jump(regEdit->text());
+          break;
+/*
+      case cMonoSpace:
+          do_mono(regEdit->text());
+          break;
+*/
+      case cSetTarget:
+          do_settarget(regEdit->text());
+          break;
+#ifdef _SCROLLPIPE
+      case cSetPipeTarget:
+          do_setpipetarget(regEdit->text());
+          break;
+#endif
+      case cSetConfigName:
+        //  qDebug("Saving config");
+          do_saveconfig(regEdit->text(), false);
+          break;
+  }
+//  reader->restore();
+//    fileBar->show();
+  reader->setFocus();
+//    qApp->processEvents();
+    reader->bDoUpdates = true;
+    reader->update();
+}
+
+void QTReaderApp::do_settarget(const QString& _txt)
+{
+    int ind = _txt.find('/');
+    if (ind == -1)
+    {
+        m_targetapp = "";
+        m_targetmsg = "";
+        QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename");
+    }
+    else
+    {
+        m_targetapp = _txt.left(ind);
+        m_targetmsg = _txt.right(_txt.length()-ind-1);
+    }
+}
+
+void QTReaderApp::chooseencoding()
+{
+    m_fontSelector->clear();
+    m_fontSelector->insertItem("Ascii");
+    m_fontSelector->insertItem("UTF-8");
+    m_fontSelector->insertItem("UCS-2(BE)");
+    m_fontSelector->insertItem("USC-2(LE)");
+    m_fontSelector->insertItem("Palm");
+    for (unicodetable::iterator iter = unicodetable::begin(); iter != unicodetable::end(); iter++)
+    {
+        m_fontSelector->insertItem(iter->mime);
+    } // delete the FontDatabase!!!
+    m_fontSelector->setCurrentItem (reader->m_encd);
+    m_fontAction = cChooseEncoding;
+    m_fontBar->show();
+    m_fontVisible = true;
+}
+
+void QTReaderApp::setfont()
+{
+    m_fontSelector->clear();
+    {
+#ifdef USEQPE
+        FontDatabase f;
+#else
+        QFontDatabase f;
+#endif
+        QStringList flist = f.families();
+        m_fontSelector->insertStringList(flist);
+    } // delete the FontDatabase!!!
+
+    for (int i = 1; i <= m_fontSelector->count(); i++)
+    {
+        if (m_fontSelector->text(i) == reader->m_fontname)
+        {
+            m_fontSelector->setCurrentItem(i);
+            break;
+        }
+    }
+    m_fontAction = cChooseFont;
+    m_fontBar->show();
+    m_fontVisible = true;
+}
+
+void QTReaderApp::setfontHelper(const QString& lcn, int size)
+{
+    if (size == 0) size = reader->m_fontControl.currentsize();
+    if (m_propogatefontchange)
+    {
+        QFont f(lcn, 10);
+        bkmkselector->setFont( f );
+        regEdit->setFont( f );
+        searchEdit->setFont( f );
+        m_annoWin->setFont( f );
+    }
+    reader->m_fontname = lcn;
+    if (!reader->ChangeFont(size))
+    {
+        reader->ChangeFont(size);
+    }
+}
+
+void QTReaderApp::do_setencoding(int i)
+{
+//    qDebug("setencoding:%d", i);
+    if (m_fontAction == cChooseEncoding)
+    {
+        reader->setencoding(i);
+    }
+    reader->refresh();
+    m_fontBar->hide();
+    m_fontVisible = false;
+//    qDebug("showedit");
+    if (reader->isVisible()) showEditTools();
+//    qDebug("showeditdone");
+}
+
+void QTReaderApp::do_setfont(const QString& lcn)
+{
+    if (m_fontAction == cChooseFont)
+    {
+        setfontHelper(lcn);
+    }
+    reader->refresh();
+    m_fontBar->hide();
+    m_fontVisible = false;
+//    qDebug("showedit");
+    //if (reader->isVisible())
+    showEditTools();
+//    qDebug("showeditdone");
+}
+
+void QTReaderApp::do_autogen(const QString& regText)
+{
+    unsigned long fs, ts;
+    reader->sizes(fs,ts);
+//  //  qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));
+  m_autogenstr = regText;
+  QRegExp re(regText);
+  CBuffer buff;
+  if (pBkmklist != NULL) delete pBkmklist;
+  pBkmklist = new CList<Bkmk>;
+  m_fBkmksChanged = true;
+
+  pbar->setGeometry(regBar->x(),regBar->y(),regBar->width(), regBar->height());
+  pbar->show();
+  pbar->raise();
+  pbar->reset();
+  reader->update();
+  qApp->processEvents();
+  reader->setFocus();
+  reader->jumpto(0);
+  int lastpc = 0;
+  int i = 0;
+  while (i >= 0)
+    {
+      unsigned int lcn = reader->locate();
+      int pc = (100*lcn)/ts;
+      if (pc != lastpc)
+      {
+        pbar->setProgress(pc);
+        qApp->processEvents();
+        if (reader->locate() != lcn) reader->jumpto(lcn);
+        reader->setFocus();
+        lastpc = pc;
+      }
+      i = reader->buffdoc.getpara(buff);
+#ifdef _UNICODE
+      if (re.match(toQString(buff.data())) != -1)
+#else
+      if (re.match(buff.data()) != -1)
+#endif
+        pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn));
+    }
+  pBkmklist->sort();
+  pbar->setProgress(100);
+  qApp->processEvents();
+  pbar->hide();
+  reader->refresh();
+}
+
+void QTReaderApp::saveprefs()
+{
+//    qDebug("saveprefs");
+//  reader->saveprefs("uqtreader");
+//    if (!m_loadedconfig)
+        do_saveconfig( APPDIR, true );
+
+/*    
+    Config config( APPDIR );
+    config.setGroup( "View" );
+    
+    reader->m_lastposn = reader->pagelocate();
+    
+    config.writeEntry("FloatDialogs", m_bFloatingDialog);
+    config.writeEntry( "StripCr", reader->bstripcr );
+    config.writeEntry( "AutoFmt", reader->bautofmt );
+    config.writeEntry( "TextFmt", reader->btextfmt );
+    config.writeEntry( "StripHtml", reader->bstriphtml );
+    config.writeEntry( "Dehyphen", reader->bdehyphen );
+    config.writeEntry( "Depluck", reader->bdepluck );
+    config.writeEntry( "Dejpluck", reader->bdejpluck );
+    config.writeEntry( "OneSpace", reader->bonespace );
+    config.writeEntry( "Unindent", reader->bunindent );
+    config.writeEntry( "Repara", reader->brepara );
+    config.writeEntry( "DoubleSpace", reader->bdblspce );
+    config.writeEntry( "Indent", reader->bindenter );
+    config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) );
+    config.writeEntry( "ScrollDelay", reader->m_delay);
+    config.writeEntry( "LastFile", reader->m_lastfile );
+    config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );
+    config.writeEntry( "PageMode", reader->m_bpagemode );
+    config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced );
+    config.writeEntry( "SwapMouse", reader->m_swapmouse);
+    config.writeEntry( "Fontname", reader->m_fontname );
+    config.writeEntry( "Encoding", reader->m_encd );
+    config.writeEntry( "CharSpacing", reader->m_charpc );
+    config.writeEntry( "Overlap", (int)(reader->m_overlap) );
+    config.writeEntry( "Margin", (int)reader->m_border );
+    config.writeEntry( "TargetApp", m_targetapp );
+    config.writeEntry( "TargetMsg", m_targetmsg );
+#ifdef _SCROLLPIPE
+    config.writeEntry( "PipeTarget", reader->m_pipetarget );
+    config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );
+#endif
+    config.writeEntry( "TwoTouch", m_twoTouch );
+    config.writeEntry( "Annotation", m_doAnnotation);
+    config.writeEntry( "Dictionary", m_doDictionary);
+    config.writeEntry( "Clipboard", m_doClipboard);
+    config.writeEntry( "SpaceTarget", m_spaceTarget);
+    config.writeEntry( "EscapeTarget", m_escapeTarget);
+    config.writeEntry( "ReturnTarget", m_returnTarget);
+    config.writeEntry( "LeftTarget", m_leftTarget);
+    config.writeEntry( "RightTarget", m_rightTarget);
+    config.writeEntry( "UpTarget", m_upTarget);
+    config.writeEntry( "DownTarget", m_downTarget);
+    config.writeEntry("LeftScroll", m_leftScroll);
+    config.writeEntry("RightScroll", m_rightScroll);
+    config.writeEntry("UpScroll", m_upScroll);
+    config.writeEntry("DownScroll", m_downScroll);
+#ifdef REPALM
+    config.writeEntry( "Repalm", reader->brepalm );
+#endif
+    config.writeEntry( "Remap", reader->bremap );
+    config.writeEntry( "Peanut", reader->bpeanut );
+    config.writeEntry( "MakeBold", reader->bmakebold );
+    config.writeEntry( "Continuous", reader->m_continuousDocument );
+    config.writeEntry( "FullJust", reader->bfulljust );
+    config.writeEntry( "ExtraSpace", reader->getextraspace() );
+    config.writeEntry( "ExtraLead", reader->getlead() );
+    config.writeEntry( "Basesize",  (int)reader->getBaseSize());
+    config.writeEntry( "RequestorFontChange", m_propogatefontchange);
+
+    config.setGroup( "Toolbar" );
+    config.writeEntry("Movable", m_tbmovesave);
+    config.writeEntry("Policy", m_tbpolsave);
+    config.writeEntry("Position", m_tbposition);
+*/
+    savefilelist();
+}
+
+/*
+void QTReaderApp::oldFile()
+{
+//  qDebug("oldFile called");
+  reader->setText(true);
+//  qDebug("settext called");
+  showEditTools();
+//  qDebug("showedit called");
+}
+*/
+
+/*
+void info_cb(Fl_Widget* o, void* _data)
+{
+
+    if (infowin == NULL)
+    {
+        
+        infowin = new Fl_Window(160,240);
+        filename = new Fl_Output(45,5,110,14,"Filename");
+        filesize = new Fl_Output(45,25,110,14,"Filesize");
+        textsize = new Fl_Output(45,45,110,14,"Textsize");
+        comprat = new CBar(45,65,110,14,"Ratio %");
+        posn = new Fl_Output(45,85,110,14,"Location");
+        frcn = new CBar(45,105,110,14,"% Read");
+        about = new Fl_Multiline_Output(5,125,150,90);
+        about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");
+        Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");
+        infowin->set_modal();
+    }
+    if (((reader_ui *)_data)->g_filename[0] != '\0')
+    {
+        unsigned long fs,ts;
+        tchar sz[20];
+        ((reader_ui *)_data)->input->sizes(fs,ts);
+        unsigned long pl = ((reader_ui *)_data)->input->locate();
+
+        filename->value(((reader_ui *)_data)->g_filename);
+
+        sprintf(sz,"%u",fs);
+        filesize->value(sz);
+
+        sprintf(sz,"%u",ts);
+        textsize->value(sz);
+
+        comprat->value(100-(100*fs + (ts >> 1))/ts);
+
+        sprintf(sz,"%u",pl);
+        posn->value(sz);
+
+        frcn->value((100*pl + (ts >> 1))/ts);
+    }
+    infowin->show();
+}
+*/
+
+void QTReaderApp::savebkmks()
+{
+    if (pBkmklist != NULL)
+    {
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR);
+                QFileInfo fi(d, reader->m_string);
+        BkmkFile bf((const char *)fi.absFilePath(), true);
+#else /* USEQPE */
+        BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true);
+#endif /* USEQPE */
+        bf.write(*pBkmklist);
+    }
+        m_fBkmksChanged = false;
+}
+
+void QTReaderApp::readfilelist()
+{
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR);
+                QFileInfo fi(d, ".openfiles");
+    BkmkFile bf((const char *)fi.absFilePath());
+#else /* USEQPE */
+    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"));
+#endif /* USEQPE */
+//    qDebug("Reading open files");
+    pOpenlist = bf.readall();
+//    if (pOpenlist != NULL) qDebug("...with success");
+//    else qDebug("...without success!");
+}
+
+void QTReaderApp::savefilelist()
+{
+    if (pOpenlist != NULL)
+    {
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR);
+                QFileInfo fi(d, ".openfiles");
+        BkmkFile bf((const char *)fi.absFilePath(), true);
+#else /* USEQPE */
+        BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true);
+#endif /* USEQPE */
+        //qDebug("Writing open files");
+        bf.write(*pOpenlist);
+    }
+}
+
+void QTReaderApp::readbkmks()
+{
+    if (pBkmklist != NULL)
+    {
+            delete pBkmklist;
+    }
+    struct stat fnstat;
+    struct stat bkstat;
+#ifndef USEQPE
+            QDir d = QDir::home();                      // "/"
+                d.cd(APPDIR);
+                QFileInfo fi(d, reader->m_string);
+#endif /* ! USEQPE */
+    if (
+        stat((const char *)reader->m_lastfile, &fnstat) == 0
+        &&
+#ifndef USEQPE
+        stat((const char *)fi.absFilePath(), &bkstat) == 0
+#else /* USEQPE */
+        stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0
+#endif /* USEQPE */
+        )
+    {
+        if (bkstat.st_mtime < fnstat.st_mtime)
+        {
+#ifndef USEQPE
+            unlink((const char *)fi.absFilePath());
+#else /* USEQPE */
+            unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
+#endif /* USEQPE */
+        }
+    }
+
+#ifndef USEQPE
+    BkmkFile bf((const char *)fi.absFilePath());
+#else /* USEQPE */
+    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string));
+#endif /* USEQPE */
+
+    pBkmklist = bf.readall();
+    m_fBkmksChanged = bf.upgraded();
+    if (pBkmklist == NULL)
+    {
+        pBkmklist = reader->getbkmklist();
+    }
+    if (pBkmklist != NULL)
+        pBkmklist->sort();
+}
+
+void QTReaderApp::addbkmk()
+{
+  m_nRegAction = cAddBkmk;
+  regEdit->setText(reader->firstword());
+  do_regedit();
+}
+
+void QTReaderApp::do_addbkmk(const QString& text)
+{
+        if (text.isEmpty())
+        {
+          QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1);
+        }
+        else
+        {
+                if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;
+#ifdef _UNICODE
+                CBuffer buff;
+                int i = 0;
+                for (i = 0; i < text.length(); i++)
+                {
+                    buff[i] = text[i].unicode();
+                }
+                buff[i] = 0;
+                pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate()));
+#else
+                pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate()));
+#endif
+                m_fBkmksChanged = true;
+                pBkmklist->sort();
+        }
+}
+
+void QTReaderApp::OnRedraw()
+{
+    if ((pBkmklist != NULL) && (m_bkmkAvail != NULL))
+    {
+        bool found = findNextBookmark(reader->pagelocate());
+        m_bkmkAvail->setEnabled(found);
+    }
+}
+
+void QTReaderApp::showAnnotation()
+{
+    m_annoWin->setName(toQString(m_anno->name()));
+    m_annoWin->setAnno(toQString(m_anno->anno()));
+    m_annoIsEditing = false;
+#ifdef USEQPE
+    Global::showInputMethod();
+#endif
+    editorStack->raiseWidget( m_annoWin );
+    m_annoWin->setFocus();
+}
+
+void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& line)
+{
+////    qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
+
+    if (m_doClipboard)
+    {
+        QClipboard* cb = QApplication::clipboard();
+        cb->setText(wrd);
+#ifdef USEQPE
+        if (wrd.length() > 10)
+        {
+            Global::statusMessage(wrd.left(8) + "..");
+        }
+        else
+        {
+            Global::statusMessage(wrd);
+        }
+#endif
+    }
+    if (m_doAnnotation)
+    {
+        //addAnno(wrd, "Need to be able to edit this", posn);
+        m_annoWin->setName(line);
+        m_annoWin->setAnno("");
+        m_annoWin->setPosn(posn);
+        m_annoIsEditing = true;
+#ifdef USEQPE
+        Global::showInputMethod();
+#endif
+        editorStack->raiseWidget( m_annoWin );
+    }
+#ifdef USEQPE
+    if (m_doDictionary)
+    {
+        if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty())
+        {
+            QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8());
+            e << wrd;
+        }
+    }
+#endif
+}
+
+void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
+{
+    if (a == 0)
+    {
+        e->ignore();
+    }
+    else
+    {
+        e->accept();
+        //qDebug("Accepted");
+        switch (a)
+        {
+            case cesOpenFile:
+            {
+                fileOpen();
+            }
+            break;
+            case cesAutoScroll:
+            {
+                reader->setautoscroll(!reader->m_autoScroll);
+                setScrollState(reader->m_autoScroll);
+            }
+            break;
+            case cesActionMark:
+            {
+                addbkmk();
+            }
+            break;
+            case cesFullScreen:
+            {
+                m_actFullscreen->setOn(!m_fullscreen);
+            }
+            break;
+            case cesActionAnno:
+            {
+                addanno();
+            }
+            break;
+            case cesZoomIn:
+                zoomin();
+                break;
+            case cesZoomOut:
+                zoomout();
+                break;
+            case cesBack:
+                reader->goBack();
+                break;
+            case cesForward:
+                reader->goForward();
+                break;
+            case cesHome:
+                reader->goHome();
+                break;
+            case cesPageUp:
+                reader->dopageup();
+                break;
+            case cesPageDown:
+                reader->dopagedn();
+                break;
+            case cesLineUp:
+                reader->lineUp();
+                break;
+            case cesLineDown:
+                reader->lineDown();
+                break;
+            case cesStartDoc:
+                gotoStart();
+                break;
+            case cesEndDoc:
+                gotoEnd();
+                break;
+            default:
+                qDebug("Unknown ActionType:%u", a);
+                break;
+        }
+    }
+}
+
+void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }
+void QTReaderApp::restoreFocus() { reader->setFocus(); } 
+
+void QTReaderApp::SaveConfig()
+{
+    m_nRegAction = cSetConfigName;
+    regEdit->setText(reader->m_string);
+    do_regedit();
+}
+
+void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
+{
+//    qDebug("do_saveconfig:%s", (const char*)_txt);
+#ifdef USEQPE
+    QString configname;
+    Config::Domain dom;
+
+    if (full)
+    {
+        configname = _txt;
+        dom = Config::User;
+    }
+    else
+    {
+        configname = Global::applicationFileName(APPDIR "/configs", _txt);
+        dom = Config::File;
+    }
+
+    Config config(configname, dom);
+    config.setGroup( "View" );
+
+#else
+        QFileInfo fi;
+        if (full)
+        {
+        //    qDebug("full:%s", (const char*)_txt);
+            QDir d = QDir::home();                      // "/"
+                if ( !d.cd(_txt) )
+                {                       // "/tmp"
+                        qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+                        d = QDir::home();
+                        d.mkdir(_txt);
+                        d.cd(_txt);
+                }
+                fi.setFile(d, INIFILE);
+        }
+        else
+        {
+            QDir d = QDir::home();                      // "/"
+                if ( !d.cd(APPDIR) )
+                {                       // "/tmp"
+                        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+                        d = QDir::home();
+                        d.mkdir(APPDIR);
+                        d.cd(APPDIR);
+                }
+                if ( !d.cd("configs") )
+                {                       // "/tmp"
+                        qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+                        d = QDir::home();
+                        d.cd(APPDIR);
+                        d.mkdir("configs");
+                        d.cd("configs");
+                }
+                fi.setFile(d, _txt);
+        }
+        //qDebug("Path:%s", (const char*)fi.absFilePath());
+        Config config(fi.absFilePath());
+#endif
+
+
+    config.writeEntry( "StripCr", reader->bstripcr );
+    config.writeEntry( "AutoFmt", reader->bautofmt );
+    config.writeEntry( "TextFmt", reader->btextfmt );
+    config.writeEntry( "StripHtml", reader->bstriphtml );
+    config.writeEntry( "Dehyphen", reader->bdehyphen );
+    config.writeEntry( "Depluck", reader->bdepluck );
+    config.writeEntry( "Dejpluck", reader->bdejpluck );
+    config.writeEntry( "OneSpace", reader->bonespace );
+    config.writeEntry( "Unindent", reader->bunindent );
+    config.writeEntry( "Repara", reader->brepara );
+    config.writeEntry( "DoubleSpace", reader->bdblspce );
+    config.writeEntry( "Indent", reader->bindenter );
+    config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) );
+    config.writeEntry( "ScrollDelay", reader->m_delay);
+    if (full)
+    {
+        config.writeEntry("Debounce", m_debounce);
+        config.writeEntry("FloatDialogs", m_bFloatingDialog);
+        reader->m_lastposn = reader->pagelocate();
+        config.writeEntry( "LastFile", reader->m_lastfile );
+        config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );
+    }
+    config.writeEntry( "PageMode", reader->m_bpagemode );
+    config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced );
+    config.writeEntry( "SwapMouse", reader->m_swapmouse);
+    config.writeEntry( "Fontname", reader->m_fontname );
+    config.writeEntry( "Encoding", reader->m_encd );
+    config.writeEntry( "CharSpacing", reader->m_charpc );
+    config.writeEntry( "Overlap", (int)(reader->m_overlap) );
+    config.writeEntry( "Margin", (int)reader->m_border );
+    config.writeEntry( "TargetApp", m_targetapp );
+    config.writeEntry( "TargetMsg", m_targetmsg );
+#ifdef _SCROLLPIPE
+    config.writeEntry( "PipeTarget", reader->m_pipetarget );
+    config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );
+#endif
+    config.writeEntry( "TwoTouch", m_twoTouch );
+    config.writeEntry( "Annotation", m_doAnnotation);
+    config.writeEntry( "Dictionary", m_doDictionary);
+    config.writeEntry( "Clipboard", m_doClipboard);
+    config.writeEntry( "SpaceTarget", m_spaceTarget);
+    config.writeEntry( "EscapeTarget", m_escapeTarget);
+    config.writeEntry( "ReturnTarget", m_returnTarget);
+    config.writeEntry( "LeftTarget", m_leftTarget);
+    config.writeEntry( "RightTarget", m_rightTarget);
+    config.writeEntry( "UpTarget", m_upTarget);
+    config.writeEntry( "DownTarget", m_downTarget);
+    config.writeEntry("LeftScroll", m_leftScroll);
+    config.writeEntry("RightScroll", m_rightScroll);
+    config.writeEntry("UpScroll", m_upScroll);
+    config.writeEntry("DownScroll", m_downScroll);
+#ifdef REPALM
+    config.writeEntry( "Repalm", reader->brepalm );
+#endif
+    config.writeEntry( "Remap", reader->bremap );
+    config.writeEntry( "Peanut", reader->bpeanut );
+    config.writeEntry( "MakeBold", reader->bmakebold );
+    config.writeEntry( "Continuous", reader->m_continuousDocument );
+    config.writeEntry( "FullJust", reader->bfulljust );
+    config.writeEntry( "ExtraSpace", reader->getextraspace() );
+    config.writeEntry( "ExtraLead", reader->getlead() );
+    config.writeEntry( "Basesize",  (int)reader->getBaseSize());
+    config.writeEntry( "RequestorFontChange", m_propogatefontchange);
+    if (full)
+    {
+        config.setGroup( "Toolbar" );
+        config.writeEntry("Movable", m_tbmovesave);
+        config.writeEntry("Policy", m_tbpolsave);
+        config.writeEntry("Position", m_tbposition);
+#ifndef USEQPE
+        config.setGroup( "Geometry" );
+        config.writeEntry( "x", x() );
+        config.writeEntry( "y", y() );
+        config.writeEntry( "width", width() );
+        config.writeEntry( "height", height() );
+#endif
+    }
+}
+
+/*
+void QTReaderApp::setstate(unsigned char* _sd, unsigned short _sdlen)
+{
+    unsigned short sdlen;
+    memcpy(&sdlen, _sd, sizeof(sdlen));
+    sdlen -= sizeof(sdlen);
+    _sd += sizeof(sdlen);
+    statedata* sd;
+    char* data;
+    if (sdlen < sizeof(statedata)+1)
+    {
+        sdlen = sizeof(statedata)+1;
+    }
+    data = new char[sdlen];
+    sd = (statedata*)data;
+    memcpy(sd, _sd, sdlen);
+    data[sdlen] = 0;
+    reader->setstate(*sd);
+    delete [] data;
+}
+
+void QTReaderApp::getstate(unsigned char*& data, unsigned short& len)
+{
+    unsigned char* olddata = data;
+    unsigned short oldlen = len;
+    len = oldlen+sizeof(unsigned short)+sizeof(statedata)+reader->m_fontname.length();
+    data = new unsigned char[len];
+    memcpy(data, olddata, oldlen);
+    delete [] olddata;
+    memcpy(data+oldlen, &len, sizeof(len));
+    statedata* sd = (statedata*)(data+oldlen+sizeof(unsigned short));
+
+    sd->bstripcr = reader->bstripcr;
+    sd->btextfmt = reader->btextfmt;
+    sd->bautofmt = reader->bautofmt;
+    sd->bstriphtml = reader->bstriphtml;
+    sd->bpeanut = reader->bpeanut;
+    sd->bdehyphen = reader->bdehyphen;
+    sd->bdepluck = reader->bdepluck;
+    sd->bdejpluck = reader->bdejpluck;
+    sd->bonespace = reader->bonespace;
+    sd->bunindent = reader->bunindent;
+    sd->brepara = reader->brepara;
+    sd->bdblspce = reader->bdblspce;
+    sd->m_bpagemode = reader->m_bpagemode;
+    sd->m_bMonoSpaced = reader->m_bMonoSpaced;
+    sd->bremap = reader->bremap;
+    sd->bmakebold = reader->bmakebold;
+    sd->Continuous = reader->m_continuousDocument;
+#ifdef REPALM
+    sd->brepalm = reader->brepalm;
+#endif
+    sd->bindenter = reader->bindenter;
+    sd->m_textsize = reader->m_textsize; //reader->m_fontControl.currentsize()
+    sd->m_encd = reader->m_encd;
+    sd->m_charpc = reader->m_charpc;
+    strcpy(sd->m_fontname, reader->m_fontname.latin1());
+}
+*/
+#ifdef _SCRIPT
+void QTReaderApp::RunScript()
+{
+    fileBrowser* fb = new fileBrowser(this,"OpieReader",!m_bFloatingDialog,
+                                      0,
+        //                            WStyle_Customize | WStyle_NoBorderEx,
+                                      "*", Global::applicationFileName(APPDIR "/scripts", ""));
+
+    QString fn;
+    if (fb->exec())
+    {
+        fn = fb->fileList[0];
+    }
+    delete fb;
+    if ( !fn.isEmpty() && fork() == 0 )
+    {
+        execlp((const char *)fn,(const char *)fn,NULL);
+    }
+}
+
+void QTReaderApp::SaveScript(const char* sname)
+{
+    FILE* f = fopen(sname,"w");
+    if (f != NULL)
+    {
+#ifdef OPIE
+        fprintf(f, "#!/bin/sh\nmsg() {\n\tqcop QPE/Application/reader \"$1\" \"$2\" \"$3\"\n}\n");
+#else
+        fprintf(f, "#!/bin/bash\nmsg() {\n\tqcop QPE/Application/uqtreader \"$1\" \"$2\" \"$3\"\n}\n");
+#endif
+        fprintf(f, "msg \"Update(int)\" 0\n");
+        fprintf(f, "msg \"Layout/StripCR(int)\" %d\n", (reader->bstripcr) ? 1:0);
+        if (reader->btextfmt) fprintf(f, "msg \"Markup(QString)\" \"Text\"\n");
+        else if (reader->bautofmt) fprintf(f, "msg \"Markup(QString)\" \"Auto\"\n");
+        else if (reader->bstriphtml) fprintf(f, "msg \"Markup(QString)\" \"HTML\"\n");
+        else if (reader->bpeanut) fprintf(f, "msg \"Markup(QString)\" \"Peanut/PML\"\n");
+        else fprintf(f, "msg \"Markup(QString)\" \"None\"\n");
+        fprintf(f, "msg \"Layout/Dehyphen(int)\" %d\n", (reader->bdehyphen) ? 1:0);
+        fprintf(f, "msg \"Layout/Depluck(int)\" %d\n", (reader->bdepluck) ? 1:0);
+        fprintf(f, "msg \"Layout/Dejpluck(int)\" %d\n", (reader->bdejpluck) ? 1:0);
+        fprintf(f, "msg \"Layout/SingleSpace(int)\" %d\n", (reader->bonespace) ? 1:0);
+        fprintf(f, "msg \"Layout/Unindent(int)\" %d\n", (reader->bunindent) ? 1:0);
+        fprintf(f, "msg \"Layout/Re-paragraph(int)\" %d\n", (reader->brepara) ? 1:0);
+        fprintf(f, "msg \"Layout/DoubleSpace(int)\" %d\n", (reader->bdblspce) ? 1:0);
+        fprintf(f, "msg \"Layout/Indent(int)\" %d\n", reader->bindenter);
+        fprintf(f, "msg \"Format/SetFont(QString,int)\" \"%s\" %d\n", (const char*)reader->m_fontname, reader->m_textsize);
+        fprintf(f, "msg \"Navigation/Page/LineScroll(int)\" %d\n", (reader->m_bpagemode) ? 1:0);
+        fprintf(f, "msg \"Format/Ideogram/Word(int)\" %d\n", (reader->m_bMonoSpaced) ? 1:0);
+        fprintf(f, "msg \"Format/Encoding(QString)\" \"%s\"\n", (const char*)m_EncodingAction[reader->m_encd]->text());
+        fprintf(f, "msg \"Format/SetWidth(int)\" %d\n", reader->m_charpc);
+        fprintf(f, "msg \"Navigation/SetOverlap(int)\" %d\n", reader->m_overlap);
+        fprintf(f, "msg \"Layout/Remap(int)\" %d\n", (reader->bremap) ? 1:0);
+        fprintf(f, "msg \"Layout/Embolden(int)\" %d\n", (reader->bmakebold) ? 1:0);
+        fprintf(f, "msg \"File/Continuous(int)\" %d\n", (reader->m_continuousDocument) ? 1:0);
+        fprintf(f, "msg \"File/SetDictionary(QString)\" \"%s/%s\"\n", (const char *)m_targetapp, (const char *)m_targetmsg);
+#ifdef _SCROLLPIPE
+        fprintf(f, "msg \"File/SetScrollTarget(QString)\" \"%s\"\n", (const char *)reader->m_pipetarget);
+#endif
+        fprintf(f, "msg \"File/Two/OneTouch(int)\" %d\n", (m_twoTouch) ? 1:0);
+        fprintf(f, "msg \"Target/Annotation(int)\" %d\n", (m_doAnnotation) ? 1:0);
+        fprintf(f, "msg \"Target/Dictionary(int)\" %d\n", (m_doDictionary) ? 1:0);
+        fprintf(f, "msg \"Target/Clipboard(int)\" %d\n", (m_doClipboard) ? 1:0);
+        fprintf(f, "msg \"File/Action(QString)\" \"%s\"\n", (const char *)m_buttonAction[m_spaceTarget]->text());
+        fprintf(f, "msg \"Update(int)\" 1\n");
+        fprintf(f, "msg \"info(QString)\" \"All Done\"\n");
+        fclose(f);
+        chmod(sname, S_IXUSR | S_IXGRP | S_IXOTH);
+    }
+}
+
+void QTReaderApp::SaveConfig()
+{
+    m_nRegAction = cSetConfigName;
+    regEdit->setText("");
+    do_regedit();
+}
+
+void QTReaderApp::do_saveconfig(const QString& _txt)
+{
+    SaveScript(Global::applicationFileName(APPDIR "/scripts", _txt));
+}
+#endif
+
+#ifdef _SCROLLPIPE
+void QTReaderApp::setpipetarget()
+{
+    m_nRegAction = cSetPipeTarget;
+    QString text = (reader->m_pipetarget.isEmpty()) ? QString("") : reader->m_pipetarget;
+    regEdit->setText(text);
+    do_regedit();
+}
+
+void QTReaderApp::do_setpipetarget(const QString& _txt)
+{
+    reader->m_pipetarget = _txt;
+}
+
+void QTReaderApp::setpause(bool sfs)
+{
+    reader->m_pauseAfterEachPara = sfs;
+}
+#endif
+
+void QTReaderApp::monospace(bool _b)
+{
+    reader->setmono(_b);
+}
+
+bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
+{
+#ifdef USEQPE
+    QString configname;
+    Config::Domain dom;
+
+    if (full)
+    {
+        configname = _txt;
+        dom = Config::User;
+    }
+    else
+    {
+        configname = Global::applicationFileName(APPDIR "/configs", _txt);
+        QFileInfo fm(configname);
+        if ( !fm.exists() ) return false;
+        dom = Config::File;
+    }
+
+    Config config(configname, dom);
+    config.setGroup( "View" );
+
+#else
+        QFileInfo fi;
+        if (full)
+        {
+            QDir d = QDir::home();                      // "/"
+                if ( !d.cd(_txt) )
+                {                       // "/tmp"
+                        qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+                        d = QDir::home();
+                        d.mkdir(_txt);
+                        d.cd(_txt);
+                }
+                fi.setFile(d, INIFILE);
+        }
+        else
+        {
+            QDir d = QDir::home();                      // "/"
+                if ( !d.cd(APPDIR) )
+                {                       // "/tmp"
+                        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+                        d = QDir::home();
+                        d.mkdir(APPDIR);
+                        d.cd(APPDIR);
+                }
+                if ( !d.cd("configs") )
+                {                       // "/tmp"
+                        qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+                        d = QDir::home();
+                        d.mkdir("configs");
+                        d.cd("configs");
+                }
+                fi.setFile(d, _txt);
+        }
+#ifdef _WINDOWS
+        struct stat fnstat;
+    if (stat((const char *)reader->m_lastfile, &fnstat) == 0) return false; // get round fileinfo bug on windows
+#else
+        if (!fi.exists()) return false;
+#endif
+        Config config(fi.absFilePath());
+#endif
+    if (full)
+    {
+        config.setGroup("Toolbar");
+        m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);
+        m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);
+        m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);
+    }
+    config.setGroup( "View" );
+    m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
+    reader->bstripcr = config.readBoolEntry( "StripCr", true );
+    reader->bfulljust = config.readBoolEntry( "FullJust", false );
+    reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 ));
+    reader->setlead(config.readNumEntry( "ExtraLead", 0 ));
+    reader->btextfmt = config.readBoolEntry( "TextFmt", false );
+    reader->bautofmt = config.readBoolEntry( "AutoFmt", true );
+    reader->bstriphtml = config.readBoolEntry( "StripHtml", false );
+    reader->bpeanut = config.readBoolEntry( "Peanut", false );
+    reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );
+    reader->bdepluck = config.readBoolEntry( "Depluck", false );
+    reader->bdejpluck = config.readBoolEntry( "Dejpluck", false );
+    reader->bonespace = config.readBoolEntry( "OneSpace", false );
+    reader->bunindent = config.readBoolEntry( "Unindent", false );
+    reader->brepara = config.readBoolEntry( "Repara", false );
+    reader->bdblspce = config.readBoolEntry( "DoubleSpace", false );
+    reader->bindenter = config.readNumEntry( "Indent", 0 );
+    reader->m_textsize = config.readNumEntry( "FontSize", 12 );
+    reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);
+    if (full)
+    {
+        reader->m_lastfile = config.readEntry( "LastFile", QString::null );
+        reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );
+    }
+    reader->m_bpagemode = config.readBoolEntry( "PageMode", true );
+    reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false);
+    reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false);
+     reader->m_fontname = config.readEntry( "Fontname", "helvetica" );
+    reader->m_encd = config.readNumEntry( "Encoding", 0 );
+    reader->m_charpc = config.readNumEntry( "CharSpacing", 100 );
+    reader->m_overlap = config.readNumEntry( "Overlap", 0 );
+    reader->m_border = config.readNumEntry( "Margin", 6 );
+#ifdef REPALM
+    reader->brepalm = config.readBoolEntry( "Repalm", true );
+#endif
+    reader->bremap = config.readBoolEntry( "Remap", true );
+    reader->bmakebold = config.readBoolEntry( "MakeBold", false );
+    reader->setContinuous(config.readBoolEntry( "Continuous", true ));
+    m_targetapp = config.readEntry( "TargetApp", QString::null );
+    m_targetmsg = config.readEntry( "TargetMsg", QString::null );
+#ifdef _SCROLLPIPE
+    reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null );
+    reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true );
+#endif
+    m_twoTouch = config.readBoolEntry( "TwoTouch", false);
+    m_doAnnotation = config.readBoolEntry( "Annotation", false);
+    m_doDictionary = config.readBoolEntry( "Dictionary", false);
+    m_doClipboard = config.readBoolEntry( "Clipboard", false);
+    m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);
+    m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone);
+    m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen);
+    m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut);
+    m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn);
+    m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp);
+    m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown);
+
+    m_leftScroll = config.readBoolEntry("LeftScroll", false);
+    m_rightScroll = config.readBoolEntry("RightScroll", false);
+    m_upScroll = config.readBoolEntry("UpScroll", true);
+    m_downScroll = config.readBoolEntry("DownScroll", true);
+    m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);
+    reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));
+    reader->setTwoTouch(m_twoTouch);
+
+    m_touch_action->setOn(m_twoTouch);
+    m_setmono_action->setOn(reader->m_bMonoSpaced);
+    setfontHelper(reader->m_fontname);
+    if (full)
+    {
+        addtoolbars(&config);
+    }
+    reader->setfilter(reader->getfilter());
+    reader->refresh();
+    return true;
+}
+
+bool QTReaderApp::PopulateConfig(const char* tgtdir)
+{
+    bkmkselector->clear();
+    bkmkselector->setText("Cancel");
+#ifndef USEQPE
+    int cnt = 0;
+
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        d = QDir::home();
+        d.mkdir(APPDIR);
+        d.cd(APPDIR);
+    }
+    if ( !d.cd(tgtdir) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );
+        d = QDir::home();
+        d.mkdir(tgtdir);
+        d.cd(tgtdir);
+    }
+    d.setFilter( QDir::Files | QDir::NoSymLinks );
+//        d.setSorting( QDir::Size | QDir::Reversed );
+
+    const QFileInfoList *list = d.entryInfoList();
+    QFileInfoListIterator it( *list );      // create list iterator
+    QFileInfo *fi;                          // pointer for traversing
+
+    while ( (fi=it.current()) ) {           // for each file...
+  
+        bkmkselector->insertItem(fi->fileName());
+        cnt++;
+                        
+        //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+        ++it;                               // goto next list element
+    }
+ 
+#else /* USEQPE */
+    int cnt = 0;
+    DIR *d;
+    char* finaldir;
+    finaldir = new char[strlen(APPDIR)+1+strlen(tgtdir)+1];
+    strcpy(finaldir, APPDIR);
+    strcat(finaldir, "/");
+    strcat(finaldir, tgtdir);
+    d = opendir((const char *)Global::applicationFileName(finaldir,""));
+
+    while(1)
+    {
+        struct dirent* de;
+        struct stat buf;
+        de = readdir(d);
+        if (de == NULL) break;
+
+        if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
+        {
+            bkmkselector->insertItem(de->d_name);
+            cnt++;
+        }
+    }
+    delete [] finaldir;
+    closedir(d);
+#endif
+    return (cnt > 0);
+}
+
+void QTReaderApp::LoadConfig()
+{
+    if (PopulateConfig("configs"))
+      {
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+        m_nBkmkAction = cLdConfig;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No config files");
+}
+
+void QTReaderApp::TidyConfig()
+{
+    if (PopulateConfig("configs"))
+      {
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+        m_nBkmkAction = cRmConfig;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No config files");
+}
+
+void QTReaderApp::ExportLinks()
+{
+    if (PopulateConfig("urls"))
+      {
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+        m_nBkmkAction = cExportLinks;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No url files");
+}
+
+void QTReaderApp::OnURLSelected(const QString& href)
+{
+    CURLDialog* urld = new CURLDialog(href, false, this);
+    urld->clipboard(m_url_clipboard);
+    urld->localfile(m_url_localfile);
+    urld->globalfile(m_url_globalfile);
+    if (urld->exec())
+    {
+        m_url_clipboard = urld->clipboard();
+        m_url_localfile = urld->localfile();
+        m_url_globalfile = urld->globalfile();
+        if (m_url_clipboard)
+        {
+            QClipboard* cb = QApplication::clipboard();
+            cb->setText(href);
+            qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href);
+        }
+        if (m_url_localfile)
+        {
+            writeUrl(reader->m_string, href);
+        }
+        if (m_url_globalfile)
+        {
+            writeUrl("GlobalURLFile", href);
+        }
+    }
+    delete urld;
+}
+
+void QTReaderApp::writeUrl(const QString& file, const QString& href)
+{
+    QString filename;
+#ifdef USEQPE
+    filename = Global::applicationFileName(APPDIR "/urls", file);
+#else
+    QFileInfo fi;
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) )
+    {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        d = QDir::home();
+        d.mkdir(APPDIR);
+        d.cd(APPDIR);
+    }
+    if ( !d.cd("urls") )
+    {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );
+        d = QDir::home();
+        d.cd(APPDIR);
+        d.mkdir("urls");
+        d.cd("urls");
+    }
+    fi.setFile(d, file);
+    filename = fi.absFilePath();
+#endif
+    FILE* fout = fopen(filename, "a");
+    if (fout != NULL)
+    {
+        fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href);
+        fclose(fout);
+    }
+    else
+    {
+        QMessageBox::warning(this, PROGNAME, "Problem with writing URL");
+    }
+}
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.cpp b/noncore/apps/opie-reader/ToolbarPrefs.cpp
index d878829..0347736 100644
--- a/noncore/apps/opie-reader/ToolbarPrefs.cpp
+++ b/noncore/apps/opie-reader/ToolbarPrefs.cpp
@@ -1,46 +1,36 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'Prefs.ui'
 **
 ** Created: Tue Feb 11 23:53:35 2003
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
-#include "useqpe.h"
 #include "ToolbarPrefs.h"
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qcombobox.h>
 #include <qbuttongroup.h>
-#include <qlineedit.h>
 #ifdef USEQPE
 #include <qpe/menubutton.h>
 #endif
 #include <qpe/qpeapplication.h>
 
 CBarPrefs::CBarPrefs(const QString& appdir, bool fs, QWidget* parent, const char* name) : QDialog(parent, name, true), config( appdir )
 {
     setCaption(tr( "Toolbar Settings" ) );
     QTabWidget* td = new QTabWidget(this);
     misc = new CMiscBarPrefs(this);
     filebar = new CFileBarPrefs(config, this);
     navbar = new CNavBarPrefs(config, this);
     viewbar = new CViewBarPrefs(config, this);
     markbar = new CMarkBarPrefs(config, this);
     indbar = new CIndBarPrefs(config, this);
     td->addTab(filebar, tr("File"));
     td->addTab(navbar, tr("Navigation"));
     td->addTab(viewbar, tr("View"));
     td->addTab(markbar, tr("Marks"));
     td->addTab(indbar, tr("Indicators"));
     td->addTab(misc, tr("Policy"));
     QVBoxLayout* v = new QVBoxLayout(this);
     v->addWidget(td);
 
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index 05f2c31..ebd14f3 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -1,51 +1,48 @@
 /****************************************************************************
 
 Derived from a file browser which was
 
 ** copyright 2001 ljp ljp@llornkcor.com
 
 Extensive modification by Tim Wentford to allow it to work in rotated mode
 
 ****************************************************************************/
 #include "fileBrowser.h"
 
 #include "QtrListView.h"
 #include <qlineedit.h>
 #include <qpushbutton.h>
-#include <qfile.h>
-#include <qmessagebox.h>
 #ifndef _WINDOWS
 #include <unistd.h>
 #endif
 #include <qlayout.h>
 #ifdef _WINDOWS
 #include <direct.h>
 #endif
 
 #include <qpe/qpeapplication.h>
 
-#include "opie.h"
 
 fileBrowser::fileBrowser( bool allownew, QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter, const QString iPath )
     : QDialog( parent, name, true,
                fl/* | WStyle_Customize | WStyle_Tool*/),
       filterspec(QDir::All)
 {
 //    showMaximized();
     if ( !name )
         setName( "fileBrowser" );
 /*
     if (parent != NULL)
     {
 #ifdef OPIE
         move(0,0);
         resize( parent->width(), parent->height() );
 #else
         setGeometry(parent->x(), parent->y(), parent->width(), parent->height() );
 #endif
     }
 */
 //    showFullScreen();
     setCaption(tr( "Browse for file" ) );
     filterStr=filter;
 
diff --git a/noncore/apps/opie-reader/main.cpp b/noncore/apps/opie-reader/main.cpp
index 3e1f5e7..6d706c4 100644
--- a/noncore/apps/opie-reader/main.cpp
+++ b/noncore/apps/opie-reader/main.cpp
@@ -1,35 +1,33 @@
 #include "useqpe.h"
 #ifdef USEQPE
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include "QTReaderApp.h"
 
 #include "signal.h"
-#include "stdio.h"
-#include "time.h"
 
 
 #ifdef USEQPE
 QTReaderApp* app = NULL;
 
 void handler(int signum)
 {
     if (app != NULL)
     {
         app->suspend();
         app->saveprefs();
     }
     signal(signum, handler);
 }
 #endif
 
 int main( int argc, char ** argv )
 {
 
 #ifdef USEQPE
     signal(SIGCONT, handler);
     QPEApplication a( argc, argv );
     QTReaderApp m;
     a.showMainDocumentWidget( &m );
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp
index e49e35f..e52fd6a 100644
--- a/noncore/apps/opie-reader/plucker.cpp
+++ b/noncore/apps/opie-reader/plucker.cpp
@@ -1,45 +1,40 @@
-#include "useqpe.h"
 #include <stdio.h>
 #include <string.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
 #ifdef USEQPE
 #include <qpe/qcopenvelope_qws.h>
 #endif
 #ifdef LOCALPICTURES
 #include <qscrollview.h>
 #endif
 #ifdef USEQPE
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
-#include <qclipboard.h>
 
 #include "plucker.h"
-#include "Aportis.h"
 #include "Palm2QImage.h"
 
 
 struct CPlucker_dataRecord
 {
     UInt16 uid;
     UInt16 nParagraphs;
     UInt16 size;
     UInt8 type;
     UInt8 reserved;
 };
 
 int CPlucker::HeaderSize()
 {
     return sizeof(CPlucker_dataRecord);
 }
 
 void CPlucker::GetHeader(UInt16& uid, UInt16& nParagraphs, UInt32& size, UInt8& type, UInt8& reserved)
 {
     CPlucker_dataRecord thishdr;
     fread(&thishdr, 1, HeaderSize(), fin);
     uid = ntohs(thishdr.uid);
     nParagraphs = ntohs(thishdr.nParagraphs);
     size = ntohs(thishdr.size);
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index 9047a45..caa945d 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,39 +1,36 @@
 #include "useqpe.h"
 #include <stdio.h>
 #include <string.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
 #ifdef USEQPE
 #include <qpe/qcopenvelope_qws.h>
 #endif /* USEQPE */
 #ifdef LOCALPICTURES
 #include <qscrollview.h>
 #endif
 #ifdef USEQPE
 #include <qpe/global.h>
 #endif /* USEQPE */
-#include <qclipboard.h>
 #ifndef USEQPE
 #include <qapplication.h>
 #else /* USEQPE */
 #include <qpe/qpeapplication.h>
 #endif /* USEQPE */
 
 #include "plucker_base.h"
 #include "Aportis.h"
 #include "Palm2QImage.h"
 
 CPlucker_base::CPlucker_base() :
 #ifdef LOCALPICTURES
     m_viewer(NULL),
     m_picture(NULL),
 #endif
     expandedtextbuffer(NULL),
     compressedtextbuffer(NULL)
 //,    urls(NULL)
  { /*printf("constructing:%x\n",fin);*/ }
 
 
 void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buffersize)
 {
     if (type%2 == 0)
@@ -524,49 +521,48 @@ void CPlucker_base::home()
 CList<Bkmk>* CPlucker_base::getbkmklist()
 {
 /*
   UInt16 thishdr_uid, thishdr_nParagraphs;
   UInt32 thishdr_size;
   UInt8 thishdr_type, thishdr_reserved;
 
   for (int i = 1; i < ntohs(head.recordList.numRecords); i++)
   {
         gotorecordnumber(i);
         GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
         if (thishdr_type == 8)
         {
             UInt16 n;
             fread(&n, 1, sizeof(n), fin);
             n = ntohs(n);
             //qDebug("Found %u bookmarks", n);
         }
         //qDebug("Found:%d, %u", i , thishdr_type);
     }
 */
     return NULL;
 }
 
-#include <qnamespace.h>
 
 QImage* CPlucker_base::expandimg(UInt16 tgt, bool border)
 {
     QImage* qimage = getimg(tgt);
     QImage* ret;
     if (qimage == NULL) return NULL;
     if (border)
     {
         QPixmap* image = new QPixmap(0,0);
         image->convertFromImage(*qimage);
         delete qimage;
         QPixmap* pret = new QPixmap(image->width()+4, image->height()+4);
         pret->fill(Qt::red);
         bitBlt(pret, 2, 2, image, 0, 0, -1, -1);//, Qt::RasterOp::CopyROP);
         delete image;
         ret = new QImage(pret->convertToImage());
     }
     else
     {
         ret = qimage;
     }
     return ret;
 }
 
@@ -659,49 +655,48 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
     }
     gotorecordnumber(jmin);
     UInt16 thishdr_uid, thishdr_nParagraphs;
     UInt32 thishdr_size;
     UInt8 thishdr_type, thishdr_reserved;
     GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
     unsigned short luid = thishdr_uid;
     //qDebug("jmin at end:%u,%u", jmin, luid);
     if (luid == urlid)
     {
         return jmin;
     }
     gotorecordnumber(jmax);
     GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
     luid = thishdr_uid;
     //qDebug("jmax at end:%u,%u", jmax, luid);
     if (luid == urlid)
     {
         return jmax;
     }
     //qDebug("Couldn't find %u", urlid);
     return 0; // Not found!
 }
 
-#include <qnamespace.h>
 
 void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen)
 {
     unsigned short sz = 0;
     for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
     {
         sz++;
     }
     size_t newlen = srclen+sizeof(sz)+sz*sizeof(unsigned long);
     unsigned char* newdata = new unsigned char[newlen];
     unsigned char* pdata = newdata;
     memcpy(newdata, src, srclen);
     newdata += srclen;
     memcpy(newdata, &sz, sizeof(sz));
     newdata += sizeof(sz);
 #ifdef _WINDOWS
     for (it = visited.begin(); it != visited.end(); it++)
 #else
     for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
 #endif
     {
         unsigned long t = *it;
         //qDebug("[%u]", t);
         memcpy(newdata, &t, sizeof(t));
diff --git a/noncore/apps/opie-reader/ppm.cpp b/noncore/apps/opie-reader/ppm.cpp
index e8bf110..1face46 100644
--- a/noncore/apps/opie-reader/ppm.cpp
+++ b/noncore/apps/opie-reader/ppm.cpp
@@ -1,27 +1,26 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "arith.h"
 #include "ppm.h"
 
 /****************************************************************************
  * Gestion des noeuds
  ****************************************************************************/
 
 /* 
  * Désallocation du noeud p
  */
 
 void ppm_worker::Node_Free(UINT p) {
   node_heap[node_free_last].free_next=p;
   node_heap[p].free_next=NIL;
   node_free_last=p;
   node_free_nb++;
 }
 
 /*
  * Allocation d'un noeud
  * s'il ne reste plus de place, on désalloue le contexte le moins utilisé.
  */
 
 UINT ppm_worker::Node_Alloc(void)  {
   UINT p;
diff --git a/noncore/apps/opie-reader/version.cpp b/noncore/apps/opie-reader/version.cpp
index 3796b67..864e4c1 100644
--- a/noncore/apps/opie-reader/version.cpp
+++ b/noncore/apps/opie-reader/version.cpp
@@ -1,27 +1,25 @@
 #include "version.h"
-#include "names.h"
-#include <qmessagebox.h>
 
 bool CheckVersion(int& major, int& bkmktype, char& minor)
 {
     if (
         (major != MAJOR)
         ||
         (bkmktype != BKMKTYPE)
         ||
         (minor != MINOR)
         )
     {
         major = MAJOR;
         bkmktype = BKMKTYPE;
         minor = MINOR;
 /*
         QMessageBox::warning(NULL, PROGNAME,
                              "This is the first time that you have\n"
                              "run this version of OpieReader.\n\n"
                              "There are two new icons visible at\n"
                              "the left end of the toolbar. The left\n"
                              "one brings up the menus, the next\n"
                              "one brings up the settings dialog.\n\n"
                              "Start by tapping the settings icon\n"
                              "and selecting the Buttons tab to\n"
diff --git a/noncore/apps/opie-sheet/Excel.cpp b/noncore/apps/opie-sheet/Excel.cpp
index 225c3e1..fc49d56 100644
--- a/noncore/apps/opie-sheet/Excel.cpp
+++ b/noncore/apps/opie-sheet/Excel.cpp
@@ -1,35 +1,32 @@
 
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <time.h>
 #include <sys/types.h>
 #include <strings.h>
-#include <qstring.h>
-#include <qlist.h>
-#include <qarray.h>
 #include "Excel.h"
 
 static xfrecord formatter[] = {
 { 0xe , DATEFORMAT, "%m/%d/%y"},
 { 0xf , DATEFORMAT, "%d-%b-%y"},
 { 0x10, DATEFORMAT, "%d-%b"},
 { 0x11, DATEFORMAT, "%b-%y"},
 { 0x12, DATEFORMAT, "%I:%M %p"},
 { 0x13, DATEFORMAT, "%I:%M:%S %p"},
 { 0x14, DATEFORMAT, "%H:%M"},
 { 0x15, DATEFORMAT, "%H:%M:%S"},
 { 0x16, DATEFORMAT, "%m/%d/%y %H:%M"},
 { 0x2d, DATEFORMAT, "%M:%S"},
 { 0x2e, DATEFORMAT, "%H:%M:%S"},
 { 0x2f, DATEFORMAT, "%M:%S"},
 { 0xa5, DATEFORMAT, "%m/%d/%y %I:%M %p"},
 { 0x1 , NUMBERFORMAT, "%.0f"},
 { 0x2 , NUMBERFORMAT, "%.2f"},
 { 0x3 , NUMBERFORMAT, "#,##%.0f"},
 { 0x4 , NUMBERFORMAT, "#,##%.2f"},
 { 0x5 , NUMBERFORMAT, "$#,##%.0f"},
 { 0x6 , NUMBERFORMAT, "$#,##%.0f"},
 { 0x7 , NUMBERFORMAT, "$#,##%.2f"},
 { 0x8 , NUMBERFORMAT, "$#,##%.2f"},
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 3d3c688..1fb2a3d 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -1,48 +1,44 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 /*
  * Opie Sheet (formerly Sheet/Qt)
  * by Serdar Ozler <sozler@sitebest.com>
  */
 
 #include "mainwindow.h"
 
-#include <qpe/filemanager.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 #include <qmessagebox.h>
-#include <qfile.h>
-#include <qtranslator.h>
 #include <qradiobutton.h>
 
 #include "cellformat.h"
 #include "numberdlg.h"
 #include "textdlg.h"
 #include "sortdlg.h"
 #include "finddlg.h"
 
 #define DEFAULT_NUM_ROWS 300
 #define DEFAULT_NUM_COLS (26*3)
 #define DEFAULT_NUM_SHEETS 3
 
 MainWindow::MainWindow(QWidget *parent, const char* n, WFlags fl)
            :QMainWindow(parent, n, fl)
 {
   // initialize variables
   documentModified=FALSE;
 
   // construct objects
   currentDoc=0;
   fileSelector=new FileSelector("application/sheet-qt", this, QString::null);
   ExcelSelector=new FileSelector("application/excel",this,QString::null,FALSE);
   connect(fileSelector, SIGNAL(closeMe()), this, SLOT(selectorHide()));
   connect(fileSelector, SIGNAL(newSelected(const DocLnk &)), this, SLOT(selectorFileNew(const DocLnk &)));
diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp
index e1e4744..f303d33 100644
--- a/noncore/apps/opie-sheet/sheet.cpp
+++ b/noncore/apps/opie-sheet/sheet.cpp
@@ -1,41 +1,40 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 /*
  * Opie Sheet (formerly Sheet/Qt)
  * by Serdar Ozler <sozler@sitebest.com>
  */
 
 #include "sheet.h"
 
-#include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
 
 #define DEFAULT_COL_WIDTH 50
 
 Sheet::Sheet(int numRows, int numCols, QWidget *parent)
       :QTable(numRows, numCols, parent)
 {
   defaultBorders.right=defaultBorders.bottom=QPen(Qt::gray, 1, Qt::SolidLine);
   defaultCellData.data="";
   defaultCellData.background=QBrush(Qt::white, Qt::SolidPattern);
   defaultCellData.alignment=(Qt::AlignmentFlags)(Qt::AlignLeft | Qt::AlignTop);
   defaultCellData.fontColor=Qt::black;
   defaultCellData.font=font();
   defaultCellData.borders=defaultBorders;
 
   clicksLocked=FALSE;
   selectionNo=-1;
   setSelectionMode(QTable::Single);
 
   sheetData.setAutoDelete(TRUE);