- convert qDebug to odebug

12 files changed, 2636 insertions, 2595 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
@@ -13,17 +13,21 @@
 //   ***************************************************************************/
 //ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL
 
+#include "LibraryDialog.h"
+#include "output.h"
+
+/* OPIE */
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
+#include <opie2/odebug.h>
 
-#include "LibraryDialog.h"
-#include "output.h"
-
+/* QT */
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 //#include <qlayout.h>
 
+/* STD */
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,140 +36,140 @@
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog. */
 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();
 
       //      this->setMaximumWidth(240);
 
-		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);
 }
 
 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();
 }
 
   /*This groks using PGWHOLE.TXT */
 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
 #endif
 } // end Newlibrary()
@@ -174,86 +178,86 @@ void  LibraryDialog::Newlibrary()
 void LibraryDialog::Library()
 {// old library groking method
 
-		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);
+        }
 
 } //end Library()
 
@@ -262,506 +266,506 @@ void LibraryDialog::Library()
     Groks the author out of the title */
 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()
 
   /*
     selected one etext*/
 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();
+                        }
+                }
+        }
 }
 
 bool  LibraryDialog::download_Etext()
 { // ftp method
   // 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;
 }
 
 bool LibraryDialog::httpDownload()
 {//  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;
 }
 
 void LibraryDialog::cancelIt()
 {
-		saveConfig();
+        saveConfig();
 
-		DlglistItemNumber = "";
-		this->reject();
+        DlglistItemNumber = "";
+        this->reject();
 }
 
 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;
 }
 
 
 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();
 }
 
   /*
     searches library index for user word*/
 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();
+        }
 }
 
   /*
@@ -769,20 +773,20 @@ void LibraryDialog::onButtonSearch()
 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");*/
 }
 
   //  bool LibraryDialog::UnzipIt( QString zipFile) {
@@ -806,7 +810,7 @@ void  LibraryDialog::parseSearchResults( QString resultStr)
 
   //          int exit=QMessageBox::information(this, "Unzip?", "Ok to unzip "+ zipFile+" ?", QMessageBox::Yes, QMessageBox::No);
   //          if (exit==QMessageBox::Yes) {
-  //              qDebug("Issuing the command "+cmd);
+  //              odebug << "Issuing the command "+cmd << oendl;
   //  #if defined(_WS_WIN_)
   //      WinExec( cmd, SW_HIDE );
   //  #endif
@@ -840,59 +844,59 @@ void LibraryDialog::sort()
     Downloads the current selected listitem*/
 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;
 }
 
   /*
     download button is pushed so we get the current items to download*/
 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;
 }
 
 
@@ -900,141 +904,141 @@ bool LibraryDialog::onButtonDownload()
     handles the sorting combo box */
 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();
 }
 
 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;
+        }
 }
 
 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;
 
 }
 
@@ -1042,26 +1046,26 @@ bool LibraryDialog::moreInfo()
     This loads the library Index*/
 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
@@ -10,15 +10,15 @@
 //  ***************************************************************************/
 // // half-assed attempt at providing a network dialog.
 // /* Created: Sun Aug 27 15:24:52 2000*/
-#include <unistd.h>
 
-extern "C" {
-#include <ftplib.h>
-}
 
 #include "NetworkDialog.h"
 #include "gutenbrowser.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qprogressbar.h>
 #include <qstringlist.h>
 #include <qpe/config.h>
