author | ar <ar> | 2004-05-03 21:35:18 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-03 21:35:18 (UTC) |
commit | 412619441fab46fc79c695a23ccf9e38135bdfad (patch) (side-by-side diff) | |
tree | 19d9b8af14cf6c345ef532bb32368b9c7b43c50f /noncore/apps/opie-reader/QTReaderApp.cpp | |
parent | d1095d71394779557f446e2a67ba55bc62eec859 (diff) | |
download | opie-412619441fab46fc79c695a23ccf9e38135bdfad.zip opie-412619441fab46fc79c695a23ccf9e38135bdfad.tar.gz opie-412619441fab46fc79c695a23ccf9e38135bdfad.tar.bz2 |
- convert qDebug to odebug
Diffstat (limited to 'noncore/apps/opie-reader/QTReaderApp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 3231 |
1 files changed, 1616 insertions, 1615 deletions
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index b072854..f18cb59 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp @@ -19,6 +19,35 @@ **********************************************************************/ + #include "useqpe.h" -#include <qregexp.h> -#include <qclipboard.h> -#include <qwidgetstack.h> +#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 "QTReaderApp.h" +#include "CDrawBuffer.h" +#include "Filedata.h" +#include "opie.h" +#include "names.h" +#include "CEncoding_tables.h" +#include "CloseDialog.h" + +/* OPIE */ +#include <opie2/odebug.h> +#ifdef USEQPE +#include <qpe/menubutton.h> +#include <qpe/fontdatabase.h> +#include <qpe/global.h> +#include <qpe/applnk.h> +#include <qpe/config.h> +#include <qpe/qcopenvelope_qws.h> +#endif + +/* QT */ #ifdef USEQPE @@ -27,8 +56,7 @@ #endif +#include <qregexp.h> +#include <qclipboard.h> +#include <qwidgetstack.h> #include <qmenubar.h> #include <qtoolbar.h> -#ifdef USEQPE -#include <qpe/menubutton.h> -#include <qpe/fontdatabase.h> -#endif #include <qcombobox.h> @@ -41,29 +69,10 @@ #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> + +/* STD */ +#include <stdlib.h> //getenv + @@ -77,10 +86,2 @@ -#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&); @@ -127,6 +128,6 @@ void QTReaderApp::listBkmkFiles() if ( !d.cd(APPDIR) ) { // "/tmp" - qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); - d = QDir::home(); - d.mkdir(APPDIR); - d.cd(APPDIR); + owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl; + d = QDir::home(); + d.mkdir(APPDIR); + d.cd(APPDIR); } @@ -145,6 +146,6 @@ void QTReaderApp::listBkmkFiles() - bkmkselector->insertItem(fi->fileName()); - cnt++; + bkmkselector->insertItem(fi->fileName()); + cnt++; - //qDebug( "%10li %s", fi->size(), fi->fileName().data() ); + //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl; ++it; // goto next list element @@ -159,12 +160,12 @@ void QTReaderApp::listBkmkFiles() { - struct dirent* de; - struct stat buf; - de = readdir(d); - if (de == NULL) break; + 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++; - } + if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode)) + { + bkmkselector->insertItem(de->d_name); + cnt++; + } } @@ -178,3 +179,3 @@ void QTReaderApp::listBkmkFiles() hidetoolbars(); - m_nBkmkAction = cRmBkmkFile; + m_nBkmkAction = cRmBkmkFile; } @@ -195,5 +196,5 @@ void QTReaderApp::hidetoolbars() #ifdef USEQPE - Global::hideInputMethod(); + Global::hideInputMethod(); #endif - regBar->hide(); + regBar->hide(); } @@ -202,5 +203,5 @@ void QTReaderApp::hidetoolbars() #ifdef USEQPE - Global::hideInputMethod(); + Global::hideInputMethod(); #endif - searchBar->hide(); + searchBar->hide(); } @@ -212,8 +213,8 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) { - 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_url_clipboard = false; + m_url_localfile = false; + m_url_globalfile = false; + ftime(&m_lastkeytime); +//// odebug << "Application directory = " << (const tchar *)QPEApplication::documentDir() << "" << oendl; +//// odebug << "Application directory = " << (const tchar *)Global::applicationFileName("uqtreader" << "" << oendl; @@ -225,4 +226,4 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) - m_fBkmksChanged = false; - + m_fBkmksChanged = false; + QString lang = getenv( "LANG" ); @@ -245,3 +246,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) -// qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot); +// odebug << "Initial Rotation(" << m_rot << "):" << rot << "" << oendl; */ @@ -262,9 +263,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) if ( !d.cd(APPDIR) ) { // "/tmp" - qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); - d = QDir::home(); - d.mkdir(APPDIR); - d.cd(APPDIR); + owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl; + d = QDir::home(); + d.mkdir(APPDIR); + d.cd(APPDIR); } QFileInfo fi(d, INIFILE); -// qDebug("Path:%s", (const char*)fi.absFilePath()); +// odebug << "Path:" << fi.absFilePath() << "" << oendl; Config config(fi.absFilePath()); @@ -357,4 +358,4 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) importSelector->setCloseVisible( FALSE ); -*/ -// qDebug("Reading file list"); +*/ +// odebug << "Reading file list" << oendl; readfilelist(); @@ -369,3 +370,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) -// qDebug("Reading config"); +// odebug << "Reading config" << oendl; // Config config( APPDIR ); @@ -439,9 +440,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) #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 )); + 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 @@ -548,3 +549,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) m_pageup_action->addTo( navigation ); - + m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 ); @@ -729,6 +730,6 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) connect( searchEdit, SIGNAL( textChanged(const QString&) ), - this, SLOT( search(const QString&) ) ); + this, SLOT( search(const QString&) ) ); #else connect( searchEdit, SIGNAL( returnPressed() ), - this, SLOT( search() ) ); + this, SLOT( search() ) ); #endif @@ -755,3 +756,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) connect( regEdit, SIGNAL( returnPressed() ), - this, SLOT( do_regaction() ) ); + this, SLOT( do_regaction() ) ); @@ -771,3 +772,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) -// qDebug("Font selector"); +// odebug << "Font selector" << oendl; m_fontSelector = new QComboBox(false, m_fontBar); @@ -776,22 +777,22 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) #ifndef USEQPE - QFontDatabase f; + QFontDatabase f; #else - FontDatabase f; + 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]; + 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&) ) ); + this, SLOT( do_setfont(const QString&) ) ); connect( m_fontSelector, SIGNAL( activated(int) ), - this, SLOT( do_setencoding(int) ) ); + this, SLOT( do_setencoding(int) ) ); @@ -801,9 +802,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) connect(qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), - this, SLOT( msgHandler(const QCString&,const QByteArray&) ) ); + this, SLOT( msgHandler(const QCString&,const QByteArray&) ) ); #endif -// qDebug("Initing"); +// odebug << "Initing" << oendl; reader->init(); -// qDebug("Inited"); +// odebug << "Inited" << oendl; // m_buttonAction[m_spaceTarget]->setOn(true); -// qDebug("fonting"); +// odebug << "fonting" << oendl; do_setfont(reader->m_fontname); @@ -811,45 +812,45 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) { -// qDebug("doclnk"); -// doc = new DocLnk(reader->m_lastfile); -// qDebug("doclnk done"); - if (pOpenlist != NULL) - { +// odebug << "doclnk" << oendl; +// doc = new DocLnk(reader->m_lastfile); +// odebug << "doclnk done" << oendl; + if (pOpenlist != NULL) + { /* - int ind = 0; - Bkmk* p = (*pOpenlist)[ind]; - while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile) - { - p = (*pOpenlist)[++ind]; - } + 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 ); - } + 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; + } +// odebug << "Item:" << toQString(CFiledata(p->anno()).name()) << "" << oendl; + p = NULL; + } + if (p != NULL) + { +// odebug << "openfrombkmk" << oendl; + if (!openfrombkmk(p)) + showEditTools(); + } + else + { +// odebug << "openfile" << oendl; + openFile( reader->m_lastfile ); + } + } + else + { +// odebug << "Openfile 2" << oendl; + if (!reader->m_lastfile.isEmpty()) + openFile( reader->m_lastfile ); + } } @@ -868,7 +869,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) { - config.writeEntry("Major", major); - config.writeEntry("BkmkType", bkmktype); - config.writeEntry("Minor", (int)minor); + config.writeEntry("Major", major); + config.writeEntry("BkmkType", bkmktype); + config.writeEntry("Minor", (int)minor); } -// qDebug("finished update"); +// odebug << "finished update" << oendl; } @@ -881,15 +882,15 @@ void QTReaderApp::addtoolbars(Config* config) { - 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() ); - } + 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() ); + } } @@ -905,19 +906,19 @@ void QTReaderApp::addtoolbars(Config* config) { - 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(); - } + 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(); + } } @@ -940,15 +941,15 @@ void QTReaderApp::addtoolbars(Config* config) { - 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(); - } + 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(); + } } @@ -964,19 +965,19 @@ void QTReaderApp::addtoolbars(Config* config) { - 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(); - } + 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(); + } } @@ -994,13 +995,13 @@ void QTReaderApp::addtoolbars(Config* config) { - 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() ); + 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() ); } @@ -1008,8 +1009,8 @@ void QTReaderApp::addtoolbars(Config* config) { - if (m_bkmkAvail != NULL) - { - m_bkmkAvail->removeFrom( markbar() ); - delete m_bkmkAvail; - m_bkmkAvail = NULL; - } + if (m_bkmkAvail != NULL) + { + m_bkmkAvail->removeFrom( markbar() ); + delete m_bkmkAvail; + m_bkmkAvail = NULL; + } } @@ -1027,17 +1028,17 @@ QToolBar* QTReaderApp::filebar() { - 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 ); + switch (m_tbpol) + { + case cesSingle: +// odebug << "Setting filebar to menubar" << oendl; + fileBar = menubar; + break; + default: + odebug << "Incorrect toolbar policy set" << oendl; + case cesMenuTool: + case cesMultiple: +// odebug << "Creating new file bar" << oendl; + fileBar = new QToolBar("File", this, m_tbposition); + break; + } +// fileBar->setHorizontalStretchable( true ); } @@ -1049,14 +1050,14 @@ QToolBar* QTReaderApp::viewbar() { - 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; - } + switch (m_tbpol) + { + case cesMultiple: + viewBar = new QToolBar("View", this, m_tbposition); + break; + default: + odebug << "Incorrect toolbar policy set" << oendl; + case cesSingle: + case cesMenuTool: + viewBar = fileBar; + break; + } } @@ -1068,16 +1069,16 @@ QToolBar* QTReaderApp::navbar() { - 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; - } + switch (m_tbpol) + { + case cesMultiple: +// odebug << "Creating new nav bar" << oendl; + navBar = new QToolBar("Navigation", this, m_tbposition); + break; + default: + odebug << "Incorrect toolbar policy set" << oendl; + case cesSingle: + case cesMenuTool: + navBar = fileBar; +// odebug << "Setting navbar to filebar" << oendl; + break; + } } @@ -1089,14 +1090,14 @@ QToolBar* QTReaderApp::markbar() { - 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; - } + switch (m_tbpol) + { + case cesMultiple: + markBar = new QToolBar("Marks", this, m_tbposition); + break; + default: + odebug << "Incorrect toolbar policy set" << oendl; + case cesSingle: + case cesMenuTool: + markBar = fileBar; + break; + } } @@ -1129,3 +1130,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) -//// qDebug("Received:%s", (const char*)msg); +//// odebug << "Received:" << msg << "" << oendl; @@ -1134,5 +1135,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString info; - stream >> info; - QMessageBox::information(this, PROGNAME, info); + QString info; + stream >> info; + QMessageBox::information(this, PROGNAME, info); } @@ -1140,13 +1141,13 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - if (info) - { - reader->bDoUpdates = true; - reader->refresh(); - } - else - { - reader->bDoUpdates = false; - } + int info; + stream >> info; + if (info) + { + reader->bDoUpdates = true; + reader->refresh(); + } + else + { + reader->bDoUpdates = false; + } } @@ -1154,5 +1155,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString info; - stream >> info; - QMessageBox::warning(this, PROGNAME, info); + QString info; + stream >> info; + QMessageBox::warning(this, PROGNAME, info); } @@ -1160,4 +1161,4 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - m_dontSave = true; - close(); + m_dontSave = true; + close(); } @@ -1165,3 +1166,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - reader->dopagedn(); + reader->dopagedn(); } @@ -1169,3 +1170,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - reader->dopageup(); + reader->dopageup(); } @@ -1173,3 +1174,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - reader->lineDown(); + reader->lineDown(); } @@ -1177,3 +1178,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - reader->lineUp(); + reader->lineUp(); } @@ -1181,3 +1182,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - showEditTools(); + showEditTools(); } @@ -1185,3 +1186,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - reader->goHome(); + reader->goHome(); } @@ -1189,3 +1190,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - reader->goBack(); + reader->goBack(); } @@ -1193,3 +1194,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - reader->goForward(); + reader->goForward(); } @@ -1197,5 +1198,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString info; - stream >> info; - openFile( info ); + QString info; + stream >> info; + openFile( info ); } @@ -1203,3 +1204,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - showinfo(); + showinfo(); } @@ -1207,5 +1208,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString info; - stream >> info; - m_spaceTarget = ActNameToInt(info); + QString info; + stream >> info; + m_spaceTarget = ActNameToInt(info); } @@ -1213,5 +1214,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - autoScroll(info); + int info; + stream >> info; + autoScroll(info); } @@ -1220,3 +1221,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - gotoStart(); + gotoStart(); } @@ -1224,3 +1225,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - gotoEnd(); + gotoEnd(); } @@ -1228,5 +1229,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - reader->locate(info); + int info; + stream >> info; + reader->locate(info); } @@ -1234,5 +1235,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - pagemode(info); + int info; + stream >> info; + pagemode(info); } @@ -1240,5 +1241,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - reader->m_overlap = info; + int info; + stream >> info; + reader->m_overlap = info; } @@ -1246,5 +1247,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - do_margin(info); + int info; + stream >> info; + do_margin(info); } @@ -1252,5 +1253,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString info; - stream >> info; - do_settarget(info); + QString info; + stream >> info; + do_settarget(info); } @@ -1259,5 +1260,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString info; - stream >> info; - reader->m_pipetarget = info; + QString info; + stream >> info; + reader->m_pipetarget = info; } @@ -1266,5 +1267,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - setTwoTouch(info); + int info; + stream >> info; + setTwoTouch(info); } @@ -1272,5 +1273,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - OnAnnotation(info); + int info; + stream >> info; + OnAnnotation(info); } @@ -1278,5 +1279,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - OnDictionary(info); + int info; + stream >> info; + OnDictionary(info); } @@ -1284,5 +1285,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - OnClipboard(info); + int info; + stream >> info; + OnClipboard(info); } @@ -1290,20 +1291,20 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - 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); + 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); } @@ -1311,5 +1312,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - setfullscreen(info); + int info; + stream >> info; + setfullscreen(info); } @@ -1317,5 +1318,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - setcontinuous(info); + int info; + stream >> info; + setcontinuous(info); } @@ -1323,27 +1324,27 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - 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); - } + 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); + } } @@ -1351,5 +1352,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - stripcr(info); + int info; + stream >> info; + stripcr(info); } @@ -1357,5 +1358,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - dehyphen(info); + int info; + stream >> info; + dehyphen(info); } @@ -1363,5 +1364,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - depluck(info); + int info; + stream >> info; + depluck(info); } @@ -1369,5 +1370,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - dejpluck(info); + int info; + stream >> info; + dejpluck(info); } @@ -1375,5 +1376,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - onespace(info); + int info; + stream >> info; + onespace(info); } @@ -1382,5 +1383,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - repalm(info); + int info; + stream >> info; + repalm(info); } @@ -1389,5 +1390,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - unindent(info); + int info; + stream >> info; + unindent(info); } @@ -1395,5 +1396,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - repara(info); + int info; + stream >> info; + repara(info); } @@ -1401,5 +1402,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - dblspce(info); + int info; + stream >> info; + dblspce(info); } @@ -1407,6 +1408,6 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - reader->bindenter = info; - reader->setfilter(reader->getfilter()); + int info; + stream >> info; + reader->bindenter = info; + reader->setfilter(reader->getfilter()); } @@ -1414,5 +1415,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - remap(info); + int info; + stream >> info; + remap(info); } @@ -1420,5 +1421,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - embolden(info); + int info; + stream >> info; + embolden(info); } @@ -1426,5 +1427,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - monospace(info); + int info; + stream >> info; + monospace(info); } @@ -1432,7 +1433,7 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - int info; - stream >> info; - reader->m_charpc = info; - reader->setfont(); - reader->refresh(); + int info; + stream >> info; + reader->m_charpc = info; + reader->setfont(); + reader->refresh(); } @@ -1440,7 +1441,7 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString fontname; - int size; - stream >> fontname; - stream >> size; - setfontHelper(fontname, size); + QString fontname; + int size; + stream >> fontname; + stream >> size; + setfontHelper(fontname, size); } @@ -1448,5 +1449,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - QString info; - stream >> info; - do_autogen(info); + QString info; + stream >> info; + do_autogen(info); } @@ -1454,3 +1455,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - editMark(); + editMark(); } @@ -1458,3 +1459,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) { - editCopy(); + editCopy(); } @@ -1466,3 +1467,3 @@ ActionTypes QTReaderApp::ActNameToInt(const QString& _enc) { - if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i; + if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i; } @@ -1483,3 +1484,3 @@ void QTReaderApp::buttonActionSelected(QAction* _a) { -//// qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text())); +//// odebug << "es:" << _a << " : " << (const char *)(_a->text()) << " (" << ActNameToInt(_a->text()) << ")" << oendl; m_spaceTarget = ActNameToInt(_a->text()); @@ -1509,5 +1510,5 @@ void QTReaderApp::clearBkmkList() { - delete pBkmklist; - pBkmklist = NULL; - m_fBkmksChanged = false; + delete pBkmklist; + pBkmklist = NULL; + m_fBkmksChanged = false; } @@ -1519,38 +1520,38 @@ void QTReaderApp::fileClose() { - 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()) - { + 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); + QDir d = QDir::home(); // "/" + d.cd(APPDIR); + d.remove(reader->m_string); #else /* USEQPE */ - unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); + unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); #endif /* USEQPE */ - } - if (cd->delConfig()) - { + } + if (cd->delConfig()) + { #ifndef USEQPE - QDir d = QDir::home(); // "/" - d.cd(APPDIR "/configs"); - d.remove(reader->m_string); + 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)); + unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string)); #endif /* USEQPE */ - } - } - - fileOpen2(); + } + } + + fileOpen2(); } @@ -1565,3 +1566,3 @@ void QTReaderApp::updatefileinfo() tchar* fl = fromQString(reader->m_lastfile); -// qDebug("Lastfile:%x", fl); +// odebug << "Lastfile:" << fl << "" << oendl; bool notadded = true; @@ -1570,32 +1571,32 @@ void QTReaderApp::updatefileinfo() { - 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); + 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()); +// odebug << "Filedata(1):" << fd.length() << ", " << dlen << "" << oendl; +// getstate(data, dlen); + iter->setAnno(data, dlen); + notadded = false; + delete [] data; + break; + } + } + } +// odebug << "Added?:" << notadded << "" << oendl; 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; + 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())); +// odebug << "Filedata(2):" << fd.length() << ", " << dlen << "" << oendl; + delete [] data; } @@ -1613,3 +1614,3 @@ void QTReaderApp::fileOpen() */ -// qDebug("fileOpen"); +// odebug << "fileOpen" << oendl; // if (!reader->m_lastfile.isEmpty()) @@ -1623,10 +1624,10 @@ void QTReaderApp::fileOpen2() { - if (m_fBkmksChanged) - { - if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0) - savebkmks(); - } - delete pBkmklist; - pBkmklist = NULL; - m_fBkmksChanged = false; + if (m_fBkmksChanged) + { + if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0) + savebkmks(); + } + delete pBkmklist; + pBkmklist = NULL; + m_fBkmksChanged = false; } @@ -1640,4 +1641,4 @@ void QTReaderApp::fileOpen2() { - m_nBkmkAction = cOpenFile; - if (listbkmk(pOpenlist, "Browse")) usebrowser = false; + m_nBkmkAction = cOpenFile; + if (listbkmk(pOpenlist, "Browse")) usebrowser = false; } @@ -1645,12 +1646,12 @@ void QTReaderApp::fileOpen2() { - QString fn = usefilebrowser(); -// qApp->processEvents(); - if (!fn.isEmpty() && QFileInfo(fn).isFile()) - { - openFile(fn); - } - reader->setFocus(); + QString fn = usefilebrowser(); +// qApp->processEvents(); + if (!fn.isEmpty() && QFileInfo(fn).isFile()) + { + openFile(fn); + } + reader->setFocus(); } // reader->refresh(); -// qDebug("HEIGHT:%d", reader->m_lastheight); +// odebug << "HEIGHT:" << reader->m_lastheight << "" << oendl; } @@ -1664,5 +1665,5 @@ QString QTReaderApp::usefilebrowser() fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog, - 0, -// WStyle_Customize | WStyle_NoBorderEx, - "*", QFileInfo(reader->m_lastfile).dirPath(true)); + 0, +// WStyle_Customize | WStyle_NoBorderEx, + "*", QFileInfo(reader->m_lastfile).dirPath(true)); @@ -1672,5 +1673,5 @@ QString QTReaderApp::usefilebrowser() { - fn = fb->getCurrentFile(); + fn = fb->getCurrentFile(); } -// qDebug("Selected %s", (const char*)fn); +// odebug << "Selected " << fn << "" << oendl; delete fb; @@ -1695,3 +1696,3 @@ void QTReaderApp::showprefs() - prefwin->twotouch(m_twoTouch); + prefwin->twotouch(m_twoTouch); prefwin->propfontchange(m_propogatefontchange); @@ -1712,3 +1713,3 @@ void QTReaderApp::showprefs() { - prefwin->Markup(0); + prefwin->Markup(0); } @@ -1716,3 +1717,3 @@ void QTReaderApp::showprefs() { - prefwin->Markup(2); + prefwin->Markup(2); } @@ -1720,3 +1721,3 @@ void QTReaderApp::showprefs() { - prefwin->Markup(3); + prefwin->Markup(3); } @@ -1724,3 +1725,3 @@ void QTReaderApp::showprefs() { - prefwin->Markup(4); + prefwin->Markup(4); } @@ -1728,3 +1729,3 @@ void QTReaderApp::showprefs() { - prefwin->Markup(1); + prefwin->Markup(1); } @@ -1770,80 +1771,80 @@ void QTReaderApp::showprefs() { - 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(); + 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: + odebug << "Format out of range" << oendl; + } + 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(); @@ -1852,3 +1853,3 @@ void QTReaderApp::showprefs() { - delete prefwin; + delete prefwin; } @@ -1861,12 +1862,12 @@ void QTReaderApp::showtoolbarprefs() #else - QFileInfo fi; + 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); + if ( !d.cd(APPDIR) ) + { // "/tmp" + owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl; + d = QDir::home(); + d.mkdir(APPDIR); + d.cd(APPDIR); + } + fi.setFile(d, INIFILE); CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this); @@ -1879,34 +1880,34 @@ void QTReaderApp::showtoolbarprefs() { - 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; + 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 ); + Config config( APPDIR ); #else - QFileInfo fi; + 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() ); + if ( !d.cd(APPDIR) ) + { // "/tmp" + owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl; + d = QDir::home(); + d.mkdir(APPDIR); + d.cd(APPDIR); + } + fi.setFile(d, INIFILE); + Config config( fi.absFilePath() ); #endif - if (isChanged) addtoolbars(&config); + if (isChanged) addtoolbars(&config); } @@ -1914,3 +1915,3 @@ void QTReaderApp::showtoolbarprefs() { - delete prefwin; + delete prefwin; } @@ -1923,3 +1924,3 @@ void QTReaderApp::showinfo() { - QMessageBox::information(this, PROGNAME, "No file loaded", 1); + QMessageBox::information(this, PROGNAME, "No file loaded", 1); } @@ -1927,11 +1928,11 @@ void QTReaderApp::showinfo() { - 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(); + 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(); } @@ -1947,3 +1948,3 @@ void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn) { - buff[i] = name[i].unicode(); + buff[i] = name[i].unicode(); } @@ -1953,3 +1954,3 @@ void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn) { - buff2[i] = text[i].unicode(); + buff2[i] = text[i].unicode(); } @@ -1968,11 +1969,31 @@ void QTReaderApp::addAnno(const QString& name, const QString& text) { - 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(); + 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())); } @@ -1980,24 +2001,4 @@ void QTReaderApp::addAnno(const QString& name, const QString& text) { - 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(); - } + showEditTools(); + } } @@ -2010,11 +2011,11 @@ bool QTReaderApp::findNextBookmark(size_t start) { - if (iter->value() >= start) - { - if (iter->value() < reader->locate()) - { - found = true; - m_anno = iter.pContent(); - } - break; - } + if (iter->value() >= start) + { + if (iter->value() < reader->locate()) + { + found = true; + m_anno = iter.pContent(); + } + break; + } } @@ -2027,3 +2028,3 @@ void QTReaderApp::addanno() { - QMessageBox::information(this, PROGNAME, "No file loaded", 1); + QMessageBox::information(this, PROGNAME, "No file loaded", 1); } @@ -2031,11 +2032,11 @@ void QTReaderApp::addanno() { - m_annoWin->setName(""); - m_annoWin->setAnno(""); - m_annoWin->setPosn(reader->pagelocate()); - m_annoIsEditing = true; - editorStack->raiseWidget( m_annoWin ); + m_annoWin->setName(""); + m_annoWin->setAnno(""); + m_annoWin->setPosn(reader->pagelocate()); + m_annoIsEditing = true; + editorStack->raiseWidget( m_annoWin ); #ifdef USEQPE - Global::showInputMethod(); + Global::showInputMethod(); #endif - m_annoWin->setFocus(); + m_annoWin->setFocus(); } @@ -2069,19 +2070,19 @@ 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; + 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; } @@ -2127,4 +2128,4 @@ void QTReaderApp::settarget() QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp) - + "/" - + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg); + + "/" + + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg); regEdit->setText(text); @@ -2140,9 +2141,9 @@ void QTReaderApp::do_mono(const QString& lcn) { - reader->m_charpc = ulcn; - reader->setfont(); - reader->refresh(); -// reader->setmono(true); + reader->m_charpc = ulcn; + reader->setfont(); + reader->refresh(); +// reader->setmono(true); } else - QMessageBox::information(this, PROGNAME, "Must be a number"); + QMessageBox::information(this, PROGNAME, "Must be a number"); } @@ -2177,3 +2178,3 @@ void QTReaderApp::findNext() { -// // qDebug("findNext called\n"); +// // odebug << "findNext called\n" << oendl; #ifdef __ISEARCH @@ -2251,30 +2252,30 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg) { - 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; - } + pos = reader->locate(); + int pc = (100*pos)/ts; + if (pc != lastpc) + { + pbar->setProgress(pc); + qApp->processEvents(); + reader->setFocus(); + lastpc = pc; } -// qDebug("Found it at %u:%u", pos, offset); + + 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; + } + } +// odebug << "Found it at " << pos << ":" << offset << "" << oendl; pbar->hide(); -// qDebug("Hid"); +// odebug << "Hid" << oendl; reader->locate(pos+offset); -// qDebug("Loacted"); -// qDebug("page up"); +// odebug << "Loacted" << oendl; +// odebug << "page up" << oendl; ret = true; @@ -2283,8 +2284,8 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg) { - if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2) - pos = searchStart; - else - pos = start; - ret = false; - findClose(); + if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2) + pos = searchStart; + else + pos = start; + ret = false; + findClose(); } @@ -2335,3 +2336,3 @@ void QTReaderApp::openFile( const QString &f ) { -// qDebug("File:%s", (const char*)f); +// odebug << "File:" << f << "" << oendl; // openFile(DocLnk(f)); @@ -2347,9 +2348,9 @@ void QTReaderApp::openFile( const QString &f ) #ifdef USEQPE - if (fm.extension( FALSE ) == "desktop") - { - DocLnk d(f); - QFileInfo fnew(d.file()); - fm = fnew; - if (!fm.exists()) return; - } + if (fm.extension( FALSE ) == "desktop") + { + DocLnk d(f); + QFileInfo fnew(d.file()); + fm = fnew; + if (!fm.exists()) return; + } #endif @@ -2368,3 +2369,3 @@ void QTReaderApp::openFile( const QString &f ) } - + } @@ -2375,4 +2376,4 @@ void QTReaderApp::resizeEvent(QResizeEvent* e) { - showNormal(); - showFullScreen(); + showNormal(); + showFullScreen(); } @@ -2382,3 +2383,3 @@ void QTReaderApp::handlekey(QKeyEvent* e) { -// qDebug("Keypress event"); +// odebug << "Keypress event" << oendl; timeb now; @@ -2388,3 +2389,3 @@ void QTReaderApp::handlekey(QKeyEvent* e) { - return; + return; } @@ -2393,91 +2394,91 @@ void QTReaderApp::handlekey(QKeyEvent* e) { - 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(); - } - + case Key_Escape: +// odebug << "escape event" << oendl; + if (m_disableesckey) + { + m_disableesckey = false; + } + else + { + m_bcloseDisabled = true; + if (m_fullscreen) + { + m_actFullscreen->setOn(false); + e->accept(); + } + else + { +// odebug << "escape action" << oendl; + 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); + QString msg("Key press was:"); + QString key; + msg += key.setNum(e->key()); + QMessageBox::information(this, PROGNAME, msg); */ @@ -2489,18 +2490,18 @@ void QTReaderApp::showEditTools() // if ( !doc ) -// close(); +// 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(); + 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(); + Global::hideInputMethod(); #endif - m_fontBar->hide(); -// showNormal(); - showFullScreen(); + m_fontBar->hide(); +// showNormal(); + showFullScreen(); } @@ -2508,42 +2509,42 @@ void QTReaderApp::showEditTools() { -// qDebug("him"); +// odebug << "him" << oendl; #ifdef USEQPE - Global::hideInputMethod(); + 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 ) - { +// odebug << "eb" << oendl; + 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(); + Global::showInputMethod(); #endif - searchBar->show(); - } - if ( regVisible ) - { + searchBar->show(); + } + if ( regVisible ) + { #ifdef USEQPE - Global::showInputMethod(); + Global::showInputMethod(); #endif - regBar->show(); - } - if (m_fontVisible) m_fontBar->show(); -// qDebug("sn"); - showNormal(); -// qDebug("sm"); + regBar->show(); + } + if (m_fontVisible) m_fontBar->show(); +// odebug << "sn" << oendl; + showNormal(); +// odebug << "sm" << oendl; #ifdef USEQPE - showMaximized(); + showMaximized(); #endif -// setCentralWidget(reader); +// setCentralWidget(reader); } -// qDebug("uc"); +// odebug << "uc" << oendl; updateCaption(); -// qDebug("rw"); +// odebug << "rw" << oendl; editorStack->raiseWidget( reader ); -// qDebug("sf"); +// odebug << "sf" << oendl; reader->setFocus(); @@ -2555,5 +2556,5 @@ void QTReaderApp::save() if ( !doc ) - return; + return; if ( !editor->edited() ) - return; + return; @@ -2563,15 +2564,15 @@ void QTReaderApp::save() 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); + 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); } @@ -2587,5 +2588,5 @@ void QTReaderApp::clear() // QMessageBox::information(this, PROGNAME, "Deleting doc", 1); -// delete doc; +// delete doc; // QMessageBox::information(this, PROGNAME, "Deleted doc", 1); -// doc = 0; +// doc = 0; // } @@ -2597,8 +2598,8 @@ void QTReaderApp::updateCaption() // if ( !doc ) -// setCaption( tr("QTReader") ); +// setCaption( tr("QTReader") ); // else { -// QString s = doc->name(); -// if ( s.isEmpty() ) -// s = tr( "Unnamed" ); - setCaption( reader->m_string + " - " + tr("Reader") ); +// QString s = doc->name(); +// if ( s.isEmpty() ) +// s = tr( "Unnamed" ); + setCaption( reader->m_string + " - " + tr("Reader") ); // } @@ -2616,8 +2617,8 @@ void QTReaderApp::closeEvent( QCloseEvent *e ) { -// qDebug("Close event"); +// odebug << "Close event" << oendl; if (m_fullscreen) { - m_fullscreen = false; - showEditTools(); - e->accept(); + m_fullscreen = false; + showEditTools(); + e->accept(); } @@ -2625,3 +2626,3 @@ void QTReaderApp::closeEvent( QCloseEvent *e ) { - e->accept(); + e->accept(); } @@ -2629,54 +2630,54 @@ void QTReaderApp::closeEvent( QCloseEvent *e ) { - 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(); + if (editorStack->visibleWidget() == reader) + { + if ((m_escapeTarget != cesNone) && m_bcloseDisabled) + { +// odebug << "Close disabled" << oendl; + m_bcloseDisabled = false; + e->ignore(); + } + else + { + if (m_fontVisible) + { + m_fontBar->hide(); + m_fontVisible = false; + } + if (regVisible) + { + regBar->hide(); #ifdef USEQPE - Global::hideInputMethod(); + Global::hideInputMethod(); #endif - regVisible = false; - return; - } - if (searchVisible) - { - searchBar->hide(); + regVisible = false; + return; + } + if (searchVisible) + { + searchBar->hide(); #ifdef USEQPE - Global::hideInputMethod(); + 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; - } + 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; + } } @@ -2688,3 +2689,3 @@ void QTReaderApp::do_gotomark() if (!listbkmk(pBkmklist)) - QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); + QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); } @@ -2695,3 +2696,3 @@ void QTReaderApp::do_delmark() if (!listbkmk(pBkmklist)) - QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); + QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); } @@ -2702,5 +2703,5 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab) if (_lab.isEmpty()) - bkmkselector->setText("Cancel"); + bkmkselector->setText("Cancel"); else - bkmkselector->setText(_lab); + bkmkselector->setText(_lab); int cnt = 0; @@ -2708,12 +2709,12 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab) { - for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++) - { + 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())); +// odebug << "Item:" << toQString(i->name()) << "" << oendl; + bkmkselector->insertItem(toQString(i->name())); #else - bkmkselector->insertItem(i->name()); + bkmkselector->insertItem(i->name()); #endif - cnt++; - } + cnt++; + } } @@ -2721,8 +2722,8 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab) { - hidetoolbars(); + hidetoolbars(); editorStack->raiseWidget( bkmkselector ); - return true; + return true; } else - return false; + return false; } @@ -2740,5 +2741,5 @@ void QTReaderApp::do_regedit() reader->bDoUpdates = false; -// qDebug("Showing regbar"); +// odebug << "Showing regbar" << oendl; regBar->show(); -// qDebug("Showing kbd"); +// odebug << "Showing kbd" << oendl; #ifdef USEQPE @@ -2756,34 +2757,18 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk) QString fn = toQString( - CFiledata(bk->anno()).name() - ); -// qDebug("fileinfo"); + CFiledata(bk->anno()).name() + ); +// odebug << "fileinfo" << oendl; 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; +// odebug << "Opening" << oendl; + 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); } @@ -2791,3 +2776,19 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk) { - return false; + 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?"); + } +// odebug << "updating" << oendl; +// showEditTools(); + reader->locate(bk->value()); + } + return true; + } + else + { + return false; } @@ -2800,143 +2801,143 @@ void QTReaderApp::gotobkmk(int ind) { - 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: - { + 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: +//// odebug << "Deleting:" << (*pBkmklist)[ind]->name() << "\n" << oendl; + 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)); + QDir d = QDir::home(); // "/" + d.cd(APPDIR); + d.remove(bkmkselector->text(ind)); #else /* USEQPE */ - unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind))); + unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind))); #endif /* USEQPE */ - } - break; - case cLdConfig: - readconfig(bkmkselector->text(ind), false); - break; - case cRmConfig: - { + } + 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)); + 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))); + unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind))); #endif /* USEQPE */ - } - break; - case cExportLinks: - { + } + 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"); - } - } + 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"); - } + 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; + CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE ); + int ret = f->exec(); + odebug << "Return:" << ret << "" << oendl; + 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 ); + odebug << "YES" << oendl; + } + else + { + odebug << "NO" << oendl; + } + delete f; */ @@ -2944,4 +2945,4 @@ void QTReaderApp::gotobkmk(int ind) #endif /* USEQPE */ - } - break; + } + break; } @@ -2953,4 +2954,4 @@ void QTReaderApp::cancelbkmk() { - QString fn = usefilebrowser(); - if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn); + QString fn = usefilebrowser(); + if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn); } @@ -2973,5 +2974,5 @@ void QTReaderApp::do_jump(const QString& lcn) if (ok) - reader->locate(ulcn); + reader->locate(ulcn); else - QMessageBox::information(this, PROGNAME, "Must be a number"); + QMessageBox::information(this, PROGNAME, "Must be a number"); } @@ -2989,27 +2990,27 @@ void QTReaderApp::do_regaction() case cAutoGen: - do_autogen(regEdit->text()); - break; + do_autogen(regEdit->text()); + break; case cAddBkmk: - do_addbkmk(regEdit->text()); - break; + do_addbkmk(regEdit->text()); + break; case cJump: - do_jump(regEdit->text()); - break; + do_jump(regEdit->text()); + break; /* case cMonoSpace: - do_mono(regEdit->text()); - break; + do_mono(regEdit->text()); + break; */ case cSetTarget: - do_settarget(regEdit->text()); - break; + do_settarget(regEdit->text()); + break; #ifdef _SCROLLPIPE case cSetPipeTarget: - do_setpipetarget(regEdit->text()); - break; + do_setpipetarget(regEdit->text()); + break; #endif case cSetConfigName: -// qDebug("Saving config"); - do_saveconfig(regEdit->text(), false); - break; +// odebug << "Saving config" << oendl; + do_saveconfig(regEdit->text(), false); + break; } @@ -3028,5 +3029,5 @@ void QTReaderApp::do_settarget(const QString& _txt) { - m_targetapp = ""; - m_targetmsg = ""; - QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename"); + m_targetapp = ""; + m_targetmsg = ""; + QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename"); } @@ -3034,4 +3035,4 @@ void QTReaderApp::do_settarget(const QString& _txt) { - m_targetapp = _txt.left(ind); - m_targetmsg = _txt.right(_txt.length()-ind-1); + m_targetapp = _txt.left(ind); + m_targetmsg = _txt.right(_txt.length()-ind-1); } @@ -3049,3 +3050,3 @@ void QTReaderApp::chooseencoding() { - m_fontSelector->insertItem(iter->mime); + m_fontSelector->insertItem(iter->mime); } // delete the FontDatabase!!! @@ -3062,8 +3063,8 @@ void QTReaderApp::setfont() #ifdef USEQPE - FontDatabase f; + FontDatabase f; #else - QFontDatabase f; + QFontDatabase f; #endif - QStringList flist = f.families(); - m_fontSelector->insertStringList(flist); + QStringList flist = f.families(); + m_fontSelector->insertStringList(flist); } // delete the FontDatabase!!! @@ -3072,7 +3073,7 @@ void QTReaderApp::setfont() { - if (m_fontSelector->text(i) == reader->m_fontname) - { - m_fontSelector->setCurrentItem(i); - break; - } + if (m_fontSelector->text(i) == reader->m_fontname) + { + m_fontSelector->setCurrentItem(i); + break; + } } @@ -3088,7 +3089,7 @@ void QTReaderApp::setfontHelper(const QString& lcn, int size) { - QFont f(lcn, 10); - bkmkselector->setFont( f ); - regEdit->setFont( f ); - searchEdit->setFont( f ); - m_annoWin->setFont( f ); + QFont f(lcn, 10); + bkmkselector->setFont( f ); + regEdit->setFont( f ); + searchEdit->setFont( f ); + m_annoWin->setFont( f ); } @@ -3097,3 +3098,3 @@ void QTReaderApp::setfontHelper(const QString& lcn, int size) { - reader->ChangeFont(size); + reader->ChangeFont(size); } @@ -3103,6 +3104,6 @@ void QTReaderApp::do_setencoding(int i) { -// qDebug("setencoding:%d", i); +// odebug << "setencoding:" << i << "" << oendl; if (m_fontAction == cChooseEncoding) { - reader->setencoding(i); + reader->setencoding(i); } @@ -3111,5 +3112,5 @@ void QTReaderApp::do_setencoding(int i) m_fontVisible = false; -// qDebug("showedit"); +// odebug << "showedit" << oendl; if (reader->isVisible()) showEditTools(); -// qDebug("showeditdone"); +// odebug << "showeditdone" << oendl; } @@ -3120,3 +3121,3 @@ void QTReaderApp::do_setfont(const QString& lcn) { - setfontHelper(lcn); + setfontHelper(lcn); } @@ -3125,6 +3126,6 @@ void QTReaderApp::do_setfont(const QString& lcn) m_fontVisible = false; -// qDebug("showedit"); +// odebug << "showedit" << oendl; //if (reader->isVisible()) showEditTools(); -// qDebug("showeditdone"); +// odebug << "showeditdone" << oendl; } @@ -3135,3 +3136,3 @@ void QTReaderApp::do_autogen(const QString& regText) reader->sizes(fs,ts); -// // qDebug("Reg:%s\n", (const tchar*)(regEdit->text())); +// // odebug << "Reg:" << (const tchar*)(regEdit->text()) << "\n" << oendl; m_autogenstr = regText; @@ -3160,5 +3161,5 @@ void QTReaderApp::do_autogen(const QString& regText) pbar->setProgress(pc); - qApp->processEvents(); - if (reader->locate() != lcn) reader->jumpto(lcn); - reader->setFocus(); + qApp->processEvents(); + if (reader->locate() != lcn) reader->jumpto(lcn); + reader->setFocus(); lastpc = pc; @@ -3171,3 +3172,3 @@ void QTReaderApp::do_autogen(const QString& regText) #endif - pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn)); + pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn)); } @@ -3182,13 +3183,13 @@ void QTReaderApp::saveprefs() { -// qDebug("saveprefs"); +// odebug << "saveprefs" << oendl; // reader->saveprefs("uqtreader"); // if (!m_loadedconfig) - do_saveconfig( APPDIR, true ); + do_saveconfig( APPDIR, true ); -/* +/* Config config( APPDIR ); config.setGroup( "View" ); - + reader->m_lastposn = reader->pagelocate(); - + config.writeEntry("FloatDialogs", m_bFloatingDialog); @@ -3263,7 +3264,7 @@ void QTReaderApp::oldFile() { -// qDebug("oldFile called"); +// odebug << "oldFile called" << oendl; reader->setText(true); -// qDebug("settext called"); +// odebug << "settext called" << oendl; showEditTools(); -// qDebug("showedit called"); +// odebug << "showedit called" << oendl; } @@ -3277,14 +3278,14 @@ void info_cb(Fl_Widget* o, void* _data) { - - 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(); + + 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(); } @@ -3292,21 +3293,21 @@ void info_cb(Fl_Widget* o, void* _data) { - unsigned long fs,ts; - tchar sz[20]; - ((reader_ui *)_data)->input->sizes(fs,ts); - unsigned long pl = ((reader_ui *)_data)->input->locate(); + 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); + filename->value(((reader_ui *)_data)->g_filename); - sprintf(sz,"%u",fs); - filesize->value(sz); + sprintf(sz,"%u",fs); + filesize->value(sz); - sprintf(sz,"%u",ts); - textsize->value(sz); + sprintf(sz,"%u",ts); + textsize->value(sz); - comprat->value(100-(100*fs + (ts >> 1))/ts); + comprat->value(100-(100*fs + (ts >> 1))/ts); - sprintf(sz,"%u",pl); - posn->value(sz); + sprintf(sz,"%u",pl); + posn->value(sz); - frcn->value((100*pl + (ts >> 1))/ts); + frcn->value((100*pl + (ts >> 1))/ts); } @@ -3321,12 +3322,12 @@ void QTReaderApp::savebkmks() #ifndef USEQPE - QDir d = QDir::home(); // "/" - d.cd(APPDIR); - QFileInfo fi(d, reader->m_string); - BkmkFile bf((const char *)fi.absFilePath(), true); + 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); + BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true); #endif /* USEQPE */ - bf.write(*pBkmklist); + bf.write(*pBkmklist); } - m_fBkmksChanged = false; + m_fBkmksChanged = false; } @@ -3336,5 +3337,5 @@ void QTReaderApp::readfilelist() #ifndef USEQPE - QDir d = QDir::home(); // "/" - d.cd(APPDIR); - QFileInfo fi(d, ".openfiles"); + QDir d = QDir::home(); // "/" + d.cd(APPDIR); + QFileInfo fi(d, ".openfiles"); BkmkFile bf((const char *)fi.absFilePath()); @@ -3343,6 +3344,6 @@ void QTReaderApp::readfilelist() #endif /* USEQPE */ -// qDebug("Reading open files"); +// odebug << "Reading open files" << oendl; pOpenlist = bf.readall(); -// if (pOpenlist != NULL) qDebug("...with success"); -// else qDebug("...without success!"); +// if (pOpenlist != NULL) odebug << "...with success" << oendl; +// else odebug << "...without success!" << oendl; } @@ -3354,11 +3355,11 @@ void QTReaderApp::savefilelist() #ifndef USEQPE - QDir d = QDir::home(); // "/" - d.cd(APPDIR); - QFileInfo fi(d, ".openfiles"); - BkmkFile bf((const char *)fi.absFilePath(), true); + 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); + BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true); #endif /* USEQPE */ -// qDebug("Writing open files"); - bf.write(*pOpenlist); +// odebug << "Writing open files" << oendl; + bf.write(*pOpenlist); } @@ -3370,3 +3371,3 @@ void QTReaderApp::readbkmks() { - delete pBkmklist; + delete pBkmklist; } @@ -3375,24 +3376,24 @@ void QTReaderApp::readbkmks() #ifndef USEQPE - QDir d = QDir::home(); // "/" - d.cd(APPDIR); - QFileInfo fi(d, reader->m_string); + QDir d = QDir::home(); // "/" + d.cd(APPDIR); + QFileInfo fi(d, reader->m_string); #endif /* ! USEQPE */ if ( - stat((const char *)reader->m_lastfile, &fnstat) == 0 - && + stat((const char *)reader->m_lastfile, &fnstat) == 0 + && #ifndef USEQPE - stat((const char *)fi.absFilePath(), &bkstat) == 0 + stat((const char *)fi.absFilePath(), &bkstat) == 0 #else /* USEQPE */ - stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0 + stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0 #endif /* USEQPE */ - ) + ) + { + if (bkstat.st_mtime < fnstat.st_mtime) { - if (bkstat.st_mtime < fnstat.st_mtime) - { #ifndef USEQPE - unlink((const char *)fi.absFilePath()); + unlink((const char *)fi.absFilePath()); #else /* USEQPE */ - unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); + unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); #endif /* USEQPE */ - } + } } @@ -3409,6 +3410,6 @@ void QTReaderApp::readbkmks() { - pBkmklist = reader->getbkmklist(); + pBkmklist = reader->getbkmklist(); } if (pBkmklist != NULL) - pBkmklist->sort(); + pBkmklist->sort(); } @@ -3424,24 +3425,24 @@ 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>; + 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())); + 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())); + pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate())); #endif - m_fBkmksChanged = true; - pBkmklist->sort(); - } + m_fBkmksChanged = true; + pBkmklist->sort(); + } } @@ -3452,4 +3453,4 @@ void QTReaderApp::OnRedraw() { - bool found = findNextBookmark(reader->pagelocate()); - m_bkmkAvail->setEnabled(found); + bool found = findNextBookmark(reader->pagelocate()); + m_bkmkAvail->setEnabled(found); } @@ -3471,3 +3472,3 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& { -//// qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd); +//// odebug << "OnWordSelected(" << posn << "):" << wrd << "" << oendl; @@ -3475,13 +3476,13 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& { - QClipboard* cb = QApplication::clipboard(); - cb->setText(wrd); + QClipboard* cb = QApplication::clipboard(); + cb->setText(wrd); #ifdef USEQPE - if (wrd.length() > 10) - { - Global::statusMessage(wrd.left(8) + ".."); - } - else - { - Global::statusMessage(wrd); - } + if (wrd.length() > 10) + { + Global::statusMessage(wrd.left(8) + ".."); + } + else + { + Global::statusMessage(wrd); + } #endif @@ -3490,11 +3491,11 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& { -// addAnno(wrd, "Need to be able to edit this", posn); - m_annoWin->setName(line); - m_annoWin->setAnno(""); - m_annoWin->setPosn(posn); - m_annoIsEditing = true; +// 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(); + Global::showInputMethod(); #endif - editorStack->raiseWidget( m_annoWin ); + editorStack->raiseWidget( m_annoWin ); } @@ -3503,7 +3504,7 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& { - if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty()) - { - QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8()); - e << wrd; - } + if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty()) + { + QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8()); + e << wrd; + } } @@ -3516,3 +3517,3 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e) { - e->ignore(); + e->ignore(); } @@ -3520,69 +3521,69 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e) { - 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; - } + e->accept(); +// odebug << "Accepted" << oendl; + 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: + odebug << "Unknown ActionType:" << a << "" << oendl; + break; + } } @@ -3591,3 +3592,3 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e) void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); } -void QTReaderApp::restoreFocus() { reader->setFocus(); } +void QTReaderApp::restoreFocus() { reader->setFocus(); } @@ -3602,3 +3603,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full) { -// qDebug("do_saveconfig:%s", (const char*)_txt); +// odebug << "do_saveconfig:" << _txt << "" << oendl; #ifdef USEQPE @@ -3609,4 +3610,4 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full) { - configname = _txt; - dom = Config::User; + configname = _txt; + dom = Config::User; } @@ -3614,4 +3615,4 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full) { - configname = Global::applicationFileName(APPDIR "/configs", _txt); - dom = Config::File; + configname = Global::applicationFileName(APPDIR "/configs", _txt); + dom = Config::File; } @@ -3622,38 +3623,38 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full) #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()); + QFileInfo fi; + if (full) + { +// odebug << "full:" << _txt << "" << oendl; + QDir d = QDir::home(); // "/" + if ( !d.cd(_txt) ) + { // "/tmp" + owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl; + d = QDir::home(); + d.mkdir(_txt); + d.cd(_txt); + } + fi.setFile(d, INIFILE); + } + else + { + QDir d = QDir::home(); // "/" + if ( !d.cd(APPDIR) ) + { // "/tmp" + owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl; + d = QDir::home(); + d.mkdir(APPDIR); + d.cd(APPDIR); + } + if ( !d.cd("configs") ) + { // "/tmp" + owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl; + d = QDir::home(); + d.cd(APPDIR); + d.mkdir("configs"); + d.cd("configs"); + } + fi.setFile(d, _txt); + } +// odebug << "Path:" << fi.absFilePath() << "" << oendl; + Config config(fi.absFilePath()); #endif @@ -3677,7 +3678,7 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool 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("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()) ); } @@ -3726,12 +3727,12 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full) { - config.setGroup( "Toolbar" ); - config.writeEntry("Movable", m_tbmovesave); - config.writeEntry("Policy", m_tbpolsave); - config.writeEntry("Position", m_tbposition); + 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() ); + config.setGroup( "Geometry" ); + config.writeEntry( "x", x() ); + config.writeEntry( "y", y() ); + config.writeEntry( "width", width() ); + config.writeEntry( "height", height() ); #endif @@ -3751,3 +3752,3 @@ void QTReaderApp::setstate(unsigned char* _sd, unsigned short _sdlen) { - sdlen = sizeof(statedata)+1; + sdlen = sizeof(statedata)+1; } @@ -3803,5 +3804,5 @@ void QTReaderApp::RunScript() fileBrowser* fb = new fileBrowser(this,"OpieReader",!m_bFloatingDialog, - 0, -// WStyle_Customize | WStyle_NoBorderEx, - "*", Global::applicationFileName(APPDIR "/scripts", "")); + 0, +// WStyle_Customize | WStyle_NoBorderEx, + "*", Global::applicationFileName(APPDIR "/scripts", "")); @@ -3810,3 +3811,3 @@ void QTReaderApp::RunScript() { - fn = fb->fileList[0]; + fn = fb->fileList[0]; } @@ -3815,3 +3816,3 @@ void QTReaderApp::RunScript() { - execlp((const char *)fn,(const char *)fn,NULL); + execlp((const char *)fn,(const char *)fn,NULL); } @@ -3825,43 +3826,43 @@ void QTReaderApp::SaveScript(const char* sname) #ifdef OPIE - fprintf(f, "#!/bin/sh\nmsg() {\n\tqcop QPE/Application/reader \"$1\" \"$2\" \"$3\"\n}\n"); + 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"); + 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); + 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); + 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); + 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); } @@ -3915,4 +3916,4 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false) { - configname = _txt; - dom = Config::User; + configname = _txt; + dom = Config::User; } @@ -3920,6 +3921,6 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false) { - configname = Global::applicationFileName(APPDIR "/configs", _txt); - QFileInfo fm(configname); - if ( !fm.exists() ) return false; - dom = Config::File; + configname = Global::applicationFileName(APPDIR "/configs", _txt); + QFileInfo fm(configname); + if ( !fm.exists() ) return false; + dom = Config::File; } @@ -3930,41 +3931,41 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false) #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); - } + QFileInfo fi; + if (full) + { + QDir d = QDir::home(); // "/" + if ( !d.cd(_txt) ) + { // "/tmp" + owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl; + d = QDir::home(); + d.mkdir(_txt); + d.cd(_txt); + } + fi.setFile(d, INIFILE); + } + else + { + QDir d = QDir::home(); // "/" + if ( !d.cd(APPDIR) ) + { // "/tmp" + owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl; + d = QDir::home(); + d.mkdir(APPDIR); + d.cd(APPDIR); + } + if ( !d.cd("configs") ) + { // "/tmp" + owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl; + d = QDir::home(); + d.mkdir("configs"); + d.cd("configs"); + } + fi.setFile(d, _txt); + } #ifdef _WINDOWS - struct stat fnstat; + 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; + if (!fi.exists()) return false; #endif - Config config(fi.absFilePath()); + Config config(fi.absFilePath()); #endif @@ -3972,6 +3973,6 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false) { - 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("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); } @@ -3999,4 +4000,4 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false) { - reader->m_lastfile = config.readEntry( "LastFile", QString::null ); - reader->m_lastposn = config.readNumEntry( "LastPosn", 0 ); + reader->m_lastfile = config.readEntry( "LastFile", QString::null ); + reader->m_lastposn = config.readNumEntry( "LastPosn", 0 ); } @@ -4047,3 +4048,3 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false) { - addtoolbars(&config); + addtoolbars(&config); } @@ -4063,12 +4064,12 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir) if ( !d.cd(APPDIR) ) { // "/tmp" - qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); - d = QDir::home(); - d.mkdir(APPDIR); - d.cd(APPDIR); + owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl; + 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); + owarn << "Cannot find the \"~/" APPDIR "/" << tgtdir << "\" directory" << oendl; + d = QDir::home(); + d.mkdir(tgtdir); + d.cd(tgtdir); } @@ -4082,10 +4083,10 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir) 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 - } - + + bkmkselector->insertItem(fi->fileName()); + cnt++; + + //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl; + ++it; // goto next list element + } + #else /* USEQPE */ @@ -4102,12 +4103,12 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir) { - struct dirent* de; - struct stat buf; - de = readdir(d); - if (de == NULL) break; + 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++; - } + if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode)) + { + bkmkselector->insertItem(de->d_name); + cnt++; + } } @@ -4125,3 +4126,3 @@ void QTReaderApp::LoadConfig() hidetoolbars(); - m_nBkmkAction = cLdConfig; + m_nBkmkAction = cLdConfig; } @@ -4137,3 +4138,3 @@ void QTReaderApp::TidyConfig() hidetoolbars(); - m_nBkmkAction = cRmConfig; + m_nBkmkAction = cRmConfig; } @@ -4149,3 +4150,3 @@ void QTReaderApp::ExportLinks() hidetoolbars(); - m_nBkmkAction = cExportLinks; + m_nBkmkAction = cExportLinks; } @@ -4163,19 +4164,19 @@ void QTReaderApp::OnURLSelected(const QString& href) { - 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); - } + 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); + odebug << "<a href=\"" << href << "\">" << href << "</a>" << oendl; + } + if (m_url_localfile) + { + writeUrl(reader->m_string, href); + } + if (m_url_globalfile) + { + writeUrl("GlobalURLFile", href); + } } @@ -4194,6 +4195,6 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href) { // "/tmp" - qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); - d = QDir::home(); - d.mkdir(APPDIR); - d.cd(APPDIR); + owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl; + d = QDir::home(); + d.mkdir(APPDIR); + d.cd(APPDIR); } @@ -4201,7 +4202,7 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href) { // "/tmp" - qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" ); - d = QDir::home(); - d.cd(APPDIR); - d.mkdir("urls"); - d.cd("urls"); + owarn << "Cannot find the \"~/" APPDIR "/urls\" directory" << oendl; + d = QDir::home(); + d.cd(APPDIR); + d.mkdir("urls"); + d.cd("urls"); } @@ -4213,4 +4214,4 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href) { - fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href); - fclose(fout); + fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href); + fclose(fout); } @@ -4218,3 +4219,3 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href) { - QMessageBox::warning(this, PROGNAME, "Problem with writing URL"); + QMessageBox::warning(this, PROGNAME, "Problem with writing URL"); } |