summaryrefslogtreecommitdiff
authorar <ar>2004-05-03 21:35:18 (UTC)
committer ar <ar>2004-05-03 21:35:18 (UTC)
commit412619441fab46fc79c695a23ccf9e38135bdfad (patch) (side-by-side diff)
tree19d9b8af14cf6c345ef532bb32368b9c7b43c50f
parentd1095d71394779557f446e2a67ba55bc62eec859 (diff)
downloadopie-412619441fab46fc79c695a23ccf9e38135bdfad.zip
opie-412619441fab46fc79c695a23ccf9e38135bdfad.tar.gz
opie-412619441fab46fc79c695a23ccf9e38135bdfad.tar.bz2
- convert qDebug to odebug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.cpp1724
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp78
-rw-r--r--noncore/apps/opie-gutenbrowser/SearchDialog.cpp4
-rw-r--r--noncore/apps/opie-gutenbrowser/browserDialog.cpp5
-rw-r--r--noncore/apps/opie-gutenbrowser/fontDialog.cpp20
-rw-r--r--noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp33
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowser.cpp3217
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp38
-rw-r--r--noncore/apps/opie-gutenbrowser/helpme.cpp13
-rw-r--r--noncore/apps/opie-gutenbrowser/main.cpp2
-rw-r--r--noncore/apps/opie-gutenbrowser/openetext.cpp55
-rw-r--r--noncore/apps/opie-gutenbrowser/optionsDialog.cpp42
-rw-r--r--noncore/apps/opie-reader/Aportis.cpp8
-rw-r--r--noncore/apps/opie-reader/Bkmks.cpp6
-rw-r--r--noncore/apps/opie-reader/BuffDoc.cpp18
-rw-r--r--noncore/apps/opie-reader/CDrawBuffer.cpp22
-rw-r--r--noncore/apps/opie-reader/QTReader.cpp52
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp3231
-rw-r--r--noncore/apps/opie-reader/StyleConsts.cpp2
-rw-r--r--noncore/apps/opie-reader/fileBrowser.cpp8
-rw-r--r--noncore/apps/opie-reader/opie-reader.pro12
-rw-r--r--noncore/apps/opie-reader/plucker.cpp10
-rw-r--r--noncore/apps/opie-reader/plucker_base.cpp1402
-rw-r--r--noncore/apps/tinykate/libkate/document/katebuffer.cpp89
-rw-r--r--noncore/apps/tinykate/libkate/document/katedocument.cpp73
-rw-r--r--noncore/apps/tinykate/libkate/document/katehighlight.cpp126
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp69
-rw-r--r--noncore/apps/tinykate/libkate/kateconfig.cpp219
-rw-r--r--noncore/apps/tinykate/tinykate.cpp31
29 files changed, 5340 insertions, 5269 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 5b22b00..270a4cf 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -15,2 +15,6 @@
+#include "LibraryDialog.h"
+#include "output.h"
+
+/* OPIE */
#include <qpe/applnk.h>
@@ -18,6 +22,5 @@
#include <qpe/qpedialog.h>
+#include <opie2/odebug.h>
-#include "LibraryDialog.h"
-#include "output.h"
-
+/* QT */
#include <qpushbutton.h>
@@ -26,2 +29,3 @@
+/* STD */
#include <unistd.h>
@@ -34,8 +38,8 @@
LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, WFlags fl )
- : QDialog( parent, name, true/* modal*/, fl )
+ : QDialog( parent, name, true/* modal*/, fl )
{
- if ( !name )
- setName( "LibraryDialog" );
- indexLoaded=false;
- initDialog();
+ if ( !name )
+ setName( "LibraryDialog" );
+ indexLoaded=false;
+ initDialog();
@@ -43,43 +47,43 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W
- index = "GUTINDEX.ALL";
- local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
- local_index = local_library + index;
+ index = "GUTINDEX.ALL";
+ local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
+ local_index = local_library + index;
- QString iniFile ;
- iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc";
+ QString iniFile ;
+ iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc";
- new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT";
+ new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT";
- old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL";
- // old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
+ old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL";
+ // old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
- // iniFile = local_library+"gutenbrowserrc";
- // new_index = local_library + "PGWHOLE.TXT";
- // old_index = local_library + "GUTINDEX.ALL";
+ // iniFile = local_library+"gutenbrowserrc";
+ // new_index = local_library + "PGWHOLE.TXT";
+ // old_index = local_library + "GUTINDEX.ALL";
- Config config("Gutenbrowser");
+ Config config("Gutenbrowser");
- config.setGroup( "HttpServer" );
- proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
+ config.setGroup( "HttpServer" );
+ proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
- config.setGroup( "FTPsite" );
- ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org");
- qDebug("Library Dialog: ftp_host is "+ftp_host);
- // ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) );
- // ftp_host=ftp_host.stripWhiteSpace();
- ftp_base_dir= config.readEntry("base", "/pub/gutenberg");
+ config.setGroup( "FTPsite" );
+ ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org");
+ odebug << "Library Dialog: ftp_host is "+ftp_host << oendl;
+ // ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) );
+ // ftp_host=ftp_host.stripWhiteSpace();
+ ftp_base_dir= config.readEntry("base", "/pub/gutenberg");
- i_binary = 0;
+ i_binary = 0;
- config.setGroup("SortAuth");
- if( config.readEntry("authSort", "FALSE") == "TRUE")
- authBox->setChecked(TRUE);
+ config.setGroup("SortAuth");
+ if( config.readEntry("authSort", "FALSE") == "TRUE")
+ authBox->setChecked(TRUE);
- config.setGroup("General");
- downDir =config.readEntry( "DownloadDirectory",local_library);
- qDebug("downDir is "+downDir);
- newindexLib.setName( old_index);
- indexLib.setName( old_index);
+ config.setGroup("General");
+ downDir =config.readEntry( "DownloadDirectory",local_library);
+ odebug << "downDir is "+downDir << oendl;
+ newindexLib.setName( old_index);
+ indexLib.setName( old_index);
- new QPEDialogListener(this);
+ new QPEDialogListener(this);
}
@@ -88,9 +92,9 @@ LibraryDialog::~LibraryDialog()
{
-// delete QList_Item2;
-// delete QList_Item1;
-// delete QList_Item3;
-// delete QList_Item4;
-// delete QList_Item5;
+// delete QList_Item2;
+// delete QList_Item1;
+// delete QList_Item3;
+// delete QList_Item4;
+// delete QList_Item5;
- // saveConfig();
+ // saveConfig();
}
@@ -101,69 +105,69 @@ void LibraryDialog::Newlibrary()
#ifndef Q_WS_QWS //sorry embedded gutenbrowser cant use zip files
- //qDebug("Opening new library index %s",newindexLib);
- if ( newindexLib.open( IO_ReadOnly) ) {
- setCaption( tr( "Library Index - using master pg index." ) );// file opened successfully
- QTextStream indexStream( &newindexLib );
- QString indexLine;
- while ( !indexStream.atEnd() ) { // until end of file..
- indexLine = indexStream.readLine();
- if ( ( indexLine.mid(4,4)).toInt() && !( indexLine.left(3)).toInt()) {
- year = indexLine.mid(4,4);
- year = year.stripWhiteSpace();
- file = indexLine.mid( indexLine.find( "[", 0, TRUE )+1, 12 );
- file = file.stripWhiteSpace();
- number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
- if( year.toInt() < 1984)
- number = number.left( number.length() -1 );
- number = number.stripWhiteSpace();
- title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
- title = title.stripWhiteSpace();
-
- getAuthor(); // groks author
- author = author.stripWhiteSpace();
- if (authBox->isChecked()) { // this reverses the first name and last name of the author
- // qDebug("Sorting last name first");
- QString lastName, firstName="";
- int finder=author.findRev( ' ', -1, TRUE);
- lastName=author.right( author.length()-finder);
- firstName=author.left(finder);
- lastName=lastName.stripWhiteSpace();
- firstName=firstName.stripWhiteSpace();
-
- if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
- author=lastName+", "+firstName;
- }
-
- if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) && (file.find( "]",0, TRUE) == -1) ) {
-
- // fill string list or something to be able to resort the whole library
- if( author.isEmpty() )
- QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
- else {
-
- if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
- (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
- QList_Item1 = new QListViewItem( ListView1,/* number,*/ title, author, year, file );
-
- else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
- (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
- QList_Item2 = new QListViewItem( ListView2, /*number, */title, author, year, file );
-
- else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
- (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
- QList_Item3 = new QListViewItem( ListView3, /*number,*/ title, author, year, file );
-
- else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
- (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
- QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
-
- else
- QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
- }
- }
- }// end if
- }// end while
- newindexLib.close();
- }
+ //odebug << "Opening new library index " << newindexLib << "" << oendl;
+ if ( newindexLib.open( IO_ReadOnly) ) {
+ setCaption( tr( "Library Index - using master pg index." ) );// file opened successfully
+ QTextStream indexStream( &newindexLib );
+ QString indexLine;
+ while ( !indexStream.atEnd() ) { // until end of file..
+ indexLine = indexStream.readLine();
+ if ( ( indexLine.mid(4,4)).toInt() && !( indexLine.left(3)).toInt()) {
+ year = indexLine.mid(4,4);
+ year = year.stripWhiteSpace();
+ file = indexLine.mid( indexLine.find( "[", 0, TRUE )+1, 12 );
+ file = file.stripWhiteSpace();
+ number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
+ if( year.toInt() < 1984)
+ number = number.left( number.length() -1 );
+ number = number.stripWhiteSpace();
+ title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
+ title = title.stripWhiteSpace();
+
+ getAuthor(); // groks author
+ author = author.stripWhiteSpace();
+ if (authBox->isChecked()) { // this reverses the first name and last name of the author
+ // odebug << "Sorting last name first" << oendl;
+ QString lastName, firstName="";
+ int finder=author.findRev( ' ', -1, TRUE);
+ lastName=author.right( author.length()-finder);
+ firstName=author.left(finder);
+ lastName=lastName.stripWhiteSpace();
+ firstName=firstName.stripWhiteSpace();
+
+ if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
+ author=lastName+", "+firstName;
+ }
+
+ if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) && (file.find( "]",0, TRUE) == -1) ) {
+
+ // fill string list or something to be able to resort the whole library
+ if( author.isEmpty() )
+ QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
+ else {
+
+ if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
+ (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
+ QList_Item1 = new QListViewItem( ListView1,/* number,*/ title, author, year, file );
+
+ else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
+ (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
+ QList_Item2 = new QListViewItem( ListView2, /*number, */title, author, year, file );
+
+ else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
+ (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
+ QList_Item3 = new QListViewItem( ListView3, /*number,*/ title, author, year, file );
+
+ else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
+ (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
+ QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
+
+ else
+ QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
+ }
+ }
+ }// end if
+ }// end while
+ newindexLib.close();
+ }
#ifndef Q_WS_QWS
- setCursor( arrowCursor);
+ setCursor( arrowCursor);
#endif
@@ -176,82 +180,82 @@ void LibraryDialog::Library()
- ListView1->clear();
- ListView2->clear();
- ListView3->clear();
- ListView4->clear();
- ListView5->clear();
-
- qDebug("opening GUTINDEX.ALL file");
- IDontKnowWhy = "";
- if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully
- QTextStream indexStream( &indexLib );
- QString indexLine;
- qApp->processEvents();
- // int jig;
- while ( !indexStream.eof() ) {
-
- indexLine = indexStream.readLine();
- if ( indexLine != "") {
- if( (indexLine.mid(4,4)).toInt() /* && !( indexLine.left(3)).toInt()*/ ) {
- // month = indexLine.left( 3);
- year = indexLine.mid(4,4);
- // title = indexLine.mid( 9, 50);
- file = indexLine.mid(60,12);
- if(file.left(1).find("[",0,TRUE) != -1)
- file.remove(1,1);
- if( file.find("]",0,TRUE) != -1)
- file = file.left( file.find("]",0,TRUE));
- //qDebug("file is "+file);
- /// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
- number = indexLine.mid(55,5);
- number = number.stripWhiteSpace();
- // title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
- title = indexLine.mid( 9, 50 );
- title = title.stripWhiteSpace();
- //qDebug("title is "+title);
- getAuthor(); // grok author
- author = author.stripWhiteSpace();
- //qDebug("author is "+author);
- if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
- QString lastName, firstName="";
- int finder=author.findRev( ' ', -1, TRUE);
- lastName=author.right( author.length()-finder);
- firstName=author.left(finder);
- lastName=lastName.stripWhiteSpace();
- firstName=firstName.stripWhiteSpace();
-
- if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
- author=lastName+", "+firstName;
- }
-
- if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) /*&& (file.find( "]",0, TRUE))*/ ) {
- // fill string list or something to be able to sort by Author
- if( author.isEmpty() )
- QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file );
- else {
- if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
- (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
- QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file );
-
- else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
- (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
- QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file );
-
- else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
- (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
- QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file );
-
- else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
- (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
- QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
- }
- }
- }
- }
- }
- indexLib.close();
- } else {
- QString sMsg;
- sMsg = ( tr("Error opening local library index:\n "))+local_index;
- QMessageBox::message( "Error",sMsg);
- }
+ ListView1->clear();
+ ListView2->clear();
+ ListView3->clear();
+ ListView4->clear();
+ ListView5->clear();
+
+ odebug << "opening GUTINDEX.ALL file" << oendl;
+ IDontKnowWhy = "";
+ if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully
+ QTextStream indexStream( &indexLib );
+ QString indexLine;
+ qApp->processEvents();
+ // int jig;
+ while ( !indexStream.eof() ) {
+
+ indexLine = indexStream.readLine();
+ if ( indexLine != "") {
+ if( (indexLine.mid(4,4)).toInt() /* && !( indexLine.left(3)).toInt()*/ ) {
+ // month = indexLine.left( 3);
+ year = indexLine.mid(4,4);
+ // title = indexLine.mid( 9, 50);
+ file = indexLine.mid(60,12);
+ if(file.left(1).find("[",0,TRUE) != -1)
+ file.remove(1,1);
+ if( file.find("]",0,TRUE) != -1)
+ file = file.left( file.find("]",0,TRUE));
+ //odebug << "file is "+file << oendl;
+ /// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
+ number = indexLine.mid(55,5);
+ number = number.stripWhiteSpace();
+ // title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
+ title = indexLine.mid( 9, 50 );
+ title = title.stripWhiteSpace();
+ //odebug << "title is "+title << oendl;
+ getAuthor(); // grok author
+ author = author.stripWhiteSpace();
+ //odebug << "author is "+author << oendl;
+ if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
+ QString lastName, firstName="";
+ int finder=author.findRev( ' ', -1, TRUE);
+ lastName=author.right( author.length()-finder);
+ firstName=author.left(finder);
+ lastName=lastName.stripWhiteSpace();
+ firstName=firstName.stripWhiteSpace();
+
+ if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
+ author=lastName+", "+firstName;
+ }
+
+ if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) /*&& (file.find( "]",0, TRUE))*/ ) {
+ // fill string list or something to be able to sort by Author
+ if( author.isEmpty() )
+ QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file );
+ else {
+ if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
+ (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
+ QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file );
+
+ else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
+ (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
+ QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file );
+
+ else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
+ (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
+ QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file );
+
+ else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
+ (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
+ QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
+ }
+ }
+ }
+ }
+ }
+ indexLib.close();
+ } else {
+ QString sMsg;
+ sMsg = ( tr("Error opening local library index:\n "))+local_index;
+ QMessageBox::message( "Error",sMsg);
+ }
@@ -264,98 +268,98 @@ bool LibraryDialog::getAuthor()
{
- if( title.contains( ", by", TRUE)) {
- int auth;
- auth = title.find(", by", 0, TRUE);
- author = title.right(title.length() - (auth + 4) );
- if( int finder = author.find("[", 0, TRUE)) {
- author = author.left(finder);
- }
- }
- else if ( title.contains( "by, ", TRUE) ) {
- int auth;
- auth = title.find("by, ", 0, TRUE);
- author = title.right(title.length() - (auth + 4) );
- if( int finder = author.find("[", 0, TRUE)) {
- author = author.left( finder);
- }
- }
- else if ( title.contains( " by", TRUE) ) {
- int auth;
- auth = title.find(" by", 0, TRUE);
- author = title.right(title.length() - (auth + 3) );
- if( int finder = author.find("[", 0, TRUE)) {
- author = author.left( finder);
- }
- }
- else if ( title.contains( "by ", TRUE) ) {
- int auth;
- auth = title.find("by ", 0, TRUE);
- author = title.right(title.length() - (auth + 3) );
- if( int finder = author.find("[", 0, TRUE)) {
- author = author.left( finder);
- }
- }
- else if ( title.contains( ",", TRUE) ) {
- int auth;
- auth = title.find(",", 0, TRUE);
- author = title.right( title.length() - (auth + 1) );
- if ( author.contains( ",", TRUE) ) {
- int auth;
- auth = author.find(",", 0, TRUE);
- author = author.right( author.length() - (auth + 1) );
- }
- if( int finder = author.find("[", 0, TRUE)) {
- author = author.left( finder);
- }
- }
- else if ( title.contains( "/", TRUE) ) {
- int auth;
- auth = title.find("/", 0, TRUE);
- author = title.right(title.length() - (auth + 1) );
- if( int finder = author.find("[", 0, TRUE)) {
- author = author.left( finder);
- }
- }
- else if ( title.contains( "of", TRUE) ) {
- int auth;
- auth = title.find("of", 0, TRUE);
- author = title.right(title.length() - (auth + 2) );
- if( int finder = author.find("[", 0, TRUE))
- {
- author = author.left( finder);
- }
- } else {
- author = "";
- }
- if ( author.contains("et. al")) {
- int auth;
- auth = author.find("et. al", 0, TRUE);
- author = author.left( auth );
- }
- if ( author.contains("#")) {
- int auth;
- auth = author.find("#", 0, TRUE);
- author = author.left( auth);
- }
- if ( author.contains("(")) {
- int auth;
- auth = author.find("(", 0, TRUE);
- author = author.left( auth);
- }
- if ( author.contains("et al")) {
- int auth;
- auth = author.find("et al", 0, TRUE);
- author = author.left( auth );
- }
- QRegExp r = QRegExp("[0-9]", TRUE, FALSE);
- if ( author.left(2).find( r) != -1 ) {
- author = "";
- }
- // if( author.contains(" ", TRUE)) {
- // int suth = author.findRev(" ", -1, TRUE);
- // author = author.right( author.length() - suth);
- // }
-
- // title
- // author
- return true;
+ if( title.contains( ", by", TRUE)) {
+ int auth;
+ auth = title.find(", by", 0, TRUE);
+ author = title.right(title.length() - (auth + 4) );
+ if( int finder = author.find("[", 0, TRUE)) {
+ author = author.left(finder);
+ }
+ }
+ else if ( title.contains( "by, ", TRUE) ) {
+ int auth;
+ auth = title.find("by, ", 0, TRUE);
+ author = title.right(title.length() - (auth + 4) );
+ if( int finder = author.find("[", 0, TRUE)) {
+ author = author.left( finder);
+ }
+ }
+ else if ( title.contains( " by", TRUE) ) {
+ int auth;
+ auth = title.find(" by", 0, TRUE);
+ author = title.right(title.length() - (auth + 3) );
+ if( int finder = author.find("[", 0, TRUE)) {
+ author = author.left( finder);
+ }
+ }
+ else if ( title.contains( "by ", TRUE) ) {
+ int auth;
+ auth = title.find("by ", 0, TRUE);
+ author = title.right(title.length() - (auth + 3) );
+ if( int finder = author.find("[", 0, TRUE)) {
+ author = author.left( finder);
+ }
+ }
+ else if ( title.contains( ",", TRUE) ) {
+ int auth;
+ auth = title.find(",", 0, TRUE);
+ author = title.right( title.length() - (auth + 1) );
+ if ( author.contains( ",", TRUE) ) {
+ int auth;
+ auth = author.find(",", 0, TRUE);
+ author = author.right( author.length() - (auth + 1) );
+ }
+ if( int finder = author.find("[", 0, TRUE)) {
+ author = author.left( finder);
+ }
+ }
+ else if ( title.contains( "/", TRUE) ) {
+ int auth;
+ auth = title.find("/", 0, TRUE);
+ author = title.right(title.length() - (auth + 1) );
+ if( int finder = author.find("[", 0, TRUE)) {
+ author = author.left( finder);
+ }
+ }
+ else if ( title.contains( "of", TRUE) ) {
+ int auth;
+ auth = title.find("of", 0, TRUE);
+ author = title.right(title.length() - (auth + 2) );
+ if( int finder = author.find("[", 0, TRUE))
+ {
+ author = author.left( finder);
+ }
+ } else {
+ author = "";
+ }
+ if ( author.contains("et. al")) {
+ int auth;
+ auth = author.find("et. al", 0, TRUE);
+ author = author.left( auth );
+ }
+ if ( author.contains("#")) {
+ int auth;
+ auth = author.find("#", 0, TRUE);
+ author = author.left( auth);
+ }
+ if ( author.contains("(")) {
+ int auth;
+ auth = author.find("(", 0, TRUE);
+ author = author.left( auth);
+ }
+ if ( author.contains("et al")) {
+ int auth;
+ auth = author.find("et al", 0, TRUE);
+ author = author.left( auth );
+ }
+ QRegExp r = QRegExp("[0-9]", TRUE, FALSE);
+ if ( author.left(2).find( r) != -1 ) {
+ author = "";
+ }
+ // if( author.contains(" ", TRUE)) {
+ // int suth = author.findRev(" ", -1, TRUE);
+ // author = author.right( author.length() - suth);
+ // }
+
+ // title
+ // author
+ return true;
}////// end getAuthor()
@@ -366,51 +370,51 @@ void LibraryDialog::select_title( QListViewItem * item)
{
- if(item != NULL) {
- i++;
- int index = tabWidget->currentPageIndex();
- DlglistItemTitle = item->text(0);
- DlglistItemYear = item->text(2);
- DlglistItemFile = item->text(3);
- switch (index) {
- case 0: {
- ListView1->clearSelection();
- }
- break;
- case 1: {
- ListView2->clearSelection();
- }
- break;
- case 2: {
- ListView3->clearSelection();
- }
- break;
- case 3: {
- ListView4->clearSelection();
- }
- break;
- case 4: {
- ListView5->clearSelection();
- }
- break;
- };
- }
-
- if(DlglistItemTitle.length()>2) {
- // DlglistItemNumber = item->text(0);
- item = 0;
- qDebug( "string from librarydialog is:%s %s %s", DlglistItemYear.latin1(),DlglistItemFile.latin1(),DlglistItemNumber.latin1());
- qDebug("Title is "+DlglistItemTitle);
-
- // check for connection here
- // if( get_extext())
-
- if(download_Etext()) {
- // qDebug("get here 2");
- if(i_binary == 1) {
-
- }
- if(checkBox->isChecked () ) {
- accept();
- }
- }
- }
+ if(item != NULL) {
+ i++;
+ int index = tabWidget->currentPageIndex();
+ DlglistItemTitle = item->text(0);
+ DlglistItemYear = item->text(2);
+ DlglistItemFile = item->text(3);
+ switch (index) {
+ case 0: {
+ ListView1->clearSelection();
+ }
+ break;
+ case 1: {
+ ListView2->clearSelection();
+ }
+ break;
+ case 2: {
+ ListView3->clearSelection();
+ }
+ break;
+ case 3: {
+ ListView4->clearSelection();
+ }
+ break;
+ case 4: {
+ ListView5->clearSelection();
+ }
+ break;
+ };
+ }
+
+ if(DlglistItemTitle.length()>2) {
+ // DlglistItemNumber = item->text(0);
+ item = 0;
+ odebug << "string from librarydialog is:" << DlglistItemYear << " " << DlglistItemFile << " " << DlglistItemNumber << "" << oendl;
+ odebug << "Title is "+DlglistItemTitle << oendl;
+
+ // check for connection here
+ // if( get_extext())
+
+ if(download_Etext()) {
+ // odebug << "get here 2" << oendl;
+ if(i_binary == 1) {
+
+ }
+ if(checkBox->isChecked () ) {
+ accept();
+ }
+ }
+ }
}
@@ -420,95 +424,95 @@ bool LibraryDialog::download_Etext()
// might have to use old gpl'd ftp for embedded!!
- Config cfg("Gutenbrowser");
- cfg.setGroup("FTPsite");
- ftp_host=cfg.readEntry("SiteName", "sailor.gutenberg.org");
- ftp_base_dir= cfg.readEntry("base", "/pub/gutenberg");
-
- qDebug("about to network dialog");
- QString NewlistItemNumber, NewlistItemYear, ls_result, result_line, s, dir, networkUrl, outputFile;
-
- //////////////////// FIXME- if 'x' is part of real name....
- NewlistItemFile = DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).left(DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).find("x", 1, FALSE));
-
- if( NewlistItemFile.find( DlglistItemFile.left(4) ,0,TRUE) ==-1 ) {
- NewlistItemFile.replace( 0,4, DlglistItemFile.left(4));
- qDebug("NewlistItemFile is now "+NewlistItemFile);
- }
- NewlistItemYear = DlglistItemYear.right(2);
- int NewlistItemYear_Int = NewlistItemYear.toInt(0, 10);
- qDebug(NewlistItemYear);
- if (NewlistItemYear_Int < 91 && NewlistItemYear_Int > 70) {
- NewlistItemYear = "90";
- }
- Edir ="etext" +NewlistItemYear;
- dir= ftp_base_dir + "/etext" +NewlistItemYear+"/";
- if( ftp_base_dir.find("=",0,true) )
- ftp_base_dir.remove( ftp_base_dir.find("=",0,true),1);
-
- networkUrl= "ftp://"+ftp_host+dir;
-
- outputFile=local_library+".guten_temp";
- //qDebug("Download file:%s",NewlistItemFile.latin1() );
- qDebug("Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile);
- QStringList networkList;
- networkList.append((const char *)ftp_host);
- networkList.append((const char *)dir);
- networkList.append((const char *)outputFile);
- networkList.append((const char *)NewlistItemFile);
+ Config cfg("Gutenbrowser");
+ cfg.setGroup("FTPsite");
+ ftp_host=cfg.readEntry("SiteName", "sailor.gutenberg.org");
+ ftp_base_dir= cfg.readEntry("base", "/pub/gutenberg");
+
+ odebug << "about to network dialog" << oendl;
+ QString NewlistItemNumber, NewlistItemYear, ls_result, result_line, s, dir, networkUrl, outputFile;
+
+ //////////////////// FIXME- if 'x' is part of real name....
+ NewlistItemFile = DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).left(DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).find("x", 1, FALSE));
+
+ if( NewlistItemFile.find( DlglistItemFile.left(4) ,0,TRUE) ==-1 ) {
+ NewlistItemFile.replace( 0,4, DlglistItemFile.left(4));
+ odebug << "NewlistItemFile is now "+NewlistItemFile << oendl;
+ }
+ NewlistItemYear = DlglistItemYear.right(2);
+ int NewlistItemYear_Int = NewlistItemYear.toInt(0, 10);
+ odebug << NewlistItemYear << oendl;
+ if (NewlistItemYear_Int < 91 && NewlistItemYear_Int > 70) {
+ NewlistItemYear = "90";
+ }
+ Edir ="etext" +NewlistItemYear;
+ dir= ftp_base_dir + "/etext" +NewlistItemYear+"/";
+ if( ftp_base_dir.find("=",0,true) )
+ ftp_base_dir.remove( ftp_base_dir.find("=",0,true),1);
+
+ networkUrl= "ftp://"+ftp_host+dir;
+
+ outputFile=local_library+".guten_temp";
+ //odebug << "Download file:" << NewlistItemFile << "" << oendl;
+ odebug << "Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile << oendl;
+ QStringList networkList;
+ networkList.append((const char *)ftp_host);
+ networkList.append((const char *)dir);
+ networkList.append((const char *)outputFile);
+ networkList.append((const char *)NewlistItemFile);
//<< (char *)ftp_host << (char *)dir << (char *)outputFile << (char *)NewlistItemFile;
- NetworkDialog *NetworkDlg;
- NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkList);
-
-
- if( NetworkDlg->exec() != 0 ) { // use new, improved, *INSTANT* network-dialog-file-getterer
- File_Name= NetworkDlg->localFileName;
- qDebug("back to Library from Network Dialog");
- qDebug("Just downloaded "+NetworkDlg->localFileName);
-
- // if (File_Name.find( local_library, 0, TRUE) != -1 ) { //could not be found
- // QString oldName=File_Name;
- // File_Name.replace(0,local_library.length(),downDir);
- // qDebug("File_Name now is "+File_Name);
-
- // }
- // rename .txt to .etx
- if(NetworkDlg->successDownload) {
- qDebug("Filename is "+File_Name);
- if(File_Name.right(4)==".txt") {
- QString s_fileName=File_Name;
- s_fileName.replace( s_fileName.length()-3,3,"gtn");
- // s_fileName.replace( s_fileName.length()-3,3,"etx");
- rename(File_Name.latin1(),s_fileName.latin1());
- File_Name=s_fileName;
-
- qDebug("Filename is now "+File_Name);
-
- }
- if(File_Name.length() > 5 ) {
- setTitle();
- QFileInfo fi(File_Name);
- QString name_file=fi.fileName();
- name_file=name_file.left(name_file.length()-4);
-
- qDebug("Setting doclink");
- DocLnk lnk;
- qDebug("name is "+name_file);
- lnk.setName(name_file); //sets file name
- qDebug("Title is "+DlglistItemTitle);
- lnk.setComment(DlglistItemTitle);
-
- qDebug("Filename is "+File_Name);
- lnk.setFile(File_Name); //sets File property
- lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
- lnk.setExec(File_Name);
- lnk.setIcon("gutenbrowser/Gutenbrowser");
- if(!lnk.writeLink()) {
- qDebug("Writing doclink did not work");
- } else {
- }
- } else
- QMessageBox::message("Note","There was an error\nwith the file");
- }
- }
- return true;
+ NetworkDialog *NetworkDlg;
+ NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkList);
+
+
+ if( NetworkDlg->exec() != 0 ) { // use new, improved, *INSTANT* network-dialog-file-getterer
+ File_Name= NetworkDlg->localFileName;
+ odebug << "back to Library from Network Dialog" << oendl;
+ odebug << "Just downloaded "+NetworkDlg->localFileName << oendl;
+
+ // if (File_Name.find( local_library, 0, TRUE) != -1 ) { //could not be found
+ // QString oldName=File_Name;
+ // File_Name.replace(0,local_library.length(),downDir);
+ // odebug << "File_Name now is "+File_Name << oendl;
+
+ // }
+ // rename .txt to .etx
+ if(NetworkDlg->successDownload) {
+ odebug << "Filename is "+File_Name << oendl;
+ if(File_Name.right(4)==".txt") {
+ QString s_fileName=File_Name;
+ s_fileName.replace( s_fileName.length()-3,3,"gtn");
+ // s_fileName.replace( s_fileName.length()-3,3,"etx");
+ rename(File_Name.latin1(),s_fileName.latin1());
+ File_Name=s_fileName;
+
+ odebug << "Filename is now "+File_Name << oendl;
+
+ }
+ if(File_Name.length() > 5 ) {
+ setTitle();
+ QFileInfo fi(File_Name);
+ QString name_file=fi.fileName();
+ name_file=name_file.left(name_file.length()-4);
+
+ odebug << "Setting doclink" << oendl;
+ DocLnk lnk;
+ odebug << "name is "+name_file << oendl;
+ lnk.setName(name_file); //sets file name
+ odebug << "Title is "+DlglistItemTitle << oendl;
+ lnk.setComment(DlglistItemTitle);
+
+ odebug << "Filename is "+File_Name << oendl;
+ lnk.setFile(File_Name); //sets File property
+ lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
+ lnk.setExec(File_Name);
+ lnk.setIcon("gutenbrowser/Gutenbrowser");
+ if(!lnk.writeLink()) {
+ odebug << "Writing doclink did not work" << oendl;
+ } else {
+ }
+ } else
+ QMessageBox::message("Note","There was an error\nwith the file");
+ }
+ }
+ return true;
}
@@ -518,43 +522,43 @@ bool LibraryDialog::httpDownload()
#ifndef Q_WS_QWS
- Config config("Gutenbrowser");
- config.setGroup( "Browser" );
- QString brow = config.readEntry("Preferred", "");
- QString file_name = "./.guten_temp";
- // config.setGroup( "HttpServer" );
- // QString s_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
- QString httpName = proxy_http + "/"+Edir;
- // progressBar->setProgress( i);
- i++;
- if ( brow != "Konq") { /////////// use lynx
- // QString cmd = "lynx -source " + httpName +" | cat >> " + file_name;
- // system(cmd);
- } else { //////////// use KFM
- // KFM::download( httpName, file_name);
- }
- i++;
- QFile tmp( file_name);
- QString str;
- if (tmp.open(IO_ReadOnly)) {
- QTextStream t( &tmp ); // use a text stream
- while ( !t.eof()) {
- QString s = t.readLine();
- if (s.contains( NewlistItemFile, FALSE) && (s.contains(".txt")) ) {
- str = s.mid( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6, (s.find( ".txt</A>", 0, TRUE) + 4) - ( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6 ) );
- httpName += "/" + str;
- }
- } //end of while loop
- }
- tmp.close();
- m_getFilePath = local_library + str;
- i++;
- if ( brow != "KFM"){ ///////// use lynx
- QString cmd = "lynx -source " + httpName +" | cat >> " + m_getFilePath;
- // QMessageBox::message("Error", cmd);
- system(cmd);
- } else { ////////// use KFM
- // KFM::download( httpName, m_getFilePath);
- }
- i++;
+ Config config("Gutenbrowser");
+ config.setGroup( "Browser" );
+ QString brow = config.readEntry("Preferred", "");
+ QString file_name = "./.guten_temp";
+ // config.setGroup( "HttpServer" );
+ // QString s_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
+ QString httpName = proxy_http + "/"+Edir;
+ // progressBar->setProgress( i);
+ i++;
+ if ( brow != "Konq") { /////////// use lynx
+ // QString cmd = "lynx -source " + httpName +" | cat >> " + file_name;
+ // system(cmd);
+ } else { //////////// use KFM
+ // KFM::download( httpName, file_name);
+ }
+ i++;
+ QFile tmp( file_name);
+ QString str;
+ if (tmp.open(IO_ReadOnly)) {
+ QTextStream t( &tmp ); // use a text stream
+ while ( !t.eof()) {
+ QString s = t.readLine();
+ if (s.contains( NewlistItemFile, FALSE) && (s.contains(".txt")) ) {
+ str = s.mid( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6, (s.find( ".txt</A>", 0, TRUE) + 4) - ( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6 ) );
+ httpName += "/" + str;
+ }
+ } //end of while loop
+ }
+ tmp.close();
+ m_getFilePath = local_library + str;
+ i++;
+ if ( brow != "KFM"){ ///////// use lynx
+ QString cmd = "lynx -source " + httpName +" | cat >> " + m_getFilePath;
+ // QMessageBox::message("Error", cmd);
+ system(cmd);
+ } else { ////////// use KFM
+ // KFM::download( httpName, m_getFilePath);
+ }
+ i++;
#endif
- return false;
+ return false;
}
@@ -563,6 +567,6 @@ void LibraryDialog::cancelIt()
{
- saveConfig();
+ saveConfig();
- DlglistItemNumber = "";
- this->reject();
+ DlglistItemNumber = "";
+ this->reject();
}
@@ -571,33 +575,33 @@ bool LibraryDialog::setTitle()
{
- Config config("Gutenbrowser");
- qDebug("setting title");
- qDebug(DlglistItemTitle);
-
- if( DlglistItemTitle.find("[",0,TRUE) != -1)
- DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
- if( DlglistItemTitle.find("]",0,TRUE) !=-1)
- DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
- qDebug("Title being set is "+DlglistItemTitle);
- int test = 0;
- QString ramble, temp;
- config.setGroup("Files");
- QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
- int i_numofFiles = s_numofFiles.toInt();
- for ( int i = 0; i <= i_numofFiles; i++){
- temp.setNum( i);
- ramble = config.readEntry( temp, "" );
- if( strcmp( ramble, File_Name) == 0){
- test = 1;
- }
- }
- config.setGroup("Files");
- config.writeEntry( "NumberOfFiles", i_numofFiles +1 );
- QString interger;
- interger.setNum( i_numofFiles +1);
- config.writeEntry( interger, File_Name);
- config.setGroup( "Titles" );
- config.writeEntry( File_Name, DlglistItemTitle);
-
- test = 0;
- return true;
+ Config config("Gutenbrowser");
+ odebug << "setting title" << oendl;
+ odebug << DlglistItemTitle << oendl;
+
+ if( DlglistItemTitle.find("[",0,TRUE) != -1)
+ DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
+ if( DlglistItemTitle.find("]",0,TRUE) !=-1)
+ DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
+ odebug << "Title being set is "+DlglistItemTitle << oendl;
+ int test = 0;
+ QString ramble, temp;
+ config.setGroup("Files");
+ QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
+ int i_numofFiles = s_numofFiles.toInt();
+ for ( int i = 0; i <= i_numofFiles; i++){
+ temp.setNum( i);
+ ramble = config.readEntry( temp, "" );
+ if( strcmp( ramble, File_Name) == 0){
+ test = 1;
+ }
+ }
+ config.setGroup("Files");
+ config.writeEntry( "NumberOfFiles", i_numofFiles +1 );
+ QString interger;
+ interger.setNum( i_numofFiles +1);
+ config.writeEntry( interger, File_Name);
+ config.setGroup( "Titles" );
+ config.writeEntry( File_Name, DlglistItemTitle);
+
+ test = 0;
+ return true;
}
@@ -607,20 +611,20 @@ void LibraryDialog::saveConfig()
{
- Config config("Gutenbrowser");
- if( httpBox->isChecked() == TRUE) {
- checked = 1;
- config.setGroup( "Proxy" );
- config.writeEntry("IsChecked", "TRUE");
- } else {
- checked = 0;
- config.setGroup( "Proxy" );
- config.writeEntry("IsChecked", "FALSE");
- }
- if (authBox->isChecked() == TRUE) {
- config.setGroup("SortAuth");
- config.writeEntry("authSort", "TRUE");
- } else {
- config.setGroup("SortAuth");
- config.writeEntry("authSort", "FALSE");
- }
- // config.write();
+ Config config("Gutenbrowser");
+ if( httpBox->isChecked() == TRUE) {
+ checked = 1;
+ config.setGroup( "Proxy" );
+ config.writeEntry("IsChecked", "TRUE");
+ } else {
+ checked = 0;
+ config.setGroup( "Proxy" );
+ config.writeEntry("IsChecked", "FALSE");
+ }
+ if (authBox->isChecked() == TRUE) {
+ config.setGroup("SortAuth");
+ config.writeEntry("authSort", "TRUE");
+ } else {
+ config.setGroup("SortAuth");
+ config.writeEntry("authSort", "FALSE");
+ }
+ // config.write();
}
@@ -631,135 +635,135 @@ void LibraryDialog::onButtonSearch()
{
- ListView1->clearSelection();
- ListView2->clearSelection();
- ListView3->clearSelection();
- ListView4->clearSelection();
- ListView5->clearSelection();
-
- int curTab=tabWidget->currentPageIndex();
- SearchDialog* searchDlg;
-
- // if( resultsList)
- searchDlg = new SearchDialog( this, "Library Search", TRUE);
- searchDlg->setCaption( tr( "Library Search" ) );
- searchDlg->setLabel( "- author or title");
- QString resultString;
- int i_berger = 0;
- if( searchDlg->exec() != 0 ) {
- QString searcherStr = searchDlg->get_text();
- int fluff=0;
-
- // int tabPage = tabWidget->currentPageIndex();
- // TODO ititerate here... struct<listViews>??
-
- QListViewItemIterator it1( ListView1 );
- QListViewItemIterator it2( ListView2 );
- QListViewItemIterator it3( ListView3 );
- QListViewItemIterator it4( ListView4 );
- QListViewItemIterator it5( ListView5 );
-
- //// this is really pitiful work,
- ///////
- bool cS;
- if( searchDlg->caseSensitiveCheckBox->isChecked())
- cS=true; //case sensitive
- else
- cS=false;
-
- if(fluff==0) {
- for ( ; it1.current(); ++it1 ) {
- resultString = ( it1.current() )->text(0);
- resultString += (" : ");
- resultString += ( it1.current() )->text(2);
- resultString += (" : ");
- resultString += ( it1.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1)
- {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) {// search routine here
- for ( ; it2.current(); ++it2 ) {
- resultString = ( it2.current() )->text(0);
- resultString += (" : ");
- resultString += ( it2.current() )->text(2);
- resultString += (" : ");
- resultString += ( it2.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) {// search routine here
- for ( ; it3.current(); ++it3 ) {
- resultString = ( it3.current() )->text(0);
- resultString += (" : ");
- resultString += ( it3.current() )->text(2);
- resultString += (" : ");
- resultString += ( it3.current() )->text(3);
-
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) {
- // search routine here
- for ( ; it4.current(); ++it4 ) {
- resultString = ( it4.current() )->text(0);
- resultString += (" : ");
- resultString += ( it4.current() )->text(2);
- resultString += (" : ");
- resultString += ( it4.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) { // search routine here
- for ( ; it5.current(); ++it5 ) {
- resultString = ( it5.current() )->text(0);
- resultString += (" : ");
- resultString += ( it5.current() )->text(2);
- resultString += (" : ");
- resultString += ( it5.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
-
- tabWidget->setCurrentPage( curTab);
-
- Searchlist.sort();
- SearchResultsDlg* SearchResultsDialog;
- SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
-
- SearchResultsDialog->showMaximized();
- if( SearchResultsDialog->exec() != 0) {
- texter = SearchResultsDialog->selText;
- // qDebug(texter);
- resultLs= SearchResultsDialog->resultsList;
- i_berger = 1;
- }
- Searchlist.clear();
-
- // if(SearchResultsDialog)
- // delete SearchResultsDialog;
- QString tester;
- for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
- texter.sprintf("%s \n",(*it).latin1());
- // qDebug(texter);
- if( tester!=texter)
- parseSearchResults( texter);
- tester = texter;
- }
- if(searchDlg)
- delete searchDlg;
- }
- if(checkBox->isChecked() ) {
- accept();
- } else {
- setActiveWindow();
- }
+ ListView1->clearSelection();
+ ListView2->clearSelection();
+ ListView3->clearSelection();
+ ListView4->clearSelection();
+ ListView5->clearSelection();
+
+ int curTab=tabWidget->currentPageIndex();
+ SearchDialog* searchDlg;
+
+ // if( resultsList)
+ searchDlg = new SearchDialog( this, "Library Search", TRUE);
+ searchDlg->setCaption( tr( "Library Search" ) );
+ searchDlg->setLabel( "- author or title");
+ QString resultString;
+ int i_berger = 0;
+ if( searchDlg->exec() != 0 ) {
+ QString searcherStr = searchDlg->get_text();
+ int fluff=0;
+
+ // int tabPage = tabWidget->currentPageIndex();
+ // TODO ititerate here... struct<listViews>??
+
+ QListViewItemIterator it1( ListView1 );
+ QListViewItemIterator it2( ListView2 );
+ QListViewItemIterator it3( ListView3 );
+ QListViewItemIterator it4( ListView4 );
+ QListViewItemIterator it5( ListView5 );
+
+ //// this is really pitiful work,
+ ///////
+ bool cS;
+ if( searchDlg->caseSensitiveCheckBox->isChecked())
+ cS=true; //case sensitive
+ else
+ cS=false;
+
+ if(fluff==0) {
+ for ( ; it1.current(); ++it1 ) {
+ resultString = ( it1.current() )->text(0);
+ resultString += (" : ");
+ resultString += ( it1.current() )->text(2);
+ resultString += (" : ");
+ resultString += ( it1.current() )->text(3);
+ if( resultString.find( searcherStr, 0, cS) != -1)
+ {
+ Searchlist.append( resultString);
+ }
+ }
+ }
+ if(fluff==0) {// search routine here
+ for ( ; it2.current(); ++it2 ) {
+ resultString = ( it2.current() )->text(0);
+ resultString += (" : ");
+ resultString += ( it2.current() )->text(2);
+ resultString += (" : ");
+ resultString += ( it2.current() )->text(3);
+ if( resultString.find( searcherStr, 0, cS) != -1) {
+ Searchlist.append( resultString);
+ }
+ }
+ }
+ if(fluff==0) {// search routine here
+ for ( ; it3.current(); ++it3 ) {
+ resultString = ( it3.current() )->text(0);
+ resultString += (" : ");
+ resultString += ( it3.current() )->text(2);
+ resultString += (" : ");
+ resultString += ( it3.current() )->text(3);
+
+ if( resultString.find( searcherStr, 0, cS) != -1) {
+ Searchlist.append( resultString);
+ }
+ }
+ }
+ if(fluff==0) {
+ // search routine here
+ for ( ; it4.current(); ++it4 ) {
+ resultString = ( it4.current() )->text(0);
+ resultString += (" : ");
+ resultString += ( it4.current() )->text(2);
+ resultString += (" : ");
+ resultString += ( it4.current() )->text(3);
+ if( resultString.find( searcherStr, 0, cS) != -1) {
+ Searchlist.append( resultString);
+ }
+ }
+ }
+ if(fluff==0) { // search routine here
+ for ( ; it5.current(); ++it5 ) {
+ resultString = ( it5.current() )->text(0);
+ resultString += (" : ");
+ resultString += ( it5.current() )->text(2);
+ resultString += (" : ");
+ resultString += ( it5.current() )->text(3);
+ if( resultString.find( searcherStr, 0, cS) != -1) {
+ Searchlist.append( resultString);
+ }
+ }
+ }
+
+ tabWidget->setCurrentPage( curTab);
+
+ Searchlist.sort();
+ SearchResultsDlg* SearchResultsDialog;
+ SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
+
+ SearchResultsDialog->showMaximized();
+ if( SearchResultsDialog->exec() != 0) {
+ texter = SearchResultsDialog->selText;
+ // odebug << texter << oendl;
+ resultLs= SearchResultsDialog->resultsList;
+ i_berger = 1;
+ }
+ Searchlist.clear();
+
+ // if(SearchResultsDialog)
+ // delete SearchResultsDialog;
+ QString tester;
+ for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
+ texter.sprintf("%s \n",(*it).latin1());
+ // odebug << texter << oendl;
+ if( tester!=texter)
+ parseSearchResults( texter);
+ tester = texter;
+ }
+ if(searchDlg)
+ delete searchDlg;
+ }
+ if(checkBox->isChecked() ) {
+ accept();
+ } else {
+ setActiveWindow();
+ }
}
@@ -771,16 +775,16 @@ void LibraryDialog::parseSearchResults( QString resultStr)
- int stringLeng=resultStr.length();
- QString my;
- my.setNum( stringLeng, 10);
-
- if( resultStr.length() > 2 && resultStr.length() < 130) {
- int titleInt = resultStr.find( " : ", 0, TRUE);
- DlglistItemTitle = resultStr.left( titleInt);
- int yearInt = resultStr.find( " : ", titleInt+3, TRUE);
- DlglistItemYear = resultStr.mid( titleInt+3, (yearInt - titleInt)-3);
- DlglistItemFile = resultStr.right( resultStr.length() - (yearInt + 3));
- download_Etext();
- }
- /*
- printf( DlglistItemTitle+"\n"); printf( DlglistItemYear+"\n"); printf( DlglistItemFile+"\n");*/
+ int stringLeng=resultStr.length();
+ QString my;
+ my.setNum( stringLeng, 10);
+
+ if( resultStr.length() > 2 && resultStr.length() < 130) {
+ int titleInt = resultStr.find( " : ", 0, TRUE);
+ DlglistItemTitle = resultStr.left( titleInt);
+ int yearInt = resultStr.find( " : ", titleInt+3, TRUE);
+ DlglistItemYear = resultStr.mid( titleInt+3, (yearInt - titleInt)-3);
+ DlglistItemFile = resultStr.right( resultStr.length() - (yearInt + 3));
+ download_Etext();
+ }
+ /*
+ printf( DlglistItemTitle+"\n"); printf( DlglistItemYear+"\n"); printf( DlglistItemFile+"\n");*/
}
@@ -808,3 +812,3 @@ void LibraryDialog::parseSearchResults( QString resultStr)
// if (exit==QMessageBox::Yes) {
- // qDebug("Issuing the command "+cmd);
+ // odebug << "Issuing the command "+cmd << oendl;
// #if defined(_WS_WIN_)
@@ -842,14 +846,14 @@ bool LibraryDialog::getItem(QListViewItem *it)
{
- // qDebug("selected getItem");
-
- // DlglistItemNumber = it->text(0);
- DlglistItemTitle = it->text(0);
- DlglistItemYear = it->text(2);
- DlglistItemFile = it->text(3);
-
- if(download_Etext()) {
- if(i_binary == 1) {
- }
- }
- return true;
+ // odebug << "selected getItem" << oendl;
+
+ // DlglistItemNumber = it->text(0);
+ DlglistItemTitle = it->text(0);
+ DlglistItemYear = it->text(2);
+ DlglistItemFile = it->text(3);
+
+ if(download_Etext()) {
+ if(i_binary == 1) {
+ }
+ }
+ return true;
}
@@ -860,37 +864,37 @@ bool LibraryDialog::onButtonDownload()
{
- // qDebug("selected onButtonDownloadz");
-
- QListViewItemIterator it1( ListView1 );
- QListViewItemIterator it2( ListView2 );
- QListViewItemIterator it3( ListView3 );
- QListViewItemIterator it4( ListView4 );
- QListViewItemIterator it5( ListView5 );
-
- // iterate through all items of the listview
- for ( ; it1.current(); ++it1 ) {
- if ( it1.current()->isSelected() )
- getItem(it1.current());
- it1.current()->setSelected(FALSE);
- }
- for ( ; it2.current(); ++it2 ) {
- if ( it2.current()->isSelected() )
- getItem(it2.current());
- it2.current()->setSelected(FALSE);
- }
- for ( ; it3.current(); ++it3 ) {
- if ( it3.current()->isSelected() )
- getItem(it3.current());
- it3.current()->setSelected(FALSE);
- }
- for ( ; it4.current(); ++it4 ) {
- if ( it4.current()->isSelected() )
- getItem(it4.current());
- it4.current()->setSelected(FALSE);
- }
- for ( ; it5.current(); ++it5 ) {
- if ( it5.current()->isSelected() )
- getItem(it5.current());
- it5.current()->setSelected(FALSE);
- }
- return true;
+ // odebug << "selected onButtonDownloadz" << oendl;
+
+ QListViewItemIterator it1( ListView1 );
+ QListViewItemIterator it2( ListView2 );
+ QListViewItemIterator it3( ListView3 );
+ QListViewItemIterator it4( ListView4 );
+ QListViewItemIterator it5( ListView5 );
+
+ // iterate through all items of the listview
+ for ( ; it1.current(); ++it1 ) {
+ if ( it1.current()->isSelected() )
+ getItem(it1.current());
+ it1.current()->setSelected(FALSE);
+ }
+ for ( ; it2.current(); ++it2 ) {
+ if ( it2.current()->isSelected() )
+ getItem(it2.current());
+ it2.current()->setSelected(FALSE);
+ }
+ for ( ; it3.current(); ++it3 ) {
+ if ( it3.current()->isSelected() )
+ getItem(it3.current());
+ it3.current()->setSelected(FALSE);
+ }
+ for ( ; it4.current(); ++it4 ) {
+ if ( it4.current()->isSelected() )
+ getItem(it4.current());
+ it4.current()->setSelected(FALSE);
+ }
+ for ( ; it5.current(); ++it5 ) {
+ if ( it5.current()->isSelected() )
+ getItem(it5.current());
+ it5.current()->setSelected(FALSE);
+ }
+ return true;
}
@@ -902,20 +906,20 @@ void LibraryDialog::comboSelect(int index)
{
- // qDebug("we are sorting");
- ListView1->setSorting( index, TRUE);
- ListView2->setSorting( index, TRUE);
- ListView3->setSorting( index, TRUE);
- ListView4->setSorting( index, TRUE);
- ListView5->setSorting( index, TRUE);
-
- ListView1->sort();
- ListView2->sort();
- ListView3->sort();
- ListView4->sort();
- ListView5->sort();
-
- // ListView1->triggerUpdate();
- // ListView2->triggerUpdate();
- // ListView3->triggerUpdate();
- // ListView4->triggerUpdate();
- // ListView5->triggerUpdate();
+ // odebug << "we are sorting" << oendl;
+ ListView1->setSorting( index, TRUE);
+ ListView2->setSorting( index, TRUE);
+ ListView3->setSorting( index, TRUE);
+ ListView4->setSorting( index, TRUE);
+ ListView5->setSorting( index, TRUE);
+
+ ListView1->sort();
+ ListView2->sort();
+ ListView3->sort();
+ ListView4->sort();
+ ListView5->sort();
+
+ // ListView1->triggerUpdate();
+ // ListView2->triggerUpdate();
+ // ListView3->triggerUpdate();
+ // ListView4->triggerUpdate();
+ // ListView5->triggerUpdate();
}
@@ -924,60 +928,60 @@ void LibraryDialog::newList()
{
- if(indexLoaded) {
- onButtonDownload();
- } else {
- Output *outDlg;
- buttonNewList->setDown(TRUE);
- QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser");
- if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true);
- if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) {
- qDebug("changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser");
- QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
- QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1";
-
- int result = QMessageBox::warning( this,"Download"
- ,"Ok to use /'wget/' to download\na new library list?\n"
- ,"Yes","No",0,0,1);
- qApp->processEvents();
- if(result == 0) {
- outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
- outDlg->showMaximized();
- outDlg->show();
- qApp->processEvents();
- FILE *fp;
- char line[130];
- outDlg->OutputEdit->append( tr("Running wget") );
- outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
- sleep(1);
- fp = popen( (const char *) cmd, "r");
- if ( !fp ) {
- } else {
- qDebug("Issuing the command\n"+cmd);
- // system(cmd);
- while ( fgets( line, sizeof line, fp)) {
- outDlg->OutputEdit->append(line);
- outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
- }
- pclose(fp);
- outDlg->OutputEdit->append("Finished downloading\n");
- outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
- qApp->processEvents();
-
- // if( QFile(gutenindex1).exists() ) {
- // QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
- // if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0)
- // qDebug("renaming error");
- // }
-
- }
- // outDlg->close();
- FindLibrary();
- if(outDlg) delete outDlg;
- }
- buttonNewList->setDown(FALSE);
- } else {
- QMessageBox::message("Note","Could not change directories");
- }
- // if(outDlg)
- // delete outDlg;
- }
+ if(indexLoaded) {
+ onButtonDownload();
+ } else {
+ Output *outDlg;
+ buttonNewList->setDown(TRUE);
+ QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser");
+ if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true);
+ if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) {
+ odebug << "changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser" << oendl;
+ QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
+ QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1";
+
+ int result = QMessageBox::warning( this,"Download"
+ ,"Ok to use /'wget/' to download\na new library list?\n"
+ ,"Yes","No",0,0,1);
+ qApp->processEvents();
+ if(result == 0) {
+ outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
+ outDlg->showMaximized();
+ outDlg->show();
+ qApp->processEvents();
+ FILE *fp;
+ char line[130];
+ outDlg->OutputEdit->append( tr("Running wget") );
+ outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+ sleep(1);
+ fp = popen( (const char *) cmd, "r");
+ if ( !fp ) {
+ } else {
+ odebug << "Issuing the command\n"+cmd << oendl;
+ // system(cmd);
+ while ( fgets( line, sizeof line, fp)) {
+ outDlg->OutputEdit->append(line);
+ outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+ }
+ pclose(fp);
+ outDlg->OutputEdit->append("Finished downloading\n");
+ outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+ qApp->processEvents();
+
+ // if( QFile(gutenindex1).exists() ) {
+ // QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
+ // if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0)
+ // odebug << "renaming error" << oendl;
+ // }
+
+ }
+ // outDlg->close();
+ FindLibrary();
+ if(outDlg) delete outDlg;
+ }
+ buttonNewList->setDown(FALSE);
+ } else {
+ QMessageBox::message("Note","Could not change directories");
+ }
+ // if(outDlg)
+ // delete outDlg;
+ }
}
@@ -987,52 +991,52 @@ bool LibraryDialog::moreInfo()
- QListViewItem * item;
- item = 0;
- QString titleString;
- item = ListView1->currentItem();
- if( item != 0) {
- titleString = item->text(0);
- ListView1->clearSelection();
- item = 0;
- }
- if( item == 0)
- item = ListView2->currentItem();
- if( item != 0) {
- titleString = item->text(0);
- ListView2->clearSelection();
- item = 0;
- }
- if( item == 0)
- item = ListView3->currentItem();
- if( item != 0) {
- titleString = item->text(0);
- ListView3->clearSelection();
- item = 0;
- }
- if( item == 0)
- item = ListView4->currentItem();
- if( item != 0) {
- titleString = item->text(0);
- ListView4->clearSelection();
- item = 0;
- }
- if( item == 0)
- item = ListView5->currentItem();
- if( item != 0) {
- titleString = item->text(0);
- ListView5->clearSelection();
- item = 0;
- }
- item=0;
- if(titleString.length()>2) {
- qDebug( "Title is "+titleString );
- titleString.replace( QRegExp("\\s"), "%20");
- titleString.replace( QRegExp("'"), "%20");
- titleString.replace( QRegExp("\""), "%20");
- titleString.replace( QRegExp("&"), "%20");
- QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search";
- cmd="opera "+cmd;
- system(cmd);
- } else
- QMessageBox::message( "Note","If you select a title, this will\nsearch google.com for that title.");
- return true;
+ QListViewItem * item;
+ item = 0;
+ QString titleString;
+ item = ListView1->currentItem();
+ if( item != 0) {
+ titleString = item->text(0);
+ ListView1->clearSelection();
+ item = 0;
+ }
+ if( item == 0)
+ item = ListView2->currentItem();
+ if( item != 0) {
+ titleString = item->text(0);
+ ListView2->clearSelection();
+ item = 0;
+ }
+ if( item == 0)
+ item = ListView3->currentItem();
+ if( item != 0) {
+ titleString = item->text(0);
+ ListView3->clearSelection();
+ item = 0;
+ }
+ if( item == 0)
+ item = ListView4->currentItem();
+ if( item != 0) {
+ titleString = item->text(0);
+ ListView4->clearSelection();
+ item = 0;
+ }
+ if( item == 0)
+ item = ListView5->currentItem();
+ if( item != 0) {
+ titleString = item->text(0);
+ ListView5->clearSelection();
+ item = 0;
+ }
+ item=0;
+ if(titleString.length()>2) {
+ odebug << "Title is "+titleString << oendl;
+ titleString.replace( QRegExp("\\s"), "%20");
+ titleString.replace( QRegExp("'"), "%20");
+ titleString.replace( QRegExp("\""), "%20");
+ titleString.replace( QRegExp("&"), "%20");
+ QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search";
+ cmd="opera "+cmd;
+ system(cmd);
+ } else
+ QMessageBox::message( "Note","If you select a title, this will\nsearch google.com for that title.");
+ return true;
@@ -1044,23 +1048,23 @@ void LibraryDialog::FindLibrary()
{
- buttonLibrary->setDown(TRUE);
-
- qApp->processEvents();
- if( QFile( new_index).exists() /* && this->isHidden() */) {
- newindexLib.setName( new_index);
- indexLib.setName( new_index);
- qDebug("index file is "+ new_index);
- Newlibrary();
- } else {
- newindexLib.setName( old_index);
- indexLib.setName( old_index);
- qDebug("new index nameis "+ old_index);
- Library();
- }
- indexLoaded=true;
- buttonSearch->setEnabled(TRUE);
- moreInfoButton->setEnabled(TRUE);
-
- buttonLibrary->setDown(FALSE);
- buttonNewList->setText("Download");
- qApp->processEvents();
+ buttonLibrary->setDown(TRUE);
+
+ qApp->processEvents();
+ if( QFile( new_index).exists() /* && this->isHidden() */) {
+ newindexLib.setName( new_index);
+ indexLib.setName( new_index);
+ odebug << "index file is "+ new_index << oendl;
+ Newlibrary();
+ } else {
+ newindexLib.setName( old_index);
+ indexLib.setName( old_index);
+ odebug << "new index nameis "+ old_index << oendl;
+ Library();
+ }
+ indexLoaded=true;
+ buttonSearch->setEnabled(TRUE);
+ moreInfoButton->setEnabled(TRUE);
+
+ buttonLibrary->setDown(FALSE);
+ buttonNewList->setText("Download");
+ qApp->processEvents();
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index aed53c6..6e6b707 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -12,7 +12,3 @@
// /* Created: Sun Aug 27 15:24:52 2000*/
-#include <unistd.h>
-extern "C" {
-#include <ftplib.h>
-}
@@ -21,2 +17,6 @@ extern "C" {
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
#include <qprogressbar.h>
@@ -32,2 +32,8 @@ extern "C" {
+/* STD */
+#include <unistd.h>
+extern "C" {
+#include <ftplib.h>
+}
+
QProgressBar* ProgressBar1;
@@ -48,3 +54,3 @@ static int log_progress(netbuf *ctl, int xfered, void *arg) {
NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QStringList netL)
- : QDialog( parent, name, modal, fl )
+ : QDialog( parent, name, modal, fl )
{
@@ -55,9 +61,9 @@ NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WF
dir = ftp_base_dir = netL[1];
- localFileName = netL[2];
- s_partialFileName = netL[3];
+ localFileName = netL[2];
+ s_partialFileName = netL[3];
- resize(240,110);
+ resize(240,110);
- local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
-// autoOk = autoDownload;
+ local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
+// autoOk = autoDownload;
// if( networkUrl.find("ftp",0,false)== -1 ) {
@@ -120,7 +126,7 @@ void NetworkDialog::initDialog() {
// connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot()));
- if(autoOk) {
- qWarning("XXXXXXXXXXXXXXXXXXXXXXXX");
- buttonOk->setDown(true);
- doOk();
- }
+ if(autoOk) {
+ owarn << "XXXXXXXXXXXXXXXXXXXXXXXX" << oendl;
+ buttonOk->setDown(true);
+ doOk();
+ }
}
@@ -145,3 +151,3 @@ void NetworkDialog::timeSlot() {
// }
-// // qDebug("timer event");
+// // odebug << "timer event" << oendl;
// qApp->processEvents();
@@ -151,3 +157,3 @@ void NetworkDialog::timeSlot() {
void NetworkDialog::connectionTimeSlot() {
-// qDebug("Connections timed out");
+// odebug << "Connections timed out" << oendl;
// ftpQuit();
@@ -169,4 +175,4 @@ bool NetworkDialog::downloadFile( QString networkUrl )
qApp->processEvents();
- qDebug("Downloading: %s",networkUrl.latin1());
- qDebug("Into: %s",localFileName.latin1());
+ odebug << "Downloading: " << networkUrl << "" << oendl;
+ odebug << "Into: " << localFileName << "" << oendl;
if( networkUrl.length() > 5) {
@@ -176,3 +182,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
if(ftp_host.length() < 2) {
- qDebug("Please select an ftp host" );
+ odebug << "Please select an ftp host" << oendl;
successDownload=false;
@@ -182,4 +188,4 @@ bool NetworkDialog::downloadFile( QString networkUrl )
QString msg;
- qDebug(ftp_host);
- qDebug("Opening ftp connection.");
+ odebug << ftp_host << oendl;
+ odebug << "Opening ftp connection." << oendl;
warnLabel->setText("connecting to: "+ftp_host );
@@ -202,3 +208,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
}
- qDebug("Changing directories.");
+ odebug << "Changing directories." << oendl;
TextLabel3->setText("Changing directories.");
@@ -219,3 +225,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
// }
- qDebug("Requesting directory list.");
+ odebug << "Requesting directory list." << oendl;
TextLabel3->setText("Getting directory list.");
@@ -234,3 +240,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
QTextStream t( &tmp ); // use a text stream
- qDebug("Finding partial filename "+s_partialFileName);
+ odebug << "Finding partial filename "+s_partialFileName << oendl;
while ( !t.eof()) {
@@ -243,3 +249,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
File_Name = str;
- qDebug("Found file_name "+ File_Name);
+ odebug << "Found file_name "+ File_Name << oendl;
break;
@@ -248,6 +254,6 @@ bool NetworkDialog::downloadFile( QString networkUrl )
// File_Name = str;
-// qDebug("Found file_name "+ File_Name);
+// odebug << "Found file_name "+ File_Name << oendl;
// break;
// }
-
+
}
@@ -258,3 +264,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
else
- qDebug("Error opening temp file.");
+ odebug << "Error opening temp file." << oendl;
@@ -265,4 +271,4 @@ bool NetworkDialog::downloadFile( QString networkUrl )
localFileName = temp+File_Name;
- qDebug("Requesting file "+ File_Name);
- qDebug( "Saving as "+localFileName);
+ odebug << "Requesting file "+ File_Name << oendl;
+ odebug << "Saving as "+localFileName << oendl;
msg="Requesting file "+ File_Name;
@@ -274,5 +280,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
QString temp;
- temp.sprintf( File_Name+" "+" %dkb", fsz);
+ temp.sprintf( File_Name+" "+" %dkb", fsz);
TextLabel3->setText(temp);
-
+
ProgressBar1->setTotalSteps(fsz);
@@ -295,3 +301,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
}
- qDebug("Ftp session successful");
+ odebug << "Ftp session successful" << oendl;
successDownload=TRUE;
@@ -304,3 +310,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
void NetworkDialog::doOk() {
- qWarning("Do OK");
+ owarn << "Do OK" << oendl;
QString loginStr;
@@ -316,3 +322,3 @@ void NetworkDialog::doOk() {
successDownload = false;
- reject();
+ reject();
}
diff --git a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
index 4ddb3f0..d989304 100644
--- a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
@@ -100,3 +100,3 @@ void SearchDialog::byeBye()
searchString = get_text();
-// qDebug("Search string is "+searchString);
+// odebug << "Search string is "+searchString << oendl;
Config cfg("Gutenbrowser");
@@ -121,3 +121,3 @@ void SearchDialog::closed()
searchString = get_text();
-// qDebug("Search string is "+searchString);
+// odebug << "Search string is "+searchString << oendl;
Config cfg("Gutenbrowser");
diff --git a/noncore/apps/opie-gutenbrowser/browserDialog.cpp b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
index 81dd516..cc05d04 100644
--- a/noncore/apps/opie-gutenbrowser/browserDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
@@ -12,2 +12,3 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
#include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
using namespace Opie::Ui;
@@ -54,3 +55,3 @@ void optionsDialog::BrowseSelected() {
// QStringList fileList=browseForFiles->fileList;
-// qDebug(selFile);
+// odebug << selFile << oendl;
// QStringList::ConstIterator f;
@@ -78,3 +79,3 @@ void optionsDialog::setHttp(int index) {
config.setGroup( "HttpServer" );
- qDebug("writing http server");
+ odebug << "writing http server" << oendl;
if( index== 0) {
diff --git a/noncore/apps/opie-gutenbrowser/fontDialog.cpp b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
index a17b1d3..fa964a6 100644
--- a/noncore/apps/opie-gutenbrowser/fontDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
@@ -92,3 +92,3 @@ void FontDialog::familyListBoxSlot(const QString & text)
family = text;
-// qDebug(family);
+// odebug << family << oendl;
QStringList styles = fdb.styles( family ); // string list of styles of our current font family
@@ -102,3 +102,3 @@ QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
dstyle = QString::number( *points );
- qDebug(dstyle);
+ odebug << dstyle << oendl;
sizeComboBox->insertItem( dstyle.left( dstyle.length() - 1 ));
@@ -153,3 +153,3 @@ void FontDialog::populateLists()
// if(family == defaultFont.family())
-// qDebug(family);
+// odebug << family << oendl;
familyListBox->insertItem( family);
@@ -211,3 +211,3 @@ void FontDialog::changeText()
}
-// qDebug("Font family is "+family);
+// odebug << "Font family is "+family << oendl;
if( styleListBox->currentItem() == -1)
@@ -217,3 +217,3 @@ void FontDialog::changeText()
}
-// qDebug("font style is "+style);
+// odebug << "font style is "+style << oendl;
@@ -225,3 +225,3 @@ void FontDialog::changeText()
-// qDebug("Font size is "+size);
+// odebug << "Font size is "+size << oendl;
bool ok;
@@ -233,3 +233,3 @@ void FontDialog::changeText()
charSet = *s;
-// qDebug(charSet);
+// odebug << charSet << oendl;
}
@@ -237,5 +237,5 @@ void FontDialog::changeText()
QFontInfo fontInfo( selectedFont);
-// if(fontInfo.italic() ) qDebug("italic");
+// if(fontInfo.italic() ) odebug << "italic" << oendl;
selectedFont.setWeight(fontInfo.weight() );
-// qDebug("Style are "+style+" %d ",fontInfo.weight());
+// odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl;
Config cfg("Gutenbrowser");
@@ -251,3 +251,3 @@ void FontDialog::changeText()
cfg.writeEntry("Italic","TRUE");
-// qDebug("Style is "+styleListBox->currentText());
+// odebug << "Style is "+styleListBox->currentText() << oendl;
} else
diff --git a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
index ad770b5..a9c7346 100644
--- a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
+++ b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
@@ -13,2 +13,3 @@
***************************************************************************/
+
#include "optionsDialog.h"
@@ -18,11 +19,15 @@
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
#include <qprogressbar.h>
-#include <stdlib.h>
#include <qurloperator.h>
-#include <qpe/config.h>
#include <qlistbox.h>
+/* STD */
+#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
-#include <stdlib.h>
@@ -40,3 +45,3 @@ void optionsDialog::ftpSiteDlg( )
ListFile+="/ftpList";
- qDebug("opening "+ListFile);
+ odebug << "opening "+ListFile << oendl;
if ( QFile(ListFile).exists() ) {
@@ -78,3 +83,3 @@ void optionsDialog::getSite()
// { // use new, improved, *INSTANT* network-dialog-file-getterer
-// qDebug("gitcha!");
+// odebug << "gitcha!" << oendl;
// }
@@ -86,3 +91,3 @@ void optionsDialog::getSite()
QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl + " 2>&1" ;
- qDebug("Issuing the command "+cmd);
+ odebug << "Issuing the command "+cmd << oendl;
Output *outDlg;
@@ -101,3 +106,3 @@ void optionsDialog::getSite()
}
- pclose(fp);
+ pclose(fp);
outDlg->close();
@@ -105,3 +110,3 @@ void optionsDialog::getSite()
delete outDlg;
-
+
// outputFile=ListFile;
@@ -115,3 +120,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
// TODO: add locations!!
- qDebug("parse ftplist "+outputFile);
+ odebug << "parse ftplist "+outputFile << oendl;
QString ftpList, s_location;
@@ -154,3 +159,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
if(( start=s.find("<BR>(", 0, TRUE) ) != -1) {
-// qDebug("%s",s.latin1());
+// odebug << "" << s << "" << oendl;
end = s.find( ")", 0, TRUE)+1;
@@ -158,3 +163,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
-// qDebug("%s", s_location.latin1());
+// odebug << "" << s_location << "" << oendl;
// ftpList += ftpSite + "\n";
@@ -175,3 +180,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
QFile f2( ListFile);
- if(!f2.open( IO_ReadWrite | IO_Truncate))
+ if(!f2.open( IO_ReadWrite | IO_Truncate))
QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n"+ListFile )) );
@@ -192,3 +197,3 @@ void optionsDialog::openSiteList() {
- qDebug(" just opens the ftp site list");
+ odebug << " just opens the ftp site list" << oendl;
// ListFile = ( QDir::homeDirPath ()) +"/.gutenbrowser/ftpList";
@@ -232,3 +237,3 @@ void optionsDialog::select_site( const char *index )
s_site2=s_site.right( s_site.length()-(s_site.find(" ",0,TRUE)+4) );
-qDebug("Selected ftp site is "+ s_site2);
+odebug << "Selected ftp site is "+ s_site2 << oendl;
int i_ftp = s_site2.find("/", 0, FALSE);
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 2a9a71e..be2b897 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -16,9 +16,3 @@
// donate@gutenberg.net
-#include <qpe/qpeapplication.h>
-#include <qpe/fontdatabase.h>
-#include <qpe/config.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/mimetype.h>
-#include <qpe/resource.h>
-#include <qpe/applnk.h>
+
@@ -35,3 +29,13 @@
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/fontdatabase.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/mimetype.h>
+#include <qpe/resource.h>
+#include <qpe/applnk.h>
+/* QT */
#include <qregexp.h>
@@ -53,2 +57,3 @@
+/* STD */
#include <stdio.h>
@@ -65,3 +70,3 @@ static const int fontsize[nfontsizes] = {8,9,10,11,12,13,14,18,24};
Gutenbrowser::Gutenbrowser()
- Gutenbrowser();
+ Gutenbrowser();
#else
@@ -69,99 +74,99 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
#endif
- : QMainWindow()
+ : QMainWindow()
{
- // QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
- // QCopEnvelope e("QPE/System", "grabKeyboard(QString)" );
- // e << "";
- // QPEApplication::grabKeyboard();
+ // QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+ // QCopEnvelope e("QPE/System", "grabKeyboard(QString)" );
+ // e << "";
+ // QPEApplication::grabKeyboard();
showMainList=TRUE;
- working=false;
- this->setUpdatesEnabled(TRUE);
- // #ifndef Q_WS_QWS
- QString msg;
- msg="You have now entered unto gutenbrowser,\n";
- msg+="make your self at home, sit back, relax and read something great.\n";
-
- local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
- setCaption("Gutenbrowser");// Embedded " VERSION);
- this->setUpdatesEnabled(TRUE);
-
- // bool firstTime=FALSE;
- topLayout = new QVBoxLayout( this, 0, 0, "topLayout");
-
- menu = new QHBoxLayout(-1,"menu");
- buttons2 = new QHBoxLayout(-1,"buttons2");
- edits = new QHBoxLayout(-1,"edits");
-
- useSplitter=TRUE;
-
- initConfig();
- initMenuBar();
- initButtonBar();
- initStatusBar();
- initView();
- initSlots();
-
- QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold);
-
- connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)),
- this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) );
- if( useIcons)
- toggleButtonIcons( TRUE);
- else
- toggleButtonIcons( FALSE);
-
- enableButtons(false);
-
- Config config("Gutenbrowser"); // populate menubuttonlist
- config.setGroup("General");
-
- config.setGroup( "Files" );
- QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
- int i_numofFiles = s_numofFiles.toInt();
-
- QString tempFileName;
-
- for (int i = 0; i <= i_numofFiles; i++) {
- // tempFileName.setNum(i);
- config.setGroup( "Files" );
- QString ramble = config.readEntry( QString::number(i), "" );
-
- config.setGroup( "Titles" );
- QString tempTitle = config.readEntry( ramble, "");
- config.setGroup( tempTitle);
- int index=config.readNumEntry( "LineNumber", -1 );
- if( index != -1) {
- // qDebug( tempTitle);
- bookmarksMenu->insertItem( tempTitle);
- }
- }
-
- // QString gutenIndex= local_library + "GUTINDEX.ALL";
- QString gutenIndex= QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL";
-
- if( QFile( gutenIndex).exists() ) {
- indexLib.setName( gutenIndex);
- } else {
- QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT";
- // QString localLibIndexFile= local_library + "PGWHOLE.TXT";
- newindexLib.setName( localLibIndexFile);
- }
- LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */);
- loadCheck=false;
- chdir(local_library);
- if(!showMainList) {
- Lview->setFocus();
- // if(firstTime)
- // Bookmark();
- for (int i=1;i< qApp->argc();i++) {
- qDebug("Suppose we open somethin");
- load(qApp->argv()[i]);
- }
- } else {
- fillWithTitles();
- mainList->setFocus();
- // mainList->setCurrentItem(0);
-
- }
- writeConfig();
+ working=false;
+ this->setUpdatesEnabled(TRUE);
+ // #ifndef Q_WS_QWS
+ QString msg;
+ msg="You have now entered unto gutenbrowser,\n";
+ msg+="make your self at home, sit back, relax and read something great.\n";
+
+ local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
+ setCaption("Gutenbrowser");// Embedded " VERSION);
+ this->setUpdatesEnabled(TRUE);
+
+ // bool firstTime=FALSE;
+ topLayout = new QVBoxLayout( this, 0, 0, "topLayout");
+
+ menu = new QHBoxLayout(-1,"menu");
+ buttons2 = new QHBoxLayout(-1,"buttons2");
+ edits = new QHBoxLayout(-1,"edits");
+
+ useSplitter=TRUE;
+
+ initConfig();
+ initMenuBar();
+ initButtonBar();
+ initStatusBar();
+ initView();
+ initSlots();
+
+ QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold);
+
+ connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)),
+ this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) );
+ if( useIcons)
+ toggleButtonIcons( TRUE);
+ else
+ toggleButtonIcons( FALSE);
+
+ enableButtons(false);
+
+ Config config("Gutenbrowser"); // populate menubuttonlist
+ config.setGroup("General");
+
+ config.setGroup( "Files" );
+ QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
+ int i_numofFiles = s_numofFiles.toInt();
+
+ QString tempFileName;
+
+ for (int i = 0; i <= i_numofFiles; i++) {
+ // tempFileName.setNum(i);
+ config.setGroup( "Files" );
+ QString ramble = config.readEntry( QString::number(i), "" );
+
+ config.setGroup( "Titles" );
+ QString tempTitle = config.readEntry( ramble, "");
+ config.setGroup( tempTitle);
+ int index=config.readNumEntry( "LineNumber", -1 );
+ if( index != -1) {
+ // odebug << tempTitle << oendl;
+ bookmarksMenu->insertItem( tempTitle);
+ }
+ }
+
+ // QString gutenIndex= local_library + "GUTINDEX.ALL";
+ QString gutenIndex= QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL";
+
+ if( QFile( gutenIndex).exists() ) {
+ indexLib.setName( gutenIndex);
+ } else {
+ QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT";
+ // QString localLibIndexFile= local_library + "PGWHOLE.TXT";
+ newindexLib.setName( localLibIndexFile);
+ }
+ LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */);
+ loadCheck=false;
+ chdir(local_library);
+ if(!showMainList) {
+ Lview->setFocus();
+ // if(firstTime)
+ // Bookmark();
+ for (int i=1;i< qApp->argc();i++) {
+ odebug << "Suppose we open somethin" << oendl;
+ load(qApp->argv()[i]);
+ }
+ } else {
+ fillWithTitles();
+ mainList->setFocus();
+ // mainList->setCurrentItem(0);
+
+ }
+ writeConfig();
} //end init
@@ -169,5 +174,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
Gutenbrowser::~Gutenbrowser() {
- // QPEApplication::grabKeyboard();
- // QPEApplication::ungrabKeyboard();
- qDebug("Exit");
+ // QPEApplication::grabKeyboard();
+ // QPEApplication::ungrabKeyboard();
+ odebug << "Exit" << oendl;
}
@@ -175,14 +180,14 @@ Gutenbrowser::~Gutenbrowser() {
/*
- Google.com search */
+ Google.com search */
void Gutenbrowser::InfoBarClick() {
- QString text;
- if( Lview->hasSelectedText()) {
- Lview->copy();
- QClipboard *cb = QApplication::clipboard();
- text = cb->text();
- } else {
- // text=title;
- text=this->caption();
- }
- searchGoogle(text);
+ QString text;
+ if( Lview->hasSelectedText()) {
+ Lview->copy();
+ QClipboard *cb = QApplication::clipboard();
+ text = cb->text();
+ } else {
+ // text=title;
+ text=this->caption();
+ }
+ searchGoogle(text);
}
@@ -190,73 +195,73 @@ void Gutenbrowser::InfoBarClick() {
/*
- download http with wget or preferred browser */
+ download http with wget or preferred browser */
void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
- // int eexit=0;
- QString cmd;
- // config.read();
- qApp->processEvents();
- QString filename = QPEApplication::qpeDir();
- if(filename.right(1)!="/")
- filename+="/etc/gutenbrowser/";
- else
- filename+="etc/gutenbrowser/";
- qDebug("filename "+filename);
- // QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
-
- filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
-
- Config config("Gutenbrowser");
- config.setGroup( "Browser" );
- QString brow = config.readEntry("Preferred", "Opera");
- qDebug("Preferred browser is "+brow);
- if(!showMsg) { //if we just get the gutenindex.all
- cmd="wget -O " + filename +" " + url+" 2>&1" ;
- chdir(local_library);
- qDebug("Issuing the system command: %s", cmd.latin1());
-
- Output *outDlg;
- outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
- outDlg->showMaximized();
- outDlg->show();
- qApp->processEvents();
- FILE *fp;
- char line[130];
- outDlg->OutputEdit->append( tr("Running wget") );
- sleep(1);
- fp = popen( (const char *) cmd, "r");
- // qDebug("Issuing the command\n"+cmd);
- // system(cmd);
- while ( fgets( line, sizeof line, fp)) {
- outDlg->OutputEdit->append(line);
- outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
- }
- pclose(fp);
- outDlg->close();
- if(outDlg)
- delete outDlg;
- } else {
- if( brow == "Konq") {
- cmd = "konqueror "+url+" &";
- }
- if( brow == "Opera") { //for desktop testing
- cmd = "opera "+url+" &";
- }
- // if( brow == "Opera") { // on Zaurus
- // cmd = "operagui "+url+" &";
- // }
- if( brow == "Mozilla") {
- cmd = "mozilla "+url+" &";
- }
- if( brow == "Netscape") {
- cmd = "netscape "+url+" &";
- }
- if(brow == "wget") {
- // cmd="wget -q "+url+" &";
- QString tempHtml=local_library+"webster.html";
- cmd="wget -O "+tempHtml+" -q "+url;
- }
-
- chdir(local_library);
- qDebug("Issuing the sys command: %s", cmd.latin1());
- system(cmd);
- }
+ // int eexit=0;
+ QString cmd;
+ // config.read();
+ qApp->processEvents();
+ QString filename = QPEApplication::qpeDir();
+ if(filename.right(1)!="/")
+ filename+="/etc/gutenbrowser/";
+ else
+ filename+="etc/gutenbrowser/";
+ odebug << "filename "+filename << oendl;
+ // QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
+
+ filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
+
+ Config config("Gutenbrowser");
+ config.setGroup( "Browser" );
+ QString brow = config.readEntry("Preferred", "Opera");
+ odebug << "Preferred browser is "+brow << oendl;
+ if(!showMsg) { //if we just get the gutenindex.all
+ cmd="wget -O " + filename +" " + url+" 2>&1" ;
+ chdir(local_library);
+ odebug << "Issuing the system command: " << cmd << "" << oendl;
+
+ Output *outDlg;
+ outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
+ outDlg->showMaximized();
+ outDlg->show();
+ qApp->processEvents();
+ FILE *fp;
+ char line[130];
+ outDlg->OutputEdit->append( tr("Running wget") );
+ sleep(1);
+ fp = popen( (const char *) cmd, "r");
+ // odebug << "Issuing the command\n"+cmd << oendl;
+ // system(cmd);
+ while ( fgets( line, sizeof line, fp)) {
+ outDlg->OutputEdit->append(line);
+ outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+ }
+ pclose(fp);
+ outDlg->close();
+ if(outDlg)
+ delete outDlg;
+ } else {
+ if( brow == "Konq") {
+ cmd = "konqueror "+url+" &";
+ }
+ if( brow == "Opera") { //for desktop testing
+ cmd = "opera "+url+" &";
+ }
+ // if( brow == "Opera") { // on Zaurus
+ // cmd = "operagui "+url+" &";
+ // }
+ if( brow == "Mozilla") {
+ cmd = "mozilla "+url+" &";
+ }
+ if( brow == "Netscape") {
+ cmd = "netscape "+url+" &";
+ }
+ if(brow == "wget") {
+ // cmd="wget -q "+url+" &";
+ QString tempHtml=local_library+"webster.html";
+ cmd="wget -O "+tempHtml+" -q "+url;
+ }
+
+ chdir(local_library);
+ odebug << "Issuing the sys command: " << cmd << "" << oendl;
+ system(cmd);
+ }
}
@@ -264,19 +269,19 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
void Gutenbrowser::toggleButtonIcons( bool useEm) {
- QString pixDir;
- if(useEm)
- useEm=TRUE;
- pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser";
- qDebug("Docdir is "+QPEApplication::documentDir());
-
- if( useIcons && QDir( pixDir).exists() ) {
- LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline
- OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook"));
- ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline
- BackButton->setPixmap( Resource::loadPixmap("back") );//in inline
- SearchButton->setPixmap( Resource::loadPixmap("gutenbrowser/search") );//in inline
- lastBmkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark_folder"));
- setBookmarkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark") );
- dictionaryButton->setPixmap( Resource::loadPixmap("gutenbrowser/spellcheck") );
- InfoBar->setPixmap( Resource::loadPixmap("gutenbrowser/google"));
- }
+ QString pixDir;
+ if(useEm)
+ useEm=TRUE;
+ pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser";
+ odebug << "Docdir is "+QPEApplication::documentDir() << oendl;
+
+ if( useIcons && QDir( pixDir).exists() ) {
+ LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline
+ OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook"));
+ ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline
+ BackButton->setPixmap( Resource::loadPixmap("back") );//in inline
+ SearchButton->setPixmap( Resource::loadPixmap("gutenbrowser/search") );//in inline
+ lastBmkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark_folder"));
+ setBookmarkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark") );
+ dictionaryButton->setPixmap( Resource::loadPixmap("gutenbrowser/spellcheck") );
+ InfoBar->setPixmap( Resource::loadPixmap("gutenbrowser/google"));
+ }
}
@@ -286,10 +291,10 @@ bool Gutenbrowser::queryExit()
{
- int exit=QMessageBox::information(this, "Quit...", "Do your really want to quit?",
- QMessageBox::Ok, QMessageBox::Cancel);
- if (exit==1) {
- writeConfig();
- qApp->quit();
- } else {
- };
- return (exit==1);
+ int exit=QMessageBox::information(this, "Quit...", "Do your really want to quit?",
+ QMessageBox::Ok, QMessageBox::Cancel);
+ if (exit==1) {
+ writeConfig();
+ qApp->quit();
+ } else {
+ };
+ return (exit==1);
}
@@ -302,8 +307,8 @@ void Gutenbrowser::slotFilePrint() {
void Gutenbrowser::ByeBye() {
- if (b_queryExit)
- queryExit();
- else {
- // writeConfig();
- qApp->quit();
- }
+ if (b_queryExit)
+ queryExit();
+ else {
+ // writeConfig();
+ qApp->quit();
+ }
}
@@ -311,5 +316,5 @@ void Gutenbrowser::ByeBye() {
void Gutenbrowser::HelpBtn() {
- HelpMe* HelpDlg;
- HelpDlg = new HelpMe( this, "Help Dialog");
- HelpDlg->showMaximized();
+ HelpMe* HelpDlg;
+ HelpDlg = new HelpMe( this, "Help Dialog");
+ HelpDlg->showMaximized();
}
@@ -318,21 +323,21 @@ void Gutenbrowser::DownloadIndex() {
#ifndef Q_WS_QWS
- {
- switch( QMessageBox::information( 0, (tr("Download Library Index, or FTP sites?")),
- (tr("Do you want to download the newest\n"
- "Project Gutenberg Library Index?\n"
- "or select an ftp site?\n")),
- (tr("&Library Index")), (tr("&Ftp Site")), (tr("&Cancel")), 2, 2 ) )
+ {
+ switch( QMessageBox::information( 0, (tr("Download Library Index, or FTP sites?")),
+ (tr("Do you want to download the newest\n"
+ "Project Gutenberg Library Index?\n"
+ "or select an ftp site?\n")),
+ (tr("&Library Index")), (tr("&Ftp Site")), (tr("&Cancel")), 2, 2 ) )
{
- case 0: // index clicked,
- downloadLibIndex();
- break;
+ case 0: // index clicked,
+ downloadLibIndex();
+ break;
- case 1: // ftp selected
- downloadFtpList();
- break;
+ case 1: // ftp selected
+ downloadFtpList();
+ break;
- case 2: // Cancel
- break;
+ case 2: // Cancel
+ break;
};
- }
+ }
#endif
@@ -342,10 +347,10 @@ void Gutenbrowser::DownloadIndex() {
void Gutenbrowser::downloadFtpList() {
- // QString cmd="wget http://www.promo.net/pg/list.html");
- //system(cmd);
- qApp->processEvents();
- optionsDialog* optDlg;
- optDlg = new optionsDialog( this,"Options_Dlg", true);
- optDlg->getSite();
- if(optDlg)
- delete optDlg;
+ // QString cmd="wget http://www.promo.net/pg/list.html");
+ //system(cmd);
+ qApp->processEvents();
+ optionsDialog* optDlg;
+ optDlg = new optionsDialog( this,"Options_Dlg", true);
+ optDlg->getSite();
+ if(optDlg)
+ delete optDlg;
}
@@ -354,23 +359,23 @@ void Gutenbrowser::downloadFtpList() {
void Gutenbrowser::downloadLibIndex() {
- // QString dwmloader = local_library + "pgwhole.zip";
- // QString cmd = "lynx -source http://www.gutenberg.net/pgwhole.zip | cat >> " + dwmloader;
- // system(cmd);
-
- // QString outputFile= local_library+ "GUTINDEX.ALL";
- // config.setGroup( "FTPsite" ); // ftp server config
- // ftp_host=config.readEntry("SiteName", "");
- // ftp_base_dir= config.readEntry("base", "");
- // QString networkUrl= "ftp://"+ftp_host+ftp_base_dir+"/GUTINDEX.ALL";
- QDir dir( local_library);
- dir.cd("", TRUE);
- goGetit( "http://sailor.gutenberg.org/GUTINDEX.ALL", false); // until ghttp works on binaries -qt3
- // goGetit( "http://www.gutenberg.net/pgwhole.zip", true); // until ghttp works on binaries -qt3
- // NetworkDialog *NetworkDlg;
- // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, outputFile );
- // if( NetworkDlg->exec() != 0 )
- // { // use new, improved, *INSTANT* network-dialog-file-getterer
- //// QMessageBox::message("Note","");
- // }
- // if(NetworkDlg)
- // delete NetworkDlg;
+ // QString dwmloader = local_library + "pgwhole.zip";
+ // QString cmd = "lynx -source http://www.gutenberg.net/pgwhole.zip | cat >> " + dwmloader;
+ // system(cmd);
+
+ // QString outputFile= local_library+ "GUTINDEX.ALL";
+ // config.setGroup( "FTPsite" ); // ftp server config
+ // ftp_host=config.readEntry("SiteName", "");
+ // ftp_base_dir= config.readEntry("base", "");
+ // QString networkUrl= "ftp://"+ftp_host+ftp_base_dir+"/GUTINDEX.ALL";
+ QDir dir( local_library);
+ dir.cd("", TRUE);
+ goGetit( "http://sailor.gutenberg.org/GUTINDEX.ALL", false); // until ghttp works on binaries -qt3
+ // goGetit( "http://www.gutenberg.net/pgwhole.zip", true); // until ghttp works on binaries -qt3
+ // NetworkDialog *NetworkDlg;
+ // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, outputFile );
+ // if( NetworkDlg->exec() != 0 )
+ // { // use new, improved, *INSTANT* network-dialog-file-getterer
+ //// QMessageBox::message("Note","");
+ // }
+ // if(NetworkDlg)
+ // delete NetworkDlg;
}
@@ -382,8 +387,8 @@ void Gutenbrowser::PrintBtn() {
void Gutenbrowser::SearchBtn() {
- if( loadCheck) {
- qDebug("loadCheck: we have a loaded doc");
- Search();
- }
- // else
- // QMessageBox::message("Note","Sorry, can't search. No etext is loaded");
+ if( loadCheck) {
+ odebug << "loadCheck: we have a loaded doc" << oendl;
+ Search();
+ }
+ // else
+ // QMessageBox::message("Note","Sorry, can't search. No etext is loaded");
}
@@ -393,50 +398,50 @@ void Gutenbrowser::ForwardBtn() {
- if( !ForwardButton->autoRepeat() && !ForwardButton->isDown()) {
-
- QString s;
- QString insertString;
- int pageSize= Lview->PageSize();
- Lview->clear();
-
- for(int fd=0; fd < pageSize - 1;fd++) {
- f.readLine(s, 256);
- if(useWrap)
- s.replace(QRegExp("\n"),"");
- insertString+=s;
- Lview->insertLine( s, -1);
- // qDebug(s);
- currentLine++;
- }
- // Lview->insertAt( insertString,0,0, FALSE);
- currentFilePos = f.at();
- // if( i_pageNum != pages) {
- // Lview->MultiLine_Ex::pageDown( FALSE);
- i_pageNum++;
- pageStopArray.resize(i_pageNum + 1);
- // int length = Lview->length();
-
- pageStopArray[i_pageNum ] = currentFilePos;
- // qDebug("%d current page is number %d, pagesize %d, length %d, current %d",
- // currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] );
- setStatus();
- Lview->setCursorPosition( 0, 0, FALSE);
- // }
-
- } else {
- // qDebug("bal");
- // if( i_pageNum != pages) {
-
- // // int newTop = Lview->Top();
- // // if(Lview->lastRow() > i)
- // Lview->ScrollUp(1);
- // // i_pageNum++;
- // setStatus();
- // Lview->setCursorPosition( Lview->Top(), 0, FALSE);
-
- // }
-
- }
- Lview->setFocus();
-
- // qDebug("page number %d line number %d", i_pageNum, currentLine);
+ if( !ForwardButton->autoRepeat() && !ForwardButton->isDown()) {
+
+ QString s;
+ QString insertString;
+ int pageSize= Lview->PageSize();
+ Lview->clear();
+
+ for(int fd=0; fd < pageSize - 1;fd++) {
+ f.readLine(s, 256);
+ if(useWrap)
+ s.replace(QRegExp("\n"),"");
+ insertString+=s;
+ Lview->insertLine( s, -1);
+ // odebug << s << oendl;
+ currentLine++;
+ }
+ // Lview->insertAt( insertString,0,0, FALSE);
+ currentFilePos = f.at();
+ // if( i_pageNum != pages) {
+ // Lview->MultiLine_Ex::pageDown( FALSE);
+ i_pageNum++;
+ pageStopArray.resize(i_pageNum + 1);
+ // int length = Lview->length();
+
+ pageStopArray[i_pageNum ] = currentFilePos;
+ // qDebug("%d current page is number %d, pagesize %d, length %d, current %d",
+ // currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] );
+ setStatus();
+ Lview->setCursorPosition( 0, 0, FALSE);
+ // }
+
+ } else {
+ // odebug << "bal" << oendl;
+ // if( i_pageNum != pages) {
+
+ // // int newTop = Lview->Top();
+ // // if(Lview->lastRow() > i)
+ // Lview->ScrollUp(1);
+ // // i_pageNum++;
+ // setStatus();
+ // Lview->setCursorPosition( Lview->Top(), 0, FALSE);
+
+ // }
+
+ }
+ Lview->setFocus();
+
+ // odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
}
@@ -445,58 +450,58 @@ void Gutenbrowser::ForwardBtn() {
void Gutenbrowser::BackBtn() {
- if( i_pageNum > 0) {
- int pageSize= Lview->PageSize();
- // int length=Lview->length();
-
- i_pageNum--;
- currentFilePos = f.at();
-
- // qDebug("%d move back to %d, current page number %d, %d, length %d",
- // currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() );
-
- if( i_pageNum < 2) {
- f.at( 0);
- } else {
- if(!f.at( pageStopArray[i_pageNum - 1] ))
- qDebug("File positioned backward did not work");
- }
- QString s;
- // int sizeLine=0;
- Lview->clear();
- // QString insertString;
-
- for(int fd = 0; fd < pageSize ;fd++) {
- // Lview->removeLine( Lview->PageSize() );
- f.readLine(s, 256);
- if(useWrap)
- s.replace(QRegExp("\n"),"");
- currentLine++;
- // insertString+=s;
- Lview->insertLine( s, -1);
- }
-
- // Lview->insertAt( insertString,0,0, FALSE);
-
- if( !BackButton->autoRepeat() && !BackButton->isDown()) {
- QString topR;
- QString lastR;
- QString pageR;
- // int sizer = Lview->lastRow() - Lview->topRow();
- // int i_topRow = Lview->topRow();
- if( i_pageNum < 1)
- i_pageNum = 1;
+ if( i_pageNum > 0) {
+ int pageSize= Lview->PageSize();
+ // int length=Lview->length();
+
+ i_pageNum--;
+ currentFilePos = f.at();
+
+ // qDebug("%d move back to %d, current page number %d, %d, length %d",
+ // currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() );
+
+ if( i_pageNum < 2) {
+ f.at( 0);
+ } else {
+ if(!f.at( pageStopArray[i_pageNum - 1] ))
+ odebug << "File positioned backward did not work" << oendl;
+ }
+ QString s;
+ // int sizeLine=0;
+ Lview->clear();
+ // QString insertString;
+
+ for(int fd = 0; fd < pageSize ;fd++) {
+ // Lview->removeLine( Lview->PageSize() );
+ f.readLine(s, 256);
+ if(useWrap)
+ s.replace(QRegExp("\n"),"");
+ currentLine++;
+ // insertString+=s;
+ Lview->insertLine( s, -1);
+ }
+
+ // Lview->insertAt( insertString,0,0, FALSE);
+
+ if( !BackButton->autoRepeat() && !BackButton->isDown()) {
+ QString topR;
+ QString lastR;
+ QString pageR;
+ // int sizer = Lview->lastRow() - Lview->topRow();
+ // int i_topRow = Lview->topRow();
+ if( i_pageNum < 1)
+ i_pageNum = 1;
setCaption(QString::number(i_pageNum));
- } else {
- // int newTop = Lview->Top();
- // if(Lview->lastRow() > i)
- Lview->MultiLine_Ex::pageUp( FALSE);
- // Lview->ScrollDown(1);
- // i_pageNum--;
- if( i_pageNum < 1)
- i_pageNum = 1;
- setStatus();
- Lview->setCursorPosition( Lview->Top(), 0, FALSE);
-
- }
- }
- Lview->setFocus();
+ } else {
+ // int newTop = Lview->Top();
+ // if(Lview->lastRow() > i)
+ Lview->MultiLine_Ex::pageUp( FALSE);
+ // Lview->ScrollDown(1);
+ // i_pageNum--;
+ if( i_pageNum < 1)
+ i_pageNum = 1;
+ setStatus();
+ Lview->setCursorPosition( Lview->Top(), 0, FALSE);
+
+ }
+ }
+ Lview->setFocus();
}
@@ -504,6 +509,6 @@ void Gutenbrowser::BackBtn() {
void Gutenbrowser::doBeginBtn() {
- if(loadCheck) {
- qApp->processEvents();
- BeginBtn();
- }
+ if(loadCheck) {
+ qApp->processEvents();
+ BeginBtn();
+ }
}
@@ -513,25 +518,25 @@ void Gutenbrowser::TopBtn() {
- if(loadCheck) {
- if( i_pageNum != 0) {
- qDebug("top");
- qApp->processEvents();
- currentLine = 0;
- i_pageNum = 1;
- int pageSize = Lview->PageSize() ;
- Lview->clear();
- QString s;
- f.at(0);
- for(int fd=0; fd < pageSize ;fd++) {
- f.readLine(s, 256);
- if(useWrap)
- s.replace(QRegExp("\n"),"");
- Lview->insertLine(s ,-1);
- currentLine++;
- }
- Lview->setCursorPosition( 0,0, FALSE);
- i_pageNum=1;
- setStatus();
- }
- Lview->setFocus();
- }
+ if(loadCheck) {
+ if( i_pageNum != 0) {
+ odebug << "top" << oendl;
+ qApp->processEvents();
+ currentLine = 0;
+ i_pageNum = 1;
+ int pageSize = Lview->PageSize() ;
+ Lview->clear();
+ QString s;
+ f.at(0);
+ for(int fd=0; fd < pageSize ;fd++) {
+ f.readLine(s, 256);
+ if(useWrap)
+ s.replace(QRegExp("\n"),"");
+ Lview->insertLine(s ,-1);
+ currentLine++;
+ }
+ Lview->setCursorPosition( 0,0, FALSE);
+ i_pageNum=1;
+ setStatus();
+ }
+ Lview->setFocus();
+ }
}
@@ -540,69 +545,69 @@ void Gutenbrowser::TopBtn() {
void Gutenbrowser::BeginBtn() {
- i_pageNum = 1;
- currentLine = 0;
- QString s_pattern="*END*THE SMALL PRINT";
- QString sPattern2 = "*END THE SMALL PRINT";
-
- int pageSize = Lview->PageSize();
- Lview->clear();
-
- // int lines = Lview->numLines();
- int pos = 0;//, i = 0;
- int i_topRow = Lview->topRow();
-
- QString LeftText;// = Lview->text();
-
- int linesPerPage = Lview->lastRow() - Lview->topRow();
- // int pages = (( linesPerPage / Lview->editSize() ) ) +1;
- // int pageN = 0;
- i_pageNum = 1;
- int lastPage=1;
- int lineNo=0;
- QString s;
- f.at( 0);
-
- while ( !f.atEnd() ) {
- f.readLine(s, 256);
- lineNo++;
- LeftText = s;
- currentFilePos = f.at();
-
- i_pageNum = lineNo/pageSize;
- if(lastPage < i_pageNum) {
- pageStopArray.resize(i_pageNum + 1);
- pageStopArray[i_pageNum ] = currentFilePos;
- // qDebug("new page number %d, found at %d", i_pageNum, currentFilePos);
- }
- // lastPage = i_pageNum;
- if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) {
- qDebug("<<<<<< FOUND IT!! new page number %d, found at %d", i_pageNum, currentFilePos);
- break;
- }
- }
- if(f.atEnd()) //in case we didnt find anything, we need to show something
- f.at(0);
- Lview->clear();
- for(int fd=0; fd < pageSize - 1;fd++) {
- f.readLine(s, 256);
- if(useWrap)
- s.replace(QRegExp("\n"),"");
- Lview->insertLine( s, -1);
- currentLine++;
- }
-
- i_pageNum = lineNo/pageSize;
- pageStopArray.resize(i_pageNum + 1);
- // int length = Lview->length();
-
- qApp->processEvents();
-
- if( pos > i_topRow ) {
- Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE);
- } else {
- Lview->setCursorPosition( pos+2 , 0, FALSE );
- }
-
- Lview->deselect();
- // AdjustStatus();
- Lview->setFocus();
+ i_pageNum = 1;
+ currentLine = 0;
+ QString s_pattern="*END*THE SMALL PRINT";
+ QString sPattern2 = "*END THE SMALL PRINT";
+
+ int pageSize = Lview->PageSize();
+ Lview->clear();
+
+ // int lines = Lview->numLines();
+ int pos = 0;//, i = 0;
+ int i_topRow = Lview->topRow();
+
+ QString LeftText;// = Lview->text();
+
+ int linesPerPage = Lview->lastRow() - Lview->topRow();
+ // int pages = (( linesPerPage / Lview->editSize() ) ) +1;
+ // int pageN = 0;
+ i_pageNum = 1;
+ int lastPage=1;
+ int lineNo=0;
+ QString s;
+ f.at( 0);
+
+ while ( !f.atEnd() ) {
+ f.readLine(s, 256);
+ lineNo++;
+ LeftText = s;
+ currentFilePos = f.at();
+
+ i_pageNum = lineNo/pageSize;
+ if(lastPage < i_pageNum) {
+ pageStopArray.resize(i_pageNum + 1);
+ pageStopArray[i_pageNum ] = currentFilePos;
+ // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
+ }
+ // lastPage = i_pageNum;
+ if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) {
+ odebug << "<<<<<< FOUND IT!! new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
+ break;
+ }
+ }
+ if(f.atEnd()) //in case we didnt find anything, we need to show something
+ f.at(0);
+ Lview->clear();
+ for(int fd=0; fd < pageSize - 1;fd++) {
+ f.readLine(s, 256);
+ if(useWrap)
+ s.replace(QRegExp("\n"),"");
+ Lview->insertLine( s, -1);
+ currentLine++;
+ }
+
+ i_pageNum = lineNo/pageSize;
+ pageStopArray.resize(i_pageNum + 1);
+ // int length = Lview->length();
+
+ qApp->processEvents();
+
+ if( pos > i_topRow ) {
+ Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE);
+ } else {
+ Lview->setCursorPosition( pos+2 , 0, FALSE );
+ }
+
+ Lview->deselect();
+ // AdjustStatus();
+ Lview->setFocus();
}
@@ -610,38 +615,38 @@ void Gutenbrowser::BeginBtn() {
/*
- sets the current page and place as a bookmark*/
+ sets the current page and place as a bookmark*/
void Gutenbrowser::setBookmark() {
- int eexit=QMessageBox::information(this, "Note",
- "Do you really want to \nset this bookmark?."
- ,QMessageBox::Yes, QMessageBox::No);
- if (eexit== 3) {
-
- currentFilePos = f.at();
-
- Config cfg("Gutenbrowser");
- cfg.setGroup("General");
- file_name=cfg.readEntry("Current","");
- qApp->processEvents();
- qDebug("Settingbook mark "+file_name);
-
- cfg.setGroup("Titles");
- title=cfg.readEntry(file_name,"");
- qDebug("title is "+ title);
-
- cfg.setGroup( "Bookmarks" );
-
- cfg.writeEntry("File Name",file_name);
- cfg.writeEntry("Page Number",QString::number(i_pageNum) );
- cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1]));
- cfg.writeEntry("Title", title);
-
- int row = Lview->topRow();// Lview->Top();
- cfg.writeEntry("LineNumber",QString::number(row) );
-
- cfg.setGroup(title);
- cfg.writeEntry("File Name",file_name);
- cfg.writeEntry( "LineNumber", QString::number( row));
- cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1]));
- cfg.writeEntry( "Page Number", QString::number( i_pageNum) );
- bookmarksMenu->insertItem( title);
- }
+ int eexit=QMessageBox::information(this, "Note",
+ "Do you really want to \nset this bookmark?."
+ ,QMessageBox::Yes, QMessageBox::No);
+ if (eexit== 3) {
+
+ currentFilePos = f.at();
+
+ Config cfg("Gutenbrowser");
+ cfg.setGroup("General");
+ file_name=cfg.readEntry("Current","");
+ qApp->processEvents();
+ odebug << "Settingbook mark "+file_name << oendl;
+
+ cfg.setGroup("Titles");
+ title=cfg.readEntry(file_name,"");
+ odebug << "title is "+ title << oendl;
+
+ cfg.setGroup( "Bookmarks" );
+
+ cfg.writeEntry("File Name",file_name);
+ cfg.writeEntry("Page Number",QString::number(i_pageNum) );
+ cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1]));
+ cfg.writeEntry("Title", title);
+
+ int row = Lview->topRow();// Lview->Top();
+ cfg.writeEntry("LineNumber",QString::number(row) );
+
+ cfg.setGroup(title);
+ cfg.writeEntry("File Name",file_name);
+ cfg.writeEntry( "LineNumber", QString::number( row));
+ cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1]));
+ cfg.writeEntry( "Page Number", QString::number( i_pageNum) );
+ bookmarksMenu->insertItem( title);
+ }
} //end setBookmark
@@ -652,83 +657,83 @@ void Gutenbrowser::Bookmark( int itemId) {
- // qApp->processEvents();
- Config config("Gutenbrowser");
- config.setGroup( "Bookmarks" );
-
- // qDebug("<<<<<< %d, %d", Lview->PageSize(), Lview->lastRow() - Lview->topRow() );
-
- QString itemString;
-
- qDebug("menu item %d", itemId);
- QString tempTitle;
- QString s_Bmrkrow;
- QString s_pageNum;
- int Bmrkrow=0;
- int bookmarkPosition = 0;
-
- // qApp->processEvents();
- config.setGroup( "Bookmarks" );
- title = config.readEntry("Title", "");
- file_name = config.readEntry("File Name", "");
- i_pageNum = config.readNumEntry("Page Number", 0);
- bookmarkPosition = config.readNumEntry( "PagePosition",0);
- Bmrkrow = config.readNumEntry("LineNumber",0);
- if( !file_name.contains("/")) {
- file_name = local_library + file_name;
- }
-
- // getTitle(file_name);
- // qApp->processEvents();
- // Lview->setFocus();
- this->setFocus();
-
- Lview->clear();
-
- load(file_name);
-
- int pageSize= Lview->PageSize();
- f.at(0);
- // Lview->clear();
- QString s;
- int lineNo=0;
- int lastPage=1;
- while ( !f.atEnd() ) {
- f.readLine(s, 256);
- lineNo++;
- currentFilePos = f.at();
-
- i_pageNum = lineNo/pageSize;
- if(lastPage < i_pageNum) {
- pageStopArray.resize(i_pageNum + 1);
- pageStopArray[i_pageNum ] = currentFilePos;
- // qDebug("new page number %d, found at %d", i_pageNum, currentFilePos);
- }
- if(currentFilePos == bookmarkPosition)
- break;
- }
- if(f.atEnd())
- f.at(0);
- else
- f.at( bookmarkPosition);
-
- for(int fd=0; fd < pageSize - 1;fd++) {
- f.readLine(s, 256);
- lineNo++;
- if(useWrap)
- s.replace(QRegExp("\n"),"");
- Lview->insertLine( s, -1);
- currentLine++;
- }
-
- i_pageNum = lineNo/pageSize;
- pageStopArray.resize(i_pageNum + 1);
-
- if(showMainList) {
- showMainList=FALSE;
- mainList->hide();
- Lview->show();
- // qApp->processEvents();
- }
-
- qDebug("bookmark loaded");
- setCaption(title);
+ // qApp->processEvents();
+ Config config("Gutenbrowser");
+ config.setGroup( "Bookmarks" );
+
+ // odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
+
+ QString itemString;
+
+ odebug << "menu item " << itemId << "" << oendl;
+ QString tempTitle;
+ QString s_Bmrkrow;
+ QString s_pageNum;
+ int Bmrkrow=0;
+ int bookmarkPosition = 0;
+
+ // qApp->processEvents();
+ config.setGroup( "Bookmarks" );
+ title = config.readEntry("Title", "");
+ file_name = config.readEntry("File Name", "");
+ i_pageNum = config.readNumEntry("Page Number", 0);
+ bookmarkPosition = config.readNumEntry( "PagePosition",0);
+ Bmrkrow = config.readNumEntry("LineNumber",0);
+ if( !file_name.contains("/")) {
+ file_name = local_library + file_name;
+ }
+
+ // getTitle(file_name);
+ // qApp->processEvents();
+ // Lview->setFocus();
+ this->setFocus();
+
+ Lview->clear();
+
+ load(file_name);
+
+ int pageSize= Lview->PageSize();
+ f.at(0);
+ // Lview->clear();
+ QString s;
+ int lineNo=0;
+ int lastPage=1;
+ while ( !f.atEnd() ) {
+ f.readLine(s, 256);
+ lineNo++;
+ currentFilePos = f.at();
+
+ i_pageNum = lineNo/pageSize;
+ if(lastPage < i_pageNum) {
+ pageStopArray.resize(i_pageNum + 1);
+ pageStopArray[i_pageNum ] = currentFilePos;
+ // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
+ }
+ if(currentFilePos == bookmarkPosition)
+ break;
+ }
+ if(f.atEnd())
+ f.at(0);
+ else
+ f.at( bookmarkPosition);
+
+ for(int fd=0; fd < pageSize - 1;fd++) {
+ f.readLine(s, 256);
+ lineNo++;
+ if(useWrap)
+ s.replace(QRegExp("\n"),"");
+ Lview->insertLine( s, -1);
+ currentLine++;
+ }
+
+ i_pageNum = lineNo/pageSize;
+ pageStopArray.resize(i_pageNum + 1);
+
+ if(showMainList) {
+ showMainList=FALSE;
+ mainList->hide();
+ Lview->show();
+ // qApp->processEvents();
+ }
+
+ odebug << "bookmark loaded" << oendl;
+ setCaption(title);
}
@@ -738,82 +743,82 @@ bool Gutenbrowser::load( const char *fileName) {
- // QCopEnvelope ( "QPE/System", "busy()" );
- // qDebug("Title is already set as "+title);
- qDebug("sizeHint %d pageSize %d", sizeHint().height(),Lview->PageSize() );
- if( Lview->PageSize() < 4) {
-
- Lview->setMaximumHeight( sizeHint().height() );
- Lview->setMinimumHeight( sizeHint().height() );
- pointSize = Lview->fontInfo().pointSize();
- qDebug("sizeHint %d point size %d", sizeHint().height(), pointSize);
- if(pointSize < 10)
- Lview->setFixedVisibleLines(19);
- else
- Lview->setFixedVisibleLines( ( (sizeHint().height() / pointSize ) * 2) -2);
- }
-
- Config cfg("Gutenbrowser");
- cfg.setGroup("General");
- cfg.writeEntry("Current",fileName);
- currentLine=0;
-
- file_name=fileName;
- QString o_file = fileName;
-
- // if (i_pageNum < 1) {
- i_pageNum = 1;
- // }
- qDebug("ready to open "+o_file);
-
- if(f.isOpen()) f.close();
- f.setName( o_file);
-
- if ( !f.open( IO_ReadOnly)) {
- QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n" +o_file)) );
- return false;
- }
- currentFilePos = 0;
- pageStopArray.resize(3);
- pageStopArray[0] = currentFilePos;
-
- fileHandle = f.handle();
- QString insertString;
- QTextStream t(&f);
- QString s;
- for(int fd=0; fd < Lview->PageSize() ;fd++) {
- s=t.readLine();
- // insertString+=s;
- if(useWrap)
- s.replace(QRegExp("\n"),"");
- // s.replace(QRegExp("\r"),"");
- Lview->insertLine( s,-1);
- currentLine++;
- }
-
- // int length = Lview->length();
- currentFilePos = f.at();
-
- pageStopArray[1] = currentFilePos;
-
- qDebug("<<<<<<<<<<<%d current page is number %d, length %d, current %d, pageSize %d",
- currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() );
-
- Lview->setMaxLines(Lview->PageSize()*2);
- qDebug("Gulped %d", currentLine);
- setCaption(title);
- Lview->setAutoUpdate( TRUE);
-
- Lview->setCursorPosition(0,0,FALSE);
-
- // pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1;
- //qDebug("number of pages %d", pages);
-
- loadCheck = true;
- enableButtons(true);
- if( donateMenu->count() == 3) {
- donateMenu->insertItem("Current Title", this, SLOT( InfoBarClick() ));
- }
- Lview->setFocus();
-
- // QCopEnvelope("QPE/System", "notBusy()" );
- return true;
+ // QCopEnvelope ( "QPE/System", "busy()" );
+ // odebug << "Title is already set as "+title << oendl;
+ odebug << "sizeHint " << sizeHint().height() << " pageSize " << Lview->PageSize() << "" << oendl;
+ if( Lview->PageSize() < 4) {
+
+ Lview->setMaximumHeight( sizeHint().height() );
+ Lview->setMinimumHeight( sizeHint().height() );
+ pointSize = Lview->fontInfo().pointSize();
+ odebug << "sizeHint " << sizeHint().height() << " point size " << pointSize << "" << oendl;
+ if(pointSize < 10)
+ Lview->setFixedVisibleLines(19);
+ else
+ Lview->setFixedVisibleLines( ( (sizeHint().height() / pointSize ) * 2) -2);
+ }
+
+ Config cfg("Gutenbrowser");
+ cfg.setGroup("General");
+ cfg.writeEntry("Current",fileName);
+ currentLine=0;
+
+ file_name=fileName;
+ QString o_file = fileName;
+
+ // if (i_pageNum < 1) {
+ i_pageNum = 1;
+ // }
+ odebug << "ready to open "+o_file << oendl;
+
+ if(f.isOpen()) f.close();
+ f.setName( o_file);
+
+ if ( !f.open( IO_ReadOnly)) {
+ QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n" +o_file)) );
+ return false;
+ }
+ currentFilePos = 0;
+ pageStopArray.resize(3);
+ pageStopArray[0] = currentFilePos;
+
+ fileHandle = f.handle();
+ QString insertString;
+ QTextStream t(&f);
+ QString s;
+ for(int fd=0; fd < Lview->PageSize() ;fd++) {
+ s=t.readLine();
+ // insertString+=s;
+ if(useWrap)
+ s.replace(QRegExp("\n"),"");
+ // s.replace(QRegExp("\r"),"");
+ Lview->insertLine( s,-1);
+ currentLine++;
+ }
+
+ // int length = Lview->length();
+ currentFilePos = f.at();
+
+ pageStopArray[1] = currentFilePos;
+
+ qDebug("<<<<<<<<<<<%d current page is number %d, length %d, current %d, pageSize %d",
+ currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() );
+
+ Lview->setMaxLines(Lview->PageSize()*2);
+ odebug << "Gulped " << currentLine << "" << oendl;
+ setCaption(title);
+ Lview->setAutoUpdate( TRUE);
+
+ Lview->setCursorPosition(0,0,FALSE);
+
+ // pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1;
+ //odebug << "number of pages " << pages << "" << oendl;
+
+ loadCheck = true;
+ enableButtons(true);
+ if( donateMenu->count() == 3) {
+ donateMenu->insertItem("Current Title", this, SLOT( InfoBarClick() ));
+ }
+ Lview->setFocus();
+
+ // QCopEnvelope("QPE/System", "notBusy()" );
+ return true;
} // end load
@@ -822,17 +827,17 @@ void Gutenbrowser::Search() {
- // if( searchDlg->isHidden())
- {
- qDebug("Starting search dialog");
- searchDlg = new SearchDialog( this, "Etext Search", true);
- searchDlg->setCaption( tr( "Etext Search" ));
- // searchDlg->setLabel( "- searches etext");
- connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
- connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
-
- QString resultString;
- QString string = searchDlg->searchString;
- Lview->deselect();
- searchDlg->show();
- searchDlg->result();
- }
+ // if( searchDlg->isHidden())
+ {
+ odebug << "Starting search dialog" << oendl;
+ searchDlg = new SearchDialog( this, "Etext Search", true);
+ searchDlg->setCaption( tr( "Etext Search" ));
+ // searchDlg->setLabel( "- searches etext");
+ connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
+ connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
+
+ QString resultString;
+ QString string = searchDlg->searchString;
+ Lview->deselect();
+ searchDlg->show();
+ searchDlg->result();
+ }
}
@@ -842,3 +847,3 @@ void Gutenbrowser::search_slot( ) {
if (!searchDlg /*&& !loadCheck */)
- return;
+ return;
@@ -847,5 +852,5 @@ void Gutenbrowser::search_slot( ) {
- // searchDlg->get_direction();// is true if searching backward
+ // searchDlg->get_direction();// is true if searching backward
if ( last_search != 0 && searchDlg->get_direction() ){
- col = col - pattern.length() - 1 ;
+ col = col - pattern.length() - 1 ;
}
@@ -854,27 +859,27 @@ void Gutenbrowser::search_slot( ) {
if(result == 0){
- if(!searchDlg->get_direction()){ // forward search
- int query = QMessageBox::information( searchDlg, "Find",
- "End of document reached.\nContinue from the beginning?",
- "Yes", "No", "", 0,1);
- if (query == 0){
- line = 0;
- col = 0;
- goto again;
- }
- } else { //backward search
- int query = QMessageBox::information( searchDlg, "Find",
- "End of document reached.\nContinue from the beginning?",
- "Yes", "No", "", 0,1);
- if (query == 0){
- QString string = Lview->textLine( Lview->numLines() - 1 );
- line = Lview->numLines() - 1;
- lineCheck = line;
- col = string.length();
- last_search = -1; //BACKWARD;
- goto again;
- }
- }
+ if(!searchDlg->get_direction()){ // forward search
+ int query = QMessageBox::information( searchDlg, "Find",
+ "End of document reached.\nContinue from the beginning?",
+ "Yes", "No", "", 0,1);
+ if (query == 0){
+ line = 0;
+ col = 0;
+ goto again;
+ }
+ } else { //backward search
+ int query = QMessageBox::information( searchDlg, "Find",
+ "End of document reached.\nContinue from the beginning?",
+ "Yes", "No", "", 0,1);
+ if (query == 0){
+ QString string = Lview->textLine( Lview->numLines() - 1 );
+ line = Lview->numLines() - 1;
+ lineCheck = line;
+ col = string.length();
+ last_search = -1; //BACKWARD;
+ goto again;
+ }
+ }
} else {
- //// emit CursorPositionChanged(); textLine
+ //// emit CursorPositionChanged(); textLine
}
@@ -883,73 +888,73 @@ void Gutenbrowser::search_slot( ) {
int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, bool forward, int line, int col ) {
- int i, length;
- int pos = -1;
- if(forward) {
- QString string;
- for(i = line; i < Lview->numLines(); i++) {
-
- string = Lview->textLine(i);
- pos = string.find(s_pattern, i == line ? col : 0, case_sensitive);
- if( pos != -1) {
- int top = Lview->Top();
- length = s_pattern.length();
- if( i > Lview->lastRow() ) {
- Lview->setCursorPosition(i,pos,FALSE);
- for(int l = 0 ; l < length; l++) {
- Lview->cursorRight(TRUE);
- }
- Lview->setCursorPosition( i , pos + length, TRUE );
- int newTop = Lview->Top();
- if(Lview->lastRow() > i)
- Lview->ScrollUp( newTop - top);
- // AdjustStatus();
- } else {
- Lview->setCursorPosition(i,pos,FALSE);
- for(int l = 0 ; l < length; l++) {
- Lview->cursorRight(TRUE);
- }
- Lview->setCursorPosition( i , pos + length, TRUE );
- // AdjustStatus();
- }
- pattern = s_pattern;
- last_search = 1; //FORWARD;
- return 1;
- }
- }
- } else { //////////////// searching backwards
- QString string;
- for( i = line; i >= 0; i--) {
- string = Lview->textLine(i);
- int line_length = string.length();
- pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive);
- if (pos != -1) {
- // int top = Lview->Top();
- length = s_pattern.length();
- if( i < Lview->Top() ) {
- Lview->ScrollDown( Lview->PageSize() );
- Lview->MultiLine_Ex::pageUp( FALSE );
- if( ! (line == i && pos > col ) ) {
- Lview->setCursorPosition( i ,pos ,FALSE );
- for(int l = 0 ; l < length; l++) {
- Lview->cursorRight(TRUE);
- }
- Lview->setCursorPosition(i ,pos + length ,TRUE );
- // int newTop = Lview->Top();
- /* if(useSplitter) Rview->ScrollUp( newTop - top);
- */ }
- } else {
- if( ! (line == i && pos > col ) ) {
- Lview->setCursorPosition( i, pos, FALSE );
- for( int l = 0 ; l < length; l++) {
- Lview->cursorRight( TRUE);
- }
- Lview->setCursorPosition( i, pos + length, TRUE );
- }
- pattern = s_pattern;
- last_search = -1;
- return 1;
- }
- }
- }
- }
- return 0;
+ int i, length;
+ int pos = -1;
+ if(forward) {
+ QString string;
+ for(i = line; i < Lview->numLines(); i++) {
+
+ string = Lview->textLine(i);
+ pos = string.find(s_pattern, i == line ? col : 0, case_sensitive);
+ if( pos != -1) {
+ int top = Lview->Top();
+ length = s_pattern.length();
+ if( i > Lview->lastRow() ) {
+ Lview->setCursorPosition(i,pos,FALSE);
+ for(int l = 0 ; l < length; l++) {
+ Lview->cursorRight(TRUE);
+ }
+ Lview->setCursorPosition( i , pos + length, TRUE );
+ int newTop = Lview->Top();
+ if(Lview->lastRow() > i)
+ Lview->ScrollUp( newTop - top);
+ // AdjustStatus();
+ } else {
+ Lview->setCursorPosition(i,pos,FALSE);
+ for(int l = 0 ; l < length; l++) {
+ Lview->cursorRight(TRUE);
+ }
+ Lview->setCursorPosition( i , pos + length, TRUE );
+ // AdjustStatus();
+ }
+ pattern = s_pattern;
+ last_search = 1; //FORWARD;
+ return 1;
+ }
+ }
+ } else { //////////////// searching backwards
+ QString string;
+ for( i = line; i >= 0; i--) {
+ string = Lview->textLine(i);
+ int line_length = string.length();
+ pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive);
+ if (pos != -1) {
+ // int top = Lview->Top();
+ length = s_pattern.length();
+ if( i < Lview->Top() ) {
+ Lview->ScrollDown( Lview->PageSize() );
+ Lview->MultiLine_Ex::pageUp( FALSE );
+ if( ! (line == i && pos > col ) ) {
+ Lview->setCursorPosition( i ,pos ,FALSE );
+ for(int l = 0 ; l < length; l++) {
+ Lview->cursorRight(TRUE);
+ }
+ Lview->setCursorPosition(i ,pos + length ,TRUE );
+ // int newTop = Lview->Top();
+ /* if(useSplitter) Rview->ScrollUp( newTop - top);
+ */ }
+ } else {
+ if( ! (line == i && pos > col ) ) {
+ Lview->setCursorPosition( i, pos, FALSE );
+ for( int l = 0 ; l < length; l++) {
+ Lview->cursorRight( TRUE);
+ }
+ Lview->setCursorPosition( i, pos + length, TRUE );
+ }
+ pattern = s_pattern;
+ last_search = -1;
+ return 1;
+ }
+ }
+ }
+ }
+ return 0;
}
@@ -958,97 +963,97 @@ void Gutenbrowser::LibraryBtn() {
- QString newestLibraryFile ="pgwhole.zip";
- QString zipFile;
- // qDebug("Local Library is %s ", local_library.latin1());
- zipFile="/usr/bin/unzip";
- // qDebug("newestLibraryFile is %s ", newestLibraryFile.latin1());
- if( QFile::exists( local_library+newestLibraryFile)) {
- if( QFile::exists(zipFile) ) {
- UnZipIt(newestLibraryFile);
- }
- else
- QMessageBox::message( "Note",( tr("Please install unzip")) );
- }
- // LibraryDlg = new LibraryDialog( this, "Library Index");
- LibraryDlg->setCaption( tr( "Gutenberg Library"));
- Config config("Gutenbrowser");
- config.setGroup("General");
- QString tmp=config.readEntry("RunBefore","FALSE");
- if(tmp=="FALSE") {
- QMessageBox::message( "Note",
- "<P>Your first time running gutenbrowser. You'll need to click the \"load library\" button to load the gutenberg index.</P>");
- config.writeEntry("RunBefore","TRUE");
- }
- if(useSplitter)
- LibraryDlg->useSmallInterface=FALSE;
-
- LibraryDlg->showMaximized();
-
- if( LibraryDlg->exec() != 0 ) {
- listItemNumber = LibraryDlg->DlglistItemNumber;
- listItemFile = LibraryDlg->DlglistItemFile;
- listItemYear = LibraryDlg->DlglistItemYear;
- listItemTitle = LibraryDlg->DlglistItemTitle;
- file_name = LibraryDlg->File_Name;
- // qDebug("title is being set as "+title);
- title = listItemTitle;
-
- // config.setGroup( "Proxy" );
- // if( LibraryDlg->checked == 1) {
- // config.writeEntry("IsChecked", "TRUE");
- // } else {
- // config.writeEntry("IsChecked", "FALSE");
- // }
- // config.write();
- // config.read();
- if ( listItemNumber.isNull()) {
- } else {
- i_pageNum = 1;
- if( file_name !="Error" && file_name.length() >2 && !file_name.isEmpty() ) {
- //replace .zip with txt for opening it.
- // printf("\nFile name is now\n");
- // printf(file_name);
- // printf("\n");
- //
- if( file_name.find(".zip"))
- {
- qDebug("Found zip file\n");
- // QStringList args;
- // args="unzip";
- // args+="-o";
- // args+=local_library+file_name;
- // args+="-d";
- // args+=local_library;
- QString cmd = "/usr/bin/unzip -o " + local_library+file_name + " -d " + local_library;
- qDebug("Issuing the command "+ cmd);
- // unzipProc=new QProcess( this, "unzipProc" ); /// fark that idea!
- // unzipProc->start();
- system(cmd);
- remove( file_name);
-
- }
- // //
- // file_name = file_name.left(4)+ ".txt";
- if( LibraryDlg)
- delete LibraryDlg;
- setTitle();
- // QCopEnvelope ( "QPE/System", "busy()" );
- load( file_name);
- } else {
- printf("Not opening the file.\n");
- }
- }
- }
- if(showMainList) {
- if(!Lview->isHidden())
- Lview->hide();
- qApp->processEvents();
- showMainList=TRUE;
- if(mainList->isHidden())
- mainList->show();
- fillWithTitles();
- qApp->processEvents();
- } else
- setCentralWidget( Lview);
- // QPEApplication::grabKeyboard();
- // fixKeys();
+ QString newestLibraryFile ="pgwhole.zip";
+ QString zipFile;
+ // odebug << "Local Library is " << local_library << " " << oendl;
+ zipFile="/usr/bin/unzip";
+ // odebug << "newestLibraryFile is " << newestLibraryFile << " " << oendl;
+ if( QFile::exists( local_library+newestLibraryFile)) {
+ if( QFile::exists(zipFile) ) {
+ UnZipIt(newestLibraryFile);
+ }
+ else
+ QMessageBox::message( "Note",( tr("Please install unzip")) );
+ }
+ // LibraryDlg = new LibraryDialog( this, "Library Index");
+ LibraryDlg->setCaption( tr( "Gutenberg Library"));
+ Config config("Gutenbrowser");
+ config.setGroup("General");
+ QString tmp=config.readEntry("RunBefore","FALSE");
+ if(tmp=="FALSE") {
+ QMessageBox::message( "Note",
+ "<P>Your first time running gutenbrowser. You'll need to click the \"load library\" button to load the gutenberg index.</P>");
+ config.writeEntry("RunBefore","TRUE");
+ }
+ if(useSplitter)
+ LibraryDlg->useSmallInterface=FALSE;
+
+ LibraryDlg->showMaximized();
+
+ if( LibraryDlg->exec() != 0 ) {
+ listItemNumber = LibraryDlg->DlglistItemNumber;
+ listItemFile = LibraryDlg->DlglistItemFile;
+ listItemYear = LibraryDlg->DlglistItemYear;
+ listItemTitle = LibraryDlg->DlglistItemTitle;
+ file_name = LibraryDlg->File_Name;
+ // odebug << "title is being set as "+title << oendl;
+ title = listItemTitle;
+
+ // config.setGroup( "Proxy" );
+ // if( LibraryDlg->checked == 1) {
+ // config.writeEntry("IsChecked", "TRUE");
+ // } else {
+ // config.writeEntry("IsChecked", "FALSE");
+ // }
+ // config.write();
+ // config.read();
+ if ( listItemNumber.isNull()) {
+ } else {
+ i_pageNum = 1;
+ if( file_name !="Error" && file_name.length() >2 && !file_name.isEmpty() ) {
+ //replace .zip with txt for opening it.
+ // printf("\nFile name is now\n");
+ // printf(file_name);
+ // printf("\n");
+ //
+ if( file_name.find(".zip"))
+ {
+ odebug << "Found zip file\n" << oendl;
+ // QStringList args;
+ // args="unzip";
+ // args+="-o";
+ // args+=local_library+file_name;
+ // args+="-d";
+ // args+=local_library;
+ QString cmd = "/usr/bin/unzip -o " + local_library+file_name + " -d " + local_library;
+ odebug << "Issuing the command "+ cmd << oendl;
+ // unzipProc=new QProcess( this, "unzipProc" ); /// fark that idea!
+ // unzipProc->start();
+ system(cmd);
+ remove( file_name);
+
+ }
+ // //
+ // file_name = file_name.left(4)+ ".txt";
+ if( LibraryDlg)
+ delete LibraryDlg;
+ setTitle();
+ // QCopEnvelope ( "QPE/System", "busy()" );
+ load( file_name);
+ } else {
+ printf("Not opening the file.\n");
+ }
+ }
+ }
+ if(showMainList) {
+ if(!Lview->isHidden())
+ Lview->hide();
+ qApp->processEvents();
+ showMainList=TRUE;
+ if(mainList->isHidden())
+ mainList->show();
+ fillWithTitles();
+ qApp->processEvents();
+ } else
+ setCentralWidget( Lview);
+ // QPEApplication::grabKeyboard();
+ // fixKeys();
}
@@ -1056,61 +1061,61 @@ void Gutenbrowser::LibraryBtn() {
void Gutenbrowser::OpenBtn() {
- QString s_temp;
- s_temp = status;
- OpenEtext* OpenDlg;
- OpenDlg = new OpenEtext(this,"OpenDlg");
- OpenDlg->showMaximized();
-
- if( OpenDlg->exec() != 0) {
- title = OpenDlg->openFileTitle;
- qDebug("title open as "+title);
- file_name = OpenDlg->file;
- i_pageNum = 1;
-
- if( !file_name.isEmpty() || file_name.length() > 2 ) {
- if(showMainList) {
- showMainList=FALSE;
- qDebug("ShowMainList is now false");
- mainList->hide();
- Lview->show();
- qApp->processEvents();
- }
- Lview->clear();
- // QCopEnvelope ( "QPE/System", "busy()" );
- load(file_name);
- } else {
- qDebug("file_name is empty!");
- if(showMainList) {
- if(!Lview->isHidden())
- Lview->hide();
- qApp->processEvents();
- if(mainList->isHidden())
- mainList->show();
- fillWithTitles();
- qApp->processEvents();
- }
-
- }
- }
- if( OpenDlg)
- delete OpenDlg;
- /*
- Config config("Gutenbrowser");
- config.setGroup( title);
- file_name = config.readEntry("File Name", "");
- i_pageNum = config.readNumEntry("Page Number", -1);
- int Bmrkrow = config.readNumEntry("LineNumber", -1);
- if(Bmrkrow > -1) {
- if( Bmrkrow > Lview->topRow() ) {
- Lview->setCursorPosition( Bmrkrow ,0, FALSE );
- Lview->ScrollUp( Bmrkrow - Lview->topRow() );
- // AdjustStatus();
+ QString s_temp;
+ s_temp = status;
+ OpenEtext* OpenDlg;
+ OpenDlg = new OpenEtext(this,"OpenDlg");
+ OpenDlg->showMaximized();
+
+ if( OpenDlg->exec() != 0) {
+ title = OpenDlg->openFileTitle;
+ odebug << "title open as "+title << oendl;
+ file_name = OpenDlg->file;
+ i_pageNum = 1;
+
+ if( !file_name.isEmpty() || file_name.length() > 2 ) {
+ if(showMainList) {
+ showMainList=FALSE;
+ odebug << "ShowMainList is now false" << oendl;
+ mainList->hide();
+ Lview->show();
+ qApp->processEvents();
+ }
+ Lview->clear();
+ // QCopEnvelope ( "QPE/System", "busy()" );
+ load(file_name);
+ } else {
+ odebug << "file_name is empty!" << oendl;
+ if(showMainList) {
+ if(!Lview->isHidden())
+ Lview->hide();
+ qApp->processEvents();
+ if(mainList->isHidden())
+ mainList->show();
+ fillWithTitles();
+ qApp->processEvents();
+ }
+
+ }
+ }
+ if( OpenDlg)
+ delete OpenDlg;
+ /*
+ Config config("Gutenbrowser");
+ config.setGroup( title);
+ file_name = config.readEntry("File Name", "");
+ i_pageNum = config.readNumEntry("Page Number", -1);
+ int Bmrkrow = config.readNumEntry("LineNumber", -1);
+ if(Bmrkrow > -1) {
+ if( Bmrkrow > Lview->topRow() ) {
+ Lview->setCursorPosition( Bmrkrow ,0, FALSE );
+ Lview->ScrollUp( Bmrkrow - Lview->topRow() );
+ // AdjustStatus();
}
else if( Bmrkrow < Lview->topRow() ) {
- Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
- Lview->ScrollDown( Lview->topRow() - Bmrkrow );
- // AdjustStatus();
- }
- }
- */
- // ResizeEdits();
+ Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
+ Lview->ScrollDown( Lview->topRow() - Bmrkrow );
+ // AdjustStatus();
+ }
+ }
+ */
+ // ResizeEdits();
@@ -1120,40 +1125,40 @@ void Gutenbrowser::ChangeFont() {
#ifndef Q_WS_QWS
- bool ok;
+ bool ok;
- weight= Lview->fontInfo().weight();
- italic = Lview->fontInfo().italic();
- bold=Lview->fontInfo().bold();
- pointSize= Lview->fontInfo().pointSize();
- fontStr=Lview->fontInfo().family();
+ weight= Lview->fontInfo().weight();
+ italic = Lview->fontInfo().italic();
+ bold=Lview->fontInfo().bold();
+ pointSize= Lview->fontInfo().pointSize();
+ fontStr=Lview->fontInfo().family();
- if(italic == true)
+ if(italic == true)
italicStr="TRUE";
- else
+ else
italicStr="FALSE";
- QFont currentfont( fontStr, pointSize, weight, italic );
+ QFont currentfont( fontStr, pointSize, weight, italic );
- if (ok) {
- QFontInfo fontInfo(font );
- fontStr=fontInfo.family();
+ if (ok) {
+ QFontInfo fontInfo(font );
+ fontStr=fontInfo.family();
- pointSize= fontInfo.pointSize();
+ pointSize= fontInfo.pointSize();
- font.setFontSize(pointSize);
+ font.setFontSize(pointSize);
- pointSizeStr.setNum( pointSize);
+ pointSizeStr.setNum( pointSize);
- weight= fontInfo.weight();
- weightStr.setNum( weight);
- italic =fontInfo.italic();
- bold=fontInfo.bold();
+ weight= fontInfo.weight();
+ weightStr.setNum( weight);
+ italic =fontInfo.italic();
+ bold=fontInfo.bold();
- if(italic == true)
- italicStr="TRUE";
- else
- italicStr="FALSE";
- if(bold == true)
- boldStr="TRUE";
- else
- boldStr="FALSE";
+ if(italic == true)
+ italicStr="TRUE";
+ else
+ italicStr="FALSE";
+ if(bold == true)
+ boldStr="TRUE";
+ else
+ boldStr="FALSE";
@@ -1166,3 +1171,3 @@ void Gutenbrowser::ChangeFont() {
config.writeEntry("Bold", boldStr );
- // config.write();
+ // config.write();
@@ -1175,7 +1180,7 @@ void Gutenbrowser::ChangeFont() {
}
- // if(loadCheck) {
- // ResizeEdits();
- // }
+ // if(loadCheck) {
+ // ResizeEdits();
+ // }
update();
- }
+ }
#endif
@@ -1185,18 +1190,18 @@ void Gutenbrowser::ChangeFont() {
/*
- performs dictionary look ups on the web */
+ performs dictionary look ups on the web */
void Gutenbrowser::LookupBtn() {
- QString text;
- if( Lview->hasSelectedText()) {
- Lview->copy();
- }
- QClipboard *cb = QApplication::clipboard();
- text = cb->text();
- int eexit=QMessageBox::information(this,
- "Note","Do you want to lookup\n\""+text+"\"\non websters web dictionary?",
- QMessageBox::Yes, QMessageBox::No);
- if (eexit== 3) {
- // this link for sale!!
- qApp->processEvents();
- goGetit( "http://www.m-w.com/cgi-bin/dictionary?" + text, true);
- }
+ QString text;
+ if( Lview->hasSelectedText()) {
+ Lview->copy();
+ }
+ QClipboard *cb = QApplication::clipboard();
+ text = cb->text();
+ int eexit=QMessageBox::information(this,
+ "Note","Do you want to lookup\n\""+text+"\"\non websters web dictionary?",
+ QMessageBox::Yes, QMessageBox::No);
+ if (eexit== 3) {
+ // this link for sale!!
+ qApp->processEvents();
+ goGetit( "http://www.m-w.com/cgi-bin/dictionary?" + text, true);
+ }
}
@@ -1204,19 +1209,19 @@ void Gutenbrowser::LookupBtn() {
void Gutenbrowser::ClearEdit() {
- Lview->setText("");
- loadCheck = false;
- status = ( tr("Gutenbrowser"));
- InfoBar->setText( "");
- setCaption( tr("Gutenbrowser"));
- i_pageNum = 0;
- enableButtons(false);
-
- if(!showMainList) {
- Lview->hide();
- showMainList=TRUE;
- mainList->show();
- fillWithTitles();
- qApp->processEvents();
- }
- if(donateMenu->idAt(3) != -1)
- donateMenu->removeItemAt(3);
+ Lview->setText("");
+ loadCheck = false;
+ status = ( tr("Gutenbrowser"));
+ InfoBar->setText( "");
+ setCaption( tr("Gutenbrowser"));
+ i_pageNum = 0;
+ enableButtons(false);
+
+ if(!showMainList) {
+ Lview->hide();
+ showMainList=TRUE;
+ mainList->show();
+ fillWithTitles();
+ qApp->processEvents();
+ }
+ if(donateMenu->idAt(3) != -1)
+ donateMenu->removeItemAt(3);
}
@@ -1225,27 +1230,27 @@ void Gutenbrowser::ClearEdit() {
bool Gutenbrowser::getTitle( const char *file ) {
- QString s_file;
- QString filer = file;
- if( filer.contains(local_library, TRUE)) {
- QFileInfo f(file);
- s_file = f.fileName();
- } else {
- s_file = filer;
- }
- Config config("Gutenbrowser");
- config.setGroup( "Files" );
- QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
- int i_numofFiles = s_numofFiles.toInt();
-
- for (int i = 1; i <= i_numofFiles; i++) {
- QString temp;
- temp.setNum(i);
- QString ramble = config.readEntry(temp, "" );
-
- if( strcmp(ramble, s_file) == 0) {
- config.setGroup( "Titles" );
- title = config.readEntry(ramble, "");
- // qDebug("(getTitle)title is being set as "+title);
- }
- }
- return true;
+ QString s_file;
+ QString filer = file;
+ if( filer.contains(local_library, TRUE)) {
+ QFileInfo f(file);
+ s_file = f.fileName();
+ } else {
+ s_file = filer;
+ }
+ Config config("Gutenbrowser");
+ config.setGroup( "Files" );
+ QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
+ int i_numofFiles = s_numofFiles.toInt();
+
+ for (int i = 1; i <= i_numofFiles; i++) {
+ QString temp;
+ temp.setNum(i);
+ QString ramble = config.readEntry(temp, "" );
+
+ if( strcmp(ramble, s_file) == 0) {
+ config.setGroup( "Titles" );
+ title = config.readEntry(ramble, "");
+ // odebug << "(getTitle)title is being set as "+title << oendl;
+ }
+ }
+ return true;
}
@@ -1253,9 +1258,9 @@ bool Gutenbrowser::getTitle( const char *file ) {
void Gutenbrowser::searchdone_slot() {
- // if (!searchDlg)
- // return;
- // searchDlg->hide();
- // Lview->setFocus();
- this->setFocus();
+ // if (!searchDlg)
+ // return;
+ // searchDlg->hide();
+ // Lview->setFocus();
+ this->setFocus();
last_search = 0;
- // ResizeEdits();
+ // ResizeEdits();
}
@@ -1263,3 +1268,3 @@ void Gutenbrowser::searchdone_slot() {
/*
- sets the status message */
+ sets the status message */
bool Gutenbrowser::setStatus() {
@@ -1267,20 +1272,20 @@ bool Gutenbrowser::setStatus() {
#ifndef Q_WS_QWS
- QString s_pages;
- s_pages.setNum( pages);
- QString chNum;
- statusTop = status.left( status.find(" ", TRUE) );
- status.append(chNum.setNum( i_pageNum));
- status += " / " + s_pages;
-
- if(loadCheck) {
- statusBar->message( status);
- InfoBar->setText( title);
- } else {
- }
+ QString s_pages;
+ s_pages.setNum( pages);
+ QString chNum;
+ statusTop = status.left( status.find(" ", TRUE) );
+ status.append(chNum.setNum( i_pageNum));
+ status += " / " + s_pages;
+
+ if(loadCheck) {
+ statusBar->message( status);
+ InfoBar->setText( title);
+ } else {
+ }
#else
- QString msg;
- msg.sprintf(title+" %d", i_pageNum);
- setCaption( msg);
+ QString msg;
+ msg.sprintf(title+" %d", i_pageNum);
+ setCaption( msg);
#endif
- return true;
+ return true;
}
@@ -1288,74 +1293,74 @@ bool Gutenbrowser::setStatus() {
void Gutenbrowser::keyReleaseEvent( QKeyEvent *e) {
- switch ( e->key() ) {
-
- case Key_M:
- // Bookmark();
- break;
- case Key_D:
- DownloadIndex();
- break;
- case Key_L:
- LibraryBtn();
- break;
- case Key_O:
- OpenBtn();
- break;
- case Key_F:
- ForwardBtn();
- break;
- case Key_B:
- BackBtn();
- break;
- case Key_P:
- PrintBtn();
- break;
- case Key_S:
- SearchBtn();
- break;
- case Key_E:
- ByeBye();
- break;
- case Key_R:
- // setBookmark();
- break;
- case Key_T:
- ChangeFont();
- break;
- case Key_C:
- ClearEdit();
- break;
- case Key_H:
- HelpBtn();
- break;
- case Key_K:
- LookupBtn();
- break;
- case Key_U:// hide menu
- if(menubar->isHidden() )
+ switch ( e->key() ) {
+
+ case Key_M:
+ // Bookmark();
+ break;
+ case Key_D:
+ DownloadIndex();
+ break;
+ case Key_L:
+ LibraryBtn();
+ break;
+ case Key_O:
+ OpenBtn();
+ break;
+ case Key_F:
+ ForwardBtn();
+ break;
+ case Key_B:
+ BackBtn();
+ break;
+ case Key_P:
+ PrintBtn();
+ break;
+ case Key_S:
+ SearchBtn();
+ break;
+ case Key_E:
+ ByeBye();
+ break;
+ case Key_R:
+ // setBookmark();
+ break;
+ case Key_T:
+ ChangeFont();
+ break;
+ case Key_C:
+ ClearEdit();
+ break;
+ case Key_H:
+ HelpBtn();
+ break;
+ case Key_K:
+ LookupBtn();
+ break;
+ case Key_U:// hide menu
+ if(menubar->isHidden() )
menubar->show();
- else
+ else
menubar->hide();
- break;
- case Key_I:
- hideButtons();
- break;
- ////////////////////////////// Zaurus keys
- case Key_Home:
- // BeginBtn();
- break;
+ break;
+ case Key_I:
+ hideButtons();
+ break;
+ ////////////////////////////// Zaurus keys
+ case Key_Home:
+ // BeginBtn();
+ break;
case Key_F9: //activity
- OpenBtn();
- break;
+ OpenBtn();
+ break;
case Key_F10: //contacts
- hideButtons();
- break;
+ hideButtons();
+ break;
case Key_F11: //menu
- if(menubar->isHidden() )
- menubar->show();
- else
- menubar->hide();
- break;
+ if(menubar->isHidden() )
+ menubar->show();
+ else
+ menubar->hide();
+ break;
case Key_F12: //home
- BeginBtn();
- break;
+ BeginBtn();
+ break;
case Key_F13: //mail
@@ -1363,60 +1368,60 @@ void Gutenbrowser::keyReleaseEvent( QKeyEvent *e) {
break;
- case Key_Space:
- if(loadCheck)
+ case Key_Space:
+ if(loadCheck)
ForwardBtn();
- // else
- // Bookmark();
- break;
- case Key_Down:
- if(loadCheck) {
- // if( !e->isAutoRepeat() )
- // AdjustStatus();
- // } else {
- // LibraryBtn();
- // ForwardBtn();
- }
-
- // ForwardButton->setFocus();
- // Lview->setFocus();
- // if(s_Wrap=="FALSE")
- // Lview->MultiLine_Ex::ScrollDown( 1);
- // LibraryBtn();
- break;
- case Key_Up:
- if(loadCheck) {
- // if( !e->isAutoRepeat() )
- // AdjustStatus();
- // } else {
- // OpenBtn();
- // BackBtn();
- }
- // BackButton->setFocus();
- // Lview->setFocus();
- // if(s_Wrap=="FALSE")
- // Lview->MultiLine_Ex::ScrollUp( 1);
-
- // LibraryBtn();
- break;
- case Key_Right:
- ForwardButton->setFocus();
- ForwardBtn();
- // LibraryBtn();
- break;
- case Key_Left:
- BackBtn();
- BackButton->setFocus();
- // OpenBtn();
- break;
- case Key_Escape:
- ByeBye();
- break;
- case Key_PageUp:
- BackBtn();
- break;
- case Key_PageDown:
- ForwardBtn();
- break;
-
- ////////////////////////////// Zaurus keys
- };
+ // else
+ // Bookmark();
+ break;
+ case Key_Down:
+ if(loadCheck) {
+ // if( !e->isAutoRepeat() )
+ // AdjustStatus();
+ // } else {
+ // LibraryBtn();
+ // ForwardBtn();
+ }
+
+ // ForwardButton->setFocus();
+ // Lview->setFocus();
+ // if(s_Wrap=="FALSE")
+ // Lview->MultiLine_Ex::ScrollDown( 1);
+ // LibraryBtn();
+ break;
+ case Key_Up:
+ if(loadCheck) {
+ // if( !e->isAutoRepeat() )
+ // AdjustStatus();
+ // } else {
+ // OpenBtn();
+ // BackBtn();
+ }
+ // BackButton->setFocus();
+ // Lview->setFocus();
+ // if(s_Wrap=="FALSE")
+ // Lview->MultiLine_Ex::ScrollUp( 1);
+
+ // LibraryBtn();
+ break;
+ case Key_Right:
+ ForwardButton->setFocus();
+ ForwardBtn();
+ // LibraryBtn();
+ break;
+ case Key_Left:
+ BackBtn();
+ BackButton->setFocus();
+ // OpenBtn();
+ break;
+ case Key_Escape:
+ ByeBye();
+ break;
+ case Key_PageUp:
+ BackBtn();
+ break;
+ case Key_PageDown:
+ ForwardBtn();
+ break;
+
+ ////////////////////////////// Zaurus keys
+ };
}
@@ -1424,23 +1429,23 @@ void Gutenbrowser::keyReleaseEvent( QKeyEvent *e) {
void Gutenbrowser::keyPressEvent( QKeyEvent *e) {
- switch ( e->key() ) {
- // case Key_Next:
- // ForwardBtn();
- // break;
- // case Key_Prior:
- // BackBtn();
- // break;
- // case Key_Space:
- // ForwardBtn();
- // break;
- // case Key_Down:
- // Lview->MultiLine_Ex::ScrollUp( 1);
- // if(useSplitter) Rview->MultiLine_Ex::ScrollUp( 1);
- // break;
- // case Key_Up:
- // if( Lview->Top() != 0) {
- // Lview->MultiLine_Ex::ScrollDown( 1);
- // if(useSplitter) Rview->MultiLine_Ex::ScrollDown( 1);
- // }
- // break;
- }
+ switch ( e->key() ) {
+ // case Key_Next:
+ // ForwardBtn();
+ // break;
+ // case Key_Prior:
+ // BackBtn();
+ // break;
+ // case Key_Space:
+ // ForwardBtn();
+ // break;
+ // case Key_Down:
+ // Lview->MultiLine_Ex::ScrollUp( 1);
+ // if(useSplitter) Rview->MultiLine_Ex::ScrollUp( 1);
+ // break;
+ // case Key_Up:
+ // if( Lview->Top() != 0) {
+ // Lview->MultiLine_Ex::ScrollDown( 1);
+ // if(useSplitter) Rview->MultiLine_Ex::ScrollDown( 1);
+ // }
+ // break;
+ }
}
@@ -1448,11 +1453,11 @@ void Gutenbrowser::keyPressEvent( QKeyEvent *e) {
void Gutenbrowser::resizeEvent( QResizeEvent *ev) {
- // qDebug("resize: %d,%d\n",ev->size().width(),ev->size().height());
+ // odebug << "resize: " << ev->size().width() << "," << ev->size().height() << "\n" << oendl;
- if( !LibraryDlg->isHidden())
- LibraryDlg->resize(ev->size().width(),ev->size().height() );
+ if( !LibraryDlg->isHidden())
+ LibraryDlg->resize(ev->size().width(),ev->size().height() );
- // if( loadCheck == true) {
- // ResizeEdits();
- // AdjustStatus();
- // }
+ // if( loadCheck == true) {
+ // ResizeEdits();
+ // AdjustStatus();
+ // }
}
@@ -1461,43 +1466,43 @@ void Gutenbrowser::resizeEvent( QResizeEvent *ev) {
void Gutenbrowser::doOptions() {
- optionsDialog* optDlg;
- optDlg = new optionsDialog( this,"Options_Dlg", true);
- QString Ddir;
- Config config("Gutenbrowser");
- config.setGroup( "General" );
- QFont myFont;
- optDlg->showMaximized();
-
- if( optDlg->exec() !=0) {
- qApp->processEvents();
- brow=optDlg->browserName;
- toggleButtonIcons( optDlg->useIcon);
- ftp_host= optDlg->ftp_host;
- ftp_base_dir= optDlg->ftp_base_dir;
- brow=optDlg->browserName;
- Ddir=optDlg->downloadDirEdit->text();
-
- qDebug("writing library config");
- Config config("Gutenbrowser");
- config.setGroup("General");
-
- QString dirname= optDlg->downloadDirEdit->text();
- if(dirname.right(1)!="/")
- dirname+="/";
- config.writeEntry( "DownloadDirectory",dirname);
- QDir newDir( optDlg->downloadDirEdit->text());
-
- if( !newDir.exists() ) {
- int exit=QMessageBox::information(this, "Note", "Ok, to make a new directory\n"+Ddir+" ?",
- QMessageBox::Ok, QMessageBox::Cancel);
- if (exit==1) {
- QString cmd="mkdir -p ";
- cmd+=Ddir.latin1();
- system(cmd);
- qDebug("Making new dir "+cmd);
- if(Ddir.right(1)!="/") {
- Ddir+="/";
- }
- config.writeEntry("DownloadDirectory",Ddir);
- }
- }
+ optionsDialog* optDlg;
+ optDlg = new optionsDialog( this,"Options_Dlg", true);
+ QString Ddir;
+ Config config("Gutenbrowser");
+ config.setGroup( "General" );
+ QFont myFont;
+ optDlg->showMaximized();
+
+ if( optDlg->exec() !=0) {
+ qApp->processEvents();
+ brow=optDlg->browserName;
+ toggleButtonIcons( optDlg->useIcon);
+ ftp_host= optDlg->ftp_host;
+ ftp_base_dir= optDlg->ftp_base_dir;
+ brow=optDlg->browserName;
+ Ddir=optDlg->downloadDirEdit->text();
+
+ odebug << "writing library config" << oendl;
+ Config config("Gutenbrowser");
+ config.setGroup("General");
+
+ QString dirname= optDlg->downloadDirEdit->text();
+ if(dirname.right(1)!="/")
+ dirname+="/";
+ config.writeEntry( "DownloadDirectory",dirname);
+ QDir newDir( optDlg->downloadDirEdit->text());
+
+ if( !newDir.exists() ) {
+ int exit=QMessageBox::information(this, "Note", "Ok, to make a new directory\n"+Ddir+" ?",
+ QMessageBox::Ok, QMessageBox::Cancel);
+ if (exit==1) {
+ QString cmd="mkdir -p ";
+ cmd+=Ddir.latin1();
+ system(cmd);
+ odebug << "Making new dir "+cmd << oendl;
+ if(Ddir.right(1)!="/") {
+ Ddir+="/";
+ }
+ config.writeEntry("DownloadDirectory",Ddir);
+ }
+ }
@@ -1505,37 +1510,37 @@ void Gutenbrowser::doOptions() {
// setStyle( optDlg->styleInt);
- if(optDlg->b_qExit==TRUE)
- b_queryExit=TRUE;
- else
- b_queryExit=FALSE;
-
- if(optDlg->fontDlg-> changedFonts) {
- qDebug("Setting font");
- myFont=optDlg->fontDlg->selectedFont;
- Lview->setFont( myFont);
- }
-
- if(optDlg->useWordWrap_CheckBox->isChecked() ) {
- qDebug("WORD WRAP is set");
- Lview->setWordWrap(QMultiLineEdit::WidgetWidth);
- useWrap=true;
- } else {
- qDebug("Word wrap is NOT set");
- Lview->setWordWrap(QMultiLineEdit::NoWrap);
- useWrap=false;
- }
- }
- if(showMainList) {
- if(!Lview->isHidden())
- Lview->hide();
- qApp->processEvents();
- if(mainList->isHidden())
- mainList->show();
- fillWithTitles();
- } else {
- Lview->show();
- showMainList=FALSE;
- mainList->hide();
- }
- qApp->processEvents();
- update();
+ if(optDlg->b_qExit==TRUE)
+ b_queryExit=TRUE;
+ else
+ b_queryExit=FALSE;
+
+ if(optDlg->fontDlg-> changedFonts) {
+ odebug << "Setting font" << oendl;
+ myFont=optDlg->fontDlg->selectedFont;
+ Lview->setFont( myFont);
+ }
+
+ if(optDlg->useWordWrap_CheckBox->isChecked() ) {
+ odebug << "WORD WRAP is set" << oendl;
+ Lview->setWordWrap(QMultiLineEdit::WidgetWidth);
+ useWrap=true;
+ } else {
+ odebug << "Word wrap is NOT set" << oendl;
+ Lview->setWordWrap(QMultiLineEdit::NoWrap);
+ useWrap=false;
+ }
+ }
+ if(showMainList) {
+ if(!Lview->isHidden())
+ Lview->hide();
+ qApp->processEvents();
+ if(mainList->isHidden())
+ mainList->show();
+ fillWithTitles();
+ } else {
+ Lview->show();
+ showMainList=FALSE;
+ mainList->hide();
+ }
+ qApp->processEvents();
+ update();
}
@@ -1543,35 +1548,35 @@ void Gutenbrowser::doOptions() {
bool Gutenbrowser::setTitle() {
- if( file_name.contains( local_library)) {
- QFileInfo f( file_name);
- QString s_file = f.fileName();
- file_name = s_file;
- }
-
- int test = 0;
- Config config("Gutenbrowser");
- config.setGroup( "Files" );
- QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
- int i_numofFiles = s_numofFiles.toInt();
-
- for (int i = 1; i <= i_numofFiles; i++) {
- QString temp;
- temp.setNum(i);
- QString ramble = config.readEntry(temp, "" );
-
- if( strcmp(ramble, file_name) == 0) {
- test = 1;
- }
- }
- if (test == 0) {
- config.writeEntry("NumberOfFiles",i_numofFiles +1 );
- QString interger;
- interger.setNum( i_numofFiles +1);
- config.writeEntry(interger, file_name);
-
- config.setGroup( "Titles" );
- config.writeEntry(file_name,listItemTitle);
- }
- test = 0;
- // config.write();
- return true;
+ if( file_name.contains( local_library)) {
+ QFileInfo f( file_name);
+ QString s_file = f.fileName();
+ file_name = s_file;
+ }
+
+ int test = 0;
+ Config config("Gutenbrowser");
+ config.setGroup( "Files" );
+ QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
+ int i_numofFiles = s_numofFiles.toInt();
+
+ for (int i = 1; i <= i_numofFiles; i++) {
+ QString temp;
+ temp.setNum(i);
+ QString ramble = config.readEntry(temp, "" );
+
+ if( strcmp(ramble, file_name) == 0) {
+ test = 1;
+ }
+ }
+ if (test == 0) {
+ config.writeEntry("NumberOfFiles",i_numofFiles +1 );
+ QString interger;
+ interger.setNum( i_numofFiles +1);
+ config.writeEntry(interger, file_name);
+
+ config.setGroup( "Titles" );
+ config.writeEntry(file_name,listItemTitle);
+ }
+ test = 0;
+ // config.write();
+ return true;
}
@@ -1580,13 +1585,13 @@ void Gutenbrowser::OnNetworkDialog( const QString &/*networkUrl*/, const QString
{
- // qDebug(networkUrl);
- // qDebug(output);
- // #ifndef Q_WS_QWS
- // NetworkDialog *NetworkDlg;
- // if( networkUrl.length() < 4 ) networkUrl= "http://sailor.gutenberg.org/mirror.sites.html";
- // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, output);
- // if( NetworkDlg->exec() != 0 ) {
- // }
- // if(NetworkDlg)
- // delete NetworkDlg;
- // #endif
+ // odebug << networkUrl << oendl;
+ // odebug << output << oendl;
+ // #ifndef Q_WS_QWS
+ // NetworkDialog *NetworkDlg;
+ // if( networkUrl.length() < 4 ) networkUrl= "http://sailor.gutenberg.org/mirror.sites.html";
+ // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, output);
+ // if( NetworkDlg->exec() != 0 ) {
+ // }
+ // if(NetworkDlg)
+ // delete NetworkDlg;
+ // #endif
}
@@ -1595,8 +1600,8 @@ void Gutenbrowser::donateGutenberg()
{
- int exit=QMessageBox::information(this, "Info", "http://www.gutenberg.org\ndonate@gutenberg.net",
- QMessageBox::Ok, QMessageBox::Cancel);
+ int exit=QMessageBox::information(this, "Info", "http://www.gutenberg.org\ndonate@gutenberg.net",
+ QMessageBox::Ok, QMessageBox::Cancel);
- if (exit==1) {
- } else {
- };
+ if (exit==1) {
+ } else {
+ };
}
@@ -1609,35 +1614,35 @@ void Gutenbrowser::writeConfig()
{
- // config.read();
- // Config config("Gutenbrowser");
- // #ifndef Q_WS_QWS
- // config.setGroup( "Geometry" );
- // QString s;
- // QString globalPosition;
- // QPoint point;
- // point=mapToGlobal(QPoint(0,0) );
- // int posiX, posiY;
- // posiX=point.x();
- // posiY=point.y();
- // globalPosition.sprintf("%i,%i", posiX, posiY);
-
- // QRect frameRect;
- // frameRect = geometry();
- // s.sprintf("%i,%i", frameRect.width(), frameRect.height());
- // config.writeEntry("Frame", s);
- // config.writeEntry("Position", globalPosition);
-
- // if( useIcons==TRUE)
- // config.writeEntry("Icons", "TRUE");
- // else
- // config.writeEntry("Icons", "FALSE");
- // #endif
-
- // #ifndef Q_WS_QWS
- // QString temp;
- // temp.setNum(styleI, 10);
- // config.setGroup( "StyleIze" );
- // config.writeEntry( "Style", temp);
- // #endif
-
- // config.setGroup("General");
+ // config.read();
+ // Config config("Gutenbrowser");
+ // #ifndef Q_WS_QWS
+ // config.setGroup( "Geometry" );
+ // QString s;
+ // QString globalPosition;
+ // QPoint point;
+ // point=mapToGlobal(QPoint(0,0) );
+ // int posiX, posiY;
+ // posiX=point.x();
+ // posiY=point.y();
+ // globalPosition.sprintf("%i,%i", posiX, posiY);
+
+ // QRect frameRect;
+ // frameRect = geometry();
+ // s.sprintf("%i,%i", frameRect.width(), frameRect.height());
+ // config.writeEntry("Frame", s);
+ // config.writeEntry("Position", globalPosition);
+
+ // if( useIcons==TRUE)
+ // config.writeEntry("Icons", "TRUE");
+ // else
+ // config.writeEntry("Icons", "FALSE");
+ // #endif
+
+ // #ifndef Q_WS_QWS
+ // QString temp;
+ // temp.setNum(styleI, 10);
+ // config.setGroup( "StyleIze" );
+ // config.writeEntry( "Style", temp);
+ // #endif
+
+ // config.setGroup("General");
}
@@ -1646,6 +1651,6 @@ void Gutenbrowser::annotations()
{
- // #ifndef Q_WS_QWS
- // QMessageBox::message("Note","hi annotate");
- // lastBmkButton->setDown(FALSE);
- // #endif
+ // #ifndef Q_WS_QWS
+ // QMessageBox::message("Note","hi annotate");
+ // lastBmkButton->setDown(FALSE);
+ // #endif
}
@@ -1656,44 +1661,44 @@ void Gutenbrowser::hideButtons()
if( !buttonsHidden) {
- buttonsHidden=TRUE;
- LibraryButton->hide();
- SearchButton->hide();
- InfoBar->hide();
- OpenButton->hide();
- BackButton->hide();
- ForwardButton->hide();
- setBookmarkButton->hide();
- lastBmkButton->hide();
- dictionaryButton->hide();
- if(useSplitter) {
- ClearButton->hide();
- PrintButton->hide();
- beginButton->hide();
- HelpButton->hide();
- FontButton->hide();
- ExitButton->hide();
- OptionsButton->hide();
- DownloadButton->hide();
- }
+ buttonsHidden=TRUE;
+ LibraryButton->hide();
+ SearchButton->hide();
+ InfoBar->hide();
+ OpenButton->hide();
+ BackButton->hide();
+ ForwardButton->hide();
+ setBookmarkButton->hide();
+ lastBmkButton->hide();
+ dictionaryButton->hide();
+ if(useSplitter) {
+ ClearButton->hide();
+ PrintButton->hide();
+ beginButton->hide();
+ HelpButton->hide();
+ FontButton->hide();
+ ExitButton->hide();
+ OptionsButton->hide();
+ DownloadButton->hide();
+ }
} else {
- buttonsHidden=FALSE;
-
- LibraryButton->show();
- SearchButton->show();
- InfoBar->show();
- OpenButton->show();
- BackButton->show();
- ForwardButton->show();
- setBookmarkButton->show();
- lastBmkButton->show();
- dictionaryButton->show();
- if(useSplitter) {
- ClearButton->show();
- PrintButton->show();
- beginButton->show();
- HelpButton->show();
- FontButton->show();
- ExitButton->show();
- OptionsButton->show();
- DownloadButton->show();
- }
+ buttonsHidden=FALSE;
+
+ LibraryButton->show();
+ SearchButton->show();
+ InfoBar->show();
+ OpenButton->show();
+ BackButton->show();
+ ForwardButton->show();
+ setBookmarkButton->show();
+ lastBmkButton->show();
+ dictionaryButton->show();
+ if(useSplitter) {
+ ClearButton->show();
+ PrintButton->show();
+ beginButton->show();
+ HelpButton->show();
+ FontButton->show();
+ ExitButton->show();
+ OptionsButton->show();
+ DownloadButton->show();
+ }
}
@@ -1710,8 +1715,8 @@ void Gutenbrowser::cleanUp( )
{
- writeConfig();
- QPEApplication::grabKeyboard();
+ writeConfig();
+ QPEApplication::grabKeyboard();
- QPEApplication::ungrabKeyboard();
- // qDebug("Cleanup");
- if(f.isOpen()) f.close();
+ QPEApplication::ungrabKeyboard();
+ // odebug << "Cleanup" << oendl;
+ if(f.isOpen()) f.close();
}
@@ -1720,3 +1725,3 @@ void Gutenbrowser::fixKeys()
{
- qDebug("Attempting to fix keys");
+ odebug << "Attempting to fix keys" << oendl;
@@ -1726,13 +1731,13 @@ void Gutenbrowser::enableButtons(bool b)
{
- BackButton->setEnabled(b);
- ForwardButton->setEnabled(b);
- SearchButton->setEnabled(b);
- setBookmarkButton->setEnabled(b);
- dictionaryButton->setEnabled(b);
- InfoBar->setEnabled(b);
-
- editMenu->setItemEnabled( -5, b);
- editMenu->setItemEnabled( -6, b);
- editMenu->setItemEnabled( -7, b);
- editMenu->setItemEnabled( -8, b);
+ BackButton->setEnabled(b);
+ ForwardButton->setEnabled(b);
+ SearchButton->setEnabled(b);
+ setBookmarkButton->setEnabled(b);
+ dictionaryButton->setEnabled(b);
+ InfoBar->setEnabled(b);
+
+ editMenu->setItemEnabled( -5, b);
+ editMenu->setItemEnabled( -6, b);
+ editMenu->setItemEnabled( -7, b);
+ editMenu->setItemEnabled( -8, b);
@@ -1741,17 +1746,17 @@ void Gutenbrowser::enableButtons(bool b)
void Gutenbrowser::fillWithTitles() {
- Config config("Gutenbrowser");
- config.setGroup( "Files" );
- int i_numofFiles = config.readNumEntry("NumberOfFiles", 0);
- mainList->clear();
- QString temp;
- for (int i = 1; i <= i_numofFiles; i++) {
- temp.setNum(i);
- config.setGroup( "Files" );
- QString ramble = config.readEntry(temp, "" );
- config.setGroup( "Titles" );
- temp = config.readEntry(ramble, "");
- if( !temp.isEmpty()) {
- mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), temp, -1);
- }
- }
+ Config config("Gutenbrowser");
+ config.setGroup( "Files" );
+ int i_numofFiles = config.readNumEntry("NumberOfFiles", 0);
+ mainList->clear();
+ QString temp;
+ for (int i = 1; i <= i_numofFiles; i++) {
+ temp.setNum(i);
+ config.setGroup( "Files" );
+ QString ramble = config.readEntry(temp, "" );
+ config.setGroup( "Titles" );
+ temp = config.readEntry(ramble, "");
+ if( !temp.isEmpty()) {
+ mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), temp, -1);
+ }
+ }
}
@@ -1759,38 +1764,38 @@ void Gutenbrowser::fillWithTitles() {
void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
- // if( !working) {
- // working=true;
- if(index) {
- // QCopEnvelope ( "QPE/System", "busy()" );
- title = index->text();
- showMainList=FALSE;
- mainList->hide();
- Lview->show();
- qApp->processEvents();
- QString temp;
- temp.setNum( mainList->currentItem() + 1);
- // openFileTitle = title;
- Config config("Gutenbrowser");
- config.setGroup( "Files" );
- QString file = config.readEntry(temp, "");
- qDebug("About to load");
- if( Lview->isVisible())
- load(file);
-
- config.setGroup( title);
- file_name = config.readEntry("File Name", "");
- i_pageNum = config.readNumEntry("Page Number", 1);
- int Bmrkrow = config.readNumEntry("LineNumber", -1);
- if(Bmrkrow > -1) {
- if( Bmrkrow > Lview->topRow() ) {
- Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE );
- Lview->ScrollUp( Bmrkrow - Lview->topRow() );
- // AdjustStatus();
- }
- else if( Bmrkrow < Lview->topRow() ) {
- Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
- Lview->ScrollDown( Lview->topRow() - Bmrkrow );
- // AdjustStatus();
- }
- }
- }
+ // if( !working) {
+ // working=true;
+ if(index) {
+ // QCopEnvelope ( "QPE/System", "busy()" );
+ title = index->text();
+ showMainList=FALSE;
+ mainList->hide();
+ Lview->show();
+ qApp->processEvents();
+ QString temp;
+ temp.setNum( mainList->currentItem() + 1);
+ // openFileTitle = title;
+ Config config("Gutenbrowser");
+ config.setGroup( "Files" );
+ QString file = config.readEntry(temp, "");
+ odebug << "About to load" << oendl;
+ if( Lview->isVisible())
+ load(file);
+
+ config.setGroup( title);
+ file_name = config.readEntry("File Name", "");
+ i_pageNum = config.readNumEntry("Page Number", 1);
+ int Bmrkrow = config.readNumEntry("LineNumber", -1);
+ if(Bmrkrow > -1) {
+ if( Bmrkrow > Lview->topRow() ) {
+ Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE );
+ Lview->ScrollUp( Bmrkrow - Lview->topRow() );
+ // AdjustStatus();
+ }
+ else if( Bmrkrow < Lview->topRow() ) {
+ Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
+ Lview->ScrollDown( Lview->topRow() - Bmrkrow );
+ // AdjustStatus();
+ }
+ }
+ }
}
@@ -1798,5 +1803,5 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
void Gutenbrowser::infoGutenbrowser() {
- QMessageBox::message("Info","Gutenbrowser was developed by\n"
- "Lorn Potter\n"
- "ljp<ljp@llornkcor.com>\n");
+ QMessageBox::message("Info","Gutenbrowser was developed by\n"
+ "Lorn Potter\n"
+ "ljp<ljp@llornkcor.com>\n");
}
@@ -1804,20 +1809,20 @@ void Gutenbrowser::infoGutenbrowser() {
void Gutenbrowser::setDocument(const QString & frozenBoogers) {
- this->hide();
- if(showMainList) {
- showMainList=FALSE;
- if(!mainList->isHidden())
- mainList->hide();
- if(Lview->isHidden())
- Lview->show();
- qApp->processEvents();
- }
- DocLnk lnk;
- lnk = DocLnk(frozenBoogers);
- // qDebug(lnk.file() );
- title=lnk.comment();
- load( lnk.file());
- this->show();
- // qDebug(title);
- // qApp->processEvents();
- // repaint();
+ this->hide();
+ if(showMainList) {
+ showMainList=FALSE;
+ if(!mainList->isHidden())
+ mainList->hide();
+ if(Lview->isHidden())
+ Lview->show();
+ qApp->processEvents();
+ }
+ DocLnk lnk;
+ lnk = DocLnk(frozenBoogers);
+ // odebug << lnk.file() << oendl;
+ title=lnk.comment();
+ load( lnk.file());
+ this->show();
+ // odebug << title << oendl;
+ // qApp->processEvents();
+ // repaint();
}
@@ -1826,17 +1831,17 @@ void Gutenbrowser::mainListPressed(int mouse, QListBoxItem * , const QPoint & )
{
- switch (mouse) {
- case 1:
- break;
- case 2: {
- QPopupMenu m;// = new QPopupMenu( Local_View );
- m.insertItem( tr( "Open" ), this, SLOT( menuOpen() ));
- m.insertSeparator();
- m.insertItem( tr( "Search google.com" ), this, SLOT( menuGoogle()));
- m.insertItem( tr( "Edit Title" ), this, SLOT( menuEditTitle()));
- // m.insertSeparator();
- // m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
- m.exec( QCursor::pos() );
- }
- break;
- };
+ switch (mouse) {
+ case 1:
+ break;
+ case 2: {
+ QPopupMenu m;// = new QPopupMenu( Local_View );
+ m.insertItem( tr( "Open" ), this, SLOT( menuOpen() ));
+ m.insertSeparator();
+ m.insertItem( tr( "Search google.com" ), this, SLOT( menuGoogle()));
+ m.insertItem( tr( "Edit Title" ), this, SLOT( menuEditTitle()));
+ // m.insertSeparator();
+ // m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
+ m.exec( QCursor::pos() );
+ }
+ break;
+ };
}
@@ -1844,3 +1849,3 @@ void Gutenbrowser::mainListPressed(int mouse, QListBoxItem * , const QPoint & )
void Gutenbrowser::menuOpen() {
- listClickedSlot( mainList->item( mainList->currentItem()));
+ listClickedSlot( mainList->item( mainList->currentItem()));
}
@@ -1848,3 +1853,3 @@ void Gutenbrowser::menuOpen() {
void Gutenbrowser::menuGoogle() {
- searchGoogle( mainList->text(mainList->currentItem()));
+ searchGoogle( mainList->text(mainList->currentItem()));
}
@@ -1852,18 +1857,18 @@ void Gutenbrowser::menuGoogle() {
void Gutenbrowser::searchGoogle( const QString &tempText) {
- QString text = tempText;
-
- int eexit=QMessageBox::information(this, "Note","Do you want to search for\n"+text+
- "\non google.com?",QMessageBox::Yes, QMessageBox::No);
- if (eexit== 3) {
- qApp->processEvents();
- text.replace( QRegExp("\\s"), "%20");
- text.replace( QRegExp("#"), "");
- text.replace( QRegExp(","), "%20");
- text.replace( QRegExp("'"), "%20");
- text.replace( QRegExp("("), "");
- text.replace( QRegExp(")"), "");
- // text.replace( QRegExp("[0-9]"), "");
- QString s_lookup = "http://google.com/search?q="+text+"&num=30&sa=Google+Search";
- goGetit( s_lookup, true);
- }
+ QString text = tempText;
+
+ int eexit=QMessageBox::information(this, "Note","Do you want to search for\n"+text+
+ "\non google.com?",QMessageBox::Yes, QMessageBox::No);
+ if (eexit== 3) {
+ qApp->processEvents();
+ text.replace( QRegExp("\\s"), "%20");
+ text.replace( QRegExp("#"), "");
+ text.replace( QRegExp(","), "%20");
+ text.replace( QRegExp("'"), "%20");
+ text.replace( QRegExp("("), "");
+ text.replace( QRegExp(")"), "");
+ // text.replace( QRegExp("[0-9]"), "");
+ QString s_lookup = "http://google.com/search?q="+text+"&num=30&sa=Google+Search";
+ goGetit( s_lookup, true);
+ }
@@ -1873,36 +1878,36 @@ void Gutenbrowser::menuEditTitle()
{
- int currentItem = mainList->currentItem();
- QString title_text = mainList->text( currentItem);
- //qDebug("Selected "+title_text);
-
- Config config("Gutenbrowser");
- config.setGroup( "Files" );
- QString s_numofFiles = config.readEntry("NumberOfFiles", "0");
- int i_numofFiles = s_numofFiles.toInt();
- QString fileNum;
- for (int i = 1; i <= i_numofFiles+1; i++) {
-
- fileNum.setNum(i);
- config.setGroup( "Files" );
- QString s_filename = config.readEntry(fileNum, "" );
- config.setGroup( "Titles" );
- QString file_title = config.readEntry( s_filename, "");
- //qDebug("file_title is "+file_title);
- if(title_text == file_title ) {
- // selFile = s_filename;
- //qDebug("Edit: "+ file_title );
- i=i_numofFiles+1;
- Edit_Title *titleEdit;
- titleEdit = new Edit_Title(this,file_title ,TRUE);
- if(titleEdit->exec() !=0) {
- //qDebug(titleEdit->newTitle);
- config.writeEntry( s_filename, titleEdit->newTitle);
- mainList->removeItem(currentItem);
- mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem);
- }
- }
- }
-
- // getTitles();
- mainList->triggerUpdate(true);
+ int currentItem = mainList->currentItem();
+ QString title_text = mainList->text( currentItem);
+ //odebug << "Selected "+title_text << oendl;
+
+ Config config("Gutenbrowser");
+ config.setGroup( "Files" );
+ QString s_numofFiles = config.readEntry("NumberOfFiles", "0");
+ int i_numofFiles = s_numofFiles.toInt();
+ QString fileNum;
+ for (int i = 1; i <= i_numofFiles+1; i++) {
+
+ fileNum.setNum(i);
+ config.setGroup( "Files" );
+ QString s_filename = config.readEntry(fileNum, "" );
+ config.setGroup( "Titles" );
+ QString file_title = config.readEntry( s_filename, "");
+ //odebug << "file_title is "+file_title << oendl;
+ if(title_text == file_title ) {
+ // selFile = s_filename;
+ //odebug << "Edit: "+ file_title << oendl;
+ i=i_numofFiles+1;
+ Edit_Title *titleEdit;
+ titleEdit = new Edit_Title(this,file_title ,TRUE);
+ if(titleEdit->exec() !=0) {
+ //odebug << titleEdit->newTitle << oendl;
+ config.writeEntry( s_filename, titleEdit->newTitle);
+ mainList->removeItem(currentItem);
+ mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem);
+ }
+ }
+ }
+
+ // getTitles();
+ mainList->triggerUpdate(true);
@@ -1913,70 +1918,70 @@ void Gutenbrowser::menuEditTitle()
bool Gutenbrowser::UnZipIt(const QString &zipFile) {
- qDebug(zipFile);
+ odebug << zipFile << oendl;
#ifndef Q_WS_QWS
- if( QFile::exists( zipFile)) { // TODO findsome other way of dealingwithzip files.
- bool isPgWhole=false;
- QString thatFile;
- if(zipFile.find("pgwhole",0,TRUE)) {
- isPgWhole=TRUE;
- thatFile= local_library +"PGWHOLE.TXT";
- }
- // else {
- // thatFile=zipFile.left(4);
- // }
- // qDebug((const char*)local_library.latin1());
- QString cmd;
+ if( QFile::exists( zipFile)) { // TODO findsome other way of dealingwithzip files.
+ bool isPgWhole=false;
+ QString thatFile;
+ if(zipFile.find("pgwhole",0,TRUE)) {
+ isPgWhole=TRUE;
+ thatFile= local_library +"PGWHOLE.TXT";
+ }
+ // else {
+ // thatFile=zipFile.left(4);
+ // }
+ // odebug << (const char*)local_library.latin1() << oendl;
+ QString cmd;
#if defined(_WS_X11_)
- if( chdir((const char*)local_library.latin1())!=0)
- qDebug("chdir failed.");
+ if( chdir((const char*)local_library.latin1())!=0)
+ odebug << "chdir failed." << oendl;
cmd = "gunzip -S .zip " + local_library+zipFile;
- //cmd = "gunzip -d " + zipFile /*newestLibraryFile */+" -d " + local_library;
+ //cmd = "gunzip -d " + zipFile /*newestLibraryFile */+" -d " + local_library;
#endif
#ifdef Q_WS_QWS
- if( chdir((const char*)local_library.latin1())!=0)
- qDebug("chdir failed.");
+ if( chdir((const char*)local_library.latin1())!=0)
+ odebug << "chdir failed." << oendl;
cmd = "unzip " + local_library+zipFile;
- // cmd = "/usr/bin/unzip -o " + local_library+zipFile +" -d /usr/share/doc/gutenbrowser" ;//+ local_library;
+ // cmd = "/usr/bin/unzip -o " + local_library+zipFile +" -d /usr/share/doc/gutenbrowser" ;//+ local_library;
#endif
- int exit=QMessageBox::information(this, "Ok to unzip?",
- "Ok to unnzip\n"+ zipFile+" ?",
- QMessageBox::Yes, QMessageBox::No);
- if (exit==QMessageBox::Yes) {
+ int exit=QMessageBox::information(this, "Ok to unzip?",
+ "Ok to unnzip\n"+ zipFile+" ?",
+ QMessageBox::Yes, QMessageBox::No);
+ if (exit==QMessageBox::Yes) {
#if defined(_WS_X11_)//
- qDebug("Issuing the command "+cmd);
- system( cmd);
- if( QFile::exists(thatFile))
- remove (thatFile);
- if(isPgWhole) {
- if( rename("pgwhole","PGWHOLE.TXT") !=0)
- qDebug("rename failed");
- } else {
- if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
- qDebug("rename failed");
- }
+ odebug << "Issuing the command "+cmd << oendl;
+ system( cmd);
+ if( QFile::exists(thatFile))
+ remove (thatFile);
+ if(isPgWhole) {
+ if( rename("pgwhole","PGWHOLE.TXT") !=0)
+ odebug << "rename failed" << oendl;
+ } else {
+ if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
+ odebug << "rename failed" << oendl;
+ }
#endif
#ifdef Q_WS_QWS
- qDebug("Issuing the command "+cmd);
- system( cmd);
- if( QFile::exists(thatFile))
- remove(thatFile);
- if(isPgWhole) {
- if( rename("pgwhole","PGWHOLE.TXT") !=0)
- qDebug("rename failed");
- } else {
- if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
- qDebug("rename failed");
- }
+ odebug << "Issuing the command "+cmd << oendl;
+ system( cmd);
+ if( QFile::exists(thatFile))
+ remove(thatFile);
+ if(isPgWhole) {
+ if( rename("pgwhole","PGWHOLE.TXT") !=0)
+ odebug << "rename failed" << oendl;
+ } else {
+ if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
+ odebug << "rename failed" << oendl;
+ }
#endif
- // remove( zipFile);
- return true;
- }
- else if(exit==QMessageBox::No) {
- // qDebug("unzip");
- return false;
- }
- }
- else
- QMessageBox::message( "Note",( tr("Please install unzip in your PATH")) );
+ // remove( zipFile);
+ return true;
+ }
+ else if(exit==QMessageBox::No) {
+ // odebug << "unzip" << oendl;
+ return false;
+ }
+ }
+ else
+ QMessageBox::message( "Note",( tr("Please install unzip in your PATH")) );
#endif
- return false;
+ return false;
}
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
index c9149ac..a226258 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
@@ -13,2 +13,3 @@
***************************************************************************/
+
//#include "gutenbrowserData.h"
@@ -16,2 +17,4 @@
+/* OPIE */
+#include <opie2/odebug.h>
#include <qpe/config.h>
@@ -22,2 +25,3 @@
+/* QT */
#include <qfontinfo.h>
@@ -37,3 +41,3 @@ void Gutenbrowser::initSlots() {
connect(mainList,SIGNAL(clicked(QListBoxItem *)),SLOT(listClickedSlot(QListBoxItem *)));
- connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int)));
+ connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int)));
}
@@ -41,3 +45,3 @@ void Gutenbrowser::initSlots() {
void Gutenbrowser::initConfig() {
-//qDebug("Starting configuration.");
+//odebug << "Starting configuration." << oendl;
QDir library(local_library);
@@ -59,3 +63,3 @@ void Gutenbrowser::initConfig() {
}
- // qDebug( "init file is %s",iniFile.latin1());
+ // odebug << "init file is " << iniFile << "" << oendl;
@@ -139,3 +143,3 @@ void Gutenbrowser::initConfig() {
- //bool ok2;
+ //bool ok2;
QString temp;
@@ -149,5 +153,5 @@ void Gutenbrowser::initConfig() {
b_queryExit=TRUE;
-// qDebug("Please query before leaving the library.");
+// odebug << "Please query before leaving the library." << oendl;
} else {
-// qDebug("Please DO NOT query before leaving the library.");
+// odebug << "Please DO NOT query before leaving the library." << oendl;
b_queryExit=FALSE;
@@ -157,3 +161,3 @@ void Gutenbrowser::initConfig() {
// QString tmpTitle=config.readEntry(file_name,"");
-
+
@@ -163,3 +167,3 @@ void Gutenbrowser::initMenuBar()
{
-// qDebug("Starting menu init.");
+// odebug << "Starting menu init." << oendl;
// menuBar entry fileMenu
@@ -178,5 +182,5 @@ void Gutenbrowser::initMenuBar()
editMenu=new QPopupMenu();
-
+
editMenu->insertItem(Resource::loadPixmap("up"), "Top",
- this, SLOT(TopBtn()) );
+ this, SLOT(TopBtn()) );
editMenu->insertItem( Resource::loadPixmap("back"), "Beginning",
@@ -185,3 +189,3 @@ void Gutenbrowser::initMenuBar()
this, SLOT(SearchBtn()) );
-
+
editMenu->insertItem("Clear", this, SLOT(ClearEdit()) );
@@ -209,3 +213,3 @@ void Gutenbrowser::initButtonBar()
{
-//qDebug("Starting buttonbar init.");
+//odebug << "Starting buttonbar init." << oendl;
@@ -224,3 +228,3 @@ void Gutenbrowser::initButtonBar()
// ForwardButton->setAutoRepeat(TRUE);
-
+
SearchButton = new QPushButton( this, "SearchButton" );
@@ -236,3 +240,3 @@ void Gutenbrowser::initButtonBar()
bookmarksMenu->insertItem("Last Set", this, SLOT(Bookmark( int) ));
-
+
lastBmkButton->setPopup(bookmarksMenu);
@@ -243,3 +247,3 @@ void Gutenbrowser::initButtonBar()
InfoBar = new QPushButton( this, "Info_Bar" );
-// qDebug("Infobar");
+// odebug << "Infobar" << oendl;
// if(!useSplitter) {
@@ -278,3 +282,3 @@ void Gutenbrowser::initView()
Lview = new MultiLine_Ex(this);
-
+
Config cfg("Gutenbrowser");
@@ -295,3 +299,3 @@ void Gutenbrowser::initView()
if(italic=="TRUE") {
- qDebug("Set Italic font");
+ odebug << "Set Italic font" << oendl;
defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround
diff --git a/noncore/apps/opie-gutenbrowser/helpme.cpp b/noncore/apps/opie-gutenbrowser/helpme.cpp
index 6a9b8c0..53e0236 100644
--- a/noncore/apps/opie-gutenbrowser/helpme.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpme.cpp
@@ -16,4 +16,2 @@
***************************************************************************/
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
@@ -22,2 +20,8 @@
+/* OPIE */
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+
+/* QT */
#include <qprogressdialog.h>
@@ -25,2 +29,3 @@
+/* STD */
#include <sys/stat.h>
@@ -113,3 +118,3 @@ void HelpMe::help()
msg=QPEApplication::qpeDir()+"help/html/gutenbrowser-index.html"; // or where ever this ends up to be
-qDebug(msg);
+odebug << msg << oendl;
QString url = "file://"+msg;
@@ -119,3 +124,3 @@ qDebug(msg);
// e << msg;
-
+
// goGetit( msg);
diff --git a/noncore/apps/opie-gutenbrowser/main.cpp b/noncore/apps/opie-gutenbrowser/main.cpp
index 5c3348c..71c836d 100644
--- a/noncore/apps/opie-gutenbrowser/main.cpp
+++ b/noncore/apps/opie-gutenbrowser/main.cpp
@@ -39,3 +39,3 @@ OPIE_EXPORT_APP( OApplicationFactory<Gutenbrowser> )
// // printf("Gutenbrowser: "VERSION"\n");
-// // // qDebug("Gutenbrowser: "VERSION);
+// // // odebug << "Gutenbrowser: "VERSION << oendl;
// // // return 0;
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index bd44ce6..0267416 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -20,2 +20,3 @@
#include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
#include <qpe/applnk.h>
@@ -25,3 +26,3 @@ using namespace Opie::Ui;
-#include <stdlib.h>
+/* QT */
#include <qtextstream.h>
@@ -29,2 +30,3 @@ using namespace Opie::Ui;
+/* STD */
#if defined(_WS_WIN_)
@@ -33,3 +35,4 @@ using namespace Opie::Ui;
#include <unistd.h>
-#include "sys/stat.h"
+#include <stdlib.h>
+#include <sys/stat.h>
#endif
@@ -136,3 +139,3 @@ OpenFileButton->setDown(TRUE);
- qDebug("Open file: "+str);
+ odebug << "Open file: "+str << oendl;
@@ -166,3 +169,3 @@ OpenFileButton->setDown(TRUE);
if( chdir((const char*)local_library.latin1())!=0)
- qDebug("chdir failed.");// QString cmd = "gunzip -d " + filer + " -d " + local_library;
+ odebug << "chdir failed." << oendl; // QString cmd = "gunzip -d " + filer + " -d " + local_library;
cmd = "gunzip -S .zip " + filer;
@@ -173,3 +176,3 @@ OpenFileButton->setDown(TRUE);
else /*if( s_fileName.right(4) == ".txt" || if( s_fileName.right(4) == ".TXT"))*/ {
-// qDebug("Filename is "+fileName);
+// odebug << "Filename is "+fileName << oendl;
s_fileName = fileName;
@@ -178,3 +181,3 @@ OpenFileButton->setDown(TRUE);
fileName = s_fileName;
-// qDebug("Filename is now "+fileName);
+// odebug << "Filename is now "+fileName << oendl;
}
@@ -189,7 +192,7 @@ OpenFileButton->setDown(TRUE);
- qDebug("Setting doclink");
+ odebug << "Setting doclink" << oendl;
DocLnk lnk;
- qDebug("name is " + name_file);
+ odebug << "name is " + name_file << oendl;
lnk.setName(name_file); //sets file name
- qDebug("Title is "+title);
+ odebug << "Title is "+title << oendl;
lnk.setComment(title);
@@ -198,3 +201,3 @@ OpenFileButton->setDown(TRUE);
getTitles();
- qDebug("Filename is "+fileName);
+ odebug << "Filename is "+fileName << oendl;
lnk.setFile(fileName); //sets File property
@@ -204,3 +207,3 @@ OpenFileButton->setDown(TRUE);
if(!lnk.writeLink())
- qDebug("Writing doclink did not work");
+ odebug << "Writing doclink did not work" << oendl;
@@ -221,3 +224,3 @@ bool OpenEtext::FindTitle( QString filename)
name = fi.fileName();
- qDebug("filename to open is " + name);
+ odebug << "filename to open is " + name << oendl;
QFile indexLib( filename);
@@ -227,3 +230,3 @@ bool OpenEtext::FindTitle( QString filename)
if ( indexLib.open( IO_ReadOnly) ) {
- qDebug("file opened successfully");
+ odebug << "file opened successfully" << oendl;
QTextStream indexStream( &indexLib );
@@ -241,3 +244,3 @@ bool OpenEtext::FindTitle( QString filename)
title = title.stripWhiteSpace ();
-// qDebug("Found the title 1 and it is %s", title.latin1());
+// odebug << "Found the title 1 and it is " << title << "" << oendl;
// QListBox_1->insertItem ( title);
@@ -249,3 +252,3 @@ bool OpenEtext::FindTitle( QString filename)
title = title.stripWhiteSpace ();
-// qDebug("Found the title 2 and it is %s", title.latin1());
+// odebug << "Found the title 2 and it is " << title << "" << oendl;
// QListBox_1->insertItem ( title);
@@ -257,3 +260,3 @@ bool OpenEtext::FindTitle( QString filename)
title = title.stripWhiteSpace ();
-// qDebug("Found the title 3 and it is %s", title.latin1());
+// odebug << "Found the title 3 and it is " << title << "" << oendl;
}
@@ -264,3 +267,3 @@ bool OpenEtext::FindTitle( QString filename)
title = title.stripWhiteSpace ();
-// qDebug("Found the title 4 and it is %s", title.latin1());
+// odebug << "Found the title 4 and it is " << title << "" << oendl;
}
@@ -270,3 +273,3 @@ bool OpenEtext::FindTitle( QString filename)
if( !findCheck || title.length() < 2) {
- qDebug("Trying hard to find title from GUTINDEX.ALL");
+ odebug << "Trying hard to find title from GUTINDEX.ALL" << oendl;
title = titleFromLibrary( filename);
@@ -295,3 +298,3 @@ bool OpenEtext::FindTitle( QString filename)
if(title.length()<3) {
-// qDebug("title is empty");
+// odebug << "title is empty" << oendl;
title="Unknown";
@@ -345,3 +348,3 @@ QString OpenEtext::titleFromLibrary( QString fileName)
title = title.stripWhiteSpace ();
-// qDebug("Finally Found the title and it is\n %s", title.latin1());
+// odebug << "Finally Found the title and it is\n " << title << "" << oendl;
// QListBox_1->insertItem ( title);
@@ -351,3 +354,3 @@ QString OpenEtext::titleFromLibrary( QString fileName)
else
- qDebug("Error opening library index "+ local_index);
+ odebug << "Error opening library index "+ local_index << oendl;
return title;
@@ -416,3 +419,3 @@ void OpenEtext::removeSelection()
rem=i;
-//qDebug("file title to remove is "+file_title);
+//odebug << "file title to remove is "+file_title << oendl;
selFile = s_filename;
@@ -484,3 +487,3 @@ void OpenEtext::editTitle() {
QString title_text = QListBox_1->text( currentItem);
-//qDebug("Selected "+title_text);
+//odebug << "Selected "+title_text << oendl;
@@ -498,6 +501,6 @@ void OpenEtext::editTitle() {
QString file_title = config.readEntry( s_filename, "");
-//qDebug("file_title is "+file_title);
+//odebug << "file_title is "+file_title << oendl;
if(title_text == file_title ) {
selFile = s_filename;
-//qDebug("Edit: "+ file_title );
+//odebug << "Edit: "+ file_title << oendl;
i=i_numofFiles+1;
@@ -506,3 +509,3 @@ void OpenEtext::editTitle() {
if(titleEdit->exec() !=0) {
-//qDebug(titleEdit->newTitle);
+//odebug << titleEdit->newTitle << oendl;
config.writeEntry( s_filename, titleEdit->newTitle);
diff --git a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
index bfd9c26..8cc83da 100644
--- a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
@@ -15,10 +15,6 @@
***************************************************************************/
-#include "optionsDialog.h"
-#include <qpe/config.h>
-#include "fontDialog.h"
-// #include <unistd.h>
-// #include <stdio.h>
-// #include <stdlib.h>
+#include "optionsDialog.h"
+#include "fontDialog.h"
//#include "ftpsitedlg.h"
@@ -26,2 +22,8 @@
//#define Inherited QDialog
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
#include <qfont.h>
@@ -40,2 +42,8 @@
#endif
+
+/* STD */
+// #include <unistd.h>
+// #include <stdio.h>
+// #include <stdlib.h>
+
/*
@@ -62,3 +70,3 @@ optionsDialog::~optionsDialog()
{
-//qDebug("OnExit()");
+//odebug << "OnExit()" << oendl;
// writeConfig();
@@ -127,3 +135,3 @@ void optionsDialog::getConfig()
cb_queryExit->setChecked(TRUE);
- qDebug("Config Setting b_qExit=TRUE;");
+ odebug << "Config Setting b_qExit=TRUE;" << oendl;
b_qExit=TRUE;
@@ -131,3 +139,3 @@ void optionsDialog::getConfig()
cb_queryExit->setChecked(FALSE);
- qDebug("ConfigSetting b_qExit=FALSE;");
+ odebug << "ConfigSetting b_qExit=FALSE;" << oendl;
b_qExit=FALSE;
@@ -135,3 +143,3 @@ void optionsDialog::getConfig()
-
+
useWordWrap_CheckBox->setChecked( config.readBoolEntry("WordWrap", 1));
@@ -143,3 +151,3 @@ void optionsDialog::getConfig()
-// // qDebug("Set style%d",index);
+// // odebug << "Set style" << index << "" << oendl;
// // //int styleInt= index;
@@ -169,3 +177,3 @@ void optionsDialog::slotQueryExit()
config.setGroup("General");
- qDebug("writing queryExit");
+ odebug << "writing queryExit" << oendl;
if(cb_queryExit->isChecked()) {
@@ -173,3 +181,3 @@ void optionsDialog::slotQueryExit()
config.writeEntry("queryExit","TRUE");
- qDebug("WritingConfig queryExit=TRUE");
+ odebug << "WritingConfig queryExit=TRUE" << oendl;
} else {
@@ -177,3 +185,3 @@ void optionsDialog::slotQueryExit()
config.writeEntry("queryExit","FALSE");
- qDebug("WritingConfig queryExit=FALSE");
+ odebug << "WritingConfig queryExit=FALSE" << oendl;
}
@@ -189,6 +197,6 @@ void optionsDialog::slotQueryExit()
// void optionsDialog::lineEditChanged(const QString &editText) {
-// qDebug(editText);
+// odebug << editText << oendl;
// }
-void optionsDialog::changeFonts()
+void optionsDialog::changeFonts()
{
@@ -205,3 +213,3 @@ void optionsDialog::slotWordWrap(bool b) {
config.write();
-
+
}
diff --git a/noncore/apps/opie-reader/Aportis.cpp b/noncore/apps/opie-reader/Aportis.cpp
index 2f8cdc3..06f44a4 100644
--- a/noncore/apps/opie-reader/Aportis.cpp
+++ b/noncore/apps/opie-reader/Aportis.cpp
@@ -30,3 +30,3 @@ CList<Bkmk>* Aportis::getbkmklist()
name[16] = '\0';
-// qDebug("Record:%d, Length:%u",i,recordlength(i));
+// odebug << "Record:" << i << ", Length:" << recordlength(i) << "" << oendl;
gotorecordnumber(i);
@@ -37,3 +37,3 @@ CList<Bkmk>* Aportis::getbkmklist()
lcn = SwapLong(lcn);
-// qDebug("Bookmark:%s:%u", name,lcn);
+// odebug << "Bookmark:" << name << ":" << lcn << "" << oendl;
tchar tname[17];
@@ -123,3 +123,3 @@ int Aportis::OpenFile(const char *src)
fread(&hdr0, sizeof(hdr0), 1, fin);
-// qDebug("Version:%x", ntohs(hdr0.Version));
+// odebug << "Version:" << ntohs(hdr0.Version) << "" << oendl;
if (hdr0.Version && 0x0200)
@@ -184,3 +184,3 @@ int Aportis::OpenFile(const char *src)
refreshbuffer();
-// qDebug("Number of records:[%u,%u]", nRecs, nRecs2);
+// odebug << "Number of records:[" << nRecs << "," << nRecs2 << "]" << oendl;
return ret;
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 16bc1f1..480c240 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -219,3 +219,3 @@ CList<Bkmk>* BkmkFile::readall()
bl = readall00(read06);
-// qDebug("Correct version!");
+// odebug << "Correct version!" << oendl;
break;
@@ -224,6 +224,6 @@ CList<Bkmk>* BkmkFile::readall()
bl = readall00(read05);
-// qDebug("Known version!");
+// odebug << "Known version!" << oendl;
break;
default:
-// qDebug("Unknown version!");
+// odebug << "Unknown version!" << oendl;
isUpgraded = true;
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index 4fbab93..68391b8 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -34,3 +34,3 @@ void BuffDoc::locate(unsigned int n)
{
- // //qDebug("BuffDoc:locating:%u",n);
+ // //odebug << "BuffDoc:locating:" << n << "" << oendl;
lastword.empty();
@@ -44,3 +44,3 @@ void BuffDoc::locate(unsigned int n)
if (exp != NULL) exp->locate(n);
- // //qDebug("BuffDoc:Located");
+ // //odebug << "BuffDoc:Located" << oendl;
}
@@ -190,3 +190,3 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border)
else buff->empty();
-// //qDebug("Buff:%s Lastword:%s", (const char*)toQString(buff->data()), (const char*)toQString(lastword.data()));
+// //odebug << "Buff:" << toQString(buff->data()) << " Lastword:" << toQString(lastword.data()) << "" << oendl;
lastcheck = len = buff->length();
@@ -324,4 +324,4 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
{
- // //qDebug("BuffDoc:Openfile:%s", src);
- // //qDebug("Trying aportis %x",exp);
+ // //odebug << "BuffDoc:Openfile:" << src << "" << oendl;
+ // //odebug << "Trying aportis " << exp << "" << oendl;
if (exp != NULL) delete exp;
@@ -380,3 +380,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
delete exp;
- //qDebug("Trying ppms");
+ //odebug << "Trying ppms" << oendl;
exp = new ppm_expander;
@@ -388,3 +388,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
exp = new Text;
-// //qDebug("Trying text");
+// //odebug << "Trying text" << oendl;
ret = exp->openfile(src);
@@ -398,3 +398,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
}
- // //qDebug("Doing final open:%x:%x",exp,filt);
+ // //odebug << "Doing final open:" << exp << ":" << filt << "" << oendl;
@@ -409,3 +409,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
filt->setsource(exp);
- // //qDebug("BuffDoc:file opened");
+ // //odebug << "BuffDoc:file opened" << oendl;
return 0;
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index ec36fb2..b137ac3 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -42,3 +42,3 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
int i;
-// //qDebug("Trying 2");
+// //odebug << "Trying 2" << oendl;
len = rhs.len;
@@ -60,3 +60,3 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
len = i;
-// //qDebug("Tried 2");
+// //odebug << "Tried 2" << oendl;
return *this;
@@ -210,3 +210,3 @@ int CDrawBuffer::width(int numchars, bool onscreen, int scwidth, unsigned char _
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
@@ -319,3 +319,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
// f.setUnderline(currentstyle.isUnderline());
-// if (currentstyle.isUnderline()) qDebug("UNDERLINE");
+// if (currentstyle.isUnderline()) odebug << "UNDERLINE" << oendl;
_p->setFont(f);
@@ -410,3 +410,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
@@ -420,3 +420,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
@@ -472,5 +472,5 @@ linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
/*
- if (currentstyle.isPicture()) qDebug("Passed thru picture");
- if (currentstyle.getLink()) qDebug("Passed thru link");
- //qDebug("islink:%d - %d", numchars, end);
+ if (currentstyle.isPicture()) odebug << "Passed thru picture" << oendl;
+ if (currentstyle.getLink()) odebug << "Passed thru link" << oendl;
+ //odebug << "islink:" << numchars << " - " << end << "" << oendl;
*/
@@ -479,3 +479,3 @@ linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
while (textend != segs.end() && end <= numchars);
-// if (currentstyle.isPicture()) qDebug("Clicked on picture");
+// if (currentstyle.isPicture()) odebug << "Clicked on picture" << oendl;
if (currentstyle.getPictureLink())
@@ -541,3 +541,3 @@ void CDrawBuffer::resize()
int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10;
-// qDebug("ExtraSpace:%d", xt);
+// odebug << "ExtraSpace:" << xt << "" << oendl;
m_ascent += xt;
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index d64abb4..b356ba5 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -82,3 +82,3 @@ QTReader::QTReader( const QString& filename, QWidget *parent=0, const tchar *nam
init();
-// // qDebug("Load_file(1)");
+// // odebug << "Load_file(1)" << oendl;
load_file((const tchar*)filename);
@@ -93,3 +93,3 @@ void QTReader::mouseMoveEvent(QMouseEvent* _e)
- qDebug("MouseMove:[%d, %d]", _e->pos().x(), _e->pos().y());
+ odebug << "MouseMove:[" << _e->pos().x() << ", " << _e->pos().y() << "]" << oendl;
}
@@ -106,3 +106,3 @@ void QTReader::mousePressEvent( QMouseEvent* _e )
{
-// qDebug("MousePress");
+// odebug << "MousePress" << oendl;
mouseUpOn = false;
@@ -319,3 +319,3 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
wrd = toQString(t->data()+first, i - first);
-// qDebug("Got %s", (const char *)wrd);
+// odebug << "Got " << (const char *)wrd << "" << oendl;
break;
@@ -329,3 +329,3 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
{
-// qDebug("Selected:%s", (const char*)wrd);
+// odebug << "Selected:" << wrd << "" << oendl;
emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data()));
@@ -341,3 +341,3 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
{
-// qDebug("MouseRelease");
+// odebug << "MouseRelease" << oendl;
if (_e->x() > width() - m_border)
@@ -396,3 +396,3 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
{
-// qDebug("Picture:%x", tgt);
+// odebug << "Picture:" << tgt << "" << oendl;
QImage* pm = buffdoc.getPicture(tgt);
@@ -412,3 +412,3 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
default:
-// qDebug("Unknown linktype");
+// odebug << "Unknown linktype" << oendl;
return;
@@ -698,3 +698,3 @@ void QTReader::setautoscroll(bool _sc)
{
-// qDebug("Opening pipe to %s", (const char*)m_pipetarget);
+// odebug << "Opening pipe to " << m_pipetarget << "" << oendl;
m_pipeout = popen((const char*)m_pipetarget, "w");
@@ -825,3 +825,3 @@ void QTReader::drawFonts( QPainter *p )
{
-// qDebug("How refreshing...");
+// odebug << "How refreshing..." << oendl;
if (buffdoc.empty()) return;
@@ -830,3 +830,3 @@ void QTReader::drawFonts( QPainter *p )
{
-// qDebug("Not Optimised %d", m_lastwidth);
+// odebug << "Not Optimised " << m_lastwidth << "" << oendl;
m_lastwidth = width();
@@ -835,3 +835,3 @@ void QTReader::drawFonts( QPainter *p )
locate(pagelocate());
-// qDebug("Not Optimised %d", m_lastwidth);
+// odebug << "Not Optimised " << m_lastwidth << "" << oendl;
}
@@ -842,3 +842,3 @@ void QTReader::drawFonts( QPainter *p )
{
-// qDebug("Optimised < %d %d %d", numlines, m_lastheight, newht);
+// odebug << "Optimised < " << numlines << " " << m_lastheight << " " << newht << "" << oendl;
int ypos = 0;
@@ -853,3 +853,3 @@ void QTReader::drawFonts( QPainter *p )
}
-// qDebug("Optimised < %d", numlines);
+// odebug << "Optimised < " << numlines << "" << oendl;
m_lastheight = newht;
@@ -858,3 +858,3 @@ void QTReader::drawFonts( QPainter *p )
{
-// qDebug("Optimised > %d", numlines);
+// odebug << "Optimised > " << numlines << "" << oendl;
int ypos = 0;
@@ -865,3 +865,3 @@ void QTReader::drawFonts( QPainter *p )
fillbuffer(numlines+1, ypos, newht);
-// qDebug("Optimised > %d", numlines);
+// odebug << "Optimised > " << numlines << "" << oendl;
}
@@ -899,3 +899,3 @@ void QTReader::drawFonts( QPainter *p )
{
- qDebug("Not so refreshing...");
+ odebug << "Not so refreshing..." << oendl;
}
@@ -1030,3 +1030,3 @@ void QTReader::resizeEvent( QResizeEvent * )
{
-// // qDebug("resize:(%u,%u)", width(), height());
+// // odebug << "resize:(" << width() << "," << height() << ")" << oendl;
// bgroup->move( width()-bgroup->width(), 0 );
@@ -1055,7 +1055,7 @@ bool QTReader::locate(unsigned long n) {
buffdoc.locate(n);
-// // qDebug("&buffdoc.located");
+// // odebug << "&buffdoc.located" << oendl;
fillbuffer();
-// // qDebug("&Buffer filled");
+// // odebug << "&Buffer filled" << oendl;
update();
-// // qDebug("&Located");
+// // odebug << "&Located" << oendl;
return true;
@@ -1119,3 +1119,3 @@ void QTReader::dopagedn()
{
-// qDebug("HEIGHT(2):%d", m_lastheight);
+// odebug << "HEIGHT(2):" << m_lastheight << "" << oendl;
buffdoc.unsuspend();
@@ -1124,3 +1124,3 @@ void QTReader::dopagedn()
{
-//// qDebug("Jumping to %u", mylastpos);
+//// odebug << "Jumping to " << mylastpos << "" << oendl;
jumpto(mylastpos);
@@ -1315,5 +1315,5 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
buffdoc.setContinuous(m_continuousDocument);
-// // qDebug("buffdoc.openfile done");
+// // odebug << "buffdoc.openfile done" << oendl;
locate(lcn);
-// // qDebug("buffdoc.locate done");
+// // odebug << "buffdoc.locate done" << oendl;
}
@@ -1321,3 +1321,3 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
update();
-// // qDebug("Updated");
+// // odebug << "Updated" << oendl;
return bRC;
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");
}
diff --git a/noncore/apps/opie-reader/StyleConsts.cpp b/noncore/apps/opie-reader/StyleConsts.cpp
index 9fb56b7..f47acee 100644
--- a/noncore/apps/opie-reader/StyleConsts.cpp
+++ b/noncore/apps/opie-reader/StyleConsts.cpp
@@ -8,3 +8,3 @@ pmstore::~pmstore()
{
-//// qDebug("Deleting image");
+//// odebug << "Deleting image" << oendl;
delete graphic;
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index e1cde6c..72a1222 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -134,3 +134,3 @@ void fileBrowser::populateList()
ListView->clear();
-////qDebug(currentDir.canonicalPath());
+////odebug << currentDir.canonicalPath() << oendl;
// currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks );
@@ -158,3 +158,3 @@ void fileBrowser::populateList()
{
-//// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+//// odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl;
}
@@ -171,3 +171,3 @@ void fileBrowser::upDir()
{
-//// qDebug(currentDir.canonicalPath());
+//// odebug << currentDir.canonicalPath() << oendl;
}
@@ -179,3 +179,3 @@ void fileBrowser::listClicked(QListViewItem *selectedItem)
-//// qDebug("%s", (const char*)strItem);
+//// odebug << "" << strItem << "" << oendl;
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index e42204a..dbf6964 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -1,3 +1,3 @@
-CONFIG = qt warn_on
-HEADERS = Aportis.h \
+CONFIG = qt warn_on
+HEADERS = Aportis.h \
Bkmks.h \
@@ -51,3 +51,3 @@ HEADERS = Aportis.h \
-SOURCES = Aportis.cpp \
+SOURCES = Aportis.cpp \
Bkmks.cpp \
@@ -85,5 +85,5 @@ TARGET = reader
-INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
+LIBS += -lqpe -lopiecore2
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp
index e52fd6a..a8e688f 100644
--- a/noncore/apps/opie-reader/plucker.cpp
+++ b/noncore/apps/opie-reader/plucker.cpp
@@ -59,3 +59,3 @@ int CPlucker::bgetch()
if (bufferrec >= ntohs(head.recordList.numRecords) - 1) return EOF;
-//// qDebug("Passing through %u", currentpos);
+//// odebug << "Passing through " << currentpos << "" << oendl;
if (!expand(bufferrec+1)) return EOF;
@@ -66,3 +66,3 @@ int CPlucker::bgetch()
{
-// qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
m_nextParaIndex++;
@@ -71,3 +71,3 @@ int CPlucker::bgetch()
mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-// qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
ch = 10;
@@ -81,3 +81,3 @@ int CPlucker::bgetch()
m_nextParaIndex++;
-// qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
if (m_nextParaIndex == m_nParas)
@@ -93,3 +93,3 @@ int CPlucker::bgetch()
mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-// qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
if (m_lastBreak == locate())
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index caa945d..b523a54 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,13 +1,15 @@
+
+
#include "useqpe.h"
-#include <stdio.h>
-#include <string.h>
+#include "plucker_base.h"
+#include "Aportis.h"
+#include "Palm2QImage.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
#ifdef USEQPE
#include <qpe/qcopenvelope_qws.h>
-#endif /* USEQPE */
-#ifdef LOCALPICTURES
-#include <qscrollview.h>
-#endif
-#ifdef USEQPE
#include <qpe/global.h>
#endif /* USEQPE */
+
#ifndef USEQPE
@@ -18,5 +20,11 @@
-#include "plucker_base.h"
-#include "Aportis.h"
-#include "Palm2QImage.h"
+/* QT */
+#ifdef LOCALPICTURES
+#include <qscrollview.h>
+#endif
+
+/* STD */
+#include <stdio.h>
+#include <string.h>
+
@@ -37,3 +45,3 @@ void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buff
{
- fread(buffer, reclen, sizeof(char), fin);
+ fread(buffer, reclen, sizeof(char), fin);
}
@@ -41,28 +49,28 @@ void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buff
{
- UInt8* readbuffer = NULL;
- if (reclen > compressedbuffersize)
- {
- readbuffer = new UInt8[reclen];
- }
- else
- {
- readbuffer = compressedtextbuffer;
- }
- if (readbuffer != NULL)
- {
- fread(readbuffer, reclen, sizeof(char), fin);
- switch (ntohs(hdr0.version))
- {
- case 2:
- UnZip(readbuffer, reclen, buffer, buffersize);
- break;
- case 1:
- UnDoc(readbuffer, reclen, buffer, buffersize);
- break;
- }
- if (reclen > compressedbuffersize)
- {
- delete [] readbuffer;
- }
- }
+ UInt8* readbuffer = NULL;
+ if (reclen > compressedbuffersize)
+ {
+ readbuffer = new UInt8[reclen];
+ }
+ else
+ {
+ readbuffer = compressedtextbuffer;
+ }
+ if (readbuffer != NULL)
+ {
+ fread(readbuffer, reclen, sizeof(char), fin);
+ switch (ntohs(hdr0.version))
+ {
+ case 2:
+ UnZip(readbuffer, reclen, buffer, buffersize);
+ break;
+ case 1:
+ UnDoc(readbuffer, reclen, buffer, buffersize);
+ break;
+ }
+ if (reclen > compressedbuffersize)
+ {
+ delete [] readbuffer;
+ }
+ }
}
@@ -75,11 +83,11 @@ void CPlucker_base::sizes(unsigned long& _file, unsigned long& _text)
{
- for (int recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
- {
- gotorecordnumber(recptr);
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size;
- UInt8 thishdr_type, thishdr_reserved;
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (thishdr_type < 2) textlength += thishdr_size;
- }
+ for (int recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
+ {
+ gotorecordnumber(recptr);
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size;
+ UInt8 thishdr_type, thishdr_reserved;
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (thishdr_type < 2) textlength += thishdr_size;
+ }
}
@@ -95,3 +103,3 @@ char* CPlucker_base::geturl(UInt16 tgt)
unsigned int nrecs = ntohs(hdr0.nRecords);
- //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+ //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
UInt16 urlid = 0;
@@ -102,13 +110,13 @@ char* CPlucker_base::geturl(UInt16 tgt)
{
- UInt16 id, name;
- fread(&name, 1, sizeof(name), fin);
- fread(&id, 1, sizeof(id), fin);
- //qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
- if (ntohs(name) == 2)
- {
- urlsfound = true;
- urlid = id;
- //qDebug("Found url index:%d", ntohs(urlid));
- }
-// //qDebug("%x", id);
+ UInt16 id, name;
+ fread(&name, 1, sizeof(name), fin);
+ fread(&id, 1, sizeof(id), fin);
+ //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
+ if (ntohs(name) == 2)
+ {
+ urlsfound = true;
+ urlid = id;
+ //odebug << "Found url index:" << ntohs(urlid) << "" << oendl;
+ }
+// //odebug << "" << id << "" << oendl;
}
@@ -116,53 +124,53 @@ char* CPlucker_base::geturl(UInt16 tgt)
{
- unsigned short recptr = finduid(ntohs(urlid));
- if (recptr != 0)
- {
- gotorecordnumber(recptr);
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size;
- UInt8 thishdr_type, thishdr_reserved;
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- UInt16 urlctr = 0;
- while (1)
- {
- UInt16 tctr;
- fread(&tctr, 1, sizeof(tctr), fin);
- fread(&urlid, 1, sizeof(urlid), fin);
- tctr = ntohs(tctr);
- //qDebug("tgt:%u urlctr:%u tctr:%u", tgt, urlctr, tctr);
- if (tctr >= tgt)
- {
- break;
- }
- urlctr = tctr;
- }
- //qDebug("urls are in %d", ntohs(urlid));
- recptr = finduid(ntohs(urlid));
- if (recptr != 0)
- {
- UInt32 reclen = recordlength(recptr) - HeaderSize();
- gotorecordnumber(recptr);
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- //qDebug("Found urls:%x",thishdr_type);
- urlsize = thishdr_size;
- urls = new char[urlsize];
- Expand(reclen, thishdr_type, (UInt8*)urls, urlsize);
- char* ptr = urls;
- int rn = urlctr+1;
- while (ptr - urls < urlsize)
- {
- if (rn == tgt)
- {
- //qDebug("URL:%s", ptr);
- int len = strlen(ptr)+1;
- pRet = new char[len];
- memcpy(pRet, ptr, len);
- break;
- }
- ptr += strlen(ptr)+1;
- rn++;
- }
- delete [] urls;
- }
- }
+ unsigned short recptr = finduid(ntohs(urlid));
+ if (recptr != 0)
+ {
+ gotorecordnumber(recptr);
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size;
+ UInt8 thishdr_type, thishdr_reserved;
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ UInt16 urlctr = 0;
+ while (1)
+ {
+ UInt16 tctr;
+ fread(&tctr, 1, sizeof(tctr), fin);
+ fread(&urlid, 1, sizeof(urlid), fin);
+ tctr = ntohs(tctr);
+ //odebug << "tgt:" << tgt << " urlctr:" << urlctr << " tctr:" << tctr << "" << oendl;
+ if (tctr >= tgt)
+ {
+ break;
+ }
+ urlctr = tctr;
+ }
+ //odebug << "urls are in " << ntohs(urlid) << "" << oendl;
+ recptr = finduid(ntohs(urlid));
+ if (recptr != 0)
+ {
+ UInt32 reclen = recordlength(recptr) - HeaderSize();
+ gotorecordnumber(recptr);
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ //odebug << "Found urls:" << thishdr_type << "" << oendl;
+ urlsize = thishdr_size;
+ urls = new char[urlsize];
+ Expand(reclen, thishdr_type, (UInt8*)urls, urlsize);
+ char* ptr = urls;
+ int rn = urlctr+1;
+ while (ptr - urls < urlsize)
+ {
+ if (rn == tgt)
+ {
+ //odebug << "URL:" << ptr << "" << oendl;
+ int len = strlen(ptr)+1;
+ pRet = new char[len];
+ memcpy(pRet, ptr, len);
+ break;
+ }
+ ptr += strlen(ptr)+1;
+ rn++;
+ }
+ delete [] urls;
+ }
+ }
}
@@ -170,6 +178,6 @@ char* CPlucker_base::geturl(UInt16 tgt)
{
- QMessageBox::information(NULL,
- QString(PROGNAME),
- QString("No external links\nin this pluck")
- );
+ QMessageBox::information(NULL,
+ QString(PROGNAME),
+ QString("No external links\nin this pluck")
+ );
}
@@ -208,5 +216,5 @@ unsigned int CPlucker_base::locate()
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (thishdr_type < 2) locpos += thishdr_size;
- thisrec++;
- gotorecordnumber(thisrec);
+ if (thishdr_type < 2) locpos += thishdr_size;
+ thisrec++;
+ gotorecordnumber(thisrec);
}
@@ -224,20 +232,20 @@ void CPlucker_base::locate(unsigned int n)
{
- textlength = 0;
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size = buffercontent;
- UInt8 thishdr_type, thishdr_reserved;
- for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
- {
- gotorecordnumber(recptr);
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (thishdr_type < 2)
- {
- textlength += thishdr_size;
- if (textlength > n)
- {
- textlength -= thishdr_size;
- break;
- }
- }
- }
+ textlength = 0;
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size = buffercontent;
+ UInt8 thishdr_type, thishdr_reserved;
+ for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
+ {
+ gotorecordnumber(recptr);
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (thishdr_type < 2)
+ {
+ textlength += thishdr_size;
+ if (textlength > n)
+ {
+ textlength -= thishdr_size;
+ break;
+ }
+ }
+ }
}
@@ -245,16 +253,16 @@ void CPlucker_base::locate(unsigned int n)
{
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size;
- UInt8 thishdr_type, thishdr_reserved;
- while (n < textlength && recptr > 1)
- {
- recptr--;
- gotorecordnumber(recptr);
- //qDebug("recptr:%u", recptr);
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (thishdr_type < 2)
- {
- textlength -= thishdr_size;
- }
- }
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size;
+ UInt8 thishdr_type, thishdr_reserved;
+ while (n < textlength && recptr > 1)
+ {
+ recptr--;
+ gotorecordnumber(recptr);
+ //odebug << "recptr:" << recptr << "" << oendl;
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (thishdr_type < 2)
+ {
+ textlength -= thishdr_size;
+ }
+ }
}
@@ -262,18 +270,18 @@ void CPlucker_base::locate(unsigned int n)
{
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size = buffercontent;
- UInt8 thishdr_type, thishdr_reserved;
- while (n > textlength + thishdr_size && recptr < ntohs(head.recordList.numRecords)-1)
- {
- textlength += thishdr_size;
- recptr++;
- gotorecordnumber(recptr);
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (!(thishdr_type < 2))
- {
- thishdr_size = 0;
- }
- }
- }
-// qDebug("Time(1): %u", clock()-start);
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size = buffercontent;
+ UInt8 thishdr_type, thishdr_reserved;
+ while (n > textlength + thishdr_size && recptr < ntohs(head.recordList.numRecords)-1)
+ {
+ textlength += thishdr_size;
+ recptr++;
+ gotorecordnumber(recptr);
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (!(thishdr_type < 2))
+ {
+ thishdr_size = 0;
+ }
+ }
+ }
+// odebug << "Time(1): " << clock()-start << "" << oendl;
/*
@@ -285,12 +293,12 @@ void CPlucker_base::locate(unsigned int n)
{
- UInt16 attr = m_ParaAttrs[m_nextParaIndex];
- m_nextParaIndex++;
- if (m_nextParaIndex == m_nParas)
- {
- m_nextPara = -1;
- }
- else
- {
- m_nextPara += m_ParaOffsets[m_nextParaIndex];
- }
+ UInt16 attr = m_ParaAttrs[m_nextParaIndex];
+ m_nextParaIndex++;
+ if (m_nextParaIndex == m_nParas)
+ {
+ m_nextPara = -1;
+ }
+ else
+ {
+ m_nextPara += m_ParaOffsets[m_nextParaIndex];
+ }
}
@@ -309,30 +317,30 @@ void CPlucker_base::locate(unsigned int n)
{
- thisrec++;
- locpos += bs;
- gotorecordnumber(thisrec);
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (thishdr_type < 2)
- {
- bs = thishdr_size;
- }
- else
- {
- bs = 0;
- }
+ thisrec++;
+ locpos += bs;
+ gotorecordnumber(thisrec);
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (thishdr_type < 2)
+ {
+ bs = thishdr_size;
+ }
+ else
+ {
+ bs = 0;
+ }
} while (locpos + bs <= n);
-// qDebug("Time(2): %u", clock()-start);
+// odebug << "Time(2): " << clock()-start << "" << oendl;
if (recptr != thisrec)
{
- qDebug("Disaster:recptr:%u thisrec:%u", recptr, thisrec);
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size = buffercontent;
- UInt8 thishdr_type, thishdr_reserved;
- for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
- {
- gotorecordnumber(recptr);
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
-// qDebug("UID:%u Paras:%u Size:%u Type:%u Reserved:%u", thishdr_uid, thishdr_nParagraphs, thishdr_size, (unsigned int)thishdr_type, (unsigned int)thishdr_reserved);
- }
-// QApplication::exit ( 100 );
+ odebug << "Disaster:recptr:" << recptr << " thisrec:" << thisrec << "" << oendl;
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size = buffercontent;
+ UInt8 thishdr_type, thishdr_reserved;
+ for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
+ {
+ gotorecordnumber(recptr);
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+// odebug << "UID:" << thishdr_uid << " Paras:" << thishdr_nParagraphs << " Size:" << thishdr_size << " Type:" << (unsigned int)thishdr_type << " Reserved:" << (unsigned int)thishdr_reserved << "" << oendl;
+ }
+// QApplication::exit ( 100 );
}
@@ -348,12 +356,12 @@ void CPlucker_base::locate(unsigned int n)
{
- UInt16 attr = m_ParaAttrs[m_nextParaIndex];
- m_nextParaIndex++;
- if (m_nextParaIndex == m_nParas)
- {
- m_nextPara = -1;
- }
- else
- {
- m_nextPara += m_ParaOffsets[m_nextParaIndex];
- }
+ UInt16 attr = m_ParaAttrs[m_nextParaIndex];
+ m_nextParaIndex++;
+ if (m_nextParaIndex == m_nParas)
+ {
+ m_nextPara = -1;
+ }
+ else
+ {
+ m_nextPara += m_ParaOffsets[m_nextParaIndex];
+ }
}
@@ -372,9 +380,9 @@ bool CPlucker_base::expand(int thisrec)
{
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- //qDebug("This (%d) type is %d, uid is %u", thisrec, thishdr_type, thishdr_uid);
- if (thishdr_type < 2) break;
- //qDebug("Skipping paragraph of type %d", thishdr_type);
- if (++thisrec >= ntohs(head.recordList.numRecords) - 1) return false;
- reclen = recordlength(thisrec);
- gotorecordnumber(thisrec);
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ //odebug << "This (" << thisrec << ") type is " << thishdr_type << ", uid is " << thishdr_uid << "" << oendl;
+ if (thishdr_type < 2) break;
+ //odebug << "Skipping paragraph of type " << thishdr_type << "" << oendl;
+ if (++thisrec >= ntohs(head.recordList.numRecords) - 1) return false;
+ reclen = recordlength(thisrec);
+ gotorecordnumber(thisrec);
}
@@ -382,3 +390,3 @@ bool CPlucker_base::expand(int thisrec)
m_bufferisreserved = (thishdr_reserved != 0);
- //qDebug("It has %u paragraphs and is %u bytes", thishdr_nParagraphs, thishdr_size);
+ //odebug << "It has " << thishdr_nParagraphs << " paragraphs and is " << thishdr_size << " bytes" << oendl;
uid = thishdr_uid;
@@ -388,8 +396,8 @@ bool CPlucker_base::expand(int thisrec)
{
- UInt16 ubytes, attrs;
- fread(&ubytes, 1, sizeof(ubytes), fin);
- fread(&attrs, 1, sizeof(attrs), fin);
- m_ParaOffsets[i] = ntohs(ubytes);
- m_ParaAttrs[i] = ntohs(attrs);
-// //qDebug("Bytes %u, Attr %x", ntohs(ubytes), ntohs(attrs));
+ UInt16 ubytes, attrs;
+ fread(&ubytes, 1, sizeof(ubytes), fin);
+ fread(&attrs, 1, sizeof(attrs), fin);
+ m_ParaOffsets[i] = ntohs(ubytes);
+ m_ParaAttrs[i] = ntohs(attrs);
+// //odebug << "Bytes " << ntohs(ubytes) << ", Attr " << ntohs(attrs) << "" << oendl;
}
@@ -397,5 +405,5 @@ bool CPlucker_base::expand(int thisrec)
{
- m_nextPara = m_ParaOffsets[0];
- //qDebug("First offset = %u", m_nextPara);
- m_nextParaIndex = 0;
+ m_nextPara = m_ParaOffsets[0];
+ //odebug << "First offset = " << m_nextPara << "" << oendl;
+ m_nextParaIndex = 0;
}
@@ -403,3 +411,3 @@ bool CPlucker_base::expand(int thisrec)
{
- m_nextPara = -1;
+ m_nextPara = -1;
}
@@ -412,5 +420,5 @@ bool CPlucker_base::expand(int thisrec)
{
- delete [] expandedtextbuffer;
- buffersize = thishdr_size;
- expandedtextbuffer = new UInt8[buffersize];
+ delete [] expandedtextbuffer;
+ buffersize = thishdr_size;
+ expandedtextbuffer = new UInt8[buffersize];
}
@@ -420,3 +428,3 @@ bool CPlucker_base::expand(int thisrec)
bufferrec = thisrec;
- //qDebug("BC:%u, HS:%u", buffercontent, thishdr_size);
+ //odebug << "BC:" << buffercontent << ", HS:" << thishdr_size << "" << oendl;
return true;
@@ -438,5 +446,5 @@ void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuff
zstream.opaque = Z_NULL;
-
+
// printf("Initialising\n");
-
+
inflateInit(&zstream);
@@ -454,3 +462,3 @@ void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuff
-// //qDebug("err:%d - %u", err, zstream.avail_in);
+// //odebug << "err:" << err << " - " << zstream.avail_in << "" << oendl;
@@ -529,12 +537,12 @@ CList<Bkmk>* CPlucker_base::getbkmklist()
{
- gotorecordnumber(i);
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (thishdr_type == 8)
- {
- UInt16 n;
- fread(&n, 1, sizeof(n), fin);
- n = ntohs(n);
- //qDebug("Found %u bookmarks", n);
- }
- //qDebug("Found:%d, %u", i , thishdr_type);
+ gotorecordnumber(i);
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (thishdr_type == 8)
+ {
+ UInt16 n;
+ fread(&n, 1, sizeof(n), fin);
+ n = ntohs(n);
+ //odebug << "Found " << n << " bookmarks" << oendl;
+ }
+ //odebug << "Found:" << i << ", " << thishdr_type << "" << oendl;
}
@@ -552,10 +560,10 @@ QImage* CPlucker_base::expandimg(UInt16 tgt, bool border)
{
- QPixmap* image = new QPixmap(0,0);
- image->convertFromImage(*qimage);
- delete qimage;
- QPixmap* pret = new QPixmap(image->width()+4, image->height()+4);
- pret->fill(Qt::red);
- bitBlt(pret, 2, 2, image, 0, 0, -1, -1);//, Qt::RasterOp::CopyROP);
- delete image;
- ret = new QImage(pret->convertToImage());
+ QPixmap* image = new QPixmap(0,0);
+ image->convertFromImage(*qimage);
+ delete qimage;
+ QPixmap* pret = new QPixmap(image->width()+4, image->height()+4);
+ pret->fill(Qt::red);
+ bitBlt(pret, 2, 2, image, 0, 0, -1, -1);//, Qt::RasterOp::CopyROP);
+ delete image;
+ ret = new QImage(pret->convertToImage());
}
@@ -563,3 +571,3 @@ QImage* CPlucker_base::expandimg(UInt16 tgt, bool border)
{
- ret = qimage;
+ ret = qimage;
}
@@ -579,7 +587,7 @@ QImage* CPlucker_base::getPicture(unsigned long tgt)
{
- pix[tgt] = *expandimg(tgt);
- return &pix[tgt];
+ pix[tgt] = *expandimg(tgt);
+ return &pix[tgt];
}
else
- return &(t.data());
+ return &(t.data());
#else
@@ -594,3 +602,3 @@ void CPlucker_base::showimg(UInt16 tgt)
{
- //qDebug("Crassssssh!");
+ //odebug << "Crassssssh!" << oendl;
QPixmap* qimage = expandimg(tgt);
@@ -605,3 +613,3 @@ void CPlucker_base::showimg(UInt16 tgt)
QPixmap* image = new QPixmap(0,0);
-// //qDebug("New image");
+// //odebug << "New image" << oendl;
image->convertFromImage(*qimage);
@@ -612,7 +620,7 @@ void CPlucker_base::showimg(UInt16 tgt)
close(f);
- //qDebug("TMPFILE:%s", tmpfile);
+ //odebug << "TMPFILE:" << tmpfile << "" << oendl;
if (image->save(tmpfile,"PNG"))
{
- QCopEnvelope e("QPE/Application/showimg", "setDocument(QString)");
- e << QString(tmpfile);
+ QCopEnvelope e("QPE/Application/showimg", "setDocument(QString)");
+ e << QString(tmpfile);
}
@@ -629,3 +637,3 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
{
-// //qDebug("Finding %u", urlid);
+// //odebug << "Finding " << urlid << "" << oendl;
unsigned short jmin = 1, jmax = ntohs(head.recordList.numRecords);
@@ -634,22 +642,22 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
{
- gotorecordnumber(jmid);
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size;
- UInt8 thishdr_type, thishdr_reserved;
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- unsigned short luid = thishdr_uid;
-// //qDebug("%u %u %u : %u", jmin, jmid, jmax, urlid);
- if (luid == urlid)
- {
- return jmid;
- }
- if (luid < urlid)
- {
- jmin = jmid;
- }
- else
- {
- jmax = jmid;
- }
- jmid = (jmin+jmax) >> 1;
+ gotorecordnumber(jmid);
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size;
+ UInt8 thishdr_type, thishdr_reserved;
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ unsigned short luid = thishdr_uid;
+// //odebug << "" << jmin << " " << jmid << " " << jmax << " : " << urlid << "" << oendl;
+ if (luid == urlid)
+ {
+ return jmid;
+ }
+ if (luid < urlid)
+ {
+ jmin = jmid;
+ }
+ else
+ {
+ jmax = jmid;
+ }
+ jmid = (jmin+jmax) >> 1;
}
@@ -661,6 +669,6 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
unsigned short luid = thishdr_uid;
- //qDebug("jmin at end:%u,%u", jmin, luid);
+ //odebug << "jmin at end:" << jmin << "," << luid << "" << oendl;
if (luid == urlid)
{
- return jmin;
+ return jmin;
}
@@ -669,8 +677,8 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
luid = thishdr_uid;
- //qDebug("jmax at end:%u,%u", jmax, luid);
+ //odebug << "jmax at end:" << jmax << "," << luid << "" << oendl;
if (luid == urlid)
{
- return jmax;
+ return jmax;
}
- //qDebug("Couldn't find %u", urlid);
+ //odebug << "Couldn't find " << urlid << "" << oendl;
return 0; // Not found!
@@ -684,3 +692,3 @@ void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsig
{
- sz++;
+ sz++;
}
@@ -699,6 +707,6 @@ void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsig
{
- unsigned long t = *it;
-// qDebug("[%u]", t);
- memcpy(newdata, &t, sizeof(t));
- newdata += sizeof(t);
+ unsigned long t = *it;
+// odebug << "[" << t << "]" << oendl;
+ memcpy(newdata, &t, sizeof(t));
+ newdata += sizeof(t);
}
@@ -713,5 +721,5 @@ void CPlucker_base::putSaveData(unsigned char*& src, unsigned short& srclen)
{
- memcpy(&sz, src, sizeof(sz));
- src += sizeof(sz);
- srclen -= sizeof(sz);
+ memcpy(&sz, src, sizeof(sz));
+ src += sizeof(sz);
+ srclen -= sizeof(sz);
}
@@ -719,16 +727,16 @@ void CPlucker_base::putSaveData(unsigned char*& src, unsigned short& srclen)
{
- unsigned long t;
- if (srclen >= sizeof(t))
- {
- memcpy(&t, src, sizeof(t));
-// qDebug("[%u]", t);
- visited.push_front(t);
- src += sizeof(t);
- srclen -= sizeof(t);
- }
- else
- {
- QMessageBox::warning(NULL, PROGNAME, "File data mismatch\nMight fix itself");
- break;
- }
+ unsigned long t;
+ if (srclen >= sizeof(t))
+ {
+ memcpy(&t, src, sizeof(t));
+// odebug << "[" << t << "]" << oendl;
+ visited.push_front(t);
+ src += sizeof(t);
+ srclen -= sizeof(t);
+ }
+ else
+ {
+ QMessageBox::warning(NULL, PROGNAME, "File data mismatch\nMight fix itself");
+ break;
+ }
}
@@ -742,3 +750,3 @@ int CPlucker_base::OpenFile(const char *src)
{
- return -1;
+ return -1;
}
@@ -753,6 +761,6 @@ int CPlucker_base::OpenFile(const char *src)
- //qDebug("Total number of records:%u", ntohs(head.recordList.numRecords));
-
+ //odebug << "Total number of records:" << ntohs(head.recordList.numRecords) << "" << oendl;
+
unsigned int nrecs = ntohs(hdr0.nRecords);
- //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+ //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
UInt16 homerecid = 1;
@@ -760,7 +768,7 @@ int CPlucker_base::OpenFile(const char *src)
{
- UInt16 id, name;
- fread(&name, 1, sizeof(name), fin);
- fread(&id, 1, sizeof(id), fin);
- //qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
- if (ntohs(name) == 0) homerecid = ntohs(id);
+ UInt16 id, name;
+ fread(&name, 1, sizeof(name), fin);
+ fread(&id, 1, sizeof(id), fin);
+ //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
+ if (ntohs(name) == 0) homerecid = ntohs(id);
}
@@ -770,13 +778,13 @@ int CPlucker_base::OpenFile(const char *src)
{
- gotorecordnumber(recptr);
- UInt16 thishdr_uid, thishdr_nParagraphs;
- UInt32 thishdr_size;
- UInt8 thishdr_type, thishdr_reserved;
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (thishdr_uid == homerecid)
- {
- m_homepos = textlength;
- break;
- }
- if (thishdr_type < 2) textlength += thishdr_size;
+ gotorecordnumber(recptr);
+ UInt16 thishdr_uid, thishdr_nParagraphs;
+ UInt32 thishdr_size;
+ UInt8 thishdr_type, thishdr_reserved;
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (thishdr_uid == homerecid)
+ {
+ m_homepos = textlength;
+ break;
+ }
+ if (thishdr_type < 2) textlength += thishdr_size;
}
@@ -787,5 +795,5 @@ int CPlucker_base::OpenFile(const char *src)
{
- m_viewer = new QScrollView(NULL);
- m_picture = new QWidget(m_viewer->viewport());
- m_viewer->addChild(m_picture);
+ m_viewer = new QScrollView(NULL);
+ m_picture = new QWidget(m_viewer->viewport());
+ m_viewer->addChild(m_picture);
}
@@ -810,3 +818,3 @@ QImage* CPlucker_base::getimg(UInt16 tgt)
UInt8* imgbuffer = new UInt8[imgsize];
-
+
Expand(reclen, thishdr_type, imgbuffer, imgsize);
@@ -821,3 +829,3 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
n &= 0xffff;
-// //qDebug("Hyper:<%u,%u>", tuid, n);
+// //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
UInt16 thisrec = 1;
@@ -830,38 +838,38 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
{
- GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- if (tuid == thishdr_uid) break;
- if (thishdr_type < 2) currentpos += thishdr_size;
-// //qDebug("hyper-cp:%u", currentpos);
- thisrec++;
- if (thisrec >= ntohs(head.recordList.numRecords))
- {
- char *turl = geturl(tuid);
- if (turl == NULL)
- {
- QMessageBox::information(NULL,
- QString(PROGNAME),
- QString("Couldn't find link")
- );
- }
- else
- {
- wrd = turl;
+ GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
+ if (tuid == thishdr_uid) break;
+ if (thishdr_type < 2) currentpos += thishdr_size;
+// //odebug << "hyper-cp:" << currentpos << "" << oendl;
+ thisrec++;
+ if (thisrec >= ntohs(head.recordList.numRecords))
+ {
+ char *turl = geturl(tuid);
+ if (turl == NULL)
+ {
+ QMessageBox::information(NULL,
+ QString(PROGNAME),
+ QString("Couldn't find link")
+ );
+ }
+ else
+ {
+ wrd = turl;
#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);
+ }
#else
#endif /* USEQPE */
- //qDebug("Link:%s", (const char*)wrd);
-// setlink(fn, wrd);
- delete [] turl;
- }
- return eNone;
- }
- gotorecordnumber(thisrec);
+ //odebug << "Link:" << wrd << "" << oendl;
+// setlink(fn, wrd);
+ delete [] turl;
+ }
+ return eNone;
+ }
+ gotorecordnumber(thisrec);
}
@@ -869,28 +877,28 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
{
- if (thishdr_type == 4)
- {
- QMessageBox::information(NULL,
- QString(PROGNAME),
- QString("Mailto links\nnot yet supported (2)"));
- }
- else
- {
- if (thishdr_type > 3)
- {
- QMessageBox::information(NULL,
- QString(PROGNAME),
- QString("External links\nnot yet supported (2)")
- );
- return eNone;
- }
- else
- {
+ if (thishdr_type == 4)
+ {
+ QMessageBox::information(NULL,
+ QString(PROGNAME),
+ QString("Mailto links\nnot yet supported (2)"));
+ }
+ else
+ {
+ if (thishdr_type > 3)
+ {
+ QMessageBox::information(NULL,
+ QString(PROGNAME),
+ QString("External links\nnot yet supported (2)")
+ );
+ return eNone;
+ }
+ else
+ {
#ifdef LOCALPICTURES
- showimg(tuid);
+ showimg(tuid);
#else
- return ePicture;
+ return ePicture;
#endif
- }
- }
- return eNone;
+ }
+ }
+ return eNone;
}
@@ -899,3 +907,3 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
{
- expandimg(thisrec);
+ expandimg(thisrec);
@@ -905,44 +913,44 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
{
- expand(thisrec);
- if (n != 0)
- {
- if (n >= m_nParas)
- {
- QMessageBox::information(NULL,
- QString(PROGNAME),
- QString("Error in link\nPara # too big")
- );
- return eNone;
- }
- unsigned int noff = 0;
- for (unsigned int i = 0; i < n; i++) noff += m_ParaOffsets[i];
- n = noff;
- }
- if (n > thishdr_size)
- {
- QMessageBox::information(NULL,
- QString(PROGNAME),
- QString("Error in link\nOffset too big")
- );
- return eNone;
- }
- //qDebug("Hyper:<%u,%u>", tuid, n);
- while (bufferpos < n && bufferpos < buffercontent) getch_base(true);
+ expand(thisrec);
+ if (n != 0)
+ {
+ if (n >= m_nParas)
+ {
+ QMessageBox::information(NULL,
+ QString(PROGNAME),
+ QString("Error in link\nPara # too big")
+ );
+ return eNone;
+ }
+ unsigned int noff = 0;
+ for (unsigned int i = 0; i < n; i++) noff += m_ParaOffsets[i];
+ n = noff;
+ }
+ if (n > thishdr_size)
+ {
+ QMessageBox::information(NULL,
+ QString(PROGNAME),
+ QString("Error in link\nOffset too big")
+ );
+ return eNone;
+ }
+ //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
+ while (bufferpos < n && bufferpos < buffercontent) getch_base(true);
/* // This is faster but the alignment doesn't get set
- mystyle.unset();
- bufferpos = n;
- currentpos += n;
- while (bufferpos >= m_nextPara && m_nextPara >= 0)
- {
- UInt16 attr = m_ParaAttrs[m_nextParaIndex];
- m_nextParaIndex++;
- if (m_nextParaIndex == m_nParas)
- {
- m_nextPara = -1;
- }
- else
- {
- m_nextPara += m_ParaOffsets[m_nextParaIndex];
- }
- }
+ mystyle.unset();
+ bufferpos = n;
+ currentpos += n;
+ while (bufferpos >= m_nextPara && m_nextPara >= 0)
+ {
+ UInt16 attr = m_ParaAttrs[m_nextParaIndex];
+ m_nextParaIndex++;
+ if (m_nextParaIndex == m_nParas)
+ {
+ m_nextPara = -1;
+ }
+ else
+ {
+ m_nextPara += m_ParaOffsets[m_nextParaIndex];
+ }
+ }
*/
@@ -957,266 +965,266 @@ tchar CPlucker_base::getch_base(bool fast)
{
- ch = bgetch();
-// //qDebug("Function:%x", ch);
- switch (ch)
- {
- case 0x38:
-// //qDebug("Break:%u", locate());
- if (m_lastBreak == locate())
- {
- ch = bgetch();
- }
- else
- {
- ch = 10;
- }
- m_lastBreak = locate();
- break;
- case 0x0a:
- case 0x0c:
- {
- unsigned long ln = 0;
- int skip = ch & 7;
- for (int i = 0; i < 2; i++)
- {
- int ch = bgetch();
- ln = (ln << 8) + ch;
-// //qDebug("ch:%d, ln:%u", ch, ln);
- }
- if (skip == 2)
- {
- ln <<= 16;
- }
- else
- {
- for (int i = 0; i < 2; i++)
- {
- int ch = bgetch();
- ln = (ln << 8) + ch;
-// //qDebug("ch:%d, ln:%u", ch, ln);
- }
- }
-// //qDebug("ln:%u", ln);
- mystyle.setLink(true);
- mystyle.setData(ln);
-// mystyle.setColour(255, 0, 0);
- bool hasseen = false;
- for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
- {
- if (*it == ln)
- {
- hasseen = true;
- break;
- }
- }
- if (hasseen)
- {
- mystyle.setStrikethru();
- }
- else
- {
- mystyle.setUnderline();
- }
- ch = bgetch();
- }
- break;
- case 0x08:
- ch = bgetch();
-// mystyle.setColour(0, 0, 0);
- mystyle.unsetUnderline();
- mystyle.unsetStrikethru();
- mystyle.setLink(false);
- mystyle.setData(0);
- break;
- case 0x40:
- mystyle.setItalic();
- ch = bgetch();
- break;
- case 0x48:
- mystyle.unsetItalic();
- ch = bgetch();
- break;
- case 0x11:
- {
- ch = bgetch();
-// //qDebug("Font:%d",ch);
- mystyle.setVOffset(0);
- mystyle.unsetMono();
- mystyle.unsetBold();
- mystyle.setFontSize(0);
- switch (ch)
- {
- case 0:
- break;
- case 1:
- mystyle.setBold();
- mystyle.setFontSize(3);
- break;
- case 2:
- mystyle.setBold();
- mystyle.setFontSize(2);
- break;
- case 3:
- mystyle.setBold();
- mystyle.setFontSize(1);
- break;
- case 4:
- mystyle.setBold();
- break;
- case 5:
- mystyle.setBold();
- break;
- case 6:
- mystyle.setBold();
- break;
- case 7:
- mystyle.setBold();
- break;
- case 8: // should be fixed width
- //qDebug("Trying fixed width");
- mystyle.setMono();
- break;
- case 9:
- mystyle.setFontSize(-1);
- break;
- case 10:
- mystyle.setFontSize(-2);
- mystyle.setVOffset(1);
- break;
- case 11:
- mystyle.setFontSize(-2);
- mystyle.setVOffset(-1);
- break;
- default:
- qDebug("Unrecognised font");
- break;
- }
- ch = bgetch();
- }
- break;
- case 0x29:
- ch = bgetch();
- switch (ch)
- {
- case 0:
- mystyle.setLeftJustify();
-// //qDebug("left");
- break;
- case 1:
- mystyle.setRightJustify();
-// //qDebug("right");
- break;
- case 2:
- mystyle.setCentreJustify();
-// //qDebug("centre");
- break;
- case 3:
- mystyle.setFullJustify();
-// //qDebug("full");
- break;
-
- }
- ch = bgetch();
- break;
- case 0x53:
- {
- int r = bgetch();
- int g = bgetch();
- int b = bgetch();
- mystyle.setColour(r,g,b);
- ch = bgetch();
- }
- break;
- case 0x1a:
- case 0x5c:
- {
- bool hasalternate = (ch == 0x5c);
- UInt16 ir = bgetch();
- ir = (ir << 8) + bgetch();
- if (hasalternate)
- {
- //qDebug("Alternate image:%x", ir);
- UInt16 ir2 = bgetch();
- ir2 = (ir2 << 8) + bgetch();
- if (!fast) mystyle.setPicture(true, expandimg(ir2, true), true, ir << 16);
+ ch = bgetch();
+// //odebug << "Function:" << ch << "" << oendl;
+ switch (ch)
+ {
+ case 0x38:
+// //odebug << "Break:" << locate() << "" << oendl;
+ if (m_lastBreak == locate())
+ {
+ ch = bgetch();
+ }
+ else
+ {
+ ch = 10;
+ }
+ m_lastBreak = locate();
+ break;
+ case 0x0a:
+ case 0x0c:
+ {
+ unsigned long ln = 0;
+ int skip = ch & 7;
+ for (int i = 0; i < 2; i++)
+ {
+ int ch = bgetch();
+ ln = (ln << 8) + ch;
+// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
+ }
+ if (skip == 2)
+ {
+ ln <<= 16;
+ }
+ else
+ {
+ for (int i = 0; i < 2; i++)
+ {
+ int ch = bgetch();
+ ln = (ln << 8) + ch;
+// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
+ }
+ }
+// //odebug << "ln:" << ln << "" << oendl;
+ mystyle.setLink(true);
+ mystyle.setData(ln);
+// mystyle.setColour(255, 0, 0);
+ bool hasseen = false;
+ for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
+ {
+ if (*it == ln)
+ {
+ hasseen = true;
+ break;
+ }
+ }
+ if (hasseen)
+ {
+ mystyle.setStrikethru();
+ }
+ else
+ {
+ mystyle.setUnderline();
+ }
+ ch = bgetch();
+ }
+ break;
+ case 0x08:
+ ch = bgetch();
+// mystyle.setColour(0, 0, 0);
+ mystyle.unsetUnderline();
+ mystyle.unsetStrikethru();
+ mystyle.setLink(false);
+ mystyle.setData(0);
+ break;
+ case 0x40:
+ mystyle.setItalic();
+ ch = bgetch();
+ break;
+ case 0x48:
+ mystyle.unsetItalic();
+ ch = bgetch();
+ break;
+ case 0x11:
+ {
+ ch = bgetch();
+// //odebug << "Font:" << ch << "" << oendl;
+ mystyle.setVOffset(0);
+ mystyle.unsetMono();
+ mystyle.unsetBold();
+ mystyle.setFontSize(0);
+ switch (ch)
+ {
+ case 0:
+ break;
+ case 1:
+ mystyle.setBold();
+ mystyle.setFontSize(3);
+ break;
+ case 2:
+ mystyle.setBold();
+ mystyle.setFontSize(2);
+ break;
+ case 3:
+ mystyle.setBold();
+ mystyle.setFontSize(1);
+ break;
+ case 4:
+ mystyle.setBold();
+ break;
+ case 5:
+ mystyle.setBold();
+ break;
+ case 6:
+ mystyle.setBold();
+ break;
+ case 7:
+ mystyle.setBold();
+ break;
+ case 8: // should be fixed width
+ //odebug << "Trying fixed width" << oendl;
+ mystyle.setMono();
+ break;
+ case 9:
+ mystyle.setFontSize(-1);
+ break;
+ case 10:
+ mystyle.setFontSize(-2);
+ mystyle.setVOffset(1);
+ break;
+ case 11:
+ mystyle.setFontSize(-2);
+ mystyle.setVOffset(-1);
+ break;
+ default:
+ odebug << "Unrecognised font" << oendl;
+ break;
+ }
+ ch = bgetch();
+ }
+ break;
+ case 0x29:
+ ch = bgetch();
+ switch (ch)
+ {
+ case 0:
+ mystyle.setLeftJustify();
+// //odebug << "left" << oendl;
+ break;
+ case 1:
+ mystyle.setRightJustify();
+// //odebug << "right" << oendl;
+ break;
+ case 2:
+ mystyle.setCentreJustify();
+// //odebug << "centre" << oendl;
+ break;
+ case 3:
+ mystyle.setFullJustify();
+// //odebug << "full" << oendl;
+ break;
+
+ }
+ ch = bgetch();
+ break;
+ case 0x53:
+ {
+ int r = bgetch();
+ int g = bgetch();
+ int b = bgetch();
+ mystyle.setColour(r,g,b);
+ ch = bgetch();
+ }
+ break;
+ case 0x1a:
+ case 0x5c:
+ {
+ bool hasalternate = (ch == 0x5c);
+ UInt16 ir = bgetch();
+ ir = (ir << 8) + bgetch();
+ if (hasalternate)
+ {
+ //odebug << "Alternate image:" << ir << "" << oendl;
+ UInt16 ir2 = bgetch();
+ ir2 = (ir2 << 8) + bgetch();
+ if (!fast) mystyle.setPicture(true, expandimg(ir2, true), true, ir << 16);
#ifdef LOCALPICTURES
- UInt32 ln = ir;
- ln <<= 16;
- mystyle.setLink(true);
- mystyle.setData(ln);
+ UInt32 ln = ir;
+ ln <<= 16;
+ mystyle.setLink(true);
+ mystyle.setData(ln);
#endif
- }
- else
- {
- if (!fast) mystyle.setPicture(true, expandimg(ir));
- }
-// if (mystyle.getLink()) qDebug("Picture link!");
- ch = '#';
- }
-// ch = bgetch();
- break;
- case 0x33:
- {
- UInt8 h = bgetch();
- UInt8 wc = bgetch();
- UInt8 pc = bgetch();
- UInt16 w = wc;
-// //qDebug("h,w,pc [%u, %u, %u]", h, w, pc);
- if (w == 0)
- {
- w = (m_scrWidth*(unsigned long)pc)/100;
- }
- if (w == 0) w = m_scrWidth;
- mystyle.setPicture(false, hRule(w,h,mystyle.Red(),mystyle.Green(),mystyle.Blue()));
-// if (mystyle.getLink()) //qDebug("hRule link!");
- ch = '#';
- }
- break;
- case 0x60:
- mystyle.setUnderline();
- ch = bgetch();
- break;
- case 0x68:
- mystyle.unsetUnderline();
- ch = bgetch();
- break;
- case 0x22:
- ch = bgetch();
- mystyle.setLeftMargin(ch);
-// //qDebug("Left margin:%d", ch);
- ch = bgetch();
- mystyle.setRightMargin(ch);
-// //qDebug("Right margin:%d", ch);
- ch = bgetch();
- break;
- case 0x70:
- mystyle.setStrikethru();
- ch = bgetch();
- break;
- case 0x78:
- mystyle.unsetStrikethru();
- ch = bgetch();
- break;
- case 0x83:
- {
- int tlen = bgetch();
- ch = bgetch();
- ch <<= 8;
- ch |= (tchar)bgetch();
- for (int i = 0; i < tlen; i++) bgetch();
- //qDebug("Function 83");
- }
- break;
- case 0x85:
- default:
- qDebug("Function:%x NOT IMPLEMENTED", ch);
- {
- int skip = ch & 7;
- for (int i = 0; i < skip; i++)
- {
- ch = bgetch();
- //qDebug("Arg %d, %d", i, ch);
- }
- ch = bgetch();
- }
- }
+ }
+ else
+ {
+ if (!fast) mystyle.setPicture(true, expandimg(ir));
+ }
+// if (mystyle.getLink()) odebug << "Picture link!" << oendl;
+ ch = '#';
+ }
+// ch = bgetch();
+ break;
+ case 0x33:
+ {
+ UInt8 h = bgetch();
+ UInt8 wc = bgetch();
+ UInt8 pc = bgetch();
+ UInt16 w = wc;
+// //odebug << "h,w,pc [" << h << ", " << w << ", " << pc << "]" << oendl;
+ if (w == 0)
+ {
+ w = (m_scrWidth*(unsigned long)pc)/100;
+ }
+ if (w == 0) w = m_scrWidth;
+ mystyle.setPicture(false, hRule(w,h,mystyle.Red(),mystyle.Green(),mystyle.Blue()));
+// if (mystyle.getLink()) //odebug << "hRule link!" << oendl;
+ ch = '#';
+ }
+ break;
+ case 0x60:
+ mystyle.setUnderline();
+ ch = bgetch();
+ break;
+ case 0x68:
+ mystyle.unsetUnderline();
+ ch = bgetch();
+ break;
+ case 0x22:
+ ch = bgetch();
+ mystyle.setLeftMargin(ch);
+// //odebug << "Left margin:" << ch << "" << oendl;
+ ch = bgetch();
+ mystyle.setRightMargin(ch);
+// //odebug << "Right margin:" << ch << "" << oendl;
+ ch = bgetch();
+ break;
+ case 0x70:
+ mystyle.setStrikethru();
+ ch = bgetch();
+ break;
+ case 0x78:
+ mystyle.unsetStrikethru();
+ ch = bgetch();
+ break;
+ case 0x83:
+ {
+ int tlen = bgetch();
+ ch = bgetch();
+ ch <<= 8;
+ ch |= (tchar)bgetch();
+ for (int i = 0; i < tlen; i++) bgetch();
+ //odebug << "Function 83" << oendl;
+ }
+ break;
+ case 0x85:
+ default:
+ odebug << "Function:" << ch << " NOT IMPLEMENTED" << oendl;
+ {
+ int skip = ch & 7;
+ for (int i = 0; i < skip; i++)
+ {
+ ch = bgetch();
+ //odebug << "Arg " << i << ", " << ch << "" << oendl;
+ }
+ ch = bgetch();
+ }
+ }
}
@@ -1225,6 +1233,6 @@ tchar CPlucker_base::getch_base(bool fast)
{
- while (ch == ' ')
- {
- ch = getch(false);
- }
+ while (ch == ' ')
+ {
+ ch = getch(false);
+ }
}
diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
index 22a4917..4c15fd0 100644
--- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp
+++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
@@ -24,13 +24,10 @@
#include "katebuffer.h"
+#include "kdebug.h"
-// Includes for reading file
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
+/* OPIE */
+#include <opie2/odebug.h>
+/* QT */
#include <qfile.h>
#include <qtextstream.h>
-
#include <qtimer.h>
@@ -38,6 +35,10 @@
-//
-
+/* STD */
+// Includes for reading file
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
#include <assert.h>
-#include <kdebug.h>
@@ -67,31 +68,31 @@ KWBuffer::insertFile(int line, const QString &file, QTextCodec *codec)
{
- if (line) {
- qDebug("insert File only supports insertion at line 0 == file opening");
- return;
- }
- clear();
- QFile iofile(file);
- iofile.open(IO_ReadOnly);
- QTextStream stream(&iofile);
- stream.setCodec(codec);
- QString qsl;
- int count=0;
- for (count=0;((qsl=stream.readLine())!=QString::null); count++)
- {
- if (count==0)
- {
- (*m_stringListIt)->append(qsl.unicode(),qsl.length());
- }
- else
- {
- TextLine::Ptr tl=new TextLine();
- tl ->append(qsl.unicode(),qsl.length());
- m_stringListIt=m_stringList.append(tl);
- }
- }
- if (count!=0)
- {
- m_stringListCurrent=count-1;
- m_lineCount=count;
- }
+ if (line) {
+ odebug << "insert File only supports insertion at line 0 == file opening" << oendl;
+ return;
+ }
+ clear();
+ QFile iofile(file);
+ iofile.open(IO_ReadOnly);
+ QTextStream stream(&iofile);
+ stream.setCodec(codec);
+ QString qsl;
+ int count=0;
+ for (count=0;((qsl=stream.readLine())!=QString::null); count++)
+ {
+ if (count==0)
+ {
+ (*m_stringListIt)->append(qsl.unicode(),qsl.length());
+ }
+ else
+ {
+ TextLine::Ptr tl=new TextLine();
+ tl ->append(qsl.unicode(),qsl.length());
+ m_stringListIt=m_stringList.append(tl);
+ }
+ }
+ if (count!=0)
+ {
+ m_stringListCurrent=count-1;
+ m_lineCount=count;
+ }
}
@@ -123,5 +124,5 @@ KWBuffer::count()
{
- qDebug("m_stringList.count %d",m_stringList.count());
+ odebug << "m_stringList.count " << m_stringList.count() << "" << oendl;
return m_lineCount;
-// return m_stringList.count();
+// return m_stringList.count();
// return m_totalLines;
@@ -150,5 +151,5 @@ KWBuffer::line(int i)
{
- if (i>=m_stringList.count()) return 0;
- seek(i);
- return *m_stringListIt;
+ if (i>=m_stringList.count()) return 0;
+ seek(i);
+ return *m_stringListIt;
}
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 0c742d7..6dc4fd2 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -8,3 +8,3 @@
jowenn@kde.org
-
+
***************************************************************************/
@@ -41,16 +41,27 @@
#include "katedocument.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
+//#include "kcharsets.h"
+#include "kdebug.h"
+//#include "kinstance.h"
-#include <qfileinfo.h>
-#include <qdatetime.h>
+#include "kglobalsettings.h"
+//#include "kaction.h"
+//#include "kstdaction.h"
-#include <kmessagebox.h>
-#include <qpe/config.h>
-#include <qstring.h>
+#include "../view/kateview.h"
+#include "katebuffer.h"
+#include "katetextline.h"
-#include <sys/time.h>
-#include <unistd.h>
+#include "katecmd.h"
-#include <stdio.h>
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+/* QT */
+#include <qfileinfo.h>
+#include <qdatetime.h>
+#include <qstring.h>
#include <qtimer.h>
@@ -64,17 +75,7 @@
#include <qtextcodec.h>
-#include <kglobal.h>
-//#include <kcharsets.h>
-#include <kdebug.h>
-//#include <kinstance.h>
-
-#include <kglobalsettings.h>
-//#include <kaction.h>
-//#include <kstdaction.h>
-
-#include "../view/kateview.h"
-#include "katebuffer.h"
-#include "katetextline.h"
-
-#include "katecmd.h"
+/* STD */
+#include <sys/time.h>
+#include <unistd.h>
+#include <stdio.h>
@@ -132,3 +133,3 @@ uint KateDocument::uniqueID = 0;
-QPtrDict<KateDocument::KateDocPrivate>* KateDocument::d_ptr = 0;
+QPtrDict<KateDocument::KateDocPrivate>* KateDocument::d_ptr = 0;
@@ -143,4 +144,4 @@ KateDocument::KateDocument(bool bSingleViewMode, bool bBrowserView,
{
-
- d(this)->hlSetByUser = false;
+
+ d(this)->hlSetByUser = false;
PreHighlightedTill=0;
@@ -154,3 +155,3 @@ KateDocument::KateDocument(bool bSingleViewMode, bool bBrowserView,
// NOTE: QFont::CharSet doesn't provide all the charsets KDE supports
- // (esp. it doesn't distinguish between UTF-8 and iso10646-1)
+ // (esp. it doesn't distinguish between UTF-8 and iso10646-1)
@@ -294,3 +295,3 @@ void KateDocument::openURL(const QString &filename)
- m_file=filename;
+ m_file=filename;
fileInfo->setFile (m_file);
@@ -300,3 +301,3 @@ void KateDocument::openURL(const QString &filename)
{
- qDebug("File doesn't exit or couldn't be read");
+ odebug << "File doesn't exit or couldn't be read" << oendl;
return ;
@@ -307,3 +308,3 @@ void KateDocument::openURL(const QString &filename)
// buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding));
- qDebug("Telling buffer to open file");
+ odebug << "Telling buffer to open file" << oendl;
buffer->insertFile(0, m_file, QTextCodec::codecForLocale());
@@ -323,3 +324,3 @@ void KateDocument::openURL(const QString &filename)
emit fileNameChanged();
-
+
return ;
@@ -329,3 +330,3 @@ bool KateDocument::saveFile()
{
-
+
QFile f( m_file );
@@ -613,3 +614,3 @@ void KateDocument::readConfig()
colors[1] = config->readColorEntry("Color Selected", colors[1]);
-
+
// config->sync();
@@ -685,3 +686,3 @@ void KateDocument::setHighlight(int n) {
void KateDocument::makeAttribs() {
- qDebug("KateDocument::makeAttribs()");
+ odebug << "KateDocument::makeAttribs()" << oendl;
m_numAttribs = hlManager->makeAttribs(m_highlight, m_attribs, maxAttribs);
@@ -1925,4 +1926,4 @@ void KateDocument::updateLines(int startLine, int endLine, int flags, int cursor
endCtx = textLine->getContext();
-// qDebug("DOHIGHLIGHT");
-
+// odebug << "DOHIGHLIGHT" << oendl;
+
ctxNum = m_highlight->doHighlight(ctxNum,textLine);
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.cpp b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
index 0d2c283..539d356 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.cpp
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
@@ -3,4 +3,4 @@
digisnap@cs.tu-berlin.de
- (C) 2002, 2001 The Kate Team <kwrite-devel@kde.org>
- (C) 2002 Joseph Wenninger <jowenn@kde.org>
+ (C) 2002, 2001 The Kate Team <kwrite-devel@kde.org>
+ (C) 2002 Joseph Wenninger <jowenn@kde.org>
This library is free software; you can redistribute it and/or
@@ -21,18 +21,3 @@
-#include <string.h>
-
-#include <qtextstream.h>
-#include <qpe/config.h>
-#include <kglobal.h>
-//#include <kinstance.h>
-//#include <kmimemagic.h>
-#include <klocale.h>
-//#include <kregexp.h>
-#include <kglobalsettings.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-
#include "katehighlight.h"
-
-
#include "katetextline.h"
@@ -41,2 +26,21 @@
+#include "kglobal.h"
+//#include "kinstance.h"
+//#include "kmimemagic.h"
+#include "klocale.h"
+//#include "kregexp.h"
+#include "kglobalsettings.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
+#include <qtextstream.h>
+
+/* STD */
+#include <string.h>
+
@@ -122,4 +126,4 @@ const QChar *HlStringDetect::checkHgl(const QChar *s, int len, bool) {
{
- QString tmp=QString(s,str.length()).upper();
- if (tmp==str) return s+str.length();
+ QString tmp=QString(s,str.length()).upper();
+ if (tmp==str) return s+str.length();
}
@@ -215,6 +219,6 @@ const QChar *HlInt::checkHgl(const QChar *str, int len, bool) {
{
- for (HlItem *it=subItems->first();it;it=subItems->next())
+ for (HlItem *it=subItems->first();it;it=subItems->next())
{
s1=it->checkHgl(s, len, false);
- if (s1) return s1;
+ if (s1) return s1;
}
@@ -250,10 +254,10 @@ const QChar *HlFloat::checkHgl(const QChar *s, int len, bool) {
if (!p) return 0L;
- else
- {
+ else
+ {
if (subItems)
{
- for (HlItem *it=subItems->first();it;it=subItems->next())
+ for (HlItem *it=subItems->first();it;it=subItems->next())
{
s1=it->checkHgl(s, len, false);
- if (s1) return s1;
+ if (s1) return s1;
}
@@ -347,3 +351,3 @@ const QChar *HlCHex::checkHgl(const QChar *str, int len, bool) {
else
- return 0L;
+ return 0L;
@@ -402,3 +406,3 @@ const QChar *HlRegExpr::checkHgl(const QChar *s, int len, bool lineStart)
else
- return (s+Expr->matchedLength());
+ return (s+Expr->matchedLength());
};
@@ -413,5 +417,5 @@ const QChar *HlLineContinue::checkHgl(const QChar *s, int len, bool) {
if ((s[0].latin1() == '\\') && (len == 1))
- {
+ {
return s + 1;
- }
+ }
return 0L;
@@ -623,3 +627,3 @@ int Highlight::doHighlight(int ctxNum, TextLine *textLine)
{
- qDebug("An item has been detected");
+ odebug << "An item has been detected" << oendl;
textLine->setAttribs(item->attr,s1 - str,s2 - str);
@@ -855,3 +859,3 @@ void Highlight::createItemData(ItemDataList &list)
{
- qDebug("Highlight::createItemData");
+ odebug << "Highlight::createItemData" << oendl;
@@ -876,3 +880,3 @@ void Highlight::createItemData(ItemDataList &list)
- qDebug("Trying to read itemData section");
+ odebug << "Trying to read itemData section" << oendl;
@@ -884,3 +888,3 @@ void Highlight::createItemData(ItemDataList &list)
{
- qDebug("Setting up one itemData element");
+ odebug << "Setting up one itemData element" << oendl;
// read all attributes
@@ -935,8 +939,8 @@ int Highlight::lookupAttrName(const QString& name, ItemDataList &iDl)
{
- for (int i=0;i<iDl.count();i++)
- {
- if (iDl.at(i)->name==name) return i;
- }
- kdDebug(13010)<<"Couldn't resolve itemDataName"<<endl;
- return 0;
+ for (int i=0;i<iDl.count();i++)
+ {
+ if (iDl.at(i)->name==name) return i;
+ }
+ kdDebug(13010)<<"Couldn't resolve itemDataName"<<endl;
+ return 0;
}
@@ -1079,7 +1083,7 @@ void Highlight::readCommentConfig()
if (HlManager::self()->syntax->groupData(data,"name")=="singleLine")
- cslStart=HlManager::self()->syntax->groupData(data,"start");
- if (HlManager::self()->syntax->groupData(data,"name")=="multiLine")
+ cslStart=HlManager::self()->syntax->groupData(data,"start");
+ if (HlManager::self()->syntax->groupData(data,"name")=="multiLine")
{
- cmlStart=HlManager::self()->syntax->groupData(data,"start");
- cmlEnd=HlManager::self()->syntax->groupData(data,"end");
+ cmlStart=HlManager::self()->syntax->groupData(data,"start");
+ cmlEnd=HlManager::self()->syntax->groupData(data,"end");
}
@@ -1114,6 +1118,6 @@ void Highlight::readGlobalKeywordConfig()
{
- kdDebug(13010)<<"Found global keyword config"<<endl;
+ kdDebug(13010)<<"Found global keyword config"<<endl;
if (HlManager::self()->syntax->groupItemData(data,QString("casesensitive"))!="0")
- casesensitive=true; else {casesensitive=false; kdDebug(13010)<<"Turning on case insensitiveness"<<endl;}
+ casesensitive=true; else {casesensitive=false; kdDebug(13010)<<"Turning on case insensitiveness"<<endl;}
//get the weak deliminators
@@ -1135,3 +1139,3 @@ void Highlight::readGlobalKeywordConfig()
- HlManager::self()->syntax->freeGroupInfo(data);
+ HlManager::self()->syntax->freeGroupInfo(data);
}
@@ -1206,6 +1210,6 @@ void Highlight::makeContextList()
{
-// kdDebug(13010)<< "In make Contextlist: Item:"<<endl;
- c=createHlItem(data,iDl);
- if (c)
- {
+// kdDebug(13010)<< "In make Contextlist: Item:"<<endl;
+ c=createHlItem(data,iDl);
+ if (c)
+ {
contextList[i]->items.append(c);
@@ -1213,14 +1217,14 @@ void Highlight::makeContextList()
// Not supported completely atm and only one level. Subitems.(all have to be matched to at once)
- datasub=HlManager::self()->syntax->getSubItems(data);
- bool tmpbool;
- if (tmpbool=HlManager::self()->syntax->nextItem(datasub))
- {
+ datasub=HlManager::self()->syntax->getSubItems(data);
+ bool tmpbool;
+ if (tmpbool=HlManager::self()->syntax->nextItem(datasub))
+ {
c->subItems=new QList<HlItem>;
- for (;tmpbool;tmpbool=HlManager::self()->syntax->nextItem(datasub))
+ for (;tmpbool;tmpbool=HlManager::self()->syntax->nextItem(datasub))
c->subItems->append(createHlItem(datasub,iDl));
}
- HlManager::self()->syntax->freeGroupInfo(datasub);
+ HlManager::self()->syntax->freeGroupInfo(datasub);
// end of sublevel
- }
-// kdDebug(13010)<<"Last line in loop"<<endl;
+ }
+// kdDebug(13010)<<"Last line in loop"<<endl;
}
@@ -1314,3 +1318,3 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
- qDebug("HlManager::makeAttribs");
+ odebug << "HlManager::makeAttribs" << oendl;
@@ -1323,3 +1327,3 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
for (z = 0; z < nAttribs; z++) {
- qDebug("HlManager::makeAttribs: createing one attribute definition");
+ odebug << "HlManager::makeAttribs: createing one attribute definition" << oendl;
itemData = itemDataList.at(z);
@@ -1417,3 +1421,3 @@ void HlManager::setDefaults(ItemStyleList &list) {
#warning fixme
-/*
+/*
config = KateFactory::instance()->config();
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 6059e9b..9fa4452 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -18,11 +18,16 @@
#include "katesyntaxdocument.h"
-#include <kateconfig.h>
+#include "kateconfig.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+#include "klocale.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qfile.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
#include <qstringlist.h>
-#include <kglobal.h>
-#include <qpe/qpeapplication.h>
#include <qdir.h>
@@ -41,3 +46,3 @@ void SyntaxDocument::setIdentifier(const QString& identifier)
if (!m_root) KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) );
-
+
}
@@ -78,3 +83,3 @@ void SyntaxDocument::setupModeList(bool force)
{
- qDebug("Found a description file:"+path+(*it));
+ odebug << "Found a description file:"+path+(*it) << oendl;
setIdentifier(path+(*it));
@@ -83,4 +88,4 @@ void SyntaxDocument::setupModeList(bool force)
{
- e=e->firstChild();
- qDebug(e->tagName());
+ e=e->firstChild();
+ odebug << e->tagName() << oendl;
if (e->tagName()=="language")
@@ -92,3 +97,3 @@ void SyntaxDocument::setupModeList(bool force)
mli->extension = e->attribute("extensions");
- qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name));
+ odebug << QString("valid description for: %1/%2").arg(mli->section).arg(mli->name) << oendl;
if (mli->section.isEmpty())
@@ -182,5 +187,5 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
syntaxContextData *retval=new syntaxContextData;
- retval->parent=0;
- retval->currentGroup=0;
- retval->item=0;
+ retval->parent=0;
+ retval->currentGroup=0;
+ retval->item=0;
if (data != 0)
@@ -214,4 +219,4 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
syntaxContextData *data=new ( syntaxContextData);
- data->currentGroup=0;
- data->parent=0;
+ data->currentGroup=0;
+ data->parent=0;
data->item=e1;
@@ -256,4 +261,4 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
data->parent=e1;
- data->currentGroup=0;
- data->item=0;
+ data->currentGroup=0;
+ data->item=0;
return data;
@@ -286,15 +291,15 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
{
- for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
- {
- if (e1->tagName()!="list") continue;
-
- if (e1->attribute("name")==type)
- {
- for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
- {
- qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value());
- m_data+=e2->firstChild()->value().stripWhiteSpace();
- }
- break;
- }
+ for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
+ {
+ if (e1->tagName()!="list") continue;
+
+ if (e1->attribute("name")==type)
+ {
+ for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
+ {
+ odebug << "FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value() << oendl;
+ m_data+=e2->firstChild()->value().stripWhiteSpace();
+ }
+ break;
+ }
}
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 96f91fb..782b629 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -20,2 +20,10 @@
+#define QTOPIA_INTERNAL_LANGLIST
+#include "kateconfig.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/global.h>
+
+/* QT */
#include <qdir.h>
@@ -27,2 +35,3 @@
+/* STD */
#include <sys/stat.h>
@@ -33,6 +42,2 @@
-#define QTOPIA_INTERNAL_LANGLIST
-#include "kateconfig.h"
-#include <qpe/global.h>
-
@@ -44,10 +49,10 @@ QString KateConfig::configFilename(const QString& name, Domain d)
switch (d) {
- case File:
- return name;
- case User: {
- QDir dir = (QString(getenv("HOME")) + "/Settings");
- if ( !dir.exists() )
- mkdir(dir.path().local8Bit(),0700);
- return dir.path() + "/" + name + ".conf";
- }
+ case File:
+ return name;
+ case User: {
+ QDir dir = (QString(getenv("HOME")) + "/Settings");
+ if ( !dir.exists() )
+ mkdir(dir.path().local8Bit(),0700);
+ return dir.path() + "/" + name + ".conf";
+ }
}
@@ -95,3 +100,3 @@ KateConfig::KateConfig( const QString &name, Domain domain )
{
- qWarning("KateConfig constructor\n");
+ owarn << "KateConfig constructor\n" << oendl;
git = groups.end();
@@ -106,3 +111,3 @@ KateConfig::KateConfig( const QString &name, Domain domain )
KateConfig::KateConfig ( const QString &name, bool what )
- : filename( configFilename(name,what ? User : File) )
+ : filename( configFilename(name,what ? User : File) )
{
@@ -120,5 +125,5 @@ KateConfig::~KateConfig()
{
- qWarning("KateConfig destructor\n");
+ owarn << "KateConfig destructor\n" << oendl;
if ( changed )
- write();
+ write();
}
@@ -131,3 +136,3 @@ bool KateConfig::hasKey( const QString &key ) const
if ( groups.end() == git )
- return FALSE;
+ return FALSE;
KateConfigGroup::ConstIterator it = ( *git ).find( key );
@@ -149,5 +154,5 @@ void KateConfig::setGroup( const QString &gname )
if ( it == groups.end() ) {
- git = groups.insert( gname, KateConfigGroup() );
- changed = TRUE;
- return;
+ git = groups.insert( gname, KateConfigGroup() );
+ changed = TRUE;
+ return;
}
@@ -174,8 +179,8 @@ void KateConfig::writeEntry( const QString &key, const QString &value )
if ( git == groups.end() ) {
- qWarning( "no group set" );
- return;
+ owarn << "no group set" << oendl;
+ return;
}
if ( (*git)[key] != value ) {
- ( *git ).insert( key, value );
- changed = TRUE;
+ ( *git ).insert( key, value );
+ changed = TRUE;
}
@@ -198,8 +203,8 @@ static QString encipher(const QString& plain)
for (int i=0; i<(int)plain.length(); i++) {
- int u = plain[i].unicode();
- int c = u ^ mix;
- QString x = QString::number(c,36);
- cipher.append(QChar('a'+x.length()));
- cipher.append(x);
- mix *= u;
+ int u = plain[i].unicode();
+ int c = u ^ mix;
+ QString x = QString::number(c,36);
+ cipher.append(QChar('a'+x.length()));
+ cipher.append(x);
+ mix *= u;
}
@@ -213,7 +218,7 @@ static QString decipher(const QString& cipher)
for (int i=0; i<(int)cipher.length();) {
- int l = cipher[i].unicode()-'a';
- QString x = cipher.mid(i+1,l); i+=l+1;
- int u = x.toInt(0,36) ^ mix;
- plain.append(QChar(u));
- mix *= u;
+ int l = cipher[i].unicode()-'a';
+ QString x = cipher.mid(i+1,l); i+=l+1;
+ int u = x.toInt(0,36) ^ mix;
+ plain.append(QChar(u));
+ mix *= u;
}
@@ -234,4 +239,4 @@ void KateConfig::writeEntryCrypt( const QString &key, const QString &value )
if ( git == groups.end() ) {
- qWarning( "no group set" );
- return;
+ owarn << "no group set" << oendl;
+ return;
}
@@ -239,4 +244,4 @@ void KateConfig::writeEntryCrypt( const QString &key, const QString &value )
if ( (*git)[key] != evalue ) {
- ( *git ).insert( key, evalue );
- changed = TRUE;
+ ( *git ).insert( key, evalue );
+ changed = TRUE;
}
@@ -289,3 +294,3 @@ void KateConfig::writeEntry( const QString &key, const QStringList &lst, const Q
for ( ; it != lst.end(); ++it )
- s += *it + sep;
+ s += *it + sep;
writeEntry( key, s );
@@ -299,3 +304,3 @@ void KateConfig::writeEntry( const QString &key, const QColor &val )
l.append( QString().setNum(val.blue()) );
-
+
writeEntry( key, l, QChar(',') );
@@ -311,3 +316,3 @@ void KateConfig::writeEntry( const QString &key, const QFont &val )
l.append( QString().setNum((int)val.charSet()) );
-
+
writeEntry( key, l, QChar(',') );
@@ -323,4 +328,4 @@ void KateConfig::removeEntry( const QString &key )
if ( git == groups.end() ) {
- qWarning( "no group set" );
- return;
+ owarn << "no group set" << oendl;
+ return;
}
@@ -356,7 +361,7 @@ QString KateConfig::readEntry( const QString &key, const QString &deflt )
if ( !res.isNull() )
- return res;
+ return res;
if ( !glang.isEmpty() ) {
- res = readEntryDirect( key+"["+glang+"]" );
- if ( !res.isNull() )
- return res;
+ res = readEntryDirect( key+"["+glang+"]" );
+ if ( !res.isNull() )
+ return res;
}
@@ -379,7 +384,7 @@ QString KateConfig::readEntryCrypt( const QString &key, const QString &deflt )
if ( res.isNull() && glang.isEmpty() )
- res = readEntryDirect( key+"["+glang+"]" );
+ res = readEntryDirect( key+"["+glang+"]" );
if ( res.isNull() )
- res = readEntryDirect( key, QString::null );
+ res = readEntryDirect( key, QString::null );
if ( res.isNull() )
- return deflt;
+ return deflt;
return decipher(res);
@@ -399,4 +404,4 @@ QString KateConfig::readEntryDirect( const QString &key, const QString &deflt )
if ( git == groups.end() ) {
- //qWarning( "no group set" );
- return deflt;
+ //owarn << "no group set" << oendl;
+ return deflt;
}
@@ -404,5 +409,5 @@ QString KateConfig::readEntryDirect( const QString &key, const QString &deflt )
if ( it != ( *git ).end() )
- return *it;
+ return *it;
else
- return deflt;
+ return deflt;
}
@@ -422,5 +427,5 @@ int KateConfig::readNumEntry( const QString &key, int deflt )
if ( s.isEmpty() )
- return deflt;
+ return deflt;
else
- return s.toInt();
+ return s.toInt();
}
@@ -440,5 +445,5 @@ bool KateConfig::readBoolEntry( const QString &key, bool deflt )
if ( s.isEmpty() )
- return deflt;
+ return deflt;
else
- return (bool)s.toInt();
+ return (bool)s.toInt();
}
@@ -458,5 +463,5 @@ QStringList KateConfig::readListEntry( const QString &key, const QChar &sep )
if ( s.isEmpty() )
- return QStringList();
+ return QStringList();
else
- return QStringList::split( sep, s );
+ return QStringList::split( sep, s );
}
@@ -486,3 +491,3 @@ QValueList<int> KateConfig::readIntListEntry( const QString &key ) const
if ( s.isEmpty() )
- return il;
+ return il;
@@ -502,8 +507,8 @@ void KateConfig::clearGroup()
if ( git == groups.end() ) {
- qWarning( "no group set" );
- return;
+ owarn << "no group set" << oendl;
+ return;
}
if ( !(*git).isEmpty() ) {
- ( *git ).clear();
- changed = TRUE;
+ ( *git ).clear();
+ changed = TRUE;
}
@@ -518,3 +523,3 @@ void KateConfig::write( const QString &fn )
if ( !fn.isEmpty() )
- filename = fn;
+ filename = fn;
strNewFile = filename + ".new";
@@ -523,9 +528,9 @@ void KateConfig::write( const QString &fn )
if ( !f.open( IO_WriteOnly|IO_Raw ) ) {
- qWarning( "could not open for writing `%s'", strNewFile.latin1() );
- git = groups.end();
- return;
+ owarn << "could not open for writing `" << strNewFile << "'" << oendl;
+ git = groups.end();
+ return;
}
-
+
QString str;
- QCString cstr;
+ QCString cstr;
QMap< QString, KateConfigGroup >::Iterator g_it = groups.begin();
@@ -533,9 +538,9 @@ void KateConfig::write( const QString &fn )
for ( ; g_it != groups.end(); ++g_it ) {
- str += "[" + g_it.key() + "]\n";
- KateConfigGroup::Iterator e_it = ( *g_it ).begin();
- for ( ; e_it != ( *g_it ).end(); ++e_it )
- str += e_it.key() + " = " + *e_it + "\n";
+ str += "[" + g_it.key() + "]\n";
+ KateConfigGroup::Iterator e_it = ( *g_it ).begin();
+ for ( ; e_it != ( *g_it ).end(); ++e_it )
+ str += e_it.key() + " = " + *e_it + "\n";
}
cstr = str.utf8();
-
+
int total_length;
@@ -543,9 +548,9 @@ void KateConfig::write( const QString &fn )
if ( total_length != int(cstr.length()) ) {
- QMessageBox::critical( 0, QObject::tr("Out of Space"),
- QObject::tr("There was a problem creating\nKateConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again.") );
- f.close();
- QFile::remove( strNewFile );
- return;
+ QMessageBox::critical( 0, QObject::tr("Out of Space"),
+ QObject::tr("There was a problem creating\nKateConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again.") );
+ f.close();
+ QFile::remove( strNewFile );
+ return;
}
-
+
f.close();
@@ -553,6 +558,6 @@ void KateConfig::write( const QString &fn )
if ( rename( strNewFile, filename ) < 0 ) {
- qWarning( "problem renaming the file %s to %s", strNewFile.latin1(),
- filename.latin1() );
- QFile::remove( strNewFile );
- }
+ qWarning( "problem renaming the file %s to %s", strNewFile.latin1(),
+ filename.latin1() );
+ QFile::remove( strNewFile );
+ }
}
@@ -575,4 +580,4 @@ void KateConfig::read()
if ( !QFileInfo( filename ).exists() ) {
- git = groups.end();
- return;
+ git = groups.end();
+ return;
}
@@ -581,4 +586,4 @@ void KateConfig::read()
if ( !f.open( IO_ReadOnly ) ) {
- git = groups.end();
- return;
+ git = groups.end();
+ return;
}
@@ -610,21 +615,21 @@ bool KateConfig::parse( const QString &l )
QString line = l.stripWhiteSpace();
-
+
if ( line [0] == QChar ( '#' ))
- return true; // ignore comments
-
+ return true; // ignore comments
+
if ( line[ 0 ] == QChar( '[' ) ) {
- QString gname = line;
- gname = gname.remove( 0, 1 );
- if ( gname[ (int)gname.length() - 1 ] == QChar( ']' ) )
- gname = gname.remove( gname.length() - 1, 1 );
- git = groups.insert( gname, KateConfigGroup() );
+ QString gname = line;
+ gname = gname.remove( 0, 1 );
+ if ( gname[ (int)gname.length() - 1 ] == QChar( ']' ) )
+ gname = gname.remove( gname.length() - 1, 1 );
+ git = groups.insert( gname, KateConfigGroup() );
} else if ( !line.isEmpty() ) {
- if ( git == groups.end() )
- return FALSE;
- int eq = line.find( '=' );
- if ( eq == -1 )
- return FALSE;
- QString key = line.left(eq).stripWhiteSpace();
- QString value = line.mid(eq+1).stripWhiteSpace();
- ( *git ).insert( key, value );
+ if ( git == groups.end() )
+ return FALSE;
+ int eq = line.find( '=' );
+ if ( eq == -1 )
+ return FALSE;
+ QString key = line.left(eq).stripWhiteSpace();
+ QString value = line.mid(eq+1).stripWhiteSpace();
+ ( *git ).insert( key, value );
}
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 3c9a637..9865c35 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -16,14 +16,19 @@
***************************************************************************/
-#include <qaction.h>
-#include <qtoolbutton.h>
-#include <qmenubar.h>
-#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
+#include "tinykate.h"
+
+#include "katedocument.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
#include <opie2/ofiledialog.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
-#include "tinykate.h"
+/* QT */
+#include <qaction.h>
+#include <qtoolbutton.h>
+#include <qmenubar.h>
-#include <katedocument.h>
-#include <kglobal.h>
@@ -154,3 +159,3 @@ TinyKate::~TinyKate( )
{
- qWarning("TinyKate destructor\n");
+ owarn << "TinyKate destructor\n" << oendl;
@@ -162,3 +167,3 @@ TinyKate::~TinyKate( )
if( KGlobal::config() != 0 ) {
- qWarning("deleting KateConfig object..\n");
+ owarn << "deleting KateConfig object..\n" << oendl;
delete KGlobal::config();
@@ -183,3 +188,3 @@ void TinyKate::open(const QString & filename)
tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed );
- qDebug(filename);
+ odebug << filename << oendl;
@@ -251,3 +256,3 @@ void TinyKate::slotSave() {
KateDocument *kd = (KateDocument*) currentView->document();
- // qDebug("saving file "+kd->docName());
+ // odebug << "saving file "+kd->docName() << oendl;
if( kd->docName().isEmpty())
@@ -267,3 +272,3 @@ void TinyKate::slotSaveAs() {
if (!filename.isEmpty()) {
- qDebug("saving file "+filename);
+ odebug << "saving file "+filename << oendl;
QFileInfo fi(filename);