@@ -30,6 +30,12 @@ extern "C" {
 #include <qpushbutton.h>
 #include <qlayout.h>
 
+/* STD */
+#include <unistd.h>
+extern "C" {
+#include <ftplib.h>
+}
+
 QProgressBar* ProgressBar1;
 QPushButton* buttonCancel;
 static netbuf *conn = NULL;
@@ -46,20 +52,20 @@ 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 )
 {
 
     ftp_host = netL[0];
     networkUrl = strUrl =  netL[0];
 
     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 ) {
 //         if ( !name )
 //              setName( "HTTP NetworkDialog" );
@@ -118,11 +124,11 @@ void NetworkDialog::initDialog() {
     connect(buttonCancel,SIGNAL(clicked()),this,SLOT(reject()));
 //    connect( timer, SIGNAL(timeout()), this , SLOT(timeSlot()));
 //    connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot()));
-		if(autoOk) {
-				qWarning("XXXXXXXXXXXXXXXXXXXXXXXX");
-				buttonOk->setDown(true);
-				doOk();
-		}
+        if(autoOk) {
+                owarn << "XXXXXXXXXXXXXXXXXXXXXXXX" << oendl;
+                buttonOk->setDown(true);
+                doOk();
+        }
 }
 
 void NetworkDialog::timeSlot() {
@@ -143,13 +149,13 @@ void NetworkDialog::timeSlot() {
 //      timerProgess--;
 //          posTimer=TRUE;
 //      }
-//  //    qDebug("timer event");
+//  //    odebug << "timer event" << oendl;
 //      qApp->processEvents();
 //      repaint();
 }
 
 void NetworkDialog::connectionTimeSlot() {
-//      qDebug("Connections timed out");
+//      odebug << "Connections timed out" << oendl;
 //      ftpQuit();
 //      qApp->processEvents();
 //      repaint();
@@ -167,21 +173,21 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //    connectionTimer->start( 600 , FALSE);
     warnLabel ->setText( "");
     qApp->processEvents();
-    qDebug("Downloading: %s",networkUrl.latin1());
-    qDebug("Into: %s",localFileName.latin1());
+    odebug << "Downloading: " << networkUrl << "" << oendl;
+    odebug << "Into: " << localFileName << "" << oendl;
     if( networkUrl.length() > 5) {
         QString ftp_user = "anonymous";
         QString ftp_pass = "zaurus@gutenbrowser.com";
 //    ftp_host= networkUrl.mid(networkUrl.find("ftp://",0, TRUE),
         if(ftp_host.length() < 2) {
-            qDebug("Please select an ftp host" );
+            odebug << "Please select an ftp host" << oendl;
             successDownload=false;
             QMessageBox::message("Note","You need to select an ftp host");
             return false;
         }
         QString msg;
-        qDebug(ftp_host);
-        qDebug("Opening ftp connection.");
+        odebug << ftp_host << oendl;
+        odebug << "Opening ftp connection." << oendl;
         warnLabel->setText("connecting to: "+ftp_host );
         qApp->processEvents();
           /////////// Open FTP connection
@@ -200,7 +206,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             QMessageBox::message("Note",msg);
             return  false;
         }
-        qDebug("Changing directories.");
+        odebug << "Changing directories." << oendl;
         TextLabel3->setText("Changing directories.");
         qApp->processEvents();
         if (!FtpChdir( dir.latin1(), conn )) {
@@ -217,7 +223,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //              FtpQuit(conn);
 //              return false;
 //      }
-        qDebug("Requesting directory list.");
+        odebug << "Requesting directory list." << oendl;
         TextLabel3->setText("Getting directory list.");
         qApp->processEvents();
         if (!FtpDir( "./.guten_temp", dir.latin1(), conn) ) {
@@ -232,7 +238,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 
         if (tmp.open(IO_ReadOnly)) {
             QTextStream t( &tmp );   // use a text stream
-            qDebug("Finding partial filename "+s_partialFileName);
+            odebug << "Finding partial filename "+s_partialFileName << oendl;
             while ( !t.eof()) {
                 s = t.readLine();
 
@@ -241,30 +247,30 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 
                     if (str.contains(".txt")) {
                         File_Name = str;
-                        qDebug("Found file_name "+ File_Name);
+                        odebug << "Found file_name "+ File_Name << oendl;
                         break;
                     }
 //                      if (str.contains(".zip")) {
 //                          File_Name = str;
-//                          qDebug("Found file_name "+ File_Name);
+//                          odebug << "Found file_name "+ File_Name << oendl;
 //                          break;
 //                      }
-                    
+
                 }
             }  //end of while loop
             tmp.close();
 //        tmp.remove(); ///TODO this is for release version Zaurus
         }
         else
-            qDebug("Error opening temp file.");
+            odebug << "Error opening temp file." << oendl;
 
         Config cfg("Gutenbrowser");
         cfg.setGroup("General");
         QString temp=cfg.readEntry("DownloadDirectory",local_library);
 
         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;
         TextLabel3->setText(msg);
         qApp->processEvents();
@@ -272,9 +278,9 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             if (!FtpSize( File_Name.latin1(), &fsz, FTPLIB_ASCII, conn))
                 fsz = 0;
             QString temp;
-            temp.sprintf( File_Name+" "+" %dkb", fsz); 
+            temp.sprintf( File_Name+" "+" %dkb", fsz);
             TextLabel3->setText(temp);
-            
+
              ProgressBar1->setTotalSteps(fsz);
             FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
             FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
@@ -293,7 +299,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             FtpQuit(conn);
             return false;
         }
-        qDebug("Ftp session successful");
+        odebug << "Ftp session successful" << oendl;
         successDownload=TRUE;
         FtpQuit(conn);
         return true;
@@ -302,7 +308,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 }
 
 void NetworkDialog::doOk() {
-		qWarning("Do OK");
+        owarn << "Do OK" << oendl;
     QString loginStr;
     loginStr = "gutenbrowser";
     if ( !ftp_host.isEmpty() )   {
@@ -314,7 +320,7 @@ void NetworkDialog::doOk() {
                 successDownload = true;
             else {
                 successDownload = false;
-                reject(); 
+                reject();
             }
         } else {
             if(downloadFile(ftp_host))
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
@@ -98,7 +98,7 @@ void SearchDialog::byeBye()
 {
 
     searchString = get_text();
-//    qDebug("Search string is "+searchString);
+//    odebug << "Search string is "+searchString << oendl; 
     Config cfg("Gutenbrowser");
     cfg.setGroup("General");
     cfg.writeEntry("LastSearch",searchString);
@@ -119,7 +119,7 @@ void SearchDialog::byeBye()
 void SearchDialog::closed()
 {
     searchString = get_text();
-//    qDebug("Search string is "+searchString);
+//    odebug << "Search string is "+searchString << oendl; 
     Config cfg("Gutenbrowser");
     cfg.setGroup("General");
     cfg.writeEntry("LastSearch",searchString);
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
@@ -10,6 +10,7 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
 using namespace Opie::Ui;
 
 /* QT */
@@ -52,7 +53,7 @@ void optionsDialog::BrowseSelected() {
     if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() )  {
       fileName = str;
 //      QStringList fileList=browseForFiles->fileList;
-//      qDebug(selFile);
+//      odebug << selFile << oendl;
 //      QStringList::ConstIterator f;
 //      QString fileTemp,filer;
 //      for (  f = fileList.begin(); f != fileList.end(); f++ ) {
@@ -76,7 +77,7 @@ void optionsDialog::BrowseSelected() {
 void optionsDialog::setHttp(int index) {
     Config config("Gutenbrowser");
     config.setGroup( "HttpServer" );
-    qDebug("writing http server");
+    odebug << "writing http server" << oendl;
     if( index== 0) {
         config.writeEntry("Preferred", "http://sailor.gutenberg.org");
     } else {
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
@@ -90,7 +90,7 @@ void FontDialog::familyListBoxSlot(const QString & text)
     styleListBox->clear();
 //  clearListBoxes();
   family = text;
-//  qDebug(family);
+//  odebug << family << oendl; 
   QStringList styles = fdb.styles( family ); // string list of styles of our current font family
   styleListBox->insertStringList( styles);
   QString dstyle;// = "\t" + style + " (";
@@ -100,7 +100,7 @@ void FontDialog::familyListBoxSlot(const QString & text)
 QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
    for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) {
        dstyle = QString::number( *points );
-       qDebug(dstyle);
+       odebug << dstyle << oendl; 
       sizeComboBox->insertItem(  dstyle.left( dstyle.length() - 1 ));
   }
 #else
@@ -151,7 +151,7 @@ void FontDialog::populateLists()
   for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) {
       QString family = *f;
 //      if(family == defaultFont.family())
-//          qDebug(family);
+//          odebug << family << oendl; 
       familyListBox->insertItem( family);
 
       if( familyListBox->text(0) == family) {
@@ -209,13 +209,13 @@ void FontDialog::changeText()
     else {
         family = familyListBox->currentText();
     }
-//          qDebug("Font family is "+family);
+//          odebug << "Font family is "+family << oendl; 
     if( styleListBox->currentItem() == -1)
         style=styleListBox->text(0);
     else {
         style = styleListBox->currentText();
     }
-//          qDebug("font style is "+style);
+//          odebug << "font style is "+style << oendl; 
 
     if( sizeComboBox->currentItem() == -1 )
         size = sizeComboBox->text(0);
@@ -223,7 +223,7 @@ void FontDialog::changeText()
      size = sizeComboBox->currentText();
     }
 
-//       qDebug("Font size is "+size);
+//       odebug << "Font size is "+size << oendl; 
     bool ok;
     int i_size = size.toInt(&ok,10);
     QStringList charSetList = fdb.charSets(family);
@@ -231,13 +231,13 @@ void FontDialog::changeText()
     QString charSet;
           for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style
             charSet = *s;
-//            qDebug(charSet);
+//            odebug << charSet << oendl; 
           }
     selectedFont = fdb.font(family,style,i_size,charSet);
     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");
     cfg.setGroup("Font");
     cfg.writeEntry("Family",family);
@@ -249,7 +249,7 @@ void FontDialog::changeText()
           selectedFont = fdb.font(family,"Regular",i_size,charSet);
           selectedFont.setItalic(TRUE); //ya right
           cfg.writeEntry("Italic","TRUE");
-//            qDebug("Style is "+styleListBox->currentText());
+//            odebug << "Style is "+styleListBox->currentText() << oendl; 
       } else
           cfg.writeEntry("Italic","FALSE");
 
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
@@ -11,20 +11,25 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
+
 #include "optionsDialog.h"
 #include "gutenbrowser.h"
 //#include "NetworkDialog.h"
 #include "output.h"
 
+/* 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>
 
 // :)~
 void optionsDialog::ftpSiteDlg( )
@@ -38,7 +43,7 @@ void optionsDialog::ftpSiteDlg( )
     if( !dir.exists())
         dir.mkdir(ListFile,true);
     ListFile+="/ftpList";
-    qDebug("opening "+ListFile);
+    odebug << "opening "+ListFile << oendl;
     if ( QFile(ListFile).exists() ) {
         openSiteList();
     } else {
@@ -76,7 +81,7 @@ void optionsDialog::getSite()
 //    NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog",TRUE,0,networkUrl,outputFile);
 //    if( NetworkDlg->exec() != 0 )
 //    { // use new, improved, *INSTANT* network-dialog-file-getterer
-//        qDebug("gitcha!");
+//        odebug << "gitcha!" << oendl;
 //    }
 //    delete NetworkDlg;
 //#ifdef Q_WS_QWS
@@ -84,7 +89,7 @@ void optionsDialog::getSite()
 // TODO qprocess here
 
     QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl + " 2>&1" ;
- qDebug("Issuing the command "+cmd);
+ odebug << "Issuing the command "+cmd << oendl;
     Output *outDlg;
     outDlg = new Output( 0, tr("Downloading ftp sites...."),TRUE);
     outDlg->showMaximized();
@@ -99,11 +104,11 @@ void optionsDialog::getSite()
         outDlg->OutputEdit->append(line);
         outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
     }
-    pclose(fp);        
+    pclose(fp);
     outDlg->close();
     if(outDlg)
         delete outDlg;
- 
+
 //    outputFile=ListFile;
     ftp_QListBox_1->clear();
     parseFtpList( outputFile); // got the html list, now parse it so we can use it
@@ -113,7 +118,7 @@ bool optionsDialog::parseFtpList( QString outputFile)
 {
 // parse ftplist html and extract just the machine names/directories
 // TODO: add locations!!
-    qDebug("parse ftplist "+outputFile);
+    odebug << "parse ftplist "+outputFile << oendl;
     QString ftpList, s_location;
     QFile f( outputFile );
 
@@ -152,11 +157,11 @@ bool optionsDialog::parseFtpList( QString outputFile)
                     s = t.readLine();
                     s = t.readLine();
             if(( start=s.find("<BR>(", 0, TRUE) ) != -1) {
-//              qDebug("%s",s.latin1());
+//              odebug << "" << s << "" << oendl;
               end = s.find( ")", 0, TRUE)+1;
               s_location= s.mid( start+4, (end - start)  );
 
-//               qDebug("%s", s_location.latin1());
+//               odebug << "" << s_location << "" << oendl;
 //                    ftpList += ftpSite + "\n";
 //                    ftp_QListBox_1->sort( TRUE );
                     ftpList += s_location+ "    "+ftpSite+"\n";
@@ -173,7 +178,7 @@ bool optionsDialog::parseFtpList( QString outputFile)
 
         } // end while loop
         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 )) );
         f2.writeBlock( ftpList, ftpList.length() );
         f.close();
@@ -190,7 +195,7 @@ bool optionsDialog::parseFtpList( QString outputFile)
 
 void optionsDialog::openSiteList() {
 
-    qDebug(" just opens the ftp site list");
+    odebug << " just opens the ftp site list" << oendl;
 //  ListFile = ( QDir::homeDirPath ()) +"/.gutenbrowser/ftpList";
     QFile f( ListFile);
     if(!f.open( IO_ReadWrite )) {
@@ -230,7 +235,7 @@ void optionsDialog::select_site( const char *index )
     QString s_site2;
 //    if(s_site.find("(",0,TRUE))
     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);
     ftp_host = s_site2.left(i_ftp );
     ftp_base_dir = s_site2.right( s_site2.length() - i_ftp);
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
@@ -14,13 +14,7 @@
 //        http://digital.library.upenn.edu/books/titles.html
 // ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL
 // 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>
+
 
 #include "editTitle.h"
 #include "gutenbrowser.h"
@@ -33,7 +27,17 @@
 #include "openetext.h"
 #include "output.h"
 
+/* 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>
 #include <qregion.h>
 #include <qpaintdevicemetrics.h>
@@ -51,6 +55,7 @@
 #include <qscrollview.h>
 #include <qpoint.h>
 
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -63,235 +68,235 @@ static const int fontsize[nfontsizes] = {8,9,10,11,12,13,14,18,24};
 
 #ifdef NOQUICKLAUNCH
 Gutenbrowser::Gutenbrowser()
-		Gutenbrowser();
+        Gutenbrowser();
 #else
 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
 
 Gutenbrowser::~Gutenbrowser() {
-			//  QPEApplication::grabKeyboard();
-			//  QPEApplication::ungrabKeyboard();
-		qDebug("Exit");
+            //  QPEApplication::grabKeyboard();
+            //  QPEApplication::ungrabKeyboard();
+        odebug << "Exit" << oendl;
 }
 
   /*
-		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);
 }
 
   /*
-		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);
+        }
 }
 
 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"));
+        }
 }
 
 
 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);
 }
 
   // SLOT IMPLEMENTATION
@@ -300,79 +305,79 @@ void Gutenbrowser::slotFilePrint() {
 }
 
 void Gutenbrowser::ByeBye() {
-		if (b_queryExit)
-				queryExit();
-		else {
-					//        writeConfig();
-				qApp->quit();
-		}
+        if (b_queryExit)
+                queryExit();
+        else {
+                    //        writeConfig();
+                qApp->quit();
+        }
 }
 
 void Gutenbrowser::HelpBtn() {
-		HelpMe* HelpDlg;
-		HelpDlg = new HelpMe( this, "Help Dialog");
-		HelpDlg->showMaximized();
+        HelpMe* HelpDlg;
+        HelpDlg = new HelpMe( this, "Help Dialog");
+        HelpDlg->showMaximized();
 }
 
 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
 } // end 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;
 }
 
 
 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;
 }
 
 
@@ -380,782 +385,782 @@ 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");
 }
 
 
 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;
 }
 
 
 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();
 }
 
 void Gutenbrowser::doBeginBtn() {
-		if(loadCheck) {
-				qApp->processEvents();
-				BeginBtn();
-		}
+        if(loadCheck) {
+                qApp->processEvents();
+                BeginBtn();
+        }
 }
 
   // moves text to the very top = 0
 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();
+        }
 }
 
   //moves text to the start of the EText
 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();
 }
 
   /*
-		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
 
 
   /* goes to last set bookmark*/
 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);
 }
 
 
 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
 
 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();
+        }
 }
 
 void Gutenbrowser::search_slot( ) {
     int line, col;
     if (!searchDlg /*&& !loadCheck */)
-				return;
+                return;
 
     Lview->getCursorPosition(&line,&col);
     QString to_find_string=searchDlg->get_text();
 
-			// 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 ;
     }
   again:
     int  result = doSearch( to_find_string , /* searchDlg->case_sensitive()*/ TRUE, searchDlg->forward_search(), line, col);
     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
     }
 }
 
 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;
 }
 
 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();
 }
 
 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();
 
 }
 
 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";
 
         pointSizeStr.setNum( pointSize);
         config.setGroup( "Font" );
@@ -1164,7 +1169,7 @@ void Gutenbrowser::ChangeFont() {
         config.writeEntry("Weight", weightStr );
         config.writeEntry("Italic", italicStr );
         config.writeEntry("Bold", boldStr );
-					//      config.write();
+                    //      config.write();
 
         Lview->setFont(font);
 
@@ -1173,432 +1178,432 @@ void Gutenbrowser::ChangeFont() {
         lRect = Lview->rect();
         if(useSplitter) {
         }
-					//       if(loadCheck) {
-					//         ResizeEdits();
-					//       }
+                    //       if(loadCheck) {
+                    //         ResizeEdits();
+                    //       }
         update();
-		}
+        }
 #endif
 }
 
 
   /*
-		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);
+        }
 }
 
 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);
 }
 
 
 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;
 }
 
 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();
 }
 
   /*
-		sets the status message */
+        sets the status message */
 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;
 }
 
 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
           LibraryBtn();
           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
+        };
 }
 
 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;
+        }
 }
 
 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();
+            //    }
 }
 
 
 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);
+                        }
+                }
 
 //            if(optDlg->styleChanged)
 //                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();
 }
 
 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;
 }
   /*Calls new fangled network dialog */
 void Gutenbrowser::OnNetworkDialog( const QString &/*networkUrl*/, const QString &/*output*/)
 {
-			//     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
 }
 
 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 {
+        };
 }
 
 void Gutenbrowser::donateByteMonkie()
@@ -1607,95 +1612,95 @@ void Gutenbrowser::donateByteMonkie()
 
 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");
 }
 
 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
 }
 
 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();
+                }
     }
 }
 
@@ -1708,277 +1713,277 @@ void Gutenbrowser::focusOutEvent( QFocusEvent* )
 
 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();
 }
 
 void Gutenbrowser::fixKeys()
 {
-		qDebug("Attempting to fix keys");
+        odebug << "Attempting to fix keys" << oendl;
 
 }
 
 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);
 
 }
 
 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);
+                }
+        }
 }
 
 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();
+                        }
+                }
+        }
 }
 
 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");
 }
 
 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();
 }
 
 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;
+        };
 }
 
 void Gutenbrowser::menuOpen() {
-		listClickedSlot( mainList->item( mainList->currentItem()));
+        listClickedSlot( mainList->item( mainList->currentItem()));
 }
 
 void Gutenbrowser::menuGoogle() {
-		searchGoogle(  mainList->text(mainList->currentItem()));
+        searchGoogle(  mainList->text(mainList->currentItem()));
 }
 
 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);
+        }
 
 }
 
 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);
 
 }
 
 
 
 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
@@ -11,15 +11,19 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
+
 //#include "gutenbrowserData.h"
 #include "gutenbrowser.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/fontdatabase.h>
 #include <qpe/menubutton.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qfontinfo.h>
 #include <qtoolbutton.h>
 
@@ -35,11 +39,11 @@ void Gutenbrowser::initSlots() {
     connect(InfoBar,SIGNAL(clicked()),SLOT(InfoBarClick()));
     connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp()));
     connect(mainList,SIGNAL(clicked(QListBoxItem *)),SLOT(listClickedSlot(QListBoxItem *)));
-    connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int)));    
+    connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int)));
 }
 
 void Gutenbrowser::initConfig() {
-//qDebug("Starting configuration.");
+//odebug << "Starting configuration." << oendl;
     QDir library(local_library);
     if ( !library.exists()) {
         library.mkdir(local_library, TRUE);
@@ -57,7 +61,7 @@ void Gutenbrowser::initConfig() {
 // #endif
 
     }
-      //    qDebug( "init file is %s",iniFile.latin1());
+      //    odebug << "init file is " << iniFile << "" << oendl;
 
 #ifdef Q_WS_QWS
     useSplitter=FALSE;
@@ -137,7 +141,7 @@ void Gutenbrowser::initConfig() {
 
     ftp_base_dir= config.readEntry("base",  "/pub/gutenberg");
 
-			//bool ok2;
+            //bool ok2;
     QString temp;
     QString copying;
     copying="";
@@ -147,21 +151,21 @@ void Gutenbrowser::initConfig() {
     qExit=config.readEntry("queryExit","TRUE");
     if(qExit=="TRUE") {
         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;
     }
 // bookmarks
 //       config.setGroup("Titles");
 //      QString tmpTitle=config.readEntry(file_name,"");
-  
+
 
 }// end initConfig()
 
 void Gutenbrowser::initMenuBar()
 {
-//    qDebug("Starting menu init.");
+//    odebug << "Starting menu init." << oendl;
       // menuBar entry fileMenu
     menubar = new QPEMenuBar(this);
 
@@ -176,14 +180,14 @@ void Gutenbrowser::initMenuBar()
       // menuBar entry editMenu
 
     editMenu=new QPopupMenu();
-    
+
     editMenu->insertItem(Resource::loadPixmap("up"), "Top",
-												 this, SLOT(TopBtn()) );
+                                                 this, SLOT(TopBtn()) );
     editMenu->insertItem( Resource::loadPixmap("back"), "Beginning",
                           this, SLOT(doBeginBtn()) );
     editMenu->insertItem( Resource::loadPixmap("gutenbrowser/search"), "Search",
                           this, SLOT(SearchBtn()) );
-    
+
     editMenu->insertItem("Clear", this, SLOT(ClearEdit()) );
 
     optionsMenu= new QPopupMenu();
@@ -207,7 +211,7 @@ void Gutenbrowser::initMenuBar()
 
 void Gutenbrowser::initButtonBar()
 {
-//qDebug("Starting buttonbar init.");
+//odebug << "Starting buttonbar init." << oendl;
 
     OpenButton = new QPushButton( this, "OpenButton" );
     OpenButton->setFocusPolicy( QWidget::TabFocus );
@@ -222,7 +226,7 @@ void Gutenbrowser::initButtonBar()
     ForwardButton = new QPushButton( this, "ForwardButton" );
     ForwardButton->setFocusPolicy( QWidget::TabFocus );
 //    ForwardButton->setAutoRepeat(TRUE);
-    
+
     SearchButton = new QPushButton( this, "SearchButton" );
     SearchButton->setFocusPolicy( QWidget::TabFocus );
 
@@ -234,14 +238,14 @@ void Gutenbrowser::initButtonBar()
 
     bookmarksMenu = new QPopupMenu();
     bookmarksMenu->insertItem("Last Set", this, SLOT(Bookmark( int) ));
-    
+
     lastBmkButton->setPopup(bookmarksMenu);
 
     dictionaryButton = new QPushButton( this, "dictionaryButton" );
     dictionaryButton->setFocusPolicy( QWidget::TabFocus );
 
     InfoBar = new QPushButton( this, "Info_Bar" );
-//    qDebug("Infobar");
+//    odebug << "Infobar" << oendl;
 //    if(!useSplitter) {
 
     buttonsHidden=FALSE;
@@ -276,7 +280,7 @@ void Gutenbrowser::initView()
       // set the main widget here
 //        QFont defaultFont( "charter", 10, 50, 0 );
     Lview = new MultiLine_Ex(this);
-      
+
     Config cfg("Gutenbrowser");
     cfg.setGroup("Font");
 
@@ -293,7 +297,7 @@ void Gutenbrowser::initView()
 
     QString italic=cfg.readEntry("Italic","FALSE");
     if(italic=="TRUE") {
-        qDebug("Set Italic font");
+        odebug << "Set Italic font" << oendl;
         defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround
         defaultFont.setItalic(TRUE);
     }
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
@@ -14,15 +14,20 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
 
 #include "helpme.h"
 #include "helpwindow.h"
 
+/* OPIE */
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qprogressdialog.h>
 #include <qlayout.h>
 
+/* STD */
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -111,12 +116,12 @@ void HelpMe::help()
 {
     QString msg ;
     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;
     goGetit( url);
 
 //       QCopEnvelope e("QPE/Application/helpbrowser", "setDocument(QString)" );
 //       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
@@ -37,7 +37,7 @@ OPIE_EXPORT_APP( OApplicationFactory<Gutenbrowser> )
 // //                     {
 // //                     case 'v': // help
 // //                         printf("Gutenbrowser: "VERSION"\n");
-// // //                        qDebug("Gutenbrowser: "VERSION);
+// // //                        odebug << "Gutenbrowser: "VERSION << oendl; 
 // //                           //                      return 0;
 // //                         break;
 // //                     case 't': // current time 19:34:20 04/03/00
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
@@ -18,20 +18,23 @@
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 using namespace Opie::Ui;
 
-#include <stdlib.h>
+/* QT */
 #include <qtextstream.h>
 #include <qfileinfo.h>
 
+/* STD */
 #if defined(_WS_WIN_)
 #include <windows.h>
 #else
 #include <unistd.h>
-#include "sys/stat.h"
+#include <stdlib.h>
+#include <sys/stat.h>
 #endif
 
 OpenEtext::OpenEtext(QWidget *parent, QString name) : QDialog(parent,name,true)
@@ -134,7 +137,7 @@ OpenFileButton->setDown(TRUE);
     if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() )  {
       filer = str;
 
-    qDebug("Open file: "+str);
+    odebug << "Open file: "+str << oendl;
 
     //      QStringList::ConstIterator f;
 //      QString fileTemp;
@@ -164,19 +167,19 @@ OpenFileButton->setDown(TRUE);
             if( s_fileName.right(4) == ".zip") { // unzip that sucker....
                 s_fileName = s_fileName.left( s_fileName.length() - 4);
                 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;
                 fileName = local_library + s_fileName + ".txt";
                 system( cmd);
             }
 // this renames the .txt to .etx!!
             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;
                 s_fileName.replace( s_fileName.length()-3,3,"gtn");//  s_fileName.replace( s_fileName.length()-3,3,"etx");
                 rename(fileName.latin1(),s_fileName.latin1());
                 fileName = s_fileName;
-//  qDebug("Filename is now "+fileName);
+//  odebug << "Filename is now "+fileName << oendl;
             }
         } else
                         fileName = str;
@@ -187,22 +190,22 @@ OpenFileButton->setDown(TRUE);
         name_file = fi.fileName();
         name_file = name_file.left(name_file.length() - 4);
 
-        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);
 
         QListBox_1->clear();
         getTitles();
-        qDebug("Filename is "+fileName);
+        odebug << "Filename is "+fileName << oendl;
         lnk.setFile(fileName); //sets File property
         lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
         lnk.setExec(fileName);
         lnk.setIcon("gutenbrowser/Gutenbrowser");
         if(!lnk.writeLink())
-            qDebug("Writing doclink did not work");
+            odebug << "Writing doclink did not work" << oendl;
 
    } // end of for each file name....
     OpenFileButton->setDown(FALSE);
@@ -219,13 +222,13 @@ bool OpenEtext::FindTitle( QString filename)
 
     QFileInfo fi(filename);
     name = fi.fileName();
-    qDebug("filename to open is " + name);
+    odebug << "filename to open is " + name << oendl;
     QFile indexLib( filename);
         bool findCheck = FALSE;
         //        int Titlenumber=0;
 
     if ( indexLib.open( IO_ReadOnly) ) {
-                qDebug("file opened successfully");
+                odebug << "file opened successfully" << oendl;
         QTextStream indexStream( &indexLib );
         QString target = "Project Gutenberg Etext of";
         QString target2 = "Project Gutenberg Etext";
@@ -239,7 +242,7 @@ bool OpenEtext::FindTitle( QString filename)
                 title = indexLine.mid( indexLine.find(target, 0, TRUE) + (target.length()) , indexLine.find("\r", 0, TRUE));
                 title = title.left( title.find( "*",0, TRUE));
                 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);
             }
             if( indexLine.find( target2, 0, TRUE) > -1 && !findCheck) {
@@ -247,7 +250,7 @@ bool OpenEtext::FindTitle( QString filename)
                 title = indexLine.mid(  indexLine.find( target2, 0, TRUE ) + ( target2.length()) , indexLine.find("\r", 0, TRUE) );
                 title = title.left( title.find( "*",0, TRUE));
                 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);
             }
             if( indexLine.find( target3, 0, TRUE) > -1 && !findCheck) {
@@ -255,20 +258,20 @@ bool OpenEtext::FindTitle( QString filename)
                 title = indexLine.mid( indexLine.find( target3, 0, TRUE) + ( target3.length()) , indexLine.find("\r", 0, TRUE));
                 title = title.left( title.find( "*",0, TRUE));
                 title = title.stripWhiteSpace ();
-//                qDebug("Found the title 3 and it is %s", title.latin1());
+//                odebug << "Found the title 3 and it is " << title << "" << oendl;
             }
             if( indexLine.find( target4, 0, TRUE) > -1 && !findCheck) {
                 findCheck = TRUE;
                 title = indexLine.mid(  indexLine.find( target4, 0, TRUE) + ( target4.length()) , indexLine.find("\r", 0, TRUE));
                 title = title.left( title.find( "*",0, TRUE));
                 title = title.stripWhiteSpace ();
-//                qDebug("Found the title 4 and it is %s", title.latin1());
+//                odebug << "Found the title 4 and it is " << title << "" << oendl;
             }
         } //endof file
                 indexLib.close();
 
         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);
             findCheck = TRUE;
         }
@@ -293,7 +296,7 @@ bool OpenEtext::FindTitle( QString filename)
                 i= i_numofFiles+1;
             }
             if(title.length()<3) {
-//                qDebug("title is empty");
+//                odebug << "title is empty" << oendl;
                 title="Unknown";
             }
             config.writeEntry( filename,title);
@@ -343,13 +346,13 @@ QString OpenEtext::titleFromLibrary( QString fileName)
                 title = indexLine.mid( 9, 50);
 //                title = indexLine.mid( 26, indexLine.length() );
                 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);
             }
         } //end while loop
     }
     else
-       qDebug("Error opening library index "+ local_index);
+       odebug << "Error opening library index "+ local_index << oendl;
     return title;
 }
 
@@ -414,7 +417,7 @@ void OpenEtext::removeSelection()
         QString file_title = config.readEntry( s_filename, "");
         if(title_text == file_title) {
             rem=i;
-//qDebug("file title to remove is "+file_title);
+//odebug << "file title to remove is "+file_title << oendl;
             selFile = s_filename;
             config.removeEntry( s_filename); //removes file=title
         }
@@ -482,7 +485,7 @@ void  OpenEtext::editTitle() {
 
     int currentItem=QListBox_1->currentItem();
     QString title_text = QListBox_1->text( currentItem);
-//qDebug("Selected "+title_text);
+//odebug << "Selected "+title_text << oendl;
 
     Config config("Gutenbrowser");
     config.setGroup( "Files" );
@@ -496,15 +499,15 @@ void  OpenEtext::editTitle() {
         QString s_filename = config.readEntry(fileNum, "" );
         config.setGroup( "Titles" );
         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;
             Edit_Title *titleEdit;
             titleEdit = new Edit_Title(this,file_title ,TRUE);
             if(titleEdit->exec() !=0) {
-//qDebug(titleEdit->newTitle);
+//odebug << titleEdit->newTitle << oendl;
                 config.writeEntry( s_filename, titleEdit->newTitle);
                 QListBox_1->removeItem(currentItem);
                 QListBox_1->insertItem ( QPixmap( QPEApplication::qpeDir()+"pics/gutenbrowser/gutenbrowser_sm.png"), titleEdit->newTitle, currentItem);
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
@@ -13,17 +13,19 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#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"
 //#include "browserDialog.h"
 //#define Inherited  QDialog
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
 #include <qfont.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -38,6 +40,12 @@
 #ifndef Q_WS_QWS
 #include <qwhatsthis.h>
 #endif
+
+/* STD */
+// #include <unistd.h>
+// #include <stdio.h>
+// #include <stdlib.h>
+
 /*
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
@@ -60,7 +68,7 @@ optionsDialog::optionsDialog( QWidget* parent,  const char* name, bool modal, WF
 
 optionsDialog::~optionsDialog()
 {
-//qDebug("OnExit()");
+//odebug << "OnExit()" << oendl;
 //    writeConfig();
 }
 
@@ -125,15 +133,15 @@ void optionsDialog::getConfig()
     QString qExit=config.readEntry("queryExit","TRUE");
     if(qExit=="TRUE") {
         cb_queryExit->setChecked(TRUE);
-        qDebug("Config Setting    b_qExit=TRUE;");
+        odebug << "Config Setting    b_qExit=TRUE;" << oendl;
         b_qExit=TRUE;
     } else {
         cb_queryExit->setChecked(FALSE);
-        qDebug("ConfigSetting    b_qExit=FALSE;");
+        odebug << "ConfigSetting    b_qExit=FALSE;" << oendl;
         b_qExit=FALSE;
     }
 
-     
+
       useWordWrap_CheckBox->setChecked( config.readBoolEntry("WordWrap", 1));
       QString downDir=config.readEntry( "DownloadDirectory",local_library);
       downloadDirEdit->setText(downDir);
@@ -141,7 +149,7 @@ void optionsDialog::getConfig()
 
 //  //  void optionsDialog::setStyle( int index) {
 
-//  //      qDebug("Set style%d",index);
+//  //      odebug << "Set style" << index << "" << oendl;
 //  //  //int styleInt= index;
 //  //   styleChanged=TRUE;
 //  //        if( ComboBoxStyle->currentItem()==0) styleInt=0;//"styleMetal"));
@@ -167,15 +175,15 @@ void optionsDialog::slotQueryExit()
 {
     Config config("Gutenbrowser");
     config.setGroup("General");
-    qDebug("writing queryExit");
+    odebug << "writing queryExit" << oendl;
     if(cb_queryExit->isChecked()) {
         b_qExit=TRUE;
         config.writeEntry("queryExit","TRUE");
-        qDebug("WritingConfig queryExit=TRUE");
+        odebug << "WritingConfig queryExit=TRUE" << oendl;
     } else {
         b_qExit=FALSE;
         config.writeEntry("queryExit","FALSE");
-        qDebug("WritingConfig queryExit=FALSE");
+        odebug << "WritingConfig queryExit=FALSE" << oendl;
     }
     config.write();
 }
@@ -187,10 +195,10 @@ void optionsDialog::slotQueryExit()
 //  }
 
 //  void optionsDialog::lineEditChanged(const QString &editText) {
-//      qDebug(editText);
+//      odebug << editText << oendl;
 //  }
 
-void optionsDialog::changeFonts() 
+void optionsDialog::changeFonts()
 {
     changedFonts=TRUE;
 }
@@ -203,5 +211,5 @@ void optionsDialog::slotWordWrap(bool b) {
 
   config.writeEntry("WordWrap", b);
   config.write();
-  
+
 }