summaryrefslogtreecommitdiff
authorar <ar>2004-05-03 21:35:18 (UTC)
committer ar <ar>2004-05-03 21:35:18 (UTC)
commit412619441fab46fc79c695a23ccf9e38135bdfad (patch) (unidiff)
tree19d9b8af14cf6c345ef532bb32368b9c7b43c50f
parentd1095d71394779557f446e2a67ba55bc62eec859 (diff)
downloadopie-412619441fab46fc79c695a23ccf9e38135bdfad.zip
opie-412619441fab46fc79c695a23ccf9e38135bdfad.tar.gz
opie-412619441fab46fc79c695a23ccf9e38135bdfad.tar.bz2
- convert qDebug to odebug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.cpp1724
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp78
-rw-r--r--noncore/apps/opie-gutenbrowser/SearchDialog.cpp4
-rw-r--r--noncore/apps/opie-gutenbrowser/browserDialog.cpp5
-rw-r--r--noncore/apps/opie-gutenbrowser/fontDialog.cpp20
-rw-r--r--noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp33
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowser.cpp3217
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp38
-rw-r--r--noncore/apps/opie-gutenbrowser/helpme.cpp13
-rw-r--r--noncore/apps/opie-gutenbrowser/main.cpp2
-rw-r--r--noncore/apps/opie-gutenbrowser/openetext.cpp55
-rw-r--r--noncore/apps/opie-gutenbrowser/optionsDialog.cpp42
-rw-r--r--noncore/apps/opie-reader/Aportis.cpp8
-rw-r--r--noncore/apps/opie-reader/Bkmks.cpp6
-rw-r--r--noncore/apps/opie-reader/BuffDoc.cpp18
-rw-r--r--noncore/apps/opie-reader/CDrawBuffer.cpp22
-rw-r--r--noncore/apps/opie-reader/QTReader.cpp52
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp3231
-rw-r--r--noncore/apps/opie-reader/StyleConsts.cpp2
-rw-r--r--noncore/apps/opie-reader/fileBrowser.cpp8
-rw-r--r--noncore/apps/opie-reader/opie-reader.pro12
-rw-r--r--noncore/apps/opie-reader/plucker.cpp10
-rw-r--r--noncore/apps/opie-reader/plucker_base.cpp1402
-rw-r--r--noncore/apps/tinykate/libkate/document/katebuffer.cpp89
-rw-r--r--noncore/apps/tinykate/libkate/document/katedocument.cpp73
-rw-r--r--noncore/apps/tinykate/libkate/document/katehighlight.cpp126
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp69
-rw-r--r--noncore/apps/tinykate/libkate/kateconfig.cpp219
-rw-r--r--noncore/apps/tinykate/tinykate.cpp31
29 files changed, 5340 insertions, 5269 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 5b22b00..270a4cf 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -15,2 +15,6 @@
15 15
16#include "LibraryDialog.h"
17#include "output.h"
18
19/* OPIE */
16#include <qpe/applnk.h> 20#include <qpe/applnk.h>
@@ -18,6 +22,5 @@
18#include <qpe/qpedialog.h> 22#include <qpe/qpedialog.h>
23#include <opie2/odebug.h>
19 24
20#include "LibraryDialog.h" 25/* QT */
21#include "output.h"
22
23#include <qpushbutton.h> 26#include <qpushbutton.h>
@@ -26,2 +29,3 @@
26 29
30/* STD */
27#include <unistd.h> 31#include <unistd.h>
@@ -34,8 +38,8 @@
34LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, WFlags fl ) 38LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, WFlags fl )
35 : QDialog( parent, name, true/* modal*/, fl ) 39 : QDialog( parent, name, true/* modal*/, fl )
36{ 40{
37 if ( !name ) 41 if ( !name )
38 setName( "LibraryDialog" ); 42 setName( "LibraryDialog" );
39 indexLoaded=false; 43 indexLoaded=false;
40 initDialog(); 44 initDialog();
41 45
@@ -43,43 +47,43 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W
43 47
44 index = "GUTINDEX.ALL"; 48 index = "GUTINDEX.ALL";
45 local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; 49 local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
46 local_index = local_library + index; 50 local_index = local_library + index;
47 51
48 QString iniFile ; 52 QString iniFile ;
49 iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc"; 53 iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc";
50 54
51 new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT"; 55 new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT";
52 56
53 old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL"; 57 old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL";
54 // old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; 58 // old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
55 59
56 // iniFile = local_library+"gutenbrowserrc"; 60 // iniFile = local_library+"gutenbrowserrc";
57 // new_index = local_library + "PGWHOLE.TXT"; 61 // new_index = local_library + "PGWHOLE.TXT";
58 // old_index = local_library + "GUTINDEX.ALL"; 62 // old_index = local_library + "GUTINDEX.ALL";
59 63
60 Config config("Gutenbrowser"); 64 Config config("Gutenbrowser");
61 65
62 config.setGroup( "HttpServer" ); 66 config.setGroup( "HttpServer" );
63 proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org"); 67 proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
64 68
65 config.setGroup( "FTPsite" ); 69 config.setGroup( "FTPsite" );
66 ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org"); 70 ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org");
67 qDebug("Library Dialog: ftp_host is "+ftp_host); 71 odebug << "Library Dialog: ftp_host is "+ftp_host << oendl;
68 // ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) ); 72 // ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) );
69 // ftp_host=ftp_host.stripWhiteSpace(); 73 // ftp_host=ftp_host.stripWhiteSpace();
70 ftp_base_dir= config.readEntry("base", "/pub/gutenberg"); 74 ftp_base_dir= config.readEntry("base", "/pub/gutenberg");
71 75
72 i_binary = 0; 76 i_binary = 0;
73 77
74 config.setGroup("SortAuth"); 78 config.setGroup("SortAuth");
75 if( config.readEntry("authSort", "FALSE") == "TRUE") 79 if( config.readEntry("authSort", "FALSE") == "TRUE")
76 authBox->setChecked(TRUE); 80 authBox->setChecked(TRUE);
77 81
78 config.setGroup("General"); 82 config.setGroup("General");
79 downDir =config.readEntry( "DownloadDirectory",local_library); 83 downDir =config.readEntry( "DownloadDirectory",local_library);
80 qDebug("downDir is "+downDir); 84 odebug << "downDir is "+downDir << oendl;
81 newindexLib.setName( old_index); 85 newindexLib.setName( old_index);
82 indexLib.setName( old_index); 86 indexLib.setName( old_index);
83 87
84 new QPEDialogListener(this); 88 new QPEDialogListener(this);
85} 89}
@@ -88,9 +92,9 @@ LibraryDialog::~LibraryDialog()
88{ 92{
89 // delete QList_Item2; 93// delete QList_Item2;
90 // delete QList_Item1; 94// delete QList_Item1;
91 // delete QList_Item3; 95// delete QList_Item3;
92 // delete QList_Item4; 96// delete QList_Item4;
93 // delete QList_Item5; 97// delete QList_Item5;
94 98
95 //saveConfig(); 99 // saveConfig();
96} 100}
@@ -101,69 +105,69 @@ void LibraryDialog::Newlibrary()
101#ifndef Q_WS_QWS //sorry embedded gutenbrowser cant use zip files 105#ifndef Q_WS_QWS //sorry embedded gutenbrowser cant use zip files
102 //qDebug("Opening new library index %s",newindexLib); 106 //odebug << "Opening new library index " << newindexLib << "" << oendl;
103 if ( newindexLib.open( IO_ReadOnly) ) { 107 if ( newindexLib.open( IO_ReadOnly) ) {
104 setCaption( tr( "Library Index - using master pg index." ) );// file opened successfully 108 setCaption( tr( "Library Index - using master pg index." ) );// file opened successfully
105 QTextStream indexStream( &newindexLib ); 109 QTextStream indexStream( &newindexLib );
106 QString indexLine; 110 QString indexLine;
107 while ( !indexStream.atEnd() ) { // until end of file.. 111 while ( !indexStream.atEnd() ) { // until end of file..
108 indexLine = indexStream.readLine(); 112 indexLine = indexStream.readLine();
109 if ( ( indexLine.mid(4,4)).toInt() && !( indexLine.left(3)).toInt()) { 113 if ( ( indexLine.mid(4,4)).toInt() && !( indexLine.left(3)).toInt()) {
110 year = indexLine.mid(4,4); 114 year = indexLine.mid(4,4);
111 year = year.stripWhiteSpace(); 115 year = year.stripWhiteSpace();
112 file = indexLine.mid( indexLine.find( "[", 0, TRUE )+1, 12 ); 116 file = indexLine.mid( indexLine.find( "[", 0, TRUE )+1, 12 );
113 file = file.stripWhiteSpace(); 117 file = file.stripWhiteSpace();
114 number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 ); 118 number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
115 if( year.toInt() < 1984) 119 if( year.toInt() < 1984)
116 number = number.left( number.length() -1 ); 120 number = number.left( number.length() -1 );
117 number = number.stripWhiteSpace(); 121 number = number.stripWhiteSpace();
118 title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() ); 122 title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
119 title = title.stripWhiteSpace(); 123 title = title.stripWhiteSpace();
120 124
121 getAuthor(); // groks author 125 getAuthor(); // groks author
122 author = author.stripWhiteSpace(); 126 author = author.stripWhiteSpace();
123 if (authBox->isChecked()) { // this reverses the first name and last name of the author 127 if (authBox->isChecked()) { // this reverses the first name and last name of the author
124 // qDebug("Sorting last name first"); 128 // odebug << "Sorting last name first" << oendl;
125 QString lastName, firstName=""; 129 QString lastName, firstName="";
126 int finder=author.findRev( ' ', -1, TRUE); 130 int finder=author.findRev( ' ', -1, TRUE);
127 lastName=author.right( author.length()-finder); 131 lastName=author.right( author.length()-finder);
128 firstName=author.left(finder); 132 firstName=author.left(finder);
129 lastName=lastName.stripWhiteSpace(); 133 lastName=lastName.stripWhiteSpace();
130 firstName=firstName.stripWhiteSpace(); 134 firstName=firstName.stripWhiteSpace();
131 135
132 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names 136 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
133 author=lastName+", "+firstName; 137 author=lastName+", "+firstName;
134 } 138 }
135 139
136 if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) && (file.find( "]",0, TRUE) == -1) ) { 140 if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) && (file.find( "]",0, TRUE) == -1) ) {
137 141
138 // fill string list or something to be able to resort the whole library 142 // fill string list or something to be able to resort the whole library
139 if( author.isEmpty() ) 143 if( author.isEmpty() )
140 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file ); 144 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
141 else { 145 else {
142 146
143 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) || 147 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
144 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) ) 148 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
145 QList_Item1 = new QListViewItem( ListView1,/* number,*/ title, author, year, file ); 149 QList_Item1 = new QListViewItem( ListView1,/* number,*/ title, author, year, file );
146 150
147 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) || 151 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
148 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) ) 152 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
149 QList_Item2 = new QListViewItem( ListView2, /*number, */title, author, year, file ); 153 QList_Item2 = new QListViewItem( ListView2, /*number, */title, author, year, file );
150 154
151 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) || 155 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
152 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) ) 156 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
153 QList_Item3 = new QListViewItem( ListView3, /*number,*/ title, author, year, file ); 157 QList_Item3 = new QListViewItem( ListView3, /*number,*/ title, author, year, file );
154 158
155 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) || 159 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
156 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) ) 160 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
157 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file ); 161 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
158 162
159 else 163 else
160 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file ); 164 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
161 } 165 }
162 } 166 }
163 }// end if 167 }// end if
164 }// end while 168 }// end while
165 newindexLib.close(); 169 newindexLib.close();
166 } 170 }
167#ifndef Q_WS_QWS 171#ifndef Q_WS_QWS
168 setCursor( arrowCursor); 172 setCursor( arrowCursor);
169#endif 173#endif
@@ -176,82 +180,82 @@ void LibraryDialog::Library()
176 180
177 ListView1->clear(); 181 ListView1->clear();
178 ListView2->clear(); 182 ListView2->clear();
179 ListView3->clear(); 183 ListView3->clear();
180 ListView4->clear(); 184 ListView4->clear();
181 ListView5->clear(); 185 ListView5->clear();
182 186
183 qDebug("opening GUTINDEX.ALL file"); 187 odebug << "opening GUTINDEX.ALL file" << oendl;
184 IDontKnowWhy = ""; 188 IDontKnowWhy = "";
185 if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully 189 if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully
186 QTextStream indexStream( &indexLib ); 190 QTextStream indexStream( &indexLib );
187 QString indexLine; 191 QString indexLine;
188 qApp->processEvents(); 192 qApp->processEvents();
189 // int jig; 193 // int jig;
190 while ( !indexStream.eof() ) { 194 while ( !indexStream.eof() ) {
191 195
192 indexLine = indexStream.readLine(); 196 indexLine = indexStream.readLine();
193 if ( indexLine != "") { 197 if ( indexLine != "") {
194 if( (indexLine.mid(4,4)).toInt() /* && !( indexLine.left(3)).toInt()*/ ) { 198 if( (indexLine.mid(4,4)).toInt() /* && !( indexLine.left(3)).toInt()*/ ) {
195 // month = indexLine.left( 3); 199 // month = indexLine.left( 3);
196 year = indexLine.mid(4,4); 200 year = indexLine.mid(4,4);
197 // title = indexLine.mid( 9, 50); 201 // title = indexLine.mid( 9, 50);
198 file = indexLine.mid(60,12); 202 file = indexLine.mid(60,12);
199 if(file.left(1).find("[",0,TRUE) != -1) 203 if(file.left(1).find("[",0,TRUE) != -1)
200 file.remove(1,1); 204 file.remove(1,1);
201 if( file.find("]",0,TRUE) != -1) 205 if( file.find("]",0,TRUE) != -1)
202 file = file.left( file.find("]",0,TRUE)); 206 file = file.left( file.find("]",0,TRUE));
203 //qDebug("file is "+file); 207 //odebug << "file is "+file << oendl;
204 /// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 ); 208 /// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
205 number = indexLine.mid(55,5); 209 number = indexLine.mid(55,5);
206 number = number.stripWhiteSpace(); 210 number = number.stripWhiteSpace();
207 // title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() ); 211 // title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
208 title = indexLine.mid( 9, 50 ); 212 title = indexLine.mid( 9, 50 );
209 title = title.stripWhiteSpace(); 213 title = title.stripWhiteSpace();
210 //qDebug("title is "+title); 214 //odebug << "title is "+title << oendl;
211 getAuthor(); // grok author 215 getAuthor(); // grok author
212 author = author.stripWhiteSpace(); 216 author = author.stripWhiteSpace();
213 //qDebug("author is "+author); 217 //odebug << "author is "+author << oendl;
214 if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author 218 if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
215 QString lastName, firstName=""; 219 QString lastName, firstName="";
216 int finder=author.findRev( ' ', -1, TRUE); 220 int finder=author.findRev( ' ', -1, TRUE);
217 lastName=author.right( author.length()-finder); 221 lastName=author.right( author.length()-finder);
218 firstName=author.left(finder); 222 firstName=author.left(finder);
219 lastName=lastName.stripWhiteSpace(); 223 lastName=lastName.stripWhiteSpace();
220 firstName=firstName.stripWhiteSpace(); 224 firstName=firstName.stripWhiteSpace();
221 225
222 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names 226 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
223 author=lastName+", "+firstName; 227 author=lastName+", "+firstName;
224 } 228 }
225 229
226 if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) /*&& (file.find( "]",0, TRUE))*/ ) { 230 if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) /*&& (file.find( "]",0, TRUE))*/ ) {
227 // fill string list or something to be able to sort by Author 231 // fill string list or something to be able to sort by Author
228 if( author.isEmpty() ) 232 if( author.isEmpty() )
229 QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file ); 233 QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file );
230 else { 234 else {
231 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) || 235 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
232 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) ) 236 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
233 QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file ); 237 QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file );
234 238
235 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) || 239 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
236 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) ) 240 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
237 QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file ); 241 QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file );
238 242
239 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) || 243 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
240 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) ) 244 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
241 QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file ); 245 QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file );
242 246
243 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) || 247 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
244 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) ) 248 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
245 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file ); 249 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
246 } 250 }
247 } 251 }
248 } 252 }
249 } 253 }
250 } 254 }
251 indexLib.close(); 255 indexLib.close();
252 } else { 256 } else {
253 QString sMsg; 257 QString sMsg;
254 sMsg = ( tr("Error opening local library index:\n "))+local_index; 258 sMsg = ( tr("Error opening local library index:\n "))+local_index;
255 QMessageBox::message( "Error",sMsg); 259 QMessageBox::message( "Error",sMsg);
256 } 260 }
257 261
@@ -264,98 +268,98 @@ bool LibraryDialog::getAuthor()
264{ 268{
265 if( title.contains( ", by", TRUE)) { 269 if( title.contains( ", by", TRUE)) {
266 int auth; 270 int auth;
267 auth = title.find(", by", 0, TRUE); 271 auth = title.find(", by", 0, TRUE);
268 author = title.right(title.length() - (auth + 4) ); 272 author = title.right(title.length() - (auth + 4) );
269 if( int finder = author.find("[", 0, TRUE)) { 273 if( int finder = author.find("[", 0, TRUE)) {
270 author = author.left(finder); 274 author = author.left(finder);
271 } 275 }
272 } 276 }
273 else if ( title.contains( "by, ", TRUE) ) { 277 else if ( title.contains( "by, ", TRUE) ) {
274 int auth; 278 int auth;
275 auth = title.find("by, ", 0, TRUE); 279 auth = title.find("by, ", 0, TRUE);
276 author = title.right(title.length() - (auth + 4) ); 280 author = title.right(title.length() - (auth + 4) );
277 if( int finder = author.find("[", 0, TRUE)) { 281 if( int finder = author.find("[", 0, TRUE)) {
278 author = author.left( finder); 282 author = author.left( finder);
279 } 283 }
280 } 284 }
281 else if ( title.contains( " by", TRUE) ) { 285 else if ( title.contains( " by", TRUE) ) {
282 int auth; 286 int auth;
283 auth = title.find(" by", 0, TRUE); 287 auth = title.find(" by", 0, TRUE);
284 author = title.right(title.length() - (auth + 3) ); 288 author = title.right(title.length() - (auth + 3) );
285 if( int finder = author.find("[", 0, TRUE)) { 289 if( int finder = author.find("[", 0, TRUE)) {
286 author = author.left( finder); 290 author = author.left( finder);
287 } 291 }
288 } 292 }
289 else if ( title.contains( "by ", TRUE) ) { 293 else if ( title.contains( "by ", TRUE) ) {
290 int auth; 294 int auth;
291 auth = title.find("by ", 0, TRUE); 295 auth = title.find("by ", 0, TRUE);
292 author = title.right(title.length() - (auth + 3) ); 296 author = title.right(title.length() - (auth + 3) );
293 if( int finder = author.find("[", 0, TRUE)) { 297 if( int finder = author.find("[", 0, TRUE)) {
294 author = author.left( finder); 298 author = author.left( finder);
295 } 299 }
296 } 300 }
297 else if ( title.contains( ",", TRUE) ) { 301 else if ( title.contains( ",", TRUE) ) {
298 int auth; 302 int auth;
299 auth = title.find(",", 0, TRUE); 303 auth = title.find(",", 0, TRUE);
300 author = title.right( title.length() - (auth + 1) ); 304 author = title.right( title.length() - (auth + 1) );
301 if ( author.contains( ",", TRUE) ) { 305 if ( author.contains( ",", TRUE) ) {
302 int auth; 306 int auth;
303 auth = author.find(",", 0, TRUE); 307 auth = author.find(",", 0, TRUE);
304 author = author.right( author.length() - (auth + 1) ); 308 author = author.right( author.length() - (auth + 1) );
305 } 309 }
306 if( int finder = author.find("[", 0, TRUE)) { 310 if( int finder = author.find("[", 0, TRUE)) {
307 author = author.left( finder); 311 author = author.left( finder);
308 } 312 }
309 } 313 }
310 else if ( title.contains( "/", TRUE) ) { 314 else if ( title.contains( "/", TRUE) ) {
311 int auth; 315 int auth;
312 auth = title.find("/", 0, TRUE); 316 auth = title.find("/", 0, TRUE);
313 author = title.right(title.length() - (auth + 1) ); 317 author = title.right(title.length() - (auth + 1) );
314 if( int finder = author.find("[", 0, TRUE)) { 318 if( int finder = author.find("[", 0, TRUE)) {
315 author = author.left( finder); 319 author = author.left( finder);
316 } 320 }
317 } 321 }
318 else if ( title.contains( "of", TRUE) ) { 322 else if ( title.contains( "of", TRUE) ) {
319 int auth; 323 int auth;
320 auth = title.find("of", 0, TRUE); 324 auth = title.find("of", 0, TRUE);
321 author = title.right(title.length() - (auth + 2) ); 325 author = title.right(title.length() - (auth + 2) );
322 if( int finder = author.find("[", 0, TRUE)) 326 if( int finder = author.find("[", 0, TRUE))
323 { 327 {
324 author = author.left( finder); 328 author = author.left( finder);
325 } 329 }
326 } else { 330 } else {
327 author = ""; 331 author = "";
328 } 332 }
329 if ( author.contains("et. al")) { 333 if ( author.contains("et. al")) {
330 int auth; 334 int auth;
331 auth = author.find("et. al", 0, TRUE); 335 auth = author.find("et. al", 0, TRUE);
332 author = author.left( auth ); 336 author = author.left( auth );
333 } 337 }
334 if ( author.contains("#")) { 338 if ( author.contains("#")) {
335 int auth; 339 int auth;
336 auth = author.find("#", 0, TRUE); 340 auth = author.find("#", 0, TRUE);
337 author = author.left( auth); 341 author = author.left( auth);
338 } 342 }
339 if ( author.contains("(")) { 343 if ( author.contains("(")) {
340 int auth; 344 int auth;
341 auth = author.find("(", 0, TRUE); 345 auth = author.find("(", 0, TRUE);
342 author = author.left( auth); 346 author = author.left( auth);
343 } 347 }
344 if ( author.contains("et al")) { 348 if ( author.contains("et al")) {
345 int auth; 349 int auth;
346 auth = author.find("et al", 0, TRUE); 350 auth = author.find("et al", 0, TRUE);
347 author = author.left( auth ); 351 author = author.left( auth );
348 } 352 }
349 QRegExp r = QRegExp("[0-9]", TRUE, FALSE); 353 QRegExp r = QRegExp("[0-9]", TRUE, FALSE);
350 if ( author.left(2).find( r) != -1 ) { 354 if ( author.left(2).find( r) != -1 ) {
351 author = ""; 355 author = "";
352 } 356 }
353 // if( author.contains(" ", TRUE)) { 357 // if( author.contains(" ", TRUE)) {
354 // int suth = author.findRev(" ", -1, TRUE); 358 // int suth = author.findRev(" ", -1, TRUE);
355 // author = author.right( author.length() - suth); 359 // author = author.right( author.length() - suth);
356 // } 360 // }
357 361
358 // title 362 // title
359 // author 363 // author
360 return true; 364 return true;
361}////// end getAuthor() 365}////// end getAuthor()
@@ -366,51 +370,51 @@ void LibraryDialog::select_title( QListViewItem * item)
366{ 370{
367 if(item != NULL) { 371 if(item != NULL) {
368 i++; 372 i++;
369 int index = tabWidget->currentPageIndex(); 373 int index = tabWidget->currentPageIndex();
370 DlglistItemTitle = item->text(0); 374 DlglistItemTitle = item->text(0);
371 DlglistItemYear = item->text(2); 375 DlglistItemYear = item->text(2);
372 DlglistItemFile = item->text(3); 376 DlglistItemFile = item->text(3);
373 switch (index) { 377 switch (index) {
374 case 0: { 378 case 0: {
375 ListView1->clearSelection(); 379 ListView1->clearSelection();
376 } 380 }
377 break; 381 break;
378 case 1: { 382 case 1: {
379 ListView2->clearSelection(); 383 ListView2->clearSelection();
380 } 384 }
381 break; 385 break;
382 case 2: { 386 case 2: {
383 ListView3->clearSelection(); 387 ListView3->clearSelection();
384 } 388 }
385 break; 389 break;
386 case 3: { 390 case 3: {
387 ListView4->clearSelection(); 391 ListView4->clearSelection();
388 } 392 }
389 break; 393 break;
390 case 4: { 394 case 4: {
391 ListView5->clearSelection(); 395 ListView5->clearSelection();
392 } 396 }
393 break; 397 break;
394 }; 398 };
395 } 399 }
396 400
397 if(DlglistItemTitle.length()>2) { 401 if(DlglistItemTitle.length()>2) {
398 // DlglistItemNumber = item->text(0); 402 // DlglistItemNumber = item->text(0);
399 item = 0; 403 item = 0;
400 qDebug( "string from librarydialog is:%s %s %s", DlglistItemYear.latin1(),DlglistItemFile.latin1(),DlglistItemNumber.latin1()); 404 odebug << "string from librarydialog is:" << DlglistItemYear << " " << DlglistItemFile << " " << DlglistItemNumber << "" << oendl;
401 qDebug("Title is "+DlglistItemTitle); 405 odebug << "Title is "+DlglistItemTitle << oendl;
402 406
403 // check for connection here 407 // check for connection here
404 // if( get_extext()) 408 // if( get_extext())
405 409
406 if(download_Etext()) { 410 if(download_Etext()) {
407 // qDebug("get here 2"); 411 // odebug << "get here 2" << oendl;
408 if(i_binary == 1) { 412 if(i_binary == 1) {
409 413
410 } 414 }
411 if(checkBox->isChecked () ) { 415 if(checkBox->isChecked () ) {
412 accept(); 416 accept();
413 } 417 }
414 } 418 }
415 } 419 }
416} 420}
@@ -420,95 +424,95 @@ bool LibraryDialog::download_Etext()
420 // might have to use old gpl'd ftp for embedded!! 424 // might have to use old gpl'd ftp for embedded!!
421 Config cfg("Gutenbrowser"); 425 Config cfg("Gutenbrowser");
422 cfg.setGroup("FTPsite"); 426 cfg.setGroup("FTPsite");
423 ftp_host=cfg.readEntry("SiteName", "sailor.gutenberg.org"); 427 ftp_host=cfg.readEntry("SiteName", "sailor.gutenberg.org");
424 ftp_base_dir= cfg.readEntry("base", "/pub/gutenberg"); 428 ftp_base_dir= cfg.readEntry("base", "/pub/gutenberg");
425 429
426 qDebug("about to network dialog"); 430 odebug << "about to network dialog" << oendl;
427 QString NewlistItemNumber, NewlistItemYear, ls_result, result_line, s, dir, networkUrl, outputFile; 431 QString NewlistItemNumber, NewlistItemYear, ls_result, result_line, s, dir, networkUrl, outputFile;
428 432
429 //////////////////// FIXME- if 'x' is part of real name.... 433 //////////////////// FIXME- if 'x' is part of real name....
430 NewlistItemFile = DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).left(DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).find("x", 1, FALSE)); 434 NewlistItemFile = DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).left(DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).find("x", 1, FALSE));
431 435
432 if( NewlistItemFile.find( DlglistItemFile.left(4) ,0,TRUE) ==-1 ) { 436 if( NewlistItemFile.find( DlglistItemFile.left(4) ,0,TRUE) ==-1 ) {
433 NewlistItemFile.replace( 0,4, DlglistItemFile.left(4)); 437 NewlistItemFile.replace( 0,4, DlglistItemFile.left(4));
434 qDebug("NewlistItemFile is now "+NewlistItemFile); 438 odebug << "NewlistItemFile is now "+NewlistItemFile << oendl;
435 } 439 }
436 NewlistItemYear = DlglistItemYear.right(2); 440 NewlistItemYear = DlglistItemYear.right(2);
437 int NewlistItemYear_Int = NewlistItemYear.toInt(0, 10); 441 int NewlistItemYear_Int = NewlistItemYear.toInt(0, 10);
438 qDebug(NewlistItemYear); 442 odebug << NewlistItemYear << oendl;
439 if (NewlistItemYear_Int < 91 && NewlistItemYear_Int > 70) { 443 if (NewlistItemYear_Int < 91 && NewlistItemYear_Int > 70) {
440 NewlistItemYear = "90"; 444 NewlistItemYear = "90";
441 } 445 }
442 Edir ="etext" +NewlistItemYear; 446 Edir ="etext" +NewlistItemYear;
443 dir= ftp_base_dir + "/etext" +NewlistItemYear+"/"; 447 dir= ftp_base_dir + "/etext" +NewlistItemYear+"/";
444 if( ftp_base_dir.find("=",0,true) ) 448 if( ftp_base_dir.find("=",0,true) )
445 ftp_base_dir.remove( ftp_base_dir.find("=",0,true),1); 449 ftp_base_dir.remove( ftp_base_dir.find("=",0,true),1);
446 450
447 networkUrl= "ftp://"+ftp_host+dir; 451 networkUrl= "ftp://"+ftp_host+dir;
448 452
449 outputFile=local_library+".guten_temp"; 453 outputFile=local_library+".guten_temp";
450 //qDebug("Download file:%s",NewlistItemFile.latin1() ); 454 //odebug << "Download file:" << NewlistItemFile << "" << oendl;
451 qDebug("Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile); 455 odebug << "Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile << oendl;
452 QStringList networkList; 456 QStringList networkList;
453 networkList.append((const char *)ftp_host); 457 networkList.append((const char *)ftp_host);
454 networkList.append((const char *)dir); 458 networkList.append((const char *)dir);
455 networkList.append((const char *)outputFile); 459 networkList.append((const char *)outputFile);
456 networkList.append((const char *)NewlistItemFile); 460 networkList.append((const char *)NewlistItemFile);
457//<< (char *)ftp_host << (char *)dir << (char *)outputFile << (char *)NewlistItemFile; 461//<< (char *)ftp_host << (char *)dir << (char *)outputFile << (char *)NewlistItemFile;
458 462
459 NetworkDialog *NetworkDlg; 463 NetworkDialog *NetworkDlg;
460 NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkList); 464 NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkList);
461 465
462 466
463 if( NetworkDlg->exec() != 0 ) { // use new, improved, *INSTANT* network-dialog-file-getterer 467 if( NetworkDlg->exec() != 0 ) { // use new, improved, *INSTANT* network-dialog-file-getterer
464 File_Name= NetworkDlg->localFileName; 468 File_Name= NetworkDlg->localFileName;
465 qDebug("back to Library from Network Dialog"); 469 odebug << "back to Library from Network Dialog" << oendl;
466 qDebug("Just downloaded "+NetworkDlg->localFileName); 470 odebug << "Just downloaded "+NetworkDlg->localFileName << oendl;
467 471
468 // if (File_Name.find( local_library, 0, TRUE) != -1 ) { //could not be found 472 // if (File_Name.find( local_library, 0, TRUE) != -1 ) { //could not be found
469 // QString oldName=File_Name; 473 // QString oldName=File_Name;
470 // File_Name.replace(0,local_library.length(),downDir); 474 // File_Name.replace(0,local_library.length(),downDir);
471 // qDebug("File_Name now is "+File_Name); 475 // odebug << "File_Name now is "+File_Name << oendl;
472 476
473 // } 477 // }
474 // rename .txt to .etx 478 // rename .txt to .etx
475 if(NetworkDlg->successDownload) { 479 if(NetworkDlg->successDownload) {
476 qDebug("Filename is "+File_Name); 480 odebug << "Filename is "+File_Name << oendl;
477 if(File_Name.right(4)==".txt") { 481 if(File_Name.right(4)==".txt") {
478 QString s_fileName=File_Name; 482 QString s_fileName=File_Name;
479 s_fileName.replace( s_fileName.length()-3,3,"gtn"); 483 s_fileName.replace( s_fileName.length()-3,3,"gtn");
480 // s_fileName.replace( s_fileName.length()-3,3,"etx"); 484 // s_fileName.replace( s_fileName.length()-3,3,"etx");
481 rename(File_Name.latin1(),s_fileName.latin1()); 485 rename(File_Name.latin1(),s_fileName.latin1());
482 File_Name=s_fileName; 486 File_Name=s_fileName;
483 487
484 qDebug("Filename is now "+File_Name); 488 odebug << "Filename is now "+File_Name << oendl;
485 489
486 } 490 }
487 if(File_Name.length() > 5 ) { 491 if(File_Name.length() > 5 ) {
488 setTitle(); 492 setTitle();
489 QFileInfo fi(File_Name); 493 QFileInfo fi(File_Name);
490 QString name_file=fi.fileName(); 494 QString name_file=fi.fileName();
491 name_file=name_file.left(name_file.length()-4); 495 name_file=name_file.left(name_file.length()-4);
492 496
493 qDebug("Setting doclink"); 497 odebug << "Setting doclink" << oendl;
494 DocLnk lnk; 498 DocLnk lnk;
495 qDebug("name is "+name_file); 499 odebug << "name is "+name_file << oendl;
496 lnk.setName(name_file); //sets file name 500 lnk.setName(name_file); //sets file name
497 qDebug("Title is "+DlglistItemTitle); 501 odebug << "Title is "+DlglistItemTitle << oendl;
498 lnk.setComment(DlglistItemTitle); 502 lnk.setComment(DlglistItemTitle);
499 503
500 qDebug("Filename is "+File_Name); 504 odebug << "Filename is "+File_Name << oendl;
501 lnk.setFile(File_Name); //sets File property 505 lnk.setFile(File_Name); //sets File property
502 lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D 506 lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
503 lnk.setExec(File_Name); 507 lnk.setExec(File_Name);
504 lnk.setIcon("gutenbrowser/Gutenbrowser"); 508 lnk.setIcon("gutenbrowser/Gutenbrowser");
505 if(!lnk.writeLink()) { 509 if(!lnk.writeLink()) {
506 qDebug("Writing doclink did not work"); 510 odebug << "Writing doclink did not work" << oendl;
507 } else { 511 } else {
508 } 512 }
509 } else 513 } else
510 QMessageBox::message("Note","There was an error\nwith the file"); 514 QMessageBox::message("Note","There was an error\nwith the file");
511 } 515 }
512 } 516 }
513 return true; 517 return true;
514} 518}
@@ -518,43 +522,43 @@ bool LibraryDialog::httpDownload()
518#ifndef Q_WS_QWS 522#ifndef Q_WS_QWS
519 Config config("Gutenbrowser"); 523 Config config("Gutenbrowser");
520 config.setGroup( "Browser" ); 524 config.setGroup( "Browser" );
521 QString brow = config.readEntry("Preferred", ""); 525 QString brow = config.readEntry("Preferred", "");
522 QString file_name = "./.guten_temp"; 526 QString file_name = "./.guten_temp";
523 // config.setGroup( "HttpServer" ); 527 // config.setGroup( "HttpServer" );
524 // QString s_http = config.readEntry("Preferred", "http://sailor.gutenbook.org"); 528 // QString s_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
525 QString httpName = proxy_http + "/"+Edir; 529 QString httpName = proxy_http + "/"+Edir;
526 // progressBar->setProgress( i); 530 // progressBar->setProgress( i);
527 i++; 531 i++;
528 if ( brow != "Konq") { /////////// use lynx 532 if ( brow != "Konq") { /////////// use lynx
529 // QString cmd = "lynx -source " + httpName +" | cat >> " + file_name; 533 // QString cmd = "lynx -source " + httpName +" | cat >> " + file_name;
530 // system(cmd); 534 // system(cmd);
531 } else { //////////// use KFM 535 } else { //////////// use KFM
532 // KFM::download( httpName, file_name); 536 // KFM::download( httpName, file_name);
533 } 537 }
534 i++; 538 i++;
535 QFile tmp( file_name); 539 QFile tmp( file_name);
536 QString str; 540 QString str;
537 if (tmp.open(IO_ReadOnly)) { 541 if (tmp.open(IO_ReadOnly)) {
538 QTextStream t( &tmp ); // use a text stream 542 QTextStream t( &tmp ); // use a text stream
539 while ( !t.eof()) { 543 while ( !t.eof()) {
540 QString s = t.readLine(); 544 QString s = t.readLine();
541 if (s.contains( NewlistItemFile, FALSE) && (s.contains(".txt")) ) { 545 if (s.contains( NewlistItemFile, FALSE) && (s.contains(".txt")) ) {
542 str = s.mid( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6, (s.find( ".txt</A>", 0, TRUE) + 4) - ( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6 ) ); 546 str = s.mid( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6, (s.find( ".txt</A>", 0, TRUE) + 4) - ( s.find( ".txt\">"+NewlistItemFile, 0, TRUE)+6 ) );
543 httpName += "/" + str; 547 httpName += "/" + str;
544 } 548 }
545 } //end of while loop 549 } //end of while loop
546 } 550 }
547 tmp.close(); 551 tmp.close();
548 m_getFilePath = local_library + str; 552 m_getFilePath = local_library + str;
549 i++; 553 i++;
550 if ( brow != "KFM"){ ///////// use lynx 554 if ( brow != "KFM"){ ///////// use lynx
551 QString cmd = "lynx -source " + httpName +" | cat >> " + m_getFilePath; 555 QString cmd = "lynx -source " + httpName +" | cat >> " + m_getFilePath;
552 // QMessageBox::message("Error", cmd); 556 // QMessageBox::message("Error", cmd);
553 system(cmd); 557 system(cmd);
554 } else { ////////// use KFM 558 } else { ////////// use KFM
555 // KFM::download( httpName, m_getFilePath); 559 // KFM::download( httpName, m_getFilePath);
556 } 560 }
557 i++; 561 i++;
558#endif 562#endif
559 return false; 563 return false;
560} 564}
@@ -563,6 +567,6 @@ void LibraryDialog::cancelIt()
563{ 567{
564 saveConfig(); 568 saveConfig();
565 569
566 DlglistItemNumber = ""; 570 DlglistItemNumber = "";
567 this->reject(); 571 this->reject();
568} 572}
@@ -571,33 +575,33 @@ bool LibraryDialog::setTitle()
571{ 575{
572 Config config("Gutenbrowser"); 576 Config config("Gutenbrowser");
573 qDebug("setting title"); 577 odebug << "setting title" << oendl;
574 qDebug(DlglistItemTitle); 578 odebug << DlglistItemTitle << oendl;
575 579
576 if( DlglistItemTitle.find("[",0,TRUE) != -1) 580 if( DlglistItemTitle.find("[",0,TRUE) != -1)
577 DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" ); 581 DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
578 if( DlglistItemTitle.find("]",0,TRUE) !=-1) 582 if( DlglistItemTitle.find("]",0,TRUE) !=-1)
579 DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" ); 583 DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
580 qDebug("Title being set is "+DlglistItemTitle); 584 odebug << "Title being set is "+DlglistItemTitle << oendl;
581 int test = 0; 585 int test = 0;
582 QString ramble, temp; 586 QString ramble, temp;
583 config.setGroup("Files"); 587 config.setGroup("Files");
584 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" ); 588 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
585 int i_numofFiles = s_numofFiles.toInt(); 589 int i_numofFiles = s_numofFiles.toInt();
586 for ( int i = 0; i <= i_numofFiles; i++){ 590 for ( int i = 0; i <= i_numofFiles; i++){
587 temp.setNum( i); 591 temp.setNum( i);
588 ramble = config.readEntry( temp, "" ); 592 ramble = config.readEntry( temp, "" );
589 if( strcmp( ramble, File_Name) == 0){ 593 if( strcmp( ramble, File_Name) == 0){
590 test = 1; 594 test = 1;
591 } 595 }
592 } 596 }
593 config.setGroup("Files"); 597 config.setGroup("Files");
594 config.writeEntry( "NumberOfFiles", i_numofFiles +1 ); 598 config.writeEntry( "NumberOfFiles", i_numofFiles +1 );
595 QString interger; 599 QString interger;
596 interger.setNum( i_numofFiles +1); 600 interger.setNum( i_numofFiles +1);
597 config.writeEntry( interger, File_Name); 601 config.writeEntry( interger, File_Name);
598 config.setGroup( "Titles" ); 602 config.setGroup( "Titles" );
599 config.writeEntry( File_Name, DlglistItemTitle); 603 config.writeEntry( File_Name, DlglistItemTitle);
600 604
601 test = 0; 605 test = 0;
602 return true; 606 return true;
603} 607}
@@ -607,20 +611,20 @@ void LibraryDialog::saveConfig()
607{ 611{
608 Config config("Gutenbrowser"); 612 Config config("Gutenbrowser");
609 if( httpBox->isChecked() == TRUE) { 613 if( httpBox->isChecked() == TRUE) {
610 checked = 1; 614 checked = 1;
611 config.setGroup( "Proxy" ); 615 config.setGroup( "Proxy" );
612 config.writeEntry("IsChecked", "TRUE"); 616 config.writeEntry("IsChecked", "TRUE");
613 } else { 617 } else {
614 checked = 0; 618 checked = 0;
615 config.setGroup( "Proxy" ); 619 config.setGroup( "Proxy" );
616 config.writeEntry("IsChecked", "FALSE"); 620 config.writeEntry("IsChecked", "FALSE");
617 } 621 }
618 if (authBox->isChecked() == TRUE) { 622 if (authBox->isChecked() == TRUE) {
619 config.setGroup("SortAuth"); 623 config.setGroup("SortAuth");
620 config.writeEntry("authSort", "TRUE"); 624 config.writeEntry("authSort", "TRUE");
621 } else { 625 } else {
622 config.setGroup("SortAuth"); 626 config.setGroup("SortAuth");
623 config.writeEntry("authSort", "FALSE"); 627 config.writeEntry("authSort", "FALSE");
624 } 628 }
625 // config.write(); 629 // config.write();
626} 630}
@@ -631,135 +635,135 @@ void LibraryDialog::onButtonSearch()
631{ 635{
632 ListView1->clearSelection(); 636 ListView1->clearSelection();
633 ListView2->clearSelection(); 637 ListView2->clearSelection();
634 ListView3->clearSelection(); 638 ListView3->clearSelection();
635 ListView4->clearSelection(); 639 ListView4->clearSelection();
636 ListView5->clearSelection(); 640 ListView5->clearSelection();
637 641
638 int curTab=tabWidget->currentPageIndex(); 642 int curTab=tabWidget->currentPageIndex();
639 SearchDialog* searchDlg; 643 SearchDialog* searchDlg;
640 644
641 // if( resultsList) 645 // if( resultsList)
642 searchDlg = new SearchDialog( this, "Library Search", TRUE); 646 searchDlg = new SearchDialog( this, "Library Search", TRUE);
643 searchDlg->setCaption( tr( "Library Search" ) ); 647 searchDlg->setCaption( tr( "Library Search" ) );
644 searchDlg->setLabel( "- author or title"); 648 searchDlg->setLabel( "- author or title");
645 QString resultString; 649 QString resultString;
646 int i_berger = 0; 650 int i_berger = 0;
647 if( searchDlg->exec() != 0 ) { 651 if( searchDlg->exec() != 0 ) {
648 QString searcherStr = searchDlg->get_text(); 652 QString searcherStr = searchDlg->get_text();
649 int fluff=0; 653 int fluff=0;
650 654
651 // int tabPage = tabWidget->currentPageIndex(); 655 // int tabPage = tabWidget->currentPageIndex();
652 // TODO ititerate here... struct<listViews>?? 656 // TODO ititerate here... struct<listViews>??
653 657
654 QListViewItemIterator it1( ListView1 ); 658 QListViewItemIterator it1( ListView1 );
655 QListViewItemIterator it2( ListView2 ); 659 QListViewItemIterator it2( ListView2 );
656 QListViewItemIterator it3( ListView3 ); 660 QListViewItemIterator it3( ListView3 );
657 QListViewItemIterator it4( ListView4 ); 661 QListViewItemIterator it4( ListView4 );
658 QListViewItemIterator it5( ListView5 ); 662 QListViewItemIterator it5( ListView5 );
659 663
660 //// this is really pitiful work, 664 //// this is really pitiful work,
661 /////// 665 ///////
662 bool cS; 666 bool cS;
663 if( searchDlg->caseSensitiveCheckBox->isChecked()) 667 if( searchDlg->caseSensitiveCheckBox->isChecked())
664 cS=true; //case sensitive 668 cS=true; //case sensitive
665 else 669 else
666 cS=false; 670 cS=false;
667 671
668 if(fluff==0) { 672 if(fluff==0) {
669 for ( ; it1.current(); ++it1 ) { 673 for ( ; it1.current(); ++it1 ) {
670 resultString = ( it1.current() )->text(0); 674 resultString = ( it1.current() )->text(0);
671 resultString += (" : "); 675 resultString += (" : ");
672 resultString += ( it1.current() )->text(2); 676 resultString += ( it1.current() )->text(2);
673 resultString += (" : "); 677 resultString += (" : ");
674 resultString += ( it1.current() )->text(3); 678 resultString += ( it1.current() )->text(3);
675 if( resultString.find( searcherStr, 0, cS) != -1) 679 if( resultString.find( searcherStr, 0, cS) != -1)
676 { 680 {
677 Searchlist.append( resultString); 681 Searchlist.append( resultString);
678 } 682 }
679 } 683 }
680 } 684 }
681 if(fluff==0) {// search routine here 685 if(fluff==0) {// search routine here
682 for ( ; it2.current(); ++it2 ) { 686 for ( ; it2.current(); ++it2 ) {
683 resultString = ( it2.current() )->text(0); 687 resultString = ( it2.current() )->text(0);
684 resultString += (" : "); 688 resultString += (" : ");
685 resultString += ( it2.current() )->text(2); 689 resultString += ( it2.current() )->text(2);
686 resultString += (" : "); 690 resultString += (" : ");
687 resultString += ( it2.current() )->text(3); 691 resultString += ( it2.current() )->text(3);
688 if( resultString.find( searcherStr, 0, cS) != -1) { 692 if( resultString.find( searcherStr, 0, cS) != -1) {
689 Searchlist.append( resultString); 693 Searchlist.append( resultString);
690 } 694 }
691 } 695 }
692 } 696 }
693 if(fluff==0) {// search routine here 697 if(fluff==0) {// search routine here
694 for ( ; it3.current(); ++it3 ) { 698 for ( ; it3.current(); ++it3 ) {
695 resultString = ( it3.current() )->text(0); 699 resultString = ( it3.current() )->text(0);
696 resultString += (" : "); 700 resultString += (" : ");
697 resultString += ( it3.current() )->text(2); 701 resultString += ( it3.current() )->text(2);
698 resultString += (" : "); 702 resultString += (" : ");
699 resultString += ( it3.current() )->text(3); 703 resultString += ( it3.current() )->text(3);
700 704
701 if( resultString.find( searcherStr, 0, cS) != -1) { 705 if( resultString.find( searcherStr, 0, cS) != -1) {
702 Searchlist.append( resultString); 706 Searchlist.append( resultString);
703 } 707 }
704 } 708 }
705 } 709 }
706 if(fluff==0) { 710 if(fluff==0) {
707 // search routine here 711 // search routine here
708 for ( ; it4.current(); ++it4 ) { 712 for ( ; it4.current(); ++it4 ) {
709 resultString = ( it4.current() )->text(0); 713 resultString = ( it4.current() )->text(0);
710 resultString += (" : "); 714 resultString += (" : ");
711 resultString += ( it4.current() )->text(2); 715 resultString += ( it4.current() )->text(2);
712 resultString += (" : "); 716 resultString += (" : ");
713 resultString += ( it4.current() )->text(3); 717 resultString += ( it4.current() )->text(3);
714 if( resultString.find( searcherStr, 0, cS) != -1) { 718 if( resultString.find( searcherStr, 0, cS) != -1) {
715 Searchlist.append( resultString); 719 Searchlist.append( resultString);
716 } 720 }
717 } 721 }
718 } 722 }
719 if(fluff==0) { // search routine here 723 if(fluff==0) { // search routine here
720 for ( ; it5.current(); ++it5 ) { 724 for ( ; it5.current(); ++it5 ) {
721 resultString = ( it5.current() )->text(0); 725 resultString = ( it5.current() )->text(0);
722 resultString += (" : "); 726 resultString += (" : ");
723 resultString += ( it5.current() )->text(2); 727 resultString += ( it5.current() )->text(2);
724 resultString += (" : "); 728 resultString += (" : ");
725 resultString += ( it5.current() )->text(3); 729 resultString += ( it5.current() )->text(3);
726 if( resultString.find( searcherStr, 0, cS) != -1) { 730 if( resultString.find( searcherStr, 0, cS) != -1) {
727 Searchlist.append( resultString); 731 Searchlist.append( resultString);
728 } 732 }
729 } 733 }
730 } 734 }
731 735
732 tabWidget->setCurrentPage( curTab); 736 tabWidget->setCurrentPage( curTab);
733 737
734 Searchlist.sort(); 738 Searchlist.sort();
735 SearchResultsDlg* SearchResultsDialog; 739 SearchResultsDlg* SearchResultsDialog;
736 SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist); 740 SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
737 741
738 SearchResultsDialog->showMaximized(); 742 SearchResultsDialog->showMaximized();
739 if( SearchResultsDialog->exec() != 0) { 743 if( SearchResultsDialog->exec() != 0) {
740 texter = SearchResultsDialog->selText; 744 texter = SearchResultsDialog->selText;
741 // qDebug(texter); 745 // odebug << texter << oendl;
742 resultLs= SearchResultsDialog->resultsList; 746 resultLs= SearchResultsDialog->resultsList;
743 i_berger = 1; 747 i_berger = 1;
744 } 748 }
745 Searchlist.clear(); 749 Searchlist.clear();
746 750
747 // if(SearchResultsDialog) 751 // if(SearchResultsDialog)
748 // delete SearchResultsDialog; 752 // delete SearchResultsDialog;
749 QString tester; 753 QString tester;
750 for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) { 754 for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
751 texter.sprintf("%s \n",(*it).latin1()); 755 texter.sprintf("%s \n",(*it).latin1());
752 // qDebug(texter); 756 // odebug << texter << oendl;
753 if( tester!=texter) 757 if( tester!=texter)
754 parseSearchResults( texter); 758 parseSearchResults( texter);
755 tester = texter; 759 tester = texter;
756 } 760 }
757 if(searchDlg) 761 if(searchDlg)
758 delete searchDlg; 762 delete searchDlg;
759 } 763 }
760 if(checkBox->isChecked() ) { 764 if(checkBox->isChecked() ) {
761 accept(); 765 accept();
762 } else { 766 } else {
763 setActiveWindow(); 767 setActiveWindow();
764 } 768 }
765} 769}
@@ -771,16 +775,16 @@ void LibraryDialog::parseSearchResults( QString resultStr)
771 775
772 int stringLeng=resultStr.length(); 776 int stringLeng=resultStr.length();
773 QString my; 777 QString my;
774 my.setNum( stringLeng, 10); 778 my.setNum( stringLeng, 10);
775 779
776 if( resultStr.length() > 2 && resultStr.length() < 130) { 780 if( resultStr.length() > 2 && resultStr.length() < 130) {
777 int titleInt = resultStr.find( " : ", 0, TRUE); 781 int titleInt = resultStr.find( " : ", 0, TRUE);
778 DlglistItemTitle = resultStr.left( titleInt); 782 DlglistItemTitle = resultStr.left( titleInt);
779 int yearInt = resultStr.find( " : ", titleInt+3, TRUE); 783 int yearInt = resultStr.find( " : ", titleInt+3, TRUE);
780 DlglistItemYear = resultStr.mid( titleInt+3, (yearInt - titleInt)-3); 784 DlglistItemYear = resultStr.mid( titleInt+3, (yearInt - titleInt)-3);
781 DlglistItemFile = resultStr.right( resultStr.length() - (yearInt + 3)); 785 DlglistItemFile = resultStr.right( resultStr.length() - (yearInt + 3));
782 download_Etext(); 786 download_Etext();
783 } 787 }
784 /* 788 /*
785 printf( DlglistItemTitle+"\n"); printf( DlglistItemYear+"\n"); printf( DlglistItemFile+"\n");*/ 789 printf( DlglistItemTitle+"\n"); printf( DlglistItemYear+"\n"); printf( DlglistItemFile+"\n");*/
786} 790}
@@ -808,3 +812,3 @@ void LibraryDialog::parseSearchResults( QString resultStr)
808 // if (exit==QMessageBox::Yes) { 812 // if (exit==QMessageBox::Yes) {
809 // qDebug("Issuing the command "+cmd); 813 // odebug << "Issuing the command "+cmd << oendl;
810 // #if defined(_WS_WIN_) 814 // #if defined(_WS_WIN_)
@@ -842,14 +846,14 @@ bool LibraryDialog::getItem(QListViewItem *it)
842{ 846{
843 // qDebug("selected getItem"); 847 // odebug << "selected getItem" << oendl;
844 848
845 // DlglistItemNumber = it->text(0); 849 // DlglistItemNumber = it->text(0);
846 DlglistItemTitle = it->text(0); 850 DlglistItemTitle = it->text(0);
847 DlglistItemYear = it->text(2); 851 DlglistItemYear = it->text(2);
848 DlglistItemFile = it->text(3); 852 DlglistItemFile = it->text(3);
849 853
850 if(download_Etext()) { 854 if(download_Etext()) {
851 if(i_binary == 1) { 855 if(i_binary == 1) {
852 } 856 }
853 } 857 }
854 return true; 858 return true;
855} 859}
@@ -860,37 +864,37 @@ bool LibraryDialog::onButtonDownload()
860{ 864{
861 // qDebug("selected onButtonDownloadz"); 865 // odebug << "selected onButtonDownloadz" << oendl;
862 866
863 QListViewItemIterator it1( ListView1 ); 867 QListViewItemIterator it1( ListView1 );
864 QListViewItemIterator it2( ListView2 ); 868 QListViewItemIterator it2( ListView2 );
865 QListViewItemIterator it3( ListView3 ); 869 QListViewItemIterator it3( ListView3 );
866 QListViewItemIterator it4( ListView4 ); 870 QListViewItemIterator it4( ListView4 );
867 QListViewItemIterator it5( ListView5 ); 871 QListViewItemIterator it5( ListView5 );
868 872
869 // iterate through all items of the listview 873 // iterate through all items of the listview
870 for ( ; it1.current(); ++it1 ) { 874 for ( ; it1.current(); ++it1 ) {
871 if ( it1.current()->isSelected() ) 875 if ( it1.current()->isSelected() )
872 getItem(it1.current()); 876 getItem(it1.current());
873 it1.current()->setSelected(FALSE); 877 it1.current()->setSelected(FALSE);
874 } 878 }
875 for ( ; it2.current(); ++it2 ) { 879 for ( ; it2.current(); ++it2 ) {
876 if ( it2.current()->isSelected() ) 880 if ( it2.current()->isSelected() )
877 getItem(it2.current()); 881 getItem(it2.current());
878 it2.current()->setSelected(FALSE); 882 it2.current()->setSelected(FALSE);
879 } 883 }
880 for ( ; it3.current(); ++it3 ) { 884 for ( ; it3.current(); ++it3 ) {
881 if ( it3.current()->isSelected() ) 885 if ( it3.current()->isSelected() )
882 getItem(it3.current()); 886 getItem(it3.current());
883 it3.current()->setSelected(FALSE); 887 it3.current()->setSelected(FALSE);
884 } 888 }
885 for ( ; it4.current(); ++it4 ) { 889 for ( ; it4.current(); ++it4 ) {
886 if ( it4.current()->isSelected() ) 890 if ( it4.current()->isSelected() )
887 getItem(it4.current()); 891 getItem(it4.current());
888 it4.current()->setSelected(FALSE); 892 it4.current()->setSelected(FALSE);
889 } 893 }
890 for ( ; it5.current(); ++it5 ) { 894 for ( ; it5.current(); ++it5 ) {
891 if ( it5.current()->isSelected() ) 895 if ( it5.current()->isSelected() )
892 getItem(it5.current()); 896 getItem(it5.current());
893 it5.current()->setSelected(FALSE); 897 it5.current()->setSelected(FALSE);
894 } 898 }
895 return true; 899 return true;
896} 900}
@@ -902,20 +906,20 @@ void LibraryDialog::comboSelect(int index)
902{ 906{
903 // qDebug("we are sorting"); 907 // odebug << "we are sorting" << oendl;
904 ListView1->setSorting( index, TRUE); 908 ListView1->setSorting( index, TRUE);
905 ListView2->setSorting( index, TRUE); 909 ListView2->setSorting( index, TRUE);
906 ListView3->setSorting( index, TRUE); 910 ListView3->setSorting( index, TRUE);
907 ListView4->setSorting( index, TRUE); 911 ListView4->setSorting( index, TRUE);
908 ListView5->setSorting( index, TRUE); 912 ListView5->setSorting( index, TRUE);
909 913
910 ListView1->sort(); 914 ListView1->sort();
911 ListView2->sort(); 915 ListView2->sort();
912 ListView3->sort(); 916 ListView3->sort();
913 ListView4->sort(); 917 ListView4->sort();
914 ListView5->sort(); 918 ListView5->sort();
915 919
916 // ListView1->triggerUpdate(); 920 // ListView1->triggerUpdate();
917 // ListView2->triggerUpdate(); 921 // ListView2->triggerUpdate();
918 // ListView3->triggerUpdate(); 922 // ListView3->triggerUpdate();
919 // ListView4->triggerUpdate(); 923 // ListView4->triggerUpdate();
920 // ListView5->triggerUpdate(); 924 // ListView5->triggerUpdate();
921} 925}
@@ -924,60 +928,60 @@ void LibraryDialog::newList()
924{ 928{
925 if(indexLoaded) { 929 if(indexLoaded) {
926 onButtonDownload(); 930 onButtonDownload();
927 } else { 931 } else {
928 Output *outDlg; 932 Output *outDlg;
929 buttonNewList->setDown(TRUE); 933 buttonNewList->setDown(TRUE);
930 QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser"); 934 QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser");
931 if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true); 935 if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true);
932 if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) { 936 if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) {
933 qDebug("changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser"); 937 odebug << "changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser" << oendl;
934 QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; 938 QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
935 QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1"; 939 QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1";
936 940
937 int result = QMessageBox::warning( this,"Download" 941 int result = QMessageBox::warning( this,"Download"
938 ,"Ok to use /'wget/' to download\na new library list?\n" 942 ,"Ok to use /'wget/' to download\na new library list?\n"
939 ,"Yes","No",0,0,1); 943 ,"Yes","No",0,0,1);
940 qApp->processEvents(); 944 qApp->processEvents();
941 if(result == 0) { 945 if(result == 0) {
942 outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE); 946 outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
943 outDlg->showMaximized(); 947 outDlg->showMaximized();
944 outDlg->show(); 948 outDlg->show();
945 qApp->processEvents(); 949 qApp->processEvents();
946 FILE *fp; 950 FILE *fp;
947 char line[130]; 951 char line[130];
948 outDlg->OutputEdit->append( tr("Running wget") ); 952 outDlg->OutputEdit->append( tr("Running wget") );
949 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 953 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
950 sleep(1); 954 sleep(1);
951 fp = popen( (const char *) cmd, "r"); 955 fp = popen( (const char *) cmd, "r");
952 if ( !fp ) { 956 if ( !fp ) {
953 } else { 957 } else {
954 qDebug("Issuing the command\n"+cmd); 958 odebug << "Issuing the command\n"+cmd << oendl;
955 // system(cmd); 959 // system(cmd);
956 while ( fgets( line, sizeof line, fp)) { 960 while ( fgets( line, sizeof line, fp)) {
957 outDlg->OutputEdit->append(line); 961 outDlg->OutputEdit->append(line);
958 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 962 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
959 } 963 }
960 pclose(fp); 964 pclose(fp);
961 outDlg->OutputEdit->append("Finished downloading\n"); 965 outDlg->OutputEdit->append("Finished downloading\n");
962 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 966 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
963 qApp->processEvents(); 967 qApp->processEvents();
964 968
965 // if( QFile(gutenindex1).exists() ) { 969 // if( QFile(gutenindex1).exists() ) {
966 // QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; 970 // QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
967 // if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0) 971 // if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0)
968 // qDebug("renaming error"); 972 // odebug << "renaming error" << oendl;
969 // } 973 // }
970 974
971 } 975 }
972 // outDlg->close(); 976 // outDlg->close();
973 FindLibrary(); 977 FindLibrary();
974 if(outDlg) delete outDlg; 978 if(outDlg) delete outDlg;
975 } 979 }
976 buttonNewList->setDown(FALSE); 980 buttonNewList->setDown(FALSE);
977 } else { 981 } else {
978 QMessageBox::message("Note","Could not change directories"); 982 QMessageBox::message("Note","Could not change directories");
979 } 983 }
980 // if(outDlg) 984 // if(outDlg)
981 // delete outDlg; 985 // delete outDlg;
982 } 986 }
983} 987}
@@ -987,52 +991,52 @@ bool LibraryDialog::moreInfo()
987 991
988 QListViewItem * item; 992 QListViewItem * item;
989 item = 0; 993 item = 0;
990 QString titleString; 994 QString titleString;
991 item = ListView1->currentItem(); 995 item = ListView1->currentItem();
992 if( item != 0) { 996 if( item != 0) {
993 titleString = item->text(0); 997 titleString = item->text(0);
994 ListView1->clearSelection(); 998 ListView1->clearSelection();
995 item = 0; 999 item = 0;
996 } 1000 }
997 if( item == 0) 1001 if( item == 0)
998 item = ListView2->currentItem(); 1002 item = ListView2->currentItem();
999 if( item != 0) { 1003 if( item != 0) {
1000 titleString = item->text(0); 1004 titleString = item->text(0);
1001 ListView2->clearSelection(); 1005 ListView2->clearSelection();
1002 item = 0; 1006 item = 0;
1003 } 1007 }
1004 if( item == 0) 1008 if( item == 0)
1005 item = ListView3->currentItem(); 1009 item = ListView3->currentItem();
1006 if( item != 0) { 1010 if( item != 0) {
1007 titleString = item->text(0); 1011 titleString = item->text(0);
1008 ListView3->clearSelection(); 1012 ListView3->clearSelection();
1009 item = 0; 1013 item = 0;
1010 } 1014 }
1011 if( item == 0) 1015 if( item == 0)
1012 item = ListView4->currentItem(); 1016 item = ListView4->currentItem();
1013 if( item != 0) { 1017 if( item != 0) {
1014 titleString = item->text(0); 1018 titleString = item->text(0);
1015 ListView4->clearSelection(); 1019 ListView4->clearSelection();
1016 item = 0; 1020 item = 0;
1017 } 1021 }
1018 if( item == 0) 1022 if( item == 0)
1019 item = ListView5->currentItem(); 1023 item = ListView5->currentItem();
1020 if( item != 0) { 1024 if( item != 0) {
1021 titleString = item->text(0); 1025 titleString = item->text(0);
1022 ListView5->clearSelection(); 1026 ListView5->clearSelection();
1023 item = 0; 1027 item = 0;
1024 } 1028 }
1025 item=0; 1029 item=0;
1026 if(titleString.length()>2) { 1030 if(titleString.length()>2) {
1027 qDebug( "Title is "+titleString ); 1031 odebug << "Title is "+titleString << oendl;
1028 titleString.replace( QRegExp("\\s"), "%20"); 1032 titleString.replace( QRegExp("\\s"), "%20");
1029 titleString.replace( QRegExp("'"), "%20"); 1033 titleString.replace( QRegExp("'"), "%20");
1030 titleString.replace( QRegExp("\""), "%20"); 1034 titleString.replace( QRegExp("\""), "%20");
1031 titleString.replace( QRegExp("&"), "%20"); 1035 titleString.replace( QRegExp("&"), "%20");
1032 QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search"; 1036 QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search";
1033 cmd="opera "+cmd; 1037 cmd="opera "+cmd;
1034 system(cmd); 1038 system(cmd);
1035 } else 1039 } else
1036 QMessageBox::message( "Note","If you select a title, this will\nsearch google.com for that title."); 1040 QMessageBox::message( "Note","If you select a title, this will\nsearch google.com for that title.");
1037 return true; 1041 return true;
1038 1042
@@ -1044,23 +1048,23 @@ void LibraryDialog::FindLibrary()
1044{ 1048{
1045 buttonLibrary->setDown(TRUE); 1049 buttonLibrary->setDown(TRUE);
1046 1050
1047 qApp->processEvents(); 1051 qApp->processEvents();
1048 if( QFile( new_index).exists() /* && this->isHidden() */) { 1052 if( QFile( new_index).exists() /* && this->isHidden() */) {
1049 newindexLib.setName( new_index); 1053 newindexLib.setName( new_index);
1050 indexLib.setName( new_index); 1054 indexLib.setName( new_index);
1051 qDebug("index file is "+ new_index); 1055 odebug << "index file is "+ new_index << oendl;
1052 Newlibrary(); 1056 Newlibrary();
1053 } else { 1057 } else {
1054 newindexLib.setName( old_index); 1058 newindexLib.setName( old_index);
1055 indexLib.setName( old_index); 1059 indexLib.setName( old_index);
1056 qDebug("new index nameis "+ old_index); 1060 odebug << "new index nameis "+ old_index << oendl;
1057 Library(); 1061 Library();
1058 } 1062 }
1059 indexLoaded=true; 1063 indexLoaded=true;
1060 buttonSearch->setEnabled(TRUE); 1064 buttonSearch->setEnabled(TRUE);
1061 moreInfoButton->setEnabled(TRUE); 1065 moreInfoButton->setEnabled(TRUE);
1062 1066
1063 buttonLibrary->setDown(FALSE); 1067 buttonLibrary->setDown(FALSE);
1064 buttonNewList->setText("Download"); 1068 buttonNewList->setText("Download");
1065 qApp->processEvents(); 1069 qApp->processEvents();
1066 1070
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index aed53c6..6e6b707 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -12,7 +12,3 @@
12// /* Created: Sun Aug 27 15:24:52 2000*/ 12// /* Created: Sun Aug 27 15:24:52 2000*/
13#include <unistd.h>
14 13
15extern "C" {
16#include <ftplib.h>
17}
18 14
@@ -21,2 +17,6 @@ extern "C" {
21 17
18/* OPIE */
19#include <opie2/odebug.h>
20
21/* QT */
22#include <qprogressbar.h> 22#include <qprogressbar.h>
@@ -32,2 +32,8 @@ extern "C" {
32 32
33/* STD */
34#include <unistd.h>
35extern "C" {
36#include <ftplib.h>
37}
38
33QProgressBar* ProgressBar1; 39QProgressBar* ProgressBar1;
@@ -48,3 +54,3 @@ static int log_progress(netbuf *ctl, int xfered, void *arg) {
48NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QStringList netL) 54NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QStringList netL)
49 : QDialog( parent, name, modal, fl ) 55 : QDialog( parent, name, modal, fl )
50{ 56{
@@ -55,9 +61,9 @@ NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WF
55 dir = ftp_base_dir = netL[1]; 61 dir = ftp_base_dir = netL[1];
56 localFileName = netL[2]; 62 localFileName = netL[2];
57 s_partialFileName = netL[3]; 63 s_partialFileName = netL[3];
58 64
59 resize(240,110); 65 resize(240,110);
60 66
61 local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; 67 local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
62 // autoOk = autoDownload; 68// autoOk = autoDownload;
63// if( networkUrl.find("ftp",0,false)== -1 ) { 69// if( networkUrl.find("ftp",0,false)== -1 ) {
@@ -120,7 +126,7 @@ void NetworkDialog::initDialog() {
120// connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot())); 126// connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot()));
121 if(autoOk) { 127 if(autoOk) {
122 qWarning("XXXXXXXXXXXXXXXXXXXXXXXX"); 128 owarn << "XXXXXXXXXXXXXXXXXXXXXXXX" << oendl;
123 buttonOk->setDown(true); 129 buttonOk->setDown(true);
124 doOk(); 130 doOk();
125 } 131 }
126} 132}
@@ -145,3 +151,3 @@ void NetworkDialog::timeSlot() {
145// } 151// }
146// // qDebug("timer event"); 152// // odebug << "timer event" << oendl;
147// qApp->processEvents(); 153// qApp->processEvents();
@@ -151,3 +157,3 @@ void NetworkDialog::timeSlot() {
151void NetworkDialog::connectionTimeSlot() { 157void NetworkDialog::connectionTimeSlot() {
152// qDebug("Connections timed out"); 158// odebug << "Connections timed out" << oendl;
153// ftpQuit(); 159// ftpQuit();
@@ -169,4 +175,4 @@ bool NetworkDialog::downloadFile( QString networkUrl )
169 qApp->processEvents(); 175 qApp->processEvents();
170 qDebug("Downloading: %s",networkUrl.latin1()); 176 odebug << "Downloading: " << networkUrl << "" << oendl;
171 qDebug("Into: %s",localFileName.latin1()); 177 odebug << "Into: " << localFileName << "" << oendl;
172 if( networkUrl.length() > 5) { 178 if( networkUrl.length() > 5) {
@@ -176,3 +182,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
176 if(ftp_host.length() < 2) { 182 if(ftp_host.length() < 2) {
177 qDebug("Please select an ftp host" ); 183 odebug << "Please select an ftp host" << oendl;
178 successDownload=false; 184 successDownload=false;
@@ -182,4 +188,4 @@ bool NetworkDialog::downloadFile( QString networkUrl )
182 QString msg; 188 QString msg;
183 qDebug(ftp_host); 189 odebug << ftp_host << oendl;
184 qDebug("Opening ftp connection."); 190 odebug << "Opening ftp connection." << oendl;
185 warnLabel->setText("connecting to: "+ftp_host ); 191 warnLabel->setText("connecting to: "+ftp_host );
@@ -202,3 +208,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
202 } 208 }
203 qDebug("Changing directories."); 209 odebug << "Changing directories." << oendl;
204 TextLabel3->setText("Changing directories."); 210 TextLabel3->setText("Changing directories.");
@@ -219,3 +225,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
219// } 225// }
220 qDebug("Requesting directory list."); 226 odebug << "Requesting directory list." << oendl;
221 TextLabel3->setText("Getting directory list."); 227 TextLabel3->setText("Getting directory list.");
@@ -234,3 +240,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
234 QTextStream t( &tmp ); // use a text stream 240 QTextStream t( &tmp ); // use a text stream
235 qDebug("Finding partial filename "+s_partialFileName); 241 odebug << "Finding partial filename "+s_partialFileName << oendl;
236 while ( !t.eof()) { 242 while ( !t.eof()) {
@@ -243,3 +249,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
243 File_Name = str; 249 File_Name = str;
244 qDebug("Found file_name "+ File_Name); 250 odebug << "Found file_name "+ File_Name << oendl;
245 break; 251 break;
@@ -248,6 +254,6 @@ bool NetworkDialog::downloadFile( QString networkUrl )
248// File_Name = str; 254// File_Name = str;
249// qDebug("Found file_name "+ File_Name); 255// odebug << "Found file_name "+ File_Name << oendl;
250// break; 256// break;
251// } 257// }
252 258
253 } 259 }
@@ -258,3 +264,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
258 else 264 else
259 qDebug("Error opening temp file."); 265 odebug << "Error opening temp file." << oendl;
260 266
@@ -265,4 +271,4 @@ bool NetworkDialog::downloadFile( QString networkUrl )
265 localFileName = temp+File_Name; 271 localFileName = temp+File_Name;
266 qDebug("Requesting file "+ File_Name); 272 odebug << "Requesting file "+ File_Name << oendl;
267 qDebug( "Saving as "+localFileName); 273 odebug << "Saving as "+localFileName << oendl;
268 msg="Requesting file "+ File_Name; 274 msg="Requesting file "+ File_Name;
@@ -274,5 +280,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
274 QString temp; 280 QString temp;
275 temp.sprintf( File_Name+" "+" %dkb", fsz); 281 temp.sprintf( File_Name+" "+" %dkb", fsz);
276 TextLabel3->setText(temp); 282 TextLabel3->setText(temp);
277 283
278 ProgressBar1->setTotalSteps(fsz); 284 ProgressBar1->setTotalSteps(fsz);
@@ -295,3 +301,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
295 } 301 }
296 qDebug("Ftp session successful"); 302 odebug << "Ftp session successful" << oendl;
297 successDownload=TRUE; 303 successDownload=TRUE;
@@ -304,3 +310,3 @@ bool NetworkDialog::downloadFile( QString networkUrl )
304void NetworkDialog::doOk() { 310void NetworkDialog::doOk() {
305 qWarning("Do OK"); 311 owarn << "Do OK" << oendl;
306 QString loginStr; 312 QString loginStr;
@@ -316,3 +322,3 @@ void NetworkDialog::doOk() {
316 successDownload = false; 322 successDownload = false;
317 reject(); 323 reject();
318 } 324 }
diff --git a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
index 4ddb3f0..d989304 100644
--- a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
@@ -100,3 +100,3 @@ void SearchDialog::byeBye()
100 searchString = get_text(); 100 searchString = get_text();
101// qDebug("Search string is "+searchString); 101// odebug << "Search string is "+searchString << oendl;
102 Config cfg("Gutenbrowser"); 102 Config cfg("Gutenbrowser");
@@ -121,3 +121,3 @@ void SearchDialog::closed()
121 searchString = get_text(); 121 searchString = get_text();
122// qDebug("Search string is "+searchString); 122// odebug << "Search string is "+searchString << oendl;
123 Config cfg("Gutenbrowser"); 123 Config cfg("Gutenbrowser");
diff --git a/noncore/apps/opie-gutenbrowser/browserDialog.cpp b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
index 81dd516..cc05d04 100644
--- a/noncore/apps/opie-gutenbrowser/browserDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
@@ -12,2 +12,3 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
12#include <opie2/ofiledialog.h> 12#include <opie2/ofiledialog.h>
13#include <opie2/odebug.h>
13using namespace Opie::Ui; 14using namespace Opie::Ui;
@@ -54,3 +55,3 @@ void optionsDialog::BrowseSelected() {
54// QStringList fileList=browseForFiles->fileList; 55// QStringList fileList=browseForFiles->fileList;
55// qDebug(selFile); 56// odebug << selFile << oendl;
56// QStringList::ConstIterator f; 57// QStringList::ConstIterator f;
@@ -78,3 +79,3 @@ void optionsDialog::setHttp(int index) {
78 config.setGroup( "HttpServer" ); 79 config.setGroup( "HttpServer" );
79 qDebug("writing http server"); 80 odebug << "writing http server" << oendl;
80 if( index== 0) { 81 if( index== 0) {
diff --git a/noncore/apps/opie-gutenbrowser/fontDialog.cpp b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
index a17b1d3..fa964a6 100644
--- a/noncore/apps/opie-gutenbrowser/fontDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
@@ -92,3 +92,3 @@ void FontDialog::familyListBoxSlot(const QString & text)
92 family = text; 92 family = text;
93// qDebug(family); 93// odebug << family << oendl;
94 QStringList styles = fdb.styles( family ); // string list of styles of our current font family 94 QStringList styles = fdb.styles( family ); // string list of styles of our current font family
@@ -102,3 +102,3 @@ QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
102 dstyle = QString::number( *points ); 102 dstyle = QString::number( *points );
103 qDebug(dstyle); 103 odebug << dstyle << oendl;
104 sizeComboBox->insertItem( dstyle.left( dstyle.length() - 1 )); 104 sizeComboBox->insertItem( dstyle.left( dstyle.length() - 1 ));
@@ -153,3 +153,3 @@ void FontDialog::populateLists()
153// if(family == defaultFont.family()) 153// if(family == defaultFont.family())
154// qDebug(family); 154// odebug << family << oendl;
155 familyListBox->insertItem( family); 155 familyListBox->insertItem( family);
@@ -211,3 +211,3 @@ void FontDialog::changeText()
211 } 211 }
212// qDebug("Font family is "+family); 212// odebug << "Font family is "+family << oendl;
213 if( styleListBox->currentItem() == -1) 213 if( styleListBox->currentItem() == -1)
@@ -217,3 +217,3 @@ void FontDialog::changeText()
217 } 217 }
218// qDebug("font style is "+style); 218// odebug << "font style is "+style << oendl;
219 219
@@ -225,3 +225,3 @@ void FontDialog::changeText()
225 225
226// qDebug("Font size is "+size); 226// odebug << "Font size is "+size << oendl;
227 bool ok; 227 bool ok;
@@ -233,3 +233,3 @@ void FontDialog::changeText()
233 charSet = *s; 233 charSet = *s;
234// qDebug(charSet); 234// odebug << charSet << oendl;
235 } 235 }
@@ -237,5 +237,5 @@ void FontDialog::changeText()
237 QFontInfo fontInfo( selectedFont); 237 QFontInfo fontInfo( selectedFont);
238// if(fontInfo.italic() ) qDebug("italic"); 238// if(fontInfo.italic() ) odebug << "italic" << oendl;
239 selectedFont.setWeight(fontInfo.weight() ); 239 selectedFont.setWeight(fontInfo.weight() );
240// qDebug("Style are "+style+" %d ",fontInfo.weight()); 240// odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl;
241 Config cfg("Gutenbrowser"); 241 Config cfg("Gutenbrowser");
@@ -251,3 +251,3 @@ void FontDialog::changeText()
251 cfg.writeEntry("Italic","TRUE"); 251 cfg.writeEntry("Italic","TRUE");
252// qDebug("Style is "+styleListBox->currentText()); 252// odebug << "Style is "+styleListBox->currentText() << oendl;
253 } else 253 } else
diff --git a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
index ad770b5..a9c7346 100644
--- a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
+++ b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
@@ -13,2 +13,3 @@
13 ***************************************************************************/ 13 ***************************************************************************/
14
14#include "optionsDialog.h" 15#include "optionsDialog.h"
@@ -18,11 +19,15 @@
18 19
20/* OPIE */
21#include <opie2/odebug.h>
22#include <qpe/config.h>
23
24/* QT */
19#include <qprogressbar.h> 25#include <qprogressbar.h>
20#include <stdlib.h>
21#include <qurloperator.h> 26#include <qurloperator.h>
22#include <qpe/config.h>
23#include <qlistbox.h> 27#include <qlistbox.h>
24 28
29/* STD */
30#include <stdlib.h>
25#include <unistd.h> 31#include <unistd.h>
26#include <stdio.h> 32#include <stdio.h>
27#include <stdlib.h>
28 33
@@ -40,3 +45,3 @@ void optionsDialog::ftpSiteDlg( )
40 ListFile+="/ftpList"; 45 ListFile+="/ftpList";
41 qDebug("opening "+ListFile); 46 odebug << "opening "+ListFile << oendl;
42 if ( QFile(ListFile).exists() ) { 47 if ( QFile(ListFile).exists() ) {
@@ -78,3 +83,3 @@ void optionsDialog::getSite()
78// { // use new, improved, *INSTANT* network-dialog-file-getterer 83// { // use new, improved, *INSTANT* network-dialog-file-getterer
79// qDebug("gitcha!"); 84// odebug << "gitcha!" << oendl;
80// } 85// }
@@ -86,3 +91,3 @@ void optionsDialog::getSite()
86 QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl + " 2>&1" ; 91 QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl + " 2>&1" ;
87 qDebug("Issuing the command "+cmd); 92 odebug << "Issuing the command "+cmd << oendl;
88 Output *outDlg; 93 Output *outDlg;
@@ -101,3 +106,3 @@ void optionsDialog::getSite()
101 } 106 }
102 pclose(fp); 107 pclose(fp);
103 outDlg->close(); 108 outDlg->close();
@@ -105,3 +110,3 @@ void optionsDialog::getSite()
105 delete outDlg; 110 delete outDlg;
106 111
107// outputFile=ListFile; 112// outputFile=ListFile;
@@ -115,3 +120,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
115// TODO: add locations!! 120// TODO: add locations!!
116 qDebug("parse ftplist "+outputFile); 121 odebug << "parse ftplist "+outputFile << oendl;
117 QString ftpList, s_location; 122 QString ftpList, s_location;
@@ -154,3 +159,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
154 if(( start=s.find("<BR>(", 0, TRUE) ) != -1) { 159 if(( start=s.find("<BR>(", 0, TRUE) ) != -1) {
155// qDebug("%s",s.latin1()); 160// odebug << "" << s << "" << oendl;
156 end = s.find( ")", 0, TRUE)+1; 161 end = s.find( ")", 0, TRUE)+1;
@@ -158,3 +163,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
158 163
159// qDebug("%s", s_location.latin1()); 164// odebug << "" << s_location << "" << oendl;
160// ftpList += ftpSite + "\n"; 165// ftpList += ftpSite + "\n";
@@ -175,3 +180,3 @@ bool optionsDialog::parseFtpList( QString outputFile)
175 QFile f2( ListFile); 180 QFile f2( ListFile);
176 if(!f2.open( IO_ReadWrite | IO_Truncate)) 181 if(!f2.open( IO_ReadWrite | IO_Truncate))
177 QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n"+ListFile )) ); 182 QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n"+ListFile )) );
@@ -192,3 +197,3 @@ void optionsDialog::openSiteList() {
192 197
193 qDebug(" just opens the ftp site list"); 198 odebug << " just opens the ftp site list" << oendl;
194// ListFile = ( QDir::homeDirPath ()) +"/.gutenbrowser/ftpList"; 199// ListFile = ( QDir::homeDirPath ()) +"/.gutenbrowser/ftpList";
@@ -232,3 +237,3 @@ void optionsDialog::select_site( const char *index )
232 s_site2=s_site.right( s_site.length()-(s_site.find(" ",0,TRUE)+4) ); 237 s_site2=s_site.right( s_site.length()-(s_site.find(" ",0,TRUE)+4) );
233qDebug("Selected ftp site is "+ s_site2); 238odebug << "Selected ftp site is "+ s_site2 << oendl;
234 int i_ftp = s_site2.find("/", 0, FALSE); 239 int i_ftp = s_site2.find("/", 0, FALSE);
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 2a9a71e..be2b897 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -16,9 +16,3 @@
16// donate@gutenberg.net 16// donate@gutenberg.net
17#include <qpe/qpeapplication.h> 17
18#include <qpe/fontdatabase.h>
19#include <qpe/config.h>
20#include <qpe/qcopenvelope_qws.h>
21#include <qpe/mimetype.h>
22#include <qpe/resource.h>
23#include <qpe/applnk.h>
24 18
@@ -35,3 +29,13 @@
35 29
30/* OPIE */
31#include <opie2/odebug.h>
32#include <qpe/qpeapplication.h>
33#include <qpe/fontdatabase.h>
34#include <qpe/config.h>
35#include <qpe/qcopenvelope_qws.h>
36#include <qpe/mimetype.h>
37#include <qpe/resource.h>
38#include <qpe/applnk.h>
36 39
40/* QT */
37#include <qregexp.h> 41#include <qregexp.h>
@@ -53,2 +57,3 @@
53 57
58/* STD */
54#include <stdio.h> 59#include <stdio.h>
@@ -65,3 +70,3 @@ static const int fontsize[nfontsizes] = {8,9,10,11,12,13,14,18,24};
65Gutenbrowser::Gutenbrowser() 70Gutenbrowser::Gutenbrowser()
66 Gutenbrowser(); 71 Gutenbrowser();
67#else 72#else
@@ -69,99 +74,99 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
69#endif 74#endif
70 : QMainWindow() 75 : QMainWindow()
71 { 76 {
72 // QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 77 // QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
73 // QCopEnvelope e("QPE/System", "grabKeyboard(QString)" ); 78 // QCopEnvelope e("QPE/System", "grabKeyboard(QString)" );
74 // e << ""; 79 // e << "";
75 // QPEApplication::grabKeyboard(); 80 // QPEApplication::grabKeyboard();
76 showMainList=TRUE; 81 showMainList=TRUE;
77 working=false; 82 working=false;
78 this->setUpdatesEnabled(TRUE); 83 this->setUpdatesEnabled(TRUE);
79 // #ifndef Q_WS_QWS 84 // #ifndef Q_WS_QWS
80 QString msg; 85 QString msg;
81 msg="You have now entered unto gutenbrowser,\n"; 86 msg="You have now entered unto gutenbrowser,\n";
82 msg+="make your self at home, sit back, relax and read something great.\n"; 87 msg+="make your self at home, sit back, relax and read something great.\n";
83 88
84 local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; 89 local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
85 setCaption("Gutenbrowser");// Embedded " VERSION); 90 setCaption("Gutenbrowser");// Embedded " VERSION);
86 this->setUpdatesEnabled(TRUE); 91 this->setUpdatesEnabled(TRUE);
87 92
88 // bool firstTime=FALSE; 93 // bool firstTime=FALSE;
89 topLayout = new QVBoxLayout( this, 0, 0, "topLayout"); 94 topLayout = new QVBoxLayout( this, 0, 0, "topLayout");
90 95
91 menu = new QHBoxLayout(-1,"menu"); 96 menu = new QHBoxLayout(-1,"menu");
92 buttons2 = new QHBoxLayout(-1,"buttons2"); 97 buttons2 = new QHBoxLayout(-1,"buttons2");
93 edits = new QHBoxLayout(-1,"edits"); 98 edits = new QHBoxLayout(-1,"edits");
94 99
95 useSplitter=TRUE; 100 useSplitter=TRUE;
96 101
97 initConfig(); 102 initConfig();
98 initMenuBar(); 103 initMenuBar();
99 initButtonBar(); 104 initButtonBar();
100 initStatusBar(); 105 initStatusBar();
101 initView(); 106 initView();
102 initSlots(); 107 initSlots();
103 108
104 QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold); 109 QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold);
105 110
106 connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)), 111 connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)),
107 this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) ); 112 this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) );
108 if( useIcons) 113 if( useIcons)
109 toggleButtonIcons( TRUE); 114 toggleButtonIcons( TRUE);
110 else 115 else
111 toggleButtonIcons( FALSE); 116 toggleButtonIcons( FALSE);
112 117
113 enableButtons(false); 118 enableButtons(false);
114 119
115 Config config("Gutenbrowser"); // populate menubuttonlist 120 Config config("Gutenbrowser"); // populate menubuttonlist
116 config.setGroup("General"); 121 config.setGroup("General");
117 122
118 config.setGroup( "Files" ); 123 config.setGroup( "Files" );
119 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" ); 124 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
120 int i_numofFiles = s_numofFiles.toInt(); 125 int i_numofFiles = s_numofFiles.toInt();
121 126
122 QString tempFileName; 127 QString tempFileName;
123 128
124 for (int i = 0; i <= i_numofFiles; i++) { 129 for (int i = 0; i <= i_numofFiles; i++) {
125 // tempFileName.setNum(i); 130 // tempFileName.setNum(i);
126 config.setGroup( "Files" ); 131 config.setGroup( "Files" );
127 QString ramble = config.readEntry( QString::number(i), "" ); 132 QString ramble = config.readEntry( QString::number(i), "" );
128 133
129 config.setGroup( "Titles" ); 134 config.setGroup( "Titles" );
130 QString tempTitle = config.readEntry( ramble, ""); 135 QString tempTitle = config.readEntry( ramble, "");
131 config.setGroup( tempTitle); 136 config.setGroup( tempTitle);
132 int index=config.readNumEntry( "LineNumber", -1 ); 137 int index=config.readNumEntry( "LineNumber", -1 );
133 if( index != -1) { 138 if( index != -1) {
134 // qDebug( tempTitle); 139 // odebug << tempTitle << oendl;
135 bookmarksMenu->insertItem( tempTitle); 140 bookmarksMenu->insertItem( tempTitle);
136 } 141 }
137 } 142 }
138 143
139 // QString gutenIndex= local_library + "GUTINDEX.ALL"; 144 // QString gutenIndex= local_library + "GUTINDEX.ALL";
140 QString gutenIndex= QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL"; 145 QString gutenIndex= QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL";
141 146
142 if( QFile( gutenIndex).exists() ) { 147 if( QFile( gutenIndex).exists() ) {
143 indexLib.setName( gutenIndex); 148 indexLib.setName( gutenIndex);
144 } else { 149 } else {
145 QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT"; 150 QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT";
146 // QString localLibIndexFile= local_library + "PGWHOLE.TXT"; 151 // QString localLibIndexFile= local_library + "PGWHOLE.TXT";
147 newindexLib.setName( localLibIndexFile); 152 newindexLib.setName( localLibIndexFile);
148 } 153 }
149 LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */); 154 LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */);
150 loadCheck=false; 155 loadCheck=false;
151 chdir(local_library); 156 chdir(local_library);
152 if(!showMainList) { 157 if(!showMainList) {
153 Lview->setFocus(); 158 Lview->setFocus();
154 // if(firstTime) 159 // if(firstTime)
155 // Bookmark(); 160 // Bookmark();
156 for (int i=1;i< qApp->argc();i++) { 161 for (int i=1;i< qApp->argc();i++) {
157 qDebug("Suppose we open somethin"); 162 odebug << "Suppose we open somethin" << oendl;
158 load(qApp->argv()[i]); 163 load(qApp->argv()[i]);
159 } 164 }
160 } else { 165 } else {
161 fillWithTitles(); 166 fillWithTitles();
162 mainList->setFocus(); 167 mainList->setFocus();
163 // mainList->setCurrentItem(0); 168 // mainList->setCurrentItem(0);
164 169
165 } 170 }
166 writeConfig(); 171 writeConfig();
167} //end init 172} //end init
@@ -169,5 +174,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
169Gutenbrowser::~Gutenbrowser() { 174Gutenbrowser::~Gutenbrowser() {
170 // QPEApplication::grabKeyboard(); 175 // QPEApplication::grabKeyboard();
171 // QPEApplication::ungrabKeyboard(); 176 // QPEApplication::ungrabKeyboard();
172 qDebug("Exit"); 177 odebug << "Exit" << oendl;
173} 178}
@@ -175,14 +180,14 @@ Gutenbrowser::~Gutenbrowser() {
175 /* 180 /*
176 Google.com search */ 181 Google.com search */
177void Gutenbrowser::InfoBarClick() { 182void Gutenbrowser::InfoBarClick() {
178 QString text; 183 QString text;
179 if( Lview->hasSelectedText()) { 184 if( Lview->hasSelectedText()) {
180 Lview->copy(); 185 Lview->copy();
181 QClipboard *cb = QApplication::clipboard(); 186 QClipboard *cb = QApplication::clipboard();
182 text = cb->text(); 187 text = cb->text();
183 } else { 188 } else {
184 // text=title; 189 // text=title;
185 text=this->caption(); 190 text=this->caption();
186 } 191 }
187 searchGoogle(text); 192 searchGoogle(text);
188} 193}
@@ -190,73 +195,73 @@ void Gutenbrowser::InfoBarClick() {
190 /* 195 /*
191 download http with wget or preferred browser */ 196 download http with wget or preferred browser */
192void Gutenbrowser::goGetit( const QString &url, bool showMsg) { 197void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
193 // int eexit=0; 198 // int eexit=0;
194 QString cmd; 199 QString cmd;
195 // config.read(); 200 // config.read();
196 qApp->processEvents(); 201 qApp->processEvents();
197 QString filename = QPEApplication::qpeDir(); 202 QString filename = QPEApplication::qpeDir();
198 if(filename.right(1)!="/") 203 if(filename.right(1)!="/")
199 filename+="/etc/gutenbrowser/"; 204 filename+="/etc/gutenbrowser/";
200 else 205 else
201 filename+="etc/gutenbrowser/"; 206 filename+="etc/gutenbrowser/";
202 qDebug("filename "+filename); 207 odebug << "filename "+filename << oendl;
203 // QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/"; 208 // QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
204 209
205 filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1); 210 filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
206 211
207 Config config("Gutenbrowser"); 212 Config config("Gutenbrowser");
208 config.setGroup( "Browser" ); 213 config.setGroup( "Browser" );
209 QString brow = config.readEntry("Preferred", "Opera"); 214 QString brow = config.readEntry("Preferred", "Opera");
210 qDebug("Preferred browser is "+brow); 215 odebug << "Preferred browser is "+brow << oendl;
211 if(!showMsg) { //if we just get the gutenindex.all 216 if(!showMsg) { //if we just get the gutenindex.all
212 cmd="wget -O " + filename +" " + url+" 2>&1" ; 217 cmd="wget -O " + filename +" " + url+" 2>&1" ;
213 chdir(local_library); 218 chdir(local_library);
214 qDebug("Issuing the system command: %s", cmd.latin1()); 219 odebug << "Issuing the system command: " << cmd << "" << oendl;
215 220
216 Output *outDlg; 221 Output *outDlg;
217 outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE); 222 outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
218 outDlg->showMaximized(); 223 outDlg->showMaximized();
219 outDlg->show(); 224 outDlg->show();
220 qApp->processEvents(); 225 qApp->processEvents();
221 FILE *fp; 226 FILE *fp;
222 char line[130]; 227 char line[130];
223 outDlg->OutputEdit->append( tr("Running wget") ); 228 outDlg->OutputEdit->append( tr("Running wget") );
224 sleep(1); 229 sleep(1);
225 fp = popen( (const char *) cmd, "r"); 230 fp = popen( (const char *) cmd, "r");
226 // qDebug("Issuing the command\n"+cmd); 231 // odebug << "Issuing the command\n"+cmd << oendl;
227 // system(cmd); 232 // system(cmd);
228 while ( fgets( line, sizeof line, fp)) { 233 while ( fgets( line, sizeof line, fp)) {
229 outDlg->OutputEdit->append(line); 234 outDlg->OutputEdit->append(line);
230 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 235 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
231 } 236 }
232 pclose(fp); 237 pclose(fp);
233 outDlg->close(); 238 outDlg->close();
234 if(outDlg) 239 if(outDlg)
235 delete outDlg; 240 delete outDlg;
236 } else { 241 } else {
237 if( brow == "Konq") { 242 if( brow == "Konq") {
238 cmd = "konqueror "+url+" &"; 243 cmd = "konqueror "+url+" &";
239 } 244 }
240 if( brow == "Opera") { //for desktop testing 245 if( brow == "Opera") { //for desktop testing
241 cmd = "opera "+url+" &"; 246 cmd = "opera "+url+" &";
242 } 247 }
243 // if( brow == "Opera") { // on Zaurus 248 // if( brow == "Opera") { // on Zaurus
244 // cmd = "operagui "+url+" &"; 249 // cmd = "operagui "+url+" &";
245 // } 250 // }
246 if( brow == "Mozilla") { 251 if( brow == "Mozilla") {
247 cmd = "mozilla "+url+" &"; 252 cmd = "mozilla "+url+" &";
248 } 253 }
249 if( brow == "Netscape") { 254 if( brow == "Netscape") {
250 cmd = "netscape "+url+" &"; 255 cmd = "netscape "+url+" &";
251 } 256 }
252 if(brow == "wget") { 257 if(brow == "wget") {
253 // cmd="wget -q "+url+" &"; 258 // cmd="wget -q "+url+" &";
254 QString tempHtml=local_library+"webster.html"; 259 QString tempHtml=local_library+"webster.html";
255 cmd="wget -O "+tempHtml+" -q "+url; 260 cmd="wget -O "+tempHtml+" -q "+url;
256 } 261 }
257 262
258 chdir(local_library); 263 chdir(local_library);
259 qDebug("Issuing the sys command: %s", cmd.latin1()); 264 odebug << "Issuing the sys command: " << cmd << "" << oendl;
260 system(cmd); 265 system(cmd);
261 } 266 }
262} 267}
@@ -264,19 +269,19 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
264void Gutenbrowser::toggleButtonIcons( bool useEm) { 269void Gutenbrowser::toggleButtonIcons( bool useEm) {
265 QString pixDir; 270 QString pixDir;
266 if(useEm) 271 if(useEm)
267 useEm=TRUE; 272 useEm=TRUE;
268 pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser"; 273 pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser";
269 qDebug("Docdir is "+QPEApplication::documentDir()); 274 odebug << "Docdir is "+QPEApplication::documentDir() << oendl;
270 275
271 if( useIcons && QDir( pixDir).exists() ) { 276 if( useIcons && QDir( pixDir).exists() ) {
272 LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline 277 LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline
273 OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook")); 278 OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook"));
274 ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline 279 ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline
275 BackButton->setPixmap( Resource::loadPixmap("back") );//in inline 280 BackButton->setPixmap( Resource::loadPixmap("back") );//in inline
276 SearchButton->setPixmap( Resource::loadPixmap("gutenbrowser/search") );//in inline 281 SearchButton->setPixmap( Resource::loadPixmap("gutenbrowser/search") );//in inline
277 lastBmkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark_folder")); 282 lastBmkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark_folder"));
278 setBookmarkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark") ); 283 setBookmarkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark") );
279 dictionaryButton->setPixmap( Resource::loadPixmap("gutenbrowser/spellcheck") ); 284 dictionaryButton->setPixmap( Resource::loadPixmap("gutenbrowser/spellcheck") );
280 InfoBar->setPixmap( Resource::loadPixmap("gutenbrowser/google")); 285 InfoBar->setPixmap( Resource::loadPixmap("gutenbrowser/google"));
281 } 286 }
282} 287}
@@ -286,10 +291,10 @@ bool Gutenbrowser::queryExit()
286{ 291{
287 int exit=QMessageBox::information(this, "Quit...", "Do your really want to quit?", 292 int exit=QMessageBox::information(this, "Quit...", "Do your really want to quit?",
288 QMessageBox::Ok, QMessageBox::Cancel); 293 QMessageBox::Ok, QMessageBox::Cancel);
289 if (exit==1) { 294 if (exit==1) {
290 writeConfig(); 295 writeConfig();
291 qApp->quit(); 296 qApp->quit();
292 } else { 297 } else {
293 }; 298 };
294 return (exit==1); 299 return (exit==1);
295} 300}
@@ -302,8 +307,8 @@ void Gutenbrowser::slotFilePrint() {
302void Gutenbrowser::ByeBye() { 307void Gutenbrowser::ByeBye() {
303 if (b_queryExit) 308 if (b_queryExit)
304 queryExit(); 309 queryExit();
305 else { 310 else {
306 // writeConfig(); 311 // writeConfig();
307 qApp->quit(); 312 qApp->quit();
308 } 313 }
309} 314}
@@ -311,5 +316,5 @@ void Gutenbrowser::ByeBye() {
311void Gutenbrowser::HelpBtn() { 316void Gutenbrowser::HelpBtn() {
312 HelpMe* HelpDlg; 317 HelpMe* HelpDlg;
313 HelpDlg = new HelpMe( this, "Help Dialog"); 318 HelpDlg = new HelpMe( this, "Help Dialog");
314 HelpDlg->showMaximized(); 319 HelpDlg->showMaximized();
315} 320}
@@ -318,21 +323,21 @@ void Gutenbrowser::DownloadIndex() {
318#ifndef Q_WS_QWS 323#ifndef Q_WS_QWS
319 { 324 {
320 switch( QMessageBox::information( 0, (tr("Download Library Index, or FTP sites?")), 325 switch( QMessageBox::information( 0, (tr("Download Library Index, or FTP sites?")),
321 (tr("Do you want to download the newest\n" 326 (tr("Do you want to download the newest\n"
322 "Project Gutenberg Library Index?\n" 327 "Project Gutenberg Library Index?\n"
323 "or select an ftp site?\n")), 328 "or select an ftp site?\n")),
324 (tr("&Library Index")), (tr("&Ftp Site")), (tr("&Cancel")), 2, 2 ) ) 329 (tr("&Library Index")), (tr("&Ftp Site")), (tr("&Cancel")), 2, 2 ) )
325 { 330 {
326 case 0: // index clicked, 331 case 0: // index clicked,
327 downloadLibIndex(); 332 downloadLibIndex();
328 break; 333 break;
329 334
330 case 1: // ftp selected 335 case 1: // ftp selected
331 downloadFtpList(); 336 downloadFtpList();
332 break; 337 break;
333 338
334 case 2: // Cancel 339 case 2: // Cancel
335 break; 340 break;
336 }; 341 };
337 } 342 }
338#endif 343#endif
@@ -342,10 +347,10 @@ void Gutenbrowser::DownloadIndex() {
342void Gutenbrowser::downloadFtpList() { 347void Gutenbrowser::downloadFtpList() {
343 // QString cmd="wget http://www.promo.net/pg/list.html"); 348 // QString cmd="wget http://www.promo.net/pg/list.html");
344 //system(cmd); 349 //system(cmd);
345 qApp->processEvents(); 350 qApp->processEvents();
346 optionsDialog* optDlg; 351 optionsDialog* optDlg;
347 optDlg = new optionsDialog( this,"Options_Dlg", true); 352 optDlg = new optionsDialog( this,"Options_Dlg", true);
348 optDlg->getSite(); 353 optDlg->getSite();
349 if(optDlg) 354 if(optDlg)
350 delete optDlg; 355 delete optDlg;
351} 356}
@@ -354,23 +359,23 @@ void Gutenbrowser::downloadFtpList() {
354void Gutenbrowser::downloadLibIndex() { 359void Gutenbrowser::downloadLibIndex() {
355 // QString dwmloader = local_library + "pgwhole.zip"; 360 // QString dwmloader = local_library + "pgwhole.zip";
356 // QString cmd = "lynx -source http://www.gutenberg.net/pgwhole.zip | cat >> " + dwmloader; 361 // QString cmd = "lynx -source http://www.gutenberg.net/pgwhole.zip | cat >> " + dwmloader;
357 // system(cmd); 362 // system(cmd);
358 363
359 // QString outputFile= local_library+ "GUTINDEX.ALL"; 364 // QString outputFile= local_library+ "GUTINDEX.ALL";
360 // config.setGroup( "FTPsite" ); // ftp server config 365 // config.setGroup( "FTPsite" ); // ftp server config
361 // ftp_host=config.readEntry("SiteName", ""); 366 // ftp_host=config.readEntry("SiteName", "");
362 // ftp_base_dir= config.readEntry("base", ""); 367 // ftp_base_dir= config.readEntry("base", "");
363 // QString networkUrl= "ftp://"+ftp_host+ftp_base_dir+"/GUTINDEX.ALL"; 368 // QString networkUrl= "ftp://"+ftp_host+ftp_base_dir+"/GUTINDEX.ALL";
364 QDir dir( local_library); 369 QDir dir( local_library);
365 dir.cd("", TRUE); 370 dir.cd("", TRUE);
366 goGetit( "http://sailor.gutenberg.org/GUTINDEX.ALL", false); // until ghttp works on binaries -qt3 371 goGetit( "http://sailor.gutenberg.org/GUTINDEX.ALL", false); // until ghttp works on binaries -qt3
367 // goGetit( "http://www.gutenberg.net/pgwhole.zip", true); // until ghttp works on binaries -qt3 372 // goGetit( "http://www.gutenberg.net/pgwhole.zip", true); // until ghttp works on binaries -qt3
368 // NetworkDialog *NetworkDlg; 373 // NetworkDialog *NetworkDlg;
369 // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, outputFile ); 374 // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, outputFile );
370 // if( NetworkDlg->exec() != 0 ) 375 // if( NetworkDlg->exec() != 0 )
371 // { // use new, improved, *INSTANT* network-dialog-file-getterer 376 // { // use new, improved, *INSTANT* network-dialog-file-getterer
372 //// QMessageBox::message("Note",""); 377 //// QMessageBox::message("Note","");
373 // } 378 // }
374 // if(NetworkDlg) 379 // if(NetworkDlg)
375 // delete NetworkDlg; 380 // delete NetworkDlg;
376} 381}
@@ -382,8 +387,8 @@ void Gutenbrowser::PrintBtn() {
382void Gutenbrowser::SearchBtn() { 387void Gutenbrowser::SearchBtn() {
383 if( loadCheck) { 388 if( loadCheck) {
384 qDebug("loadCheck: we have a loaded doc"); 389 odebug << "loadCheck: we have a loaded doc" << oendl;
385 Search(); 390 Search();
386 } 391 }
387 // else 392 // else
388 // QMessageBox::message("Note","Sorry, can't search. No etext is loaded"); 393 // QMessageBox::message("Note","Sorry, can't search. No etext is loaded");
389} 394}
@@ -393,50 +398,50 @@ void Gutenbrowser::ForwardBtn() {
393 398
394 if( !ForwardButton->autoRepeat() && !ForwardButton->isDown()) { 399 if( !ForwardButton->autoRepeat() && !ForwardButton->isDown()) {
395 400
396 QString s; 401 QString s;
397 QString insertString; 402 QString insertString;
398 int pageSize= Lview->PageSize(); 403 int pageSize= Lview->PageSize();
399 Lview->clear(); 404 Lview->clear();
400 405
401 for(int fd=0; fd < pageSize - 1;fd++) { 406 for(int fd=0; fd < pageSize - 1;fd++) {
402 f.readLine(s, 256); 407 f.readLine(s, 256);
403 if(useWrap) 408 if(useWrap)
404 s.replace(QRegExp("\n"),""); 409 s.replace(QRegExp("\n"),"");
405 insertString+=s; 410 insertString+=s;
406 Lview->insertLine( s, -1); 411 Lview->insertLine( s, -1);
407 // qDebug(s); 412 // odebug << s << oendl;
408 currentLine++; 413 currentLine++;
409 } 414 }
410 // Lview->insertAt( insertString,0,0, FALSE); 415 // Lview->insertAt( insertString,0,0, FALSE);
411 currentFilePos = f.at(); 416 currentFilePos = f.at();
412 // if( i_pageNum != pages) { 417 // if( i_pageNum != pages) {
413 // Lview->MultiLine_Ex::pageDown( FALSE); 418 // Lview->MultiLine_Ex::pageDown( FALSE);
414 i_pageNum++; 419 i_pageNum++;
415 pageStopArray.resize(i_pageNum + 1); 420 pageStopArray.resize(i_pageNum + 1);
416 // int length = Lview->length(); 421 // int length = Lview->length();
417 422
418 pageStopArray[i_pageNum ] = currentFilePos; 423 pageStopArray[i_pageNum ] = currentFilePos;
419 // qDebug("%d current page is number %d, pagesize %d, length %d, current %d", 424 // qDebug("%d current page is number %d, pagesize %d, length %d, current %d",
420 // currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] ); 425 // currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] );
421 setStatus(); 426 setStatus();
422 Lview->setCursorPosition( 0, 0, FALSE); 427 Lview->setCursorPosition( 0, 0, FALSE);
423 // } 428 // }
424 429
425 } else { 430 } else {
426 // qDebug("bal"); 431 // odebug << "bal" << oendl;
427 // if( i_pageNum != pages) { 432 // if( i_pageNum != pages) {
428 433
429 // // int newTop = Lview->Top(); 434 // // int newTop = Lview->Top();
430 // // if(Lview->lastRow() > i) 435 // // if(Lview->lastRow() > i)
431 // Lview->ScrollUp(1); 436 // Lview->ScrollUp(1);
432 // // i_pageNum++; 437 // // i_pageNum++;
433 // setStatus(); 438 // setStatus();
434 // Lview->setCursorPosition( Lview->Top(), 0, FALSE); 439 // Lview->setCursorPosition( Lview->Top(), 0, FALSE);
435 440
436 // } 441 // }
437 442
438 } 443 }
439 Lview->setFocus(); 444 Lview->setFocus();
440 445
441 // qDebug("page number %d line number %d", i_pageNum, currentLine); 446 // odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
442} 447}
@@ -445,58 +450,58 @@ void Gutenbrowser::ForwardBtn() {
445void Gutenbrowser::BackBtn() { 450void Gutenbrowser::BackBtn() {
446 if( i_pageNum > 0) { 451 if( i_pageNum > 0) {
447 int pageSize= Lview->PageSize(); 452 int pageSize= Lview->PageSize();
448 // int length=Lview->length(); 453 // int length=Lview->length();
449 454
450 i_pageNum--; 455 i_pageNum--;
451 currentFilePos = f.at(); 456 currentFilePos = f.at();
452 457
453 // qDebug("%d move back to %d, current page number %d, %d, length %d", 458 // qDebug("%d move back to %d, current page number %d, %d, length %d",
454 // currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() ); 459 // currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() );
455 460
456 if( i_pageNum < 2) { 461 if( i_pageNum < 2) {
457 f.at( 0); 462 f.at( 0);
458 } else { 463 } else {
459 if(!f.at( pageStopArray[i_pageNum - 1] )) 464 if(!f.at( pageStopArray[i_pageNum - 1] ))
460 qDebug("File positioned backward did not work"); 465 odebug << "File positioned backward did not work" << oendl;
461 } 466 }
462 QString s; 467 QString s;
463 // int sizeLine=0; 468 // int sizeLine=0;
464 Lview->clear(); 469 Lview->clear();
465 // QString insertString; 470 // QString insertString;
466 471
467 for(int fd = 0; fd < pageSize ;fd++) { 472 for(int fd = 0; fd < pageSize ;fd++) {
468 // Lview->removeLine( Lview->PageSize() ); 473 // Lview->removeLine( Lview->PageSize() );
469 f.readLine(s, 256); 474 f.readLine(s, 256);
470 if(useWrap) 475 if(useWrap)
471 s.replace(QRegExp("\n"),""); 476 s.replace(QRegExp("\n"),"");
472 currentLine++; 477 currentLine++;
473 // insertString+=s; 478 // insertString+=s;
474 Lview->insertLine( s, -1); 479 Lview->insertLine( s, -1);
475 } 480 }
476 481
477 // Lview->insertAt( insertString,0,0, FALSE); 482 // Lview->insertAt( insertString,0,0, FALSE);
478 483
479 if( !BackButton->autoRepeat() && !BackButton->isDown()) { 484 if( !BackButton->autoRepeat() && !BackButton->isDown()) {
480 QString topR; 485 QString topR;
481 QString lastR; 486 QString lastR;
482 QString pageR; 487 QString pageR;
483 // int sizer = Lview->lastRow() - Lview->topRow(); 488 // int sizer = Lview->lastRow() - Lview->topRow();
484 // int i_topRow = Lview->topRow(); 489 // int i_topRow = Lview->topRow();
485 if( i_pageNum < 1) 490 if( i_pageNum < 1)
486 i_pageNum = 1; 491 i_pageNum = 1;
487 setCaption(QString::number(i_pageNum)); 492 setCaption(QString::number(i_pageNum));
488 } else { 493 } else {
489 // int newTop = Lview->Top(); 494 // int newTop = Lview->Top();
490 // if(Lview->lastRow() > i) 495 // if(Lview->lastRow() > i)
491 Lview->MultiLine_Ex::pageUp( FALSE); 496 Lview->MultiLine_Ex::pageUp( FALSE);
492 // Lview->ScrollDown(1); 497 // Lview->ScrollDown(1);
493 // i_pageNum--; 498 // i_pageNum--;
494 if( i_pageNum < 1) 499 if( i_pageNum < 1)
495 i_pageNum = 1; 500 i_pageNum = 1;
496 setStatus(); 501 setStatus();
497 Lview->setCursorPosition( Lview->Top(), 0, FALSE); 502 Lview->setCursorPosition( Lview->Top(), 0, FALSE);
498 503
499 } 504 }
500 } 505 }
501 Lview->setFocus(); 506 Lview->setFocus();
502} 507}
@@ -504,6 +509,6 @@ void Gutenbrowser::BackBtn() {
504void Gutenbrowser::doBeginBtn() { 509void Gutenbrowser::doBeginBtn() {
505 if(loadCheck) { 510 if(loadCheck) {
506 qApp->processEvents(); 511 qApp->processEvents();
507 BeginBtn(); 512 BeginBtn();
508 } 513 }
509} 514}
@@ -513,25 +518,25 @@ void Gutenbrowser::TopBtn() {
513 518
514 if(loadCheck) { 519 if(loadCheck) {
515 if( i_pageNum != 0) { 520 if( i_pageNum != 0) {
516 qDebug("top"); 521 odebug << "top" << oendl;
517 qApp->processEvents(); 522 qApp->processEvents();
518 currentLine = 0; 523 currentLine = 0;
519 i_pageNum = 1; 524 i_pageNum = 1;
520 int pageSize = Lview->PageSize() ; 525 int pageSize = Lview->PageSize() ;
521 Lview->clear(); 526 Lview->clear();
522 QString s; 527 QString s;
523 f.at(0); 528 f.at(0);
524 for(int fd=0; fd < pageSize ;fd++) { 529 for(int fd=0; fd < pageSize ;fd++) {
525 f.readLine(s, 256); 530 f.readLine(s, 256);
526 if(useWrap) 531 if(useWrap)
527 s.replace(QRegExp("\n"),""); 532 s.replace(QRegExp("\n"),"");
528 Lview->insertLine(s ,-1); 533 Lview->insertLine(s ,-1);
529 currentLine++; 534 currentLine++;
530 } 535 }
531 Lview->setCursorPosition( 0,0, FALSE); 536 Lview->setCursorPosition( 0,0, FALSE);
532 i_pageNum=1; 537 i_pageNum=1;
533 setStatus(); 538 setStatus();
534 } 539 }
535 Lview->setFocus(); 540 Lview->setFocus();
536 } 541 }
537} 542}
@@ -540,69 +545,69 @@ void Gutenbrowser::TopBtn() {
540void Gutenbrowser::BeginBtn() { 545void Gutenbrowser::BeginBtn() {
541 i_pageNum = 1; 546 i_pageNum = 1;
542 currentLine = 0; 547 currentLine = 0;
543 QString s_pattern="*END*THE SMALL PRINT"; 548 QString s_pattern="*END*THE SMALL PRINT";
544 QString sPattern2 = "*END THE SMALL PRINT"; 549 QString sPattern2 = "*END THE SMALL PRINT";
545 550
546 int pageSize = Lview->PageSize(); 551 int pageSize = Lview->PageSize();
547 Lview->clear(); 552 Lview->clear();
548 553
549 // int lines = Lview->numLines(); 554 // int lines = Lview->numLines();
550 int pos = 0;//, i = 0; 555 int pos = 0;//, i = 0;
551 int i_topRow = Lview->topRow(); 556 int i_topRow = Lview->topRow();
552 557
553 QString LeftText;// = Lview->text(); 558 QString LeftText;// = Lview->text();
554 559
555 int linesPerPage = Lview->lastRow() - Lview->topRow(); 560 int linesPerPage = Lview->lastRow() - Lview->topRow();
556 // int pages = (( linesPerPage / Lview->editSize() ) ) +1; 561 // int pages = (( linesPerPage / Lview->editSize() ) ) +1;
557 // int pageN = 0; 562 // int pageN = 0;
558 i_pageNum = 1; 563 i_pageNum = 1;
559 int lastPage=1; 564 int lastPage=1;
560 int lineNo=0; 565 int lineNo=0;
561 QString s; 566 QString s;
562 f.at( 0); 567 f.at( 0);
563 568
564 while ( !f.atEnd() ) { 569 while ( !f.atEnd() ) {
565 f.readLine(s, 256); 570 f.readLine(s, 256);
566 lineNo++; 571 lineNo++;
567 LeftText = s; 572 LeftText = s;
568 currentFilePos = f.at(); 573 currentFilePos = f.at();
569 574
570 i_pageNum = lineNo/pageSize; 575 i_pageNum = lineNo/pageSize;
571 if(lastPage < i_pageNum) { 576 if(lastPage < i_pageNum) {
572 pageStopArray.resize(i_pageNum + 1); 577 pageStopArray.resize(i_pageNum + 1);
573 pageStopArray[i_pageNum ] = currentFilePos; 578 pageStopArray[i_pageNum ] = currentFilePos;
574 // qDebug("new page number %d, found at %d", i_pageNum, currentFilePos); 579 // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
575 } 580 }
576 // lastPage = i_pageNum; 581 // lastPage = i_pageNum;
577 if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) { 582 if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) {
578 qDebug("<<<<<< FOUND IT!! new page number %d, found at %d", i_pageNum, currentFilePos); 583 odebug << "<<<<<< FOUND IT!! new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
579 break; 584 break;
580 } 585 }
581 } 586 }
582 if(f.atEnd()) //in case we didnt find anything, we need to show something 587 if(f.atEnd()) //in case we didnt find anything, we need to show something
583 f.at(0); 588 f.at(0);
584 Lview->clear(); 589 Lview->clear();
585 for(int fd=0; fd < pageSize - 1;fd++) { 590 for(int fd=0; fd < pageSize - 1;fd++) {
586 f.readLine(s, 256); 591 f.readLine(s, 256);
587 if(useWrap) 592 if(useWrap)
588 s.replace(QRegExp("\n"),""); 593 s.replace(QRegExp("\n"),"");
589 Lview->insertLine( s, -1); 594 Lview->insertLine( s, -1);
590 currentLine++; 595 currentLine++;
591 } 596 }
592 597
593 i_pageNum = lineNo/pageSize; 598 i_pageNum = lineNo/pageSize;
594 pageStopArray.resize(i_pageNum + 1); 599 pageStopArray.resize(i_pageNum + 1);
595 // int length = Lview->length(); 600 // int length = Lview->length();
596 601
597 qApp->processEvents(); 602 qApp->processEvents();
598 603
599 if( pos > i_topRow ) { 604 if( pos > i_topRow ) {
600 Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE); 605 Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE);
601 } else { 606 } else {
602 Lview->setCursorPosition( pos+2 , 0, FALSE ); 607 Lview->setCursorPosition( pos+2 , 0, FALSE );
603 } 608 }
604 609
605 Lview->deselect(); 610 Lview->deselect();
606 // AdjustStatus(); 611 // AdjustStatus();
607 Lview->setFocus(); 612 Lview->setFocus();
608} 613}
@@ -610,38 +615,38 @@ void Gutenbrowser::BeginBtn() {
610 /* 615 /*
611 sets the current page and place as a bookmark*/ 616 sets the current page and place as a bookmark*/
612void Gutenbrowser::setBookmark() { 617void Gutenbrowser::setBookmark() {
613 int eexit=QMessageBox::information(this, "Note", 618 int eexit=QMessageBox::information(this, "Note",
614 "Do you really want to \nset this bookmark?." 619 "Do you really want to \nset this bookmark?."
615 ,QMessageBox::Yes, QMessageBox::No); 620 ,QMessageBox::Yes, QMessageBox::No);
616 if (eexit== 3) { 621 if (eexit== 3) {
617 622
618 currentFilePos = f.at(); 623 currentFilePos = f.at();
619 624
620 Config cfg("Gutenbrowser"); 625 Config cfg("Gutenbrowser");
621 cfg.setGroup("General"); 626 cfg.setGroup("General");
622 file_name=cfg.readEntry("Current",""); 627 file_name=cfg.readEntry("Current","");
623 qApp->processEvents(); 628 qApp->processEvents();
624 qDebug("Settingbook mark "+file_name); 629 odebug << "Settingbook mark "+file_name << oendl;
625 630
626 cfg.setGroup("Titles"); 631 cfg.setGroup("Titles");
627 title=cfg.readEntry(file_name,""); 632 title=cfg.readEntry(file_name,"");
628 qDebug("title is "+ title); 633 odebug << "title is "+ title << oendl;
629 634
630 cfg.setGroup( "Bookmarks" ); 635 cfg.setGroup( "Bookmarks" );
631 636
632 cfg.writeEntry("File Name",file_name); 637 cfg.writeEntry("File Name",file_name);
633 cfg.writeEntry("Page Number",QString::number(i_pageNum) ); 638 cfg.writeEntry("Page Number",QString::number(i_pageNum) );
634 cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1])); 639 cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1]));
635 cfg.writeEntry("Title", title); 640 cfg.writeEntry("Title", title);
636 641
637 int row = Lview->topRow();// Lview->Top(); 642 int row = Lview->topRow();// Lview->Top();
638 cfg.writeEntry("LineNumber",QString::number(row) ); 643 cfg.writeEntry("LineNumber",QString::number(row) );
639 644
640 cfg.setGroup(title); 645 cfg.setGroup(title);
641 cfg.writeEntry("File Name",file_name); 646 cfg.writeEntry("File Name",file_name);
642 cfg.writeEntry( "LineNumber", QString::number( row)); 647 cfg.writeEntry( "LineNumber", QString::number( row));
643 cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1])); 648 cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1]));
644 cfg.writeEntry( "Page Number", QString::number( i_pageNum) ); 649 cfg.writeEntry( "Page Number", QString::number( i_pageNum) );
645 bookmarksMenu->insertItem( title); 650 bookmarksMenu->insertItem( title);
646 } 651 }
647} //end setBookmark 652} //end setBookmark
@@ -652,83 +657,83 @@ void Gutenbrowser::Bookmark( int itemId) {
652 657
653 // qApp->processEvents(); 658 // qApp->processEvents();
654 Config config("Gutenbrowser"); 659 Config config("Gutenbrowser");
655 config.setGroup( "Bookmarks" ); 660 config.setGroup( "Bookmarks" );
656 661
657 // qDebug("<<<<<< %d, %d", Lview->PageSize(), Lview->lastRow() - Lview->topRow() ); 662 // odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
658 663
659 QString itemString; 664 QString itemString;
660 665
661 qDebug("menu item %d", itemId); 666 odebug << "menu item " << itemId << "" << oendl;
662 QString tempTitle; 667 QString tempTitle;
663 QString s_Bmrkrow; 668 QString s_Bmrkrow;
664 QString s_pageNum; 669 QString s_pageNum;
665 int Bmrkrow=0; 670 int Bmrkrow=0;
666 int bookmarkPosition = 0; 671 int bookmarkPosition = 0;
667 672
668 // qApp->processEvents(); 673 // qApp->processEvents();
669 config.setGroup( "Bookmarks" ); 674 config.setGroup( "Bookmarks" );
670 title = config.readEntry("Title", ""); 675 title = config.readEntry("Title", "");
671 file_name = config.readEntry("File Name", ""); 676 file_name = config.readEntry("File Name", "");
672 i_pageNum = config.readNumEntry("Page Number", 0); 677 i_pageNum = config.readNumEntry("Page Number", 0);
673 bookmarkPosition = config.readNumEntry( "PagePosition",0); 678 bookmarkPosition = config.readNumEntry( "PagePosition",0);
674 Bmrkrow = config.readNumEntry("LineNumber",0); 679 Bmrkrow = config.readNumEntry("LineNumber",0);
675 if( !file_name.contains("/")) { 680 if( !file_name.contains("/")) {
676 file_name = local_library + file_name; 681 file_name = local_library + file_name;
677 } 682 }
678 683
679 // getTitle(file_name); 684 // getTitle(file_name);
680 // qApp->processEvents(); 685 // qApp->processEvents();
681 // Lview->setFocus(); 686 // Lview->setFocus();
682 this->setFocus(); 687 this->setFocus();
683 688
684 Lview->clear(); 689 Lview->clear();
685 690
686 load(file_name); 691 load(file_name);
687 692
688 int pageSize= Lview->PageSize(); 693 int pageSize= Lview->PageSize();
689 f.at(0); 694 f.at(0);
690 // Lview->clear(); 695 // Lview->clear();
691 QString s; 696 QString s;
692 int lineNo=0; 697 int lineNo=0;
693 int lastPage=1; 698 int lastPage=1;
694 while ( !f.atEnd() ) { 699 while ( !f.atEnd() ) {
695 f.readLine(s, 256); 700 f.readLine(s, 256);
696 lineNo++; 701 lineNo++;
697 currentFilePos = f.at(); 702 currentFilePos = f.at();
698 703
699 i_pageNum = lineNo/pageSize; 704 i_pageNum = lineNo/pageSize;
700 if(lastPage < i_pageNum) { 705 if(lastPage < i_pageNum) {
701 pageStopArray.resize(i_pageNum + 1); 706 pageStopArray.resize(i_pageNum + 1);
702 pageStopArray[i_pageNum ] = currentFilePos; 707 pageStopArray[i_pageNum ] = currentFilePos;
703 // qDebug("new page number %d, found at %d", i_pageNum, currentFilePos); 708 // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
704 } 709 }
705 if(currentFilePos == bookmarkPosition) 710 if(currentFilePos == bookmarkPosition)
706 break; 711 break;
707 } 712 }
708 if(f.atEnd()) 713 if(f.atEnd())
709 f.at(0); 714 f.at(0);
710 else 715 else
711 f.at( bookmarkPosition); 716 f.at( bookmarkPosition);
712 717
713 for(int fd=0; fd < pageSize - 1;fd++) { 718 for(int fd=0; fd < pageSize - 1;fd++) {
714 f.readLine(s, 256); 719 f.readLine(s, 256);
715 lineNo++; 720 lineNo++;
716 if(useWrap) 721 if(useWrap)
717 s.replace(QRegExp("\n"),""); 722 s.replace(QRegExp("\n"),"");
718 Lview->insertLine( s, -1); 723 Lview->insertLine( s, -1);
719 currentLine++; 724 currentLine++;
720 } 725 }
721 726
722 i_pageNum = lineNo/pageSize; 727 i_pageNum = lineNo/pageSize;
723 pageStopArray.resize(i_pageNum + 1); 728 pageStopArray.resize(i_pageNum + 1);
724 729
725 if(showMainList) { 730 if(showMainList) {
726 showMainList=FALSE; 731 showMainList=FALSE;
727 mainList->hide(); 732 mainList->hide();
728 Lview->show(); 733 Lview->show();
729 // qApp->processEvents(); 734 // qApp->processEvents();
730 } 735 }
731 736
732 qDebug("bookmark loaded"); 737 odebug << "bookmark loaded" << oendl;
733 setCaption(title); 738 setCaption(title);
734} 739}
@@ -738,82 +743,82 @@ bool Gutenbrowser::load( const char *fileName) {
738 743
739 // QCopEnvelope ( "QPE/System", "busy()" ); 744 // QCopEnvelope ( "QPE/System", "busy()" );
740 // qDebug("Title is already set as "+title); 745 // odebug << "Title is already set as "+title << oendl;
741 qDebug("sizeHint %d pageSize %d", sizeHint().height(),Lview->PageSize() ); 746 odebug << "sizeHint " << sizeHint().height() << " pageSize " << Lview->PageSize() << "" << oendl;
742 if( Lview->PageSize() < 4) { 747 if( Lview->PageSize() < 4) {
743 748
744 Lview->setMaximumHeight( sizeHint().height() ); 749 Lview->setMaximumHeight( sizeHint().height() );
745 Lview->setMinimumHeight( sizeHint().height() ); 750 Lview->setMinimumHeight( sizeHint().height() );
746 pointSize = Lview->fontInfo().pointSize(); 751 pointSize = Lview->fontInfo().pointSize();
747 qDebug("sizeHint %d point size %d", sizeHint().height(), pointSize); 752 odebug << "sizeHint " << sizeHint().height() << " point size " << pointSize << "" << oendl;
748 if(pointSize < 10) 753 if(pointSize < 10)
749 Lview->setFixedVisibleLines(19); 754 Lview->setFixedVisibleLines(19);
750 else 755 else
751 Lview->setFixedVisibleLines( ( (sizeHint().height() / pointSize ) * 2) -2); 756 Lview->setFixedVisibleLines( ( (sizeHint().height() / pointSize ) * 2) -2);
752 } 757 }
753 758
754 Config cfg("Gutenbrowser"); 759 Config cfg("Gutenbrowser");
755 cfg.setGroup("General"); 760 cfg.setGroup("General");
756 cfg.writeEntry("Current",fileName); 761 cfg.writeEntry("Current",fileName);
757 currentLine=0; 762 currentLine=0;
758 763
759 file_name=fileName; 764 file_name=fileName;
760 QString o_file = fileName; 765 QString o_file = fileName;
761 766
762 // if (i_pageNum < 1) { 767 // if (i_pageNum < 1) {
763 i_pageNum = 1; 768 i_pageNum = 1;
764 // } 769 // }
765 qDebug("ready to open "+o_file); 770 odebug << "ready to open "+o_file << oendl;
766 771
767 if(f.isOpen()) f.close(); 772 if(f.isOpen()) f.close();
768 f.setName( o_file); 773 f.setName( o_file);
769 774
770 if ( !f.open( IO_ReadOnly)) { 775 if ( !f.open( IO_ReadOnly)) {
771 QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n" +o_file)) ); 776 QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n" +o_file)) );
772 return false; 777 return false;
773 } 778 }
774 currentFilePos = 0; 779 currentFilePos = 0;
775 pageStopArray.resize(3); 780 pageStopArray.resize(3);
776 pageStopArray[0] = currentFilePos; 781 pageStopArray[0] = currentFilePos;
777 782
778 fileHandle = f.handle(); 783 fileHandle = f.handle();
779 QString insertString; 784 QString insertString;
780 QTextStream t(&f); 785 QTextStream t(&f);
781 QString s; 786 QString s;
782 for(int fd=0; fd < Lview->PageSize() ;fd++) { 787 for(int fd=0; fd < Lview->PageSize() ;fd++) {
783 s=t.readLine(); 788 s=t.readLine();
784 // insertString+=s; 789 // insertString+=s;
785 if(useWrap) 790 if(useWrap)
786 s.replace(QRegExp("\n"),""); 791 s.replace(QRegExp("\n"),"");
787 // s.replace(QRegExp("\r"),""); 792 // s.replace(QRegExp("\r"),"");
788 Lview->insertLine( s,-1); 793 Lview->insertLine( s,-1);
789 currentLine++; 794 currentLine++;
790 } 795 }
791 796
792 // int length = Lview->length(); 797 // int length = Lview->length();
793 currentFilePos = f.at(); 798 currentFilePos = f.at();
794 799
795 pageStopArray[1] = currentFilePos; 800 pageStopArray[1] = currentFilePos;
796 801
797 qDebug("<<<<<<<<<<<%d current page is number %d, length %d, current %d, pageSize %d", 802 qDebug("<<<<<<<<<<<%d current page is number %d, length %d, current %d, pageSize %d",
798 currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() ); 803 currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() );
799 804
800 Lview->setMaxLines(Lview->PageSize()*2); 805 Lview->setMaxLines(Lview->PageSize()*2);
801 qDebug("Gulped %d", currentLine); 806 odebug << "Gulped " << currentLine << "" << oendl;
802 setCaption(title); 807 setCaption(title);
803 Lview->setAutoUpdate( TRUE); 808 Lview->setAutoUpdate( TRUE);
804 809
805 Lview->setCursorPosition(0,0,FALSE); 810 Lview->setCursorPosition(0,0,FALSE);
806 811
807 // pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1; 812 // pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1;
808 //qDebug("number of pages %d", pages); 813 //odebug << "number of pages " << pages << "" << oendl;
809 814
810 loadCheck = true; 815 loadCheck = true;
811 enableButtons(true); 816 enableButtons(true);
812 if( donateMenu->count() == 3) { 817 if( donateMenu->count() == 3) {
813 donateMenu->insertItem("Current Title", this, SLOT( InfoBarClick() )); 818 donateMenu->insertItem("Current Title", this, SLOT( InfoBarClick() ));
814 } 819 }
815 Lview->setFocus(); 820 Lview->setFocus();
816 821
817 // QCopEnvelope("QPE/System", "notBusy()" ); 822 // QCopEnvelope("QPE/System", "notBusy()" );
818 return true; 823 return true;
819} // end load 824} // end load
@@ -822,17 +827,17 @@ void Gutenbrowser::Search() {
822 827
823 // if( searchDlg->isHidden()) 828 // if( searchDlg->isHidden())
824 { 829 {
825 qDebug("Starting search dialog"); 830 odebug << "Starting search dialog" << oendl;
826 searchDlg = new SearchDialog( this, "Etext Search", true); 831 searchDlg = new SearchDialog( this, "Etext Search", true);
827 searchDlg->setCaption( tr( "Etext Search" )); 832 searchDlg->setCaption( tr( "Etext Search" ));
828 // searchDlg->setLabel( "- searches etext"); 833 // searchDlg->setLabel( "- searches etext");
829 connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot())); 834 connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
830 connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot())); 835 connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
831 836
832 QString resultString; 837 QString resultString;
833 QString string = searchDlg->searchString; 838 QString string = searchDlg->searchString;
834 Lview->deselect(); 839 Lview->deselect();
835 searchDlg->show(); 840 searchDlg->show();
836 searchDlg->result(); 841 searchDlg->result();
837 } 842 }
838} 843}
@@ -842,3 +847,3 @@ void Gutenbrowser::search_slot( ) {
842 if (!searchDlg /*&& !loadCheck */) 847 if (!searchDlg /*&& !loadCheck */)
843 return; 848 return;
844 849
@@ -847,5 +852,5 @@ void Gutenbrowser::search_slot( ) {
847 852
848 // searchDlg->get_direction();// is true if searching backward 853 // searchDlg->get_direction();// is true if searching backward
849 if ( last_search != 0 && searchDlg->get_direction() ){ 854 if ( last_search != 0 && searchDlg->get_direction() ){
850 col = col - pattern.length() - 1 ; 855 col = col - pattern.length() - 1 ;
851 } 856 }
@@ -854,27 +859,27 @@ void Gutenbrowser::search_slot( ) {
854 if(result == 0){ 859 if(result == 0){
855 if(!searchDlg->get_direction()){ // forward search 860 if(!searchDlg->get_direction()){ // forward search
856 int query = QMessageBox::information( searchDlg, "Find", 861 int query = QMessageBox::information( searchDlg, "Find",
857 "End of document reached.\nContinue from the beginning?", 862 "End of document reached.\nContinue from the beginning?",
858 "Yes", "No", "", 0,1); 863 "Yes", "No", "", 0,1);
859 if (query == 0){ 864 if (query == 0){
860 line = 0; 865 line = 0;
861 col = 0; 866 col = 0;
862 goto again; 867 goto again;
863 } 868 }
864 } else { //backward search 869 } else { //backward search
865 int query = QMessageBox::information( searchDlg, "Find", 870 int query = QMessageBox::information( searchDlg, "Find",
866 "End of document reached.\nContinue from the beginning?", 871 "End of document reached.\nContinue from the beginning?",
867 "Yes", "No", "", 0,1); 872 "Yes", "No", "", 0,1);
868 if (query == 0){ 873 if (query == 0){
869 QString string = Lview->textLine( Lview->numLines() - 1 ); 874 QString string = Lview->textLine( Lview->numLines() - 1 );
870 line = Lview->numLines() - 1; 875 line = Lview->numLines() - 1;
871 lineCheck = line; 876 lineCheck = line;
872 col = string.length(); 877 col = string.length();
873 last_search = -1; //BACKWARD; 878 last_search = -1; //BACKWARD;
874 goto again; 879 goto again;
875 } 880 }
876 } 881 }
877 } else { 882 } else {
878 883
879 //// emit CursorPositionChanged(); textLine 884 //// emit CursorPositionChanged(); textLine
880 } 885 }
@@ -883,73 +888,73 @@ void Gutenbrowser::search_slot( ) {
883int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, bool forward, int line, int col ) { 888int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, bool forward, int line, int col ) {
884 int i, length; 889 int i, length;
885 int pos = -1; 890 int pos = -1;
886 if(forward) { 891 if(forward) {
887 QString string; 892 QString string;
888 for(i = line; i < Lview->numLines(); i++) { 893 for(i = line; i < Lview->numLines(); i++) {
889 894
890 string = Lview->textLine(i); 895 string = Lview->textLine(i);
891 pos = string.find(s_pattern, i == line ? col : 0, case_sensitive); 896 pos = string.find(s_pattern, i == line ? col : 0, case_sensitive);
892 if( pos != -1) { 897 if( pos != -1) {
893 int top = Lview->Top(); 898 int top = Lview->Top();
894 length = s_pattern.length(); 899 length = s_pattern.length();
895 if( i > Lview->lastRow() ) { 900 if( i > Lview->lastRow() ) {
896 Lview->setCursorPosition(i,pos,FALSE); 901 Lview->setCursorPosition(i,pos,FALSE);
897 for(int l = 0 ; l < length; l++) { 902 for(int l = 0 ; l < length; l++) {
898 Lview->cursorRight(TRUE); 903 Lview->cursorRight(TRUE);
899 } 904 }
900 Lview->setCursorPosition( i , pos + length, TRUE ); 905 Lview->setCursorPosition( i , pos + length, TRUE );
901 int newTop = Lview->Top(); 906 int newTop = Lview->Top();
902 if(Lview->lastRow() > i) 907 if(Lview->lastRow() > i)
903 Lview->ScrollUp( newTop - top); 908 Lview->ScrollUp( newTop - top);
904 // AdjustStatus(); 909 // AdjustStatus();
905 } else { 910 } else {
906 Lview->setCursorPosition(i,pos,FALSE); 911 Lview->setCursorPosition(i,pos,FALSE);
907 for(int l = 0 ; l < length; l++) { 912 for(int l = 0 ; l < length; l++) {
908 Lview->cursorRight(TRUE); 913 Lview->cursorRight(TRUE);
909 } 914 }
910 Lview->setCursorPosition( i , pos + length, TRUE ); 915 Lview->setCursorPosition( i , pos + length, TRUE );
911 // AdjustStatus(); 916 // AdjustStatus();
912 } 917 }
913 pattern = s_pattern; 918 pattern = s_pattern;
914 last_search = 1; //FORWARD; 919 last_search = 1; //FORWARD;
915 return 1; 920 return 1;
916 } 921 }
917 } 922 }
918 } else { //////////////// searching backwards 923 } else { //////////////// searching backwards
919 QString string; 924 QString string;
920 for( i = line; i >= 0; i--) { 925 for( i = line; i >= 0; i--) {
921 string = Lview->textLine(i); 926 string = Lview->textLine(i);
922 int line_length = string.length(); 927 int line_length = string.length();
923 pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive); 928 pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive);
924 if (pos != -1) { 929 if (pos != -1) {
925 // int top = Lview->Top(); 930 // int top = Lview->Top();
926 length = s_pattern.length(); 931 length = s_pattern.length();
927 if( i < Lview->Top() ) { 932 if( i < Lview->Top() ) {
928 Lview->ScrollDown( Lview->PageSize() ); 933 Lview->ScrollDown( Lview->PageSize() );
929 Lview->MultiLine_Ex::pageUp( FALSE ); 934 Lview->MultiLine_Ex::pageUp( FALSE );
930 if( ! (line == i && pos > col ) ) { 935 if( ! (line == i && pos > col ) ) {
931 Lview->setCursorPosition( i ,pos ,FALSE ); 936 Lview->setCursorPosition( i ,pos ,FALSE );
932 for(int l = 0 ; l < length; l++) { 937 for(int l = 0 ; l < length; l++) {
933 Lview->cursorRight(TRUE); 938 Lview->cursorRight(TRUE);
934 } 939 }
935 Lview->setCursorPosition(i ,pos + length ,TRUE ); 940 Lview->setCursorPosition(i ,pos + length ,TRUE );
936 // int newTop = Lview->Top(); 941 // int newTop = Lview->Top();
937 /* if(useSplitter) Rview->ScrollUp( newTop - top); 942 /* if(useSplitter) Rview->ScrollUp( newTop - top);
938 */ } 943 */ }
939 } else { 944 } else {
940 if( ! (line == i && pos > col ) ) { 945 if( ! (line == i && pos > col ) ) {
941 Lview->setCursorPosition( i, pos, FALSE ); 946 Lview->setCursorPosition( i, pos, FALSE );
942 for( int l = 0 ; l < length; l++) { 947 for( int l = 0 ; l < length; l++) {
943 Lview->cursorRight( TRUE); 948 Lview->cursorRight( TRUE);
944 } 949 }
945 Lview->setCursorPosition( i, pos + length, TRUE ); 950 Lview->setCursorPosition( i, pos + length, TRUE );
946 } 951 }
947 pattern = s_pattern; 952 pattern = s_pattern;
948 last_search = -1; 953 last_search = -1;
949 return 1; 954 return 1;
950 } 955 }
951 } 956 }
952 } 957 }
953 } 958 }
954 return 0; 959 return 0;
955} 960}
@@ -958,97 +963,97 @@ void Gutenbrowser::LibraryBtn() {
958 963
959 QString newestLibraryFile ="pgwhole.zip"; 964 QString newestLibraryFile ="pgwhole.zip";
960 QString zipFile; 965 QString zipFile;
961 // qDebug("Local Library is %s ", local_library.latin1()); 966 // odebug << "Local Library is " << local_library << " " << oendl;
962 zipFile="/usr/bin/unzip"; 967 zipFile="/usr/bin/unzip";
963 // qDebug("newestLibraryFile is %s ", newestLibraryFile.latin1()); 968 // odebug << "newestLibraryFile is " << newestLibraryFile << " " << oendl;
964 if( QFile::exists( local_library+newestLibraryFile)) { 969 if( QFile::exists( local_library+newestLibraryFile)) {
965 if( QFile::exists(zipFile) ) { 970 if( QFile::exists(zipFile) ) {
966 UnZipIt(newestLibraryFile); 971 UnZipIt(newestLibraryFile);
967 } 972 }
968 else 973 else
969 QMessageBox::message( "Note",( tr("Please install unzip")) ); 974 QMessageBox::message( "Note",( tr("Please install unzip")) );
970 } 975 }
971 // LibraryDlg = new LibraryDialog( this, "Library Index"); 976 // LibraryDlg = new LibraryDialog( this, "Library Index");
972 LibraryDlg->setCaption( tr( "Gutenberg Library")); 977 LibraryDlg->setCaption( tr( "Gutenberg Library"));
973 Config config("Gutenbrowser"); 978 Config config("Gutenbrowser");
974 config.setGroup("General"); 979 config.setGroup("General");
975 QString tmp=config.readEntry("RunBefore","FALSE"); 980 QString tmp=config.readEntry("RunBefore","FALSE");
976 if(tmp=="FALSE") { 981 if(tmp=="FALSE") {
977 QMessageBox::message( "Note", 982 QMessageBox::message( "Note",
978 "<P>Your first time running gutenbrowser. You'll need to click the \"load library\" button to load the gutenberg index.</P>"); 983 "<P>Your first time running gutenbrowser. You'll need to click the \"load library\" button to load the gutenberg index.</P>");
979 config.writeEntry("RunBefore","TRUE"); 984 config.writeEntry("RunBefore","TRUE");
980 } 985 }
981 if(useSplitter) 986 if(useSplitter)
982 LibraryDlg->useSmallInterface=FALSE; 987 LibraryDlg->useSmallInterface=FALSE;
983 988
984 LibraryDlg->showMaximized(); 989 LibraryDlg->showMaximized();
985 990
986 if( LibraryDlg->exec() != 0 ) { 991 if( LibraryDlg->exec() != 0 ) {
987 listItemNumber = LibraryDlg->DlglistItemNumber; 992 listItemNumber = LibraryDlg->DlglistItemNumber;
988 listItemFile = LibraryDlg->DlglistItemFile; 993 listItemFile = LibraryDlg->DlglistItemFile;
989 listItemYear = LibraryDlg->DlglistItemYear; 994 listItemYear = LibraryDlg->DlglistItemYear;
990 listItemTitle = LibraryDlg->DlglistItemTitle; 995 listItemTitle = LibraryDlg->DlglistItemTitle;
991 file_name = LibraryDlg->File_Name; 996 file_name = LibraryDlg->File_Name;
992 // qDebug("title is being set as "+title); 997 // odebug << "title is being set as "+title << oendl;
993 title = listItemTitle; 998 title = listItemTitle;
994 999
995 // config.setGroup( "Proxy" ); 1000 // config.setGroup( "Proxy" );
996 // if( LibraryDlg->checked == 1) { 1001 // if( LibraryDlg->checked == 1) {
997 // config.writeEntry("IsChecked", "TRUE"); 1002 // config.writeEntry("IsChecked", "TRUE");
998 // } else { 1003 // } else {
999 // config.writeEntry("IsChecked", "FALSE"); 1004 // config.writeEntry("IsChecked", "FALSE");
1000 // } 1005 // }
1001 // config.write(); 1006 // config.write();
1002 // config.read(); 1007 // config.read();
1003 if ( listItemNumber.isNull()) { 1008 if ( listItemNumber.isNull()) {
1004 } else { 1009 } else {
1005 i_pageNum = 1; 1010 i_pageNum = 1;
1006 if( file_name !="Error" && file_name.length() >2 && !file_name.isEmpty() ) { 1011 if( file_name !="Error" && file_name.length() >2 && !file_name.isEmpty() ) {
1007 //replace .zip with txt for opening it. 1012 //replace .zip with txt for opening it.
1008 // printf("\nFile name is now\n"); 1013 // printf("\nFile name is now\n");
1009 // printf(file_name); 1014 // printf(file_name);
1010 // printf("\n"); 1015 // printf("\n");
1011 // 1016 //
1012 if( file_name.find(".zip")) 1017 if( file_name.find(".zip"))
1013 { 1018 {
1014 qDebug("Found zip file\n"); 1019 odebug << "Found zip file\n" << oendl;
1015 // QStringList args; 1020 // QStringList args;
1016 // args="unzip"; 1021 // args="unzip";
1017 // args+="-o"; 1022 // args+="-o";
1018 // args+=local_library+file_name; 1023 // args+=local_library+file_name;
1019 // args+="-d"; 1024 // args+="-d";
1020 // args+=local_library; 1025 // args+=local_library;
1021 QString cmd = "/usr/bin/unzip -o " + local_library+file_name + " -d " + local_library; 1026 QString cmd = "/usr/bin/unzip -o " + local_library+file_name + " -d " + local_library;
1022 qDebug("Issuing the command "+ cmd); 1027 odebug << "Issuing the command "+ cmd << oendl;
1023 // unzipProc=new QProcess( this, "unzipProc" ); /// fark that idea! 1028 // unzipProc=new QProcess( this, "unzipProc" ); /// fark that idea!
1024 // unzipProc->start(); 1029 // unzipProc->start();
1025 system(cmd); 1030 system(cmd);
1026 remove( file_name); 1031 remove( file_name);
1027 1032
1028 } 1033 }
1029 // // 1034 // //
1030 // file_name = file_name.left(4)+ ".txt"; 1035 // file_name = file_name.left(4)+ ".txt";
1031 if( LibraryDlg) 1036 if( LibraryDlg)
1032 delete LibraryDlg; 1037 delete LibraryDlg;
1033 setTitle(); 1038 setTitle();
1034 // QCopEnvelope ( "QPE/System", "busy()" ); 1039 // QCopEnvelope ( "QPE/System", "busy()" );
1035 load( file_name); 1040 load( file_name);
1036 } else { 1041 } else {
1037 printf("Not opening the file.\n"); 1042 printf("Not opening the file.\n");
1038 } 1043 }
1039 } 1044 }
1040 } 1045 }
1041 if(showMainList) { 1046 if(showMainList) {
1042 if(!Lview->isHidden()) 1047 if(!Lview->isHidden())
1043 Lview->hide(); 1048 Lview->hide();
1044 qApp->processEvents(); 1049 qApp->processEvents();
1045 showMainList=TRUE; 1050 showMainList=TRUE;
1046 if(mainList->isHidden()) 1051 if(mainList->isHidden())
1047 mainList->show(); 1052 mainList->show();
1048 fillWithTitles(); 1053 fillWithTitles();
1049 qApp->processEvents(); 1054 qApp->processEvents();
1050 } else 1055 } else
1051 setCentralWidget( Lview); 1056 setCentralWidget( Lview);
1052 // QPEApplication::grabKeyboard(); 1057 // QPEApplication::grabKeyboard();
1053 // fixKeys(); 1058 // fixKeys();
1054} 1059}
@@ -1056,61 +1061,61 @@ void Gutenbrowser::LibraryBtn() {
1056void Gutenbrowser::OpenBtn() { 1061void Gutenbrowser::OpenBtn() {
1057 QString s_temp; 1062 QString s_temp;
1058 s_temp = status; 1063 s_temp = status;
1059 OpenEtext* OpenDlg; 1064 OpenEtext* OpenDlg;
1060 OpenDlg = new OpenEtext(this,"OpenDlg"); 1065 OpenDlg = new OpenEtext(this,"OpenDlg");
1061 OpenDlg->showMaximized(); 1066 OpenDlg->showMaximized();
1062 1067
1063 if( OpenDlg->exec() != 0) { 1068 if( OpenDlg->exec() != 0) {
1064 title = OpenDlg->openFileTitle; 1069 title = OpenDlg->openFileTitle;
1065 qDebug("title open as "+title); 1070 odebug << "title open as "+title << oendl;
1066 file_name = OpenDlg->file; 1071 file_name = OpenDlg->file;
1067 i_pageNum = 1; 1072 i_pageNum = 1;
1068 1073
1069 if( !file_name.isEmpty() || file_name.length() > 2 ) { 1074 if( !file_name.isEmpty() || file_name.length() > 2 ) {
1070 if(showMainList) { 1075 if(showMainList) {
1071 showMainList=FALSE; 1076 showMainList=FALSE;
1072 qDebug("ShowMainList is now false"); 1077 odebug << "ShowMainList is now false" << oendl;
1073 mainList->hide(); 1078 mainList->hide();
1074 Lview->show(); 1079 Lview->show();
1075 qApp->processEvents(); 1080 qApp->processEvents();
1076 } 1081 }
1077 Lview->clear(); 1082 Lview->clear();
1078 // QCopEnvelope ( "QPE/System", "busy()" ); 1083 // QCopEnvelope ( "QPE/System", "busy()" );
1079 load(file_name); 1084 load(file_name);
1080 } else { 1085 } else {
1081 qDebug("file_name is empty!"); 1086 odebug << "file_name is empty!" << oendl;
1082 if(showMainList) { 1087 if(showMainList) {
1083 if(!Lview->isHidden()) 1088 if(!Lview->isHidden())
1084 Lview->hide(); 1089 Lview->hide();
1085 qApp->processEvents(); 1090 qApp->processEvents();
1086 if(mainList->isHidden()) 1091 if(mainList->isHidden())
1087 mainList->show(); 1092 mainList->show();
1088 fillWithTitles(); 1093 fillWithTitles();
1089 qApp->processEvents(); 1094 qApp->processEvents();
1090 } 1095 }
1091 1096
1092 } 1097 }
1093 } 1098 }
1094 if( OpenDlg) 1099 if( OpenDlg)
1095 delete OpenDlg; 1100 delete OpenDlg;
1096 /* 1101 /*
1097 Config config("Gutenbrowser"); 1102 Config config("Gutenbrowser");
1098 config.setGroup( title); 1103 config.setGroup( title);
1099 file_name = config.readEntry("File Name", ""); 1104 file_name = config.readEntry("File Name", "");
1100 i_pageNum = config.readNumEntry("Page Number", -1); 1105 i_pageNum = config.readNumEntry("Page Number", -1);
1101 int Bmrkrow = config.readNumEntry("LineNumber", -1); 1106 int Bmrkrow = config.readNumEntry("LineNumber", -1);
1102 if(Bmrkrow > -1) { 1107 if(Bmrkrow > -1) {
1103 if( Bmrkrow > Lview->topRow() ) { 1108 if( Bmrkrow > Lview->topRow() ) {
1104 Lview->setCursorPosition( Bmrkrow ,0, FALSE ); 1109 Lview->setCursorPosition( Bmrkrow ,0, FALSE );
1105 Lview->ScrollUp( Bmrkrow - Lview->topRow() ); 1110 Lview->ScrollUp( Bmrkrow - Lview->topRow() );
1106 // AdjustStatus(); 1111 // AdjustStatus();
1107 } 1112 }
1108 else if( Bmrkrow < Lview->topRow() ) { 1113 else if( Bmrkrow < Lview->topRow() ) {
1109 Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE ); 1114 Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
1110 Lview->ScrollDown( Lview->topRow() - Bmrkrow ); 1115 Lview->ScrollDown( Lview->topRow() - Bmrkrow );
1111 // AdjustStatus(); 1116 // AdjustStatus();
1112 } 1117 }
1113 } 1118 }
1114 */ 1119 */
1115 // ResizeEdits(); 1120 // ResizeEdits();
1116 1121
@@ -1120,40 +1125,40 @@ void Gutenbrowser::ChangeFont() {
1120#ifndef Q_WS_QWS 1125#ifndef Q_WS_QWS
1121 bool ok; 1126 bool ok;
1122 1127
1123 weight= Lview->fontInfo().weight(); 1128 weight= Lview->fontInfo().weight();
1124 italic = Lview->fontInfo().italic(); 1129 italic = Lview->fontInfo().italic();
1125 bold=Lview->fontInfo().bold(); 1130 bold=Lview->fontInfo().bold();
1126 pointSize= Lview->fontInfo().pointSize(); 1131 pointSize= Lview->fontInfo().pointSize();
1127 fontStr=Lview->fontInfo().family(); 1132 fontStr=Lview->fontInfo().family();
1128 1133
1129 if(italic == true) 1134 if(italic == true)
1130 italicStr="TRUE"; 1135 italicStr="TRUE";
1131 else 1136 else
1132 italicStr="FALSE"; 1137 italicStr="FALSE";
1133 1138
1134 QFont currentfont( fontStr, pointSize, weight, italic ); 1139 QFont currentfont( fontStr, pointSize, weight, italic );
1135 1140
1136 if (ok) { 1141 if (ok) {
1137 QFontInfo fontInfo(font ); 1142 QFontInfo fontInfo(font );
1138 fontStr=fontInfo.family(); 1143 fontStr=fontInfo.family();
1139 1144
1140 pointSize= fontInfo.pointSize(); 1145 pointSize= fontInfo.pointSize();
1141 1146
1142 font.setFontSize(pointSize); 1147 font.setFontSize(pointSize);
1143 1148
1144 pointSizeStr.setNum( pointSize); 1149 pointSizeStr.setNum( pointSize);
1145 1150
1146 weight= fontInfo.weight(); 1151 weight= fontInfo.weight();
1147 weightStr.setNum( weight); 1152 weightStr.setNum( weight);
1148 italic =fontInfo.italic(); 1153 italic =fontInfo.italic();
1149 bold=fontInfo.bold(); 1154 bold=fontInfo.bold();
1150 1155
1151 if(italic == true) 1156 if(italic == true)
1152 italicStr="TRUE"; 1157 italicStr="TRUE";
1153 else 1158 else
1154 italicStr="FALSE"; 1159 italicStr="FALSE";
1155 if(bold == true) 1160 if(bold == true)
1156 boldStr="TRUE"; 1161 boldStr="TRUE";
1157 else 1162 else
1158 boldStr="FALSE"; 1163 boldStr="FALSE";
1159 1164
@@ -1166,3 +1171,3 @@ void Gutenbrowser::ChangeFont() {
1166 config.writeEntry("Bold", boldStr ); 1171 config.writeEntry("Bold", boldStr );
1167 // config.write(); 1172 // config.write();
1168 1173
@@ -1175,7 +1180,7 @@ void Gutenbrowser::ChangeFont() {
1175 } 1180 }
1176 // if(loadCheck) { 1181 // if(loadCheck) {
1177 // ResizeEdits(); 1182 // ResizeEdits();
1178 // } 1183 // }
1179 update(); 1184 update();
1180 } 1185 }
1181#endif 1186#endif
@@ -1185,18 +1190,18 @@ void Gutenbrowser::ChangeFont() {
1185 /* 1190 /*
1186 performs dictionary look ups on the web */ 1191 performs dictionary look ups on the web */
1187void Gutenbrowser::LookupBtn() { 1192void Gutenbrowser::LookupBtn() {
1188 QString text; 1193 QString text;
1189 if( Lview->hasSelectedText()) { 1194 if( Lview->hasSelectedText()) {
1190 Lview->copy(); 1195 Lview->copy();
1191 } 1196 }
1192 QClipboard *cb = QApplication::clipboard(); 1197 QClipboard *cb = QApplication::clipboard();
1193 text = cb->text(); 1198 text = cb->text();
1194 int eexit=QMessageBox::information(this, 1199 int eexit=QMessageBox::information(this,
1195 "Note","Do you want to lookup\n\""+text+"\"\non websters web dictionary?", 1200 "Note","Do you want to lookup\n\""+text+"\"\non websters web dictionary?",
1196 QMessageBox::Yes, QMessageBox::No); 1201 QMessageBox::Yes, QMessageBox::No);
1197 if (eexit== 3) { 1202 if (eexit== 3) {
1198 // this link for sale!! 1203 // this link for sale!!
1199 qApp->processEvents(); 1204 qApp->processEvents();
1200 goGetit( "http://www.m-w.com/cgi-bin/dictionary?" + text, true); 1205 goGetit( "http://www.m-w.com/cgi-bin/dictionary?" + text, true);
1201 } 1206 }
1202} 1207}
@@ -1204,19 +1209,19 @@ void Gutenbrowser::LookupBtn() {
1204void Gutenbrowser::ClearEdit() { 1209void Gutenbrowser::ClearEdit() {
1205 Lview->setText(""); 1210 Lview->setText("");
1206 loadCheck = false; 1211 loadCheck = false;
1207 status = ( tr("Gutenbrowser")); 1212 status = ( tr("Gutenbrowser"));
1208 InfoBar->setText( ""); 1213 InfoBar->setText( "");
1209 setCaption( tr("Gutenbrowser")); 1214 setCaption( tr("Gutenbrowser"));
1210 i_pageNum = 0; 1215 i_pageNum = 0;
1211 enableButtons(false); 1216 enableButtons(false);
1212 1217
1213 if(!showMainList) { 1218 if(!showMainList) {
1214 Lview->hide(); 1219 Lview->hide();
1215 showMainList=TRUE; 1220 showMainList=TRUE;
1216 mainList->show(); 1221 mainList->show();
1217 fillWithTitles(); 1222 fillWithTitles();
1218 qApp->processEvents(); 1223 qApp->processEvents();
1219 } 1224 }
1220 if(donateMenu->idAt(3) != -1) 1225 if(donateMenu->idAt(3) != -1)
1221 donateMenu->removeItemAt(3); 1226 donateMenu->removeItemAt(3);
1222} 1227}
@@ -1225,27 +1230,27 @@ void Gutenbrowser::ClearEdit() {
1225bool Gutenbrowser::getTitle( const char *file ) { 1230bool Gutenbrowser::getTitle( const char *file ) {
1226 QString s_file; 1231 QString s_file;
1227 QString filer = file; 1232 QString filer = file;
1228 if( filer.contains(local_library, TRUE)) { 1233 if( filer.contains(local_library, TRUE)) {
1229 QFileInfo f(file); 1234 QFileInfo f(file);
1230 s_file = f.fileName(); 1235 s_file = f.fileName();
1231 } else { 1236 } else {
1232 s_file = filer; 1237 s_file = filer;
1233 } 1238 }
1234 Config config("Gutenbrowser"); 1239 Config config("Gutenbrowser");
1235 config.setGroup( "Files" ); 1240 config.setGroup( "Files" );
1236 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" ); 1241 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
1237 int i_numofFiles = s_numofFiles.toInt(); 1242 int i_numofFiles = s_numofFiles.toInt();
1238 1243
1239 for (int i = 1; i <= i_numofFiles; i++) { 1244 for (int i = 1; i <= i_numofFiles; i++) {
1240 QString temp; 1245 QString temp;
1241 temp.setNum(i); 1246 temp.setNum(i);
1242 QString ramble = config.readEntry(temp, "" ); 1247 QString ramble = config.readEntry(temp, "" );
1243 1248
1244 if( strcmp(ramble, s_file) == 0) { 1249 if( strcmp(ramble, s_file) == 0) {
1245 config.setGroup( "Titles" ); 1250 config.setGroup( "Titles" );
1246 title = config.readEntry(ramble, ""); 1251 title = config.readEntry(ramble, "");
1247 // qDebug("(getTitle)title is being set as "+title); 1252 // odebug << "(getTitle)title is being set as "+title << oendl;
1248 } 1253 }
1249 } 1254 }
1250 return true; 1255 return true;
1251} 1256}
@@ -1253,9 +1258,9 @@ bool Gutenbrowser::getTitle( const char *file ) {
1253void Gutenbrowser::searchdone_slot() { 1258void Gutenbrowser::searchdone_slot() {
1254 // if (!searchDlg) 1259 // if (!searchDlg)
1255 // return; 1260 // return;
1256 // searchDlg->hide(); 1261 // searchDlg->hide();
1257 // Lview->setFocus(); 1262 // Lview->setFocus();
1258 this->setFocus(); 1263 this->setFocus();
1259 last_search = 0; 1264 last_search = 0;
1260 // ResizeEdits(); 1265 // ResizeEdits();
1261} 1266}
@@ -1263,3 +1268,3 @@ void Gutenbrowser::searchdone_slot() {
1263 /* 1268 /*
1264 sets the status message */ 1269 sets the status message */
1265bool Gutenbrowser::setStatus() { 1270bool Gutenbrowser::setStatus() {
@@ -1267,20 +1272,20 @@ bool Gutenbrowser::setStatus() {
1267#ifndef Q_WS_QWS 1272#ifndef Q_WS_QWS
1268 QString s_pages; 1273 QString s_pages;
1269 s_pages.setNum( pages); 1274 s_pages.setNum( pages);
1270 QString chNum; 1275 QString chNum;
1271 statusTop = status.left( status.find(" ", TRUE) ); 1276 statusTop = status.left( status.find(" ", TRUE) );
1272 status.append(chNum.setNum( i_pageNum)); 1277 status.append(chNum.setNum( i_pageNum));
1273 status += " / " + s_pages; 1278 status += " / " + s_pages;
1274 1279
1275 if(loadCheck) { 1280 if(loadCheck) {
1276 statusBar->message( status); 1281 statusBar->message( status);
1277 InfoBar->setText( title); 1282 InfoBar->setText( title);
1278 } else { 1283 } else {
1279 } 1284 }
1280#else 1285#else
1281 QString msg; 1286 QString msg;
1282 msg.sprintf(title+" %d", i_pageNum); 1287 msg.sprintf(title+" %d", i_pageNum);
1283 setCaption( msg); 1288 setCaption( msg);
1284#endif 1289#endif
1285 return true; 1290 return true;
1286} 1291}
@@ -1288,74 +1293,74 @@ bool Gutenbrowser::setStatus() {
1288void Gutenbrowser::keyReleaseEvent( QKeyEvent *e) { 1293void Gutenbrowser::keyReleaseEvent( QKeyEvent *e) {
1289 switch ( e->key() ) { 1294 switch ( e->key() ) {
1290 1295
1291 case Key_M: 1296 case Key_M:
1292 // Bookmark(); 1297 // Bookmark();
1293 break; 1298 break;
1294 case Key_D: 1299 case Key_D:
1295 DownloadIndex(); 1300 DownloadIndex();
1296 break; 1301 break;
1297 case Key_L: 1302 case Key_L:
1298 LibraryBtn(); 1303 LibraryBtn();
1299 break; 1304 break;
1300 case Key_O: 1305 case Key_O:
1301 OpenBtn(); 1306 OpenBtn();
1302 break; 1307 break;
1303 case Key_F: 1308 case Key_F:
1304 ForwardBtn(); 1309 ForwardBtn();
1305 break; 1310 break;
1306 case Key_B: 1311 case Key_B:
1307 BackBtn(); 1312 BackBtn();
1308 break; 1313 break;
1309 case Key_P: 1314 case Key_P:
1310 PrintBtn(); 1315 PrintBtn();
1311 break; 1316 break;
1312 case Key_S: 1317 case Key_S:
1313 SearchBtn(); 1318 SearchBtn();
1314 break; 1319 break;
1315 case Key_E: 1320 case Key_E:
1316 ByeBye(); 1321 ByeBye();
1317 break; 1322 break;
1318 case Key_R: 1323 case Key_R:
1319 // setBookmark(); 1324 // setBookmark();
1320 break; 1325 break;
1321 case Key_T: 1326 case Key_T:
1322 ChangeFont(); 1327 ChangeFont();
1323 break; 1328 break;
1324 case Key_C: 1329 case Key_C:
1325 ClearEdit(); 1330 ClearEdit();
1326 break; 1331 break;
1327 case Key_H: 1332 case Key_H:
1328 HelpBtn(); 1333 HelpBtn();
1329 break; 1334 break;
1330 case Key_K: 1335 case Key_K:
1331 LookupBtn(); 1336 LookupBtn();
1332 break; 1337 break;
1333 case Key_U:// hide menu 1338 case Key_U:// hide menu
1334 if(menubar->isHidden() ) 1339 if(menubar->isHidden() )
1335 menubar->show(); 1340 menubar->show();
1336 else 1341 else
1337 menubar->hide(); 1342 menubar->hide();
1338 break; 1343 break;
1339 case Key_I: 1344 case Key_I:
1340 hideButtons(); 1345 hideButtons();
1341 break; 1346 break;
1342 ////////////////////////////// Zaurus keys 1347 ////////////////////////////// Zaurus keys
1343 case Key_Home: 1348 case Key_Home:
1344 // BeginBtn(); 1349 // BeginBtn();
1345 break; 1350 break;
1346 case Key_F9: //activity 1351 case Key_F9: //activity
1347 OpenBtn(); 1352 OpenBtn();
1348 break; 1353 break;
1349 case Key_F10: //contacts 1354 case Key_F10: //contacts
1350 hideButtons(); 1355 hideButtons();
1351 break; 1356 break;
1352 case Key_F11: //menu 1357 case Key_F11: //menu
1353 if(menubar->isHidden() ) 1358 if(menubar->isHidden() )
1354 menubar->show(); 1359 menubar->show();
1355 else 1360 else
1356 menubar->hide(); 1361 menubar->hide();
1357 break; 1362 break;
1358 case Key_F12: //home 1363 case Key_F12: //home
1359 BeginBtn(); 1364 BeginBtn();
1360 break; 1365 break;
1361 case Key_F13: //mail 1366 case Key_F13: //mail
@@ -1363,60 +1368,60 @@ void Gutenbrowser::keyReleaseEvent( QKeyEvent *e) {
1363 break; 1368 break;
1364 case Key_Space: 1369 case Key_Space:
1365 if(loadCheck) 1370 if(loadCheck)
1366 ForwardBtn(); 1371 ForwardBtn();
1367 // else 1372 // else
1368 // Bookmark(); 1373 // Bookmark();
1369 break; 1374 break;
1370 case Key_Down: 1375 case Key_Down:
1371 if(loadCheck) { 1376 if(loadCheck) {
1372 // if( !e->isAutoRepeat() ) 1377 // if( !e->isAutoRepeat() )
1373 // AdjustStatus(); 1378 // AdjustStatus();
1374 // } else { 1379 // } else {
1375 // LibraryBtn(); 1380 // LibraryBtn();
1376 // ForwardBtn(); 1381 // ForwardBtn();
1377 } 1382 }
1378 1383
1379 // ForwardButton->setFocus(); 1384 // ForwardButton->setFocus();
1380 // Lview->setFocus(); 1385 // Lview->setFocus();
1381 // if(s_Wrap=="FALSE") 1386 // if(s_Wrap=="FALSE")
1382 // Lview->MultiLine_Ex::ScrollDown( 1); 1387 // Lview->MultiLine_Ex::ScrollDown( 1);
1383 // LibraryBtn(); 1388 // LibraryBtn();
1384 break; 1389 break;
1385 case Key_Up: 1390 case Key_Up:
1386 if(loadCheck) { 1391 if(loadCheck) {
1387 // if( !e->isAutoRepeat() ) 1392 // if( !e->isAutoRepeat() )
1388 // AdjustStatus(); 1393 // AdjustStatus();
1389 // } else { 1394 // } else {
1390 // OpenBtn(); 1395 // OpenBtn();
1391 // BackBtn(); 1396 // BackBtn();
1392 } 1397 }
1393 // BackButton->setFocus(); 1398 // BackButton->setFocus();
1394 // Lview->setFocus(); 1399 // Lview->setFocus();
1395 // if(s_Wrap=="FALSE") 1400 // if(s_Wrap=="FALSE")
1396 // Lview->MultiLine_Ex::ScrollUp( 1); 1401 // Lview->MultiLine_Ex::ScrollUp( 1);
1397 1402
1398 // LibraryBtn(); 1403 // LibraryBtn();
1399 break; 1404 break;
1400 case Key_Right: 1405 case Key_Right:
1401 ForwardButton->setFocus(); 1406 ForwardButton->setFocus();
1402 ForwardBtn(); 1407 ForwardBtn();
1403 // LibraryBtn(); 1408 // LibraryBtn();
1404 break; 1409 break;
1405 case Key_Left: 1410 case Key_Left:
1406 BackBtn(); 1411 BackBtn();
1407 BackButton->setFocus(); 1412 BackButton->setFocus();
1408 // OpenBtn(); 1413 // OpenBtn();
1409 break; 1414 break;
1410 case Key_Escape: 1415 case Key_Escape:
1411 ByeBye(); 1416 ByeBye();
1412 break; 1417 break;
1413 case Key_PageUp: 1418 case Key_PageUp:
1414 BackBtn(); 1419 BackBtn();
1415 break; 1420 break;
1416 case Key_PageDown: 1421 case Key_PageDown:
1417 ForwardBtn(); 1422 ForwardBtn();
1418 break; 1423 break;
1419 1424
1420 ////////////////////////////// Zaurus keys 1425 ////////////////////////////// Zaurus keys
1421 }; 1426 };
1422} 1427}
@@ -1424,23 +1429,23 @@ void Gutenbrowser::keyReleaseEvent( QKeyEvent *e) {
1424void Gutenbrowser::keyPressEvent( QKeyEvent *e) { 1429void Gutenbrowser::keyPressEvent( QKeyEvent *e) {
1425 switch ( e->key() ) { 1430 switch ( e->key() ) {
1426 // case Key_Next: 1431 // case Key_Next:
1427 // ForwardBtn(); 1432 // ForwardBtn();
1428 // break; 1433 // break;
1429 // case Key_Prior: 1434 // case Key_Prior:
1430 // BackBtn(); 1435 // BackBtn();
1431 // break; 1436 // break;
1432 // case Key_Space: 1437 // case Key_Space:
1433 // ForwardBtn(); 1438 // ForwardBtn();
1434 // break; 1439 // break;
1435 // case Key_Down: 1440 // case Key_Down:
1436 // Lview->MultiLine_Ex::ScrollUp( 1); 1441 // Lview->MultiLine_Ex::ScrollUp( 1);
1437 // if(useSplitter) Rview->MultiLine_Ex::ScrollUp( 1); 1442 // if(useSplitter) Rview->MultiLine_Ex::ScrollUp( 1);
1438 // break; 1443 // break;
1439 // case Key_Up: 1444 // case Key_Up:
1440 // if( Lview->Top() != 0) { 1445 // if( Lview->Top() != 0) {
1441 // Lview->MultiLine_Ex::ScrollDown( 1); 1446 // Lview->MultiLine_Ex::ScrollDown( 1);
1442 // if(useSplitter) Rview->MultiLine_Ex::ScrollDown( 1); 1447 // if(useSplitter) Rview->MultiLine_Ex::ScrollDown( 1);
1443 // } 1448 // }
1444 // break; 1449 // break;
1445 } 1450 }
1446} 1451}
@@ -1448,11 +1453,11 @@ void Gutenbrowser::keyPressEvent( QKeyEvent *e) {
1448void Gutenbrowser::resizeEvent( QResizeEvent *ev) { 1453void Gutenbrowser::resizeEvent( QResizeEvent *ev) {
1449 // qDebug("resize: %d,%d\n",ev->size().width(),ev->size().height()); 1454 // odebug << "resize: " << ev->size().width() << "," << ev->size().height() << "\n" << oendl;
1450 1455
1451 if( !LibraryDlg->isHidden()) 1456 if( !LibraryDlg->isHidden())
1452 LibraryDlg->resize(ev->size().width(),ev->size().height() ); 1457 LibraryDlg->resize(ev->size().width(),ev->size().height() );
1453 1458
1454 // if( loadCheck == true) { 1459 // if( loadCheck == true) {
1455 // ResizeEdits(); 1460 // ResizeEdits();
1456 // AdjustStatus(); 1461 // AdjustStatus();
1457 // } 1462 // }
1458} 1463}
@@ -1461,43 +1466,43 @@ void Gutenbrowser::resizeEvent( QResizeEvent *ev) {
1461void Gutenbrowser::doOptions() { 1466void Gutenbrowser::doOptions() {
1462 optionsDialog* optDlg; 1467 optionsDialog* optDlg;
1463 optDlg = new optionsDialog( this,"Options_Dlg", true); 1468 optDlg = new optionsDialog( this,"Options_Dlg", true);
1464 QString Ddir; 1469 QString Ddir;
1465 Config config("Gutenbrowser"); 1470 Config config("Gutenbrowser");
1466 config.setGroup( "General" ); 1471 config.setGroup( "General" );
1467 QFont myFont; 1472 QFont myFont;
1468 optDlg->showMaximized(); 1473 optDlg->showMaximized();
1469 1474
1470 if( optDlg->exec() !=0) { 1475 if( optDlg->exec() !=0) {
1471 qApp->processEvents(); 1476 qApp->processEvents();
1472 brow=optDlg->browserName; 1477 brow=optDlg->browserName;
1473 toggleButtonIcons( optDlg->useIcon); 1478 toggleButtonIcons( optDlg->useIcon);
1474 ftp_host= optDlg->ftp_host; 1479 ftp_host= optDlg->ftp_host;
1475 ftp_base_dir= optDlg->ftp_base_dir; 1480 ftp_base_dir= optDlg->ftp_base_dir;
1476 brow=optDlg->browserName; 1481 brow=optDlg->browserName;
1477 Ddir=optDlg->downloadDirEdit->text(); 1482 Ddir=optDlg->downloadDirEdit->text();
1478 1483
1479 qDebug("writing library config"); 1484 odebug << "writing library config" << oendl;
1480 Config config("Gutenbrowser"); 1485 Config config("Gutenbrowser");
1481 config.setGroup("General"); 1486 config.setGroup("General");
1482 1487
1483 QString dirname= optDlg->downloadDirEdit->text(); 1488 QString dirname= optDlg->downloadDirEdit->text();
1484 if(dirname.right(1)!="/") 1489 if(dirname.right(1)!="/")
1485 dirname+="/"; 1490 dirname+="/";
1486 config.writeEntry( "DownloadDirectory",dirname); 1491 config.writeEntry( "DownloadDirectory",dirname);
1487 QDir newDir( optDlg->downloadDirEdit->text()); 1492 QDir newDir( optDlg->downloadDirEdit->text());
1488 1493
1489 if( !newDir.exists() ) { 1494 if( !newDir.exists() ) {
1490 int exit=QMessageBox::information(this, "Note", "Ok, to make a new directory\n"+Ddir+" ?", 1495 int exit=QMessageBox::information(this, "Note", "Ok, to make a new directory\n"+Ddir+" ?",
1491 QMessageBox::Ok, QMessageBox::Cancel); 1496 QMessageBox::Ok, QMessageBox::Cancel);
1492 if (exit==1) { 1497 if (exit==1) {
1493 QString cmd="mkdir -p "; 1498 QString cmd="mkdir -p ";
1494 cmd+=Ddir.latin1(); 1499 cmd+=Ddir.latin1();
1495 system(cmd); 1500 system(cmd);
1496 qDebug("Making new dir "+cmd); 1501 odebug << "Making new dir "+cmd << oendl;
1497 if(Ddir.right(1)!="/") { 1502 if(Ddir.right(1)!="/") {
1498 Ddir+="/"; 1503 Ddir+="/";
1499 } 1504 }
1500 config.writeEntry("DownloadDirectory",Ddir); 1505 config.writeEntry("DownloadDirectory",Ddir);
1501 } 1506 }
1502 } 1507 }
1503 1508
@@ -1505,37 +1510,37 @@ void Gutenbrowser::doOptions() {
1505// setStyle( optDlg->styleInt); 1510// setStyle( optDlg->styleInt);
1506 if(optDlg->b_qExit==TRUE) 1511 if(optDlg->b_qExit==TRUE)
1507 b_queryExit=TRUE; 1512 b_queryExit=TRUE;
1508 else 1513 else
1509 b_queryExit=FALSE; 1514 b_queryExit=FALSE;
1510 1515
1511 if(optDlg->fontDlg-> changedFonts) { 1516 if(optDlg->fontDlg-> changedFonts) {
1512 qDebug("Setting font"); 1517 odebug << "Setting font" << oendl;
1513 myFont=optDlg->fontDlg->selectedFont; 1518 myFont=optDlg->fontDlg->selectedFont;
1514 Lview->setFont( myFont); 1519 Lview->setFont( myFont);
1515 } 1520 }
1516 1521
1517 if(optDlg->useWordWrap_CheckBox->isChecked() ) { 1522 if(optDlg->useWordWrap_CheckBox->isChecked() ) {
1518 qDebug("WORD WRAP is set"); 1523 odebug << "WORD WRAP is set" << oendl;
1519 Lview->setWordWrap(QMultiLineEdit::WidgetWidth); 1524 Lview->setWordWrap(QMultiLineEdit::WidgetWidth);
1520 useWrap=true; 1525 useWrap=true;
1521 } else { 1526 } else {
1522 qDebug("Word wrap is NOT set"); 1527 odebug << "Word wrap is NOT set" << oendl;
1523 Lview->setWordWrap(QMultiLineEdit::NoWrap); 1528 Lview->setWordWrap(QMultiLineEdit::NoWrap);
1524 useWrap=false; 1529 useWrap=false;
1525 } 1530 }
1526 } 1531 }
1527 if(showMainList) { 1532 if(showMainList) {
1528 if(!Lview->isHidden()) 1533 if(!Lview->isHidden())
1529 Lview->hide(); 1534 Lview->hide();
1530 qApp->processEvents(); 1535 qApp->processEvents();
1531 if(mainList->isHidden()) 1536 if(mainList->isHidden())
1532 mainList->show(); 1537 mainList->show();
1533 fillWithTitles(); 1538 fillWithTitles();
1534 } else { 1539 } else {
1535 Lview->show(); 1540 Lview->show();
1536 showMainList=FALSE; 1541 showMainList=FALSE;
1537 mainList->hide(); 1542 mainList->hide();
1538 } 1543 }
1539 qApp->processEvents(); 1544 qApp->processEvents();
1540 update(); 1545 update();
1541} 1546}
@@ -1543,35 +1548,35 @@ void Gutenbrowser::doOptions() {
1543bool Gutenbrowser::setTitle() { 1548bool Gutenbrowser::setTitle() {
1544 if( file_name.contains( local_library)) { 1549 if( file_name.contains( local_library)) {
1545 QFileInfo f( file_name); 1550 QFileInfo f( file_name);
1546 QString s_file = f.fileName(); 1551 QString s_file = f.fileName();
1547 file_name = s_file; 1552 file_name = s_file;
1548 } 1553 }
1549 1554
1550 int test = 0; 1555 int test = 0;
1551 Config config("Gutenbrowser"); 1556 Config config("Gutenbrowser");
1552 config.setGroup( "Files" ); 1557 config.setGroup( "Files" );
1553 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" ); 1558 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
1554 int i_numofFiles = s_numofFiles.toInt(); 1559 int i_numofFiles = s_numofFiles.toInt();
1555 1560
1556 for (int i = 1; i <= i_numofFiles; i++) { 1561 for (int i = 1; i <= i_numofFiles; i++) {
1557 QString temp; 1562 QString temp;
1558 temp.setNum(i); 1563 temp.setNum(i);
1559 QString ramble = config.readEntry(temp, "" ); 1564 QString ramble = config.readEntry(temp, "" );
1560 1565
1561 if( strcmp(ramble, file_name) == 0) { 1566 if( strcmp(ramble, file_name) == 0) {
1562 test = 1; 1567 test = 1;
1563 } 1568 }
1564 } 1569 }
1565 if (test == 0) { 1570 if (test == 0) {
1566 config.writeEntry("NumberOfFiles",i_numofFiles +1 ); 1571 config.writeEntry("NumberOfFiles",i_numofFiles +1 );
1567 QString interger; 1572 QString interger;
1568 interger.setNum( i_numofFiles +1); 1573 interger.setNum( i_numofFiles +1);
1569 config.writeEntry(interger, file_name); 1574 config.writeEntry(interger, file_name);
1570 1575
1571 config.setGroup( "Titles" ); 1576 config.setGroup( "Titles" );
1572 config.writeEntry(file_name,listItemTitle); 1577 config.writeEntry(file_name,listItemTitle);
1573 } 1578 }
1574 test = 0; 1579 test = 0;
1575 // config.write(); 1580 // config.write();
1576 return true; 1581 return true;
1577} 1582}
@@ -1580,13 +1585,13 @@ void Gutenbrowser::OnNetworkDialog( const QString &/*networkUrl*/, const QString
1580{ 1585{
1581 // qDebug(networkUrl); 1586 // odebug << networkUrl << oendl;
1582 // qDebug(output); 1587 // odebug << output << oendl;
1583 // #ifndef Q_WS_QWS 1588 // #ifndef Q_WS_QWS
1584 // NetworkDialog *NetworkDlg; 1589 // NetworkDialog *NetworkDlg;
1585 // if( networkUrl.length() < 4 ) networkUrl= "http://sailor.gutenberg.org/mirror.sites.html"; 1590 // if( networkUrl.length() < 4 ) networkUrl= "http://sailor.gutenberg.org/mirror.sites.html";
1586 // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, output); 1591 // NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, output);
1587 // if( NetworkDlg->exec() != 0 ) { 1592 // if( NetworkDlg->exec() != 0 ) {
1588 // } 1593 // }
1589 // if(NetworkDlg) 1594 // if(NetworkDlg)
1590 // delete NetworkDlg; 1595 // delete NetworkDlg;
1591 // #endif 1596 // #endif
1592} 1597}
@@ -1595,8 +1600,8 @@ void Gutenbrowser::donateGutenberg()
1595{ 1600{
1596 int exit=QMessageBox::information(this,"Info", "http://www.gutenberg.org\ndonate@gutenberg.net", 1601 int exit=QMessageBox::information(this, "Info", "http://www.gutenberg.org\ndonate@gutenberg.net",
1597 QMessageBox::Ok, QMessageBox::Cancel); 1602 QMessageBox::Ok, QMessageBox::Cancel);
1598 1603
1599 if (exit==1) { 1604 if (exit==1) {
1600 } else { 1605 } else {
1601 }; 1606 };
1602} 1607}
@@ -1609,35 +1614,35 @@ void Gutenbrowser::writeConfig()
1609{ 1614{
1610 // config.read(); 1615 // config.read();
1611 // Config config("Gutenbrowser"); 1616 // Config config("Gutenbrowser");
1612 // #ifndef Q_WS_QWS 1617 // #ifndef Q_WS_QWS
1613 // config.setGroup( "Geometry" ); 1618 // config.setGroup( "Geometry" );
1614 // QString s; 1619 // QString s;
1615 // QString globalPosition; 1620 // QString globalPosition;
1616 // QPoint point; 1621 // QPoint point;
1617 // point=mapToGlobal(QPoint(0,0) ); 1622 // point=mapToGlobal(QPoint(0,0) );
1618 // int posiX, posiY; 1623 // int posiX, posiY;
1619 // posiX=point.x(); 1624 // posiX=point.x();
1620 // posiY=point.y(); 1625 // posiY=point.y();
1621 // globalPosition.sprintf("%i,%i", posiX, posiY); 1626 // globalPosition.sprintf("%i,%i", posiX, posiY);
1622 1627
1623 // QRect frameRect; 1628 // QRect frameRect;
1624 // frameRect = geometry(); 1629 // frameRect = geometry();
1625 // s.sprintf("%i,%i", frameRect.width(), frameRect.height()); 1630 // s.sprintf("%i,%i", frameRect.width(), frameRect.height());
1626 // config.writeEntry("Frame", s); 1631 // config.writeEntry("Frame", s);
1627 // config.writeEntry("Position", globalPosition); 1632 // config.writeEntry("Position", globalPosition);
1628 1633
1629 // if( useIcons==TRUE) 1634 // if( useIcons==TRUE)
1630 // config.writeEntry("Icons", "TRUE"); 1635 // config.writeEntry("Icons", "TRUE");
1631 // else 1636 // else
1632 // config.writeEntry("Icons", "FALSE"); 1637 // config.writeEntry("Icons", "FALSE");
1633 // #endif 1638 // #endif
1634 1639
1635 // #ifndef Q_WS_QWS 1640 // #ifndef Q_WS_QWS
1636 // QString temp; 1641 // QString temp;
1637 // temp.setNum(styleI, 10); 1642 // temp.setNum(styleI, 10);
1638 // config.setGroup( "StyleIze" ); 1643 // config.setGroup( "StyleIze" );
1639 // config.writeEntry( "Style", temp); 1644 // config.writeEntry( "Style", temp);
1640 // #endif 1645 // #endif
1641 1646
1642 // config.setGroup("General"); 1647 // config.setGroup("General");
1643} 1648}
@@ -1646,6 +1651,6 @@ void Gutenbrowser::annotations()
1646{ 1651{
1647 // #ifndef Q_WS_QWS 1652 // #ifndef Q_WS_QWS
1648 // QMessageBox::message("Note","hi annotate"); 1653 // QMessageBox::message("Note","hi annotate");
1649 // lastBmkButton->setDown(FALSE); 1654 // lastBmkButton->setDown(FALSE);
1650 // #endif 1655 // #endif
1651} 1656}
@@ -1656,44 +1661,44 @@ void Gutenbrowser::hideButtons()
1656 if( !buttonsHidden) { 1661 if( !buttonsHidden) {
1657 buttonsHidden=TRUE; 1662 buttonsHidden=TRUE;
1658 LibraryButton->hide(); 1663 LibraryButton->hide();
1659 SearchButton->hide(); 1664 SearchButton->hide();
1660 InfoBar->hide(); 1665 InfoBar->hide();
1661 OpenButton->hide(); 1666 OpenButton->hide();
1662 BackButton->hide(); 1667 BackButton->hide();
1663 ForwardButton->hide(); 1668 ForwardButton->hide();
1664 setBookmarkButton->hide(); 1669 setBookmarkButton->hide();
1665 lastBmkButton->hide(); 1670 lastBmkButton->hide();
1666 dictionaryButton->hide(); 1671 dictionaryButton->hide();
1667 if(useSplitter) { 1672 if(useSplitter) {
1668 ClearButton->hide(); 1673 ClearButton->hide();
1669 PrintButton->hide(); 1674 PrintButton->hide();
1670 beginButton->hide(); 1675 beginButton->hide();
1671 HelpButton->hide(); 1676 HelpButton->hide();
1672 FontButton->hide(); 1677 FontButton->hide();
1673 ExitButton->hide(); 1678 ExitButton->hide();
1674 OptionsButton->hide(); 1679 OptionsButton->hide();
1675 DownloadButton->hide(); 1680 DownloadButton->hide();
1676 } 1681 }
1677 } else { 1682 } else {
1678 buttonsHidden=FALSE; 1683 buttonsHidden=FALSE;
1679 1684
1680 LibraryButton->show(); 1685 LibraryButton->show();
1681 SearchButton->show(); 1686 SearchButton->show();
1682 InfoBar->show(); 1687 InfoBar->show();
1683 OpenButton->show(); 1688 OpenButton->show();
1684 BackButton->show(); 1689 BackButton->show();
1685 ForwardButton->show(); 1690 ForwardButton->show();
1686 setBookmarkButton->show(); 1691 setBookmarkButton->show();
1687 lastBmkButton->show(); 1692 lastBmkButton->show();
1688 dictionaryButton->show(); 1693 dictionaryButton->show();
1689 if(useSplitter) { 1694 if(useSplitter) {
1690 ClearButton->show(); 1695 ClearButton->show();
1691 PrintButton->show(); 1696 PrintButton->show();
1692 beginButton->show(); 1697 beginButton->show();
1693 HelpButton->show(); 1698 HelpButton->show();
1694 FontButton->show(); 1699 FontButton->show();
1695 ExitButton->show(); 1700 ExitButton->show();
1696 OptionsButton->show(); 1701 OptionsButton->show();
1697 DownloadButton->show(); 1702 DownloadButton->show();
1698 } 1703 }
1699 } 1704 }
@@ -1710,8 +1715,8 @@ void Gutenbrowser::cleanUp( )
1710{ 1715{
1711 writeConfig(); 1716 writeConfig();
1712 QPEApplication::grabKeyboard(); 1717 QPEApplication::grabKeyboard();
1713 1718
1714 QPEApplication::ungrabKeyboard(); 1719 QPEApplication::ungrabKeyboard();
1715 // qDebug("Cleanup"); 1720 // odebug << "Cleanup" << oendl;
1716 if(f.isOpen()) f.close(); 1721 if(f.isOpen()) f.close();
1717} 1722}
@@ -1720,3 +1725,3 @@ void Gutenbrowser::fixKeys()
1720{ 1725{
1721 qDebug("Attempting to fix keys"); 1726 odebug << "Attempting to fix keys" << oendl;
1722 1727
@@ -1726,13 +1731,13 @@ void Gutenbrowser::enableButtons(bool b)
1726{ 1731{
1727 BackButton->setEnabled(b); 1732 BackButton->setEnabled(b);
1728 ForwardButton->setEnabled(b); 1733 ForwardButton->setEnabled(b);
1729 SearchButton->setEnabled(b); 1734 SearchButton->setEnabled(b);
1730 setBookmarkButton->setEnabled(b); 1735 setBookmarkButton->setEnabled(b);
1731 dictionaryButton->setEnabled(b); 1736 dictionaryButton->setEnabled(b);
1732 InfoBar->setEnabled(b); 1737 InfoBar->setEnabled(b);
1733 1738
1734 editMenu->setItemEnabled( -5, b); 1739 editMenu->setItemEnabled( -5, b);
1735 editMenu->setItemEnabled( -6, b); 1740 editMenu->setItemEnabled( -6, b);
1736 editMenu->setItemEnabled( -7, b); 1741 editMenu->setItemEnabled( -7, b);
1737 editMenu->setItemEnabled( -8, b); 1742 editMenu->setItemEnabled( -8, b);
1738 1743
@@ -1741,17 +1746,17 @@ void Gutenbrowser::enableButtons(bool b)
1741void Gutenbrowser::fillWithTitles() { 1746void Gutenbrowser::fillWithTitles() {
1742 Config config("Gutenbrowser"); 1747 Config config("Gutenbrowser");
1743 config.setGroup( "Files" ); 1748 config.setGroup( "Files" );
1744 int i_numofFiles = config.readNumEntry("NumberOfFiles", 0); 1749 int i_numofFiles = config.readNumEntry("NumberOfFiles", 0);
1745 mainList->clear(); 1750 mainList->clear();
1746 QString temp; 1751 QString temp;
1747 for (int i = 1; i <= i_numofFiles; i++) { 1752 for (int i = 1; i <= i_numofFiles; i++) {
1748 temp.setNum(i); 1753 temp.setNum(i);
1749 config.setGroup( "Files" ); 1754 config.setGroup( "Files" );
1750 QString ramble = config.readEntry(temp, "" ); 1755 QString ramble = config.readEntry(temp, "" );
1751 config.setGroup( "Titles" ); 1756 config.setGroup( "Titles" );
1752 temp = config.readEntry(ramble, ""); 1757 temp = config.readEntry(ramble, "");
1753 if( !temp.isEmpty()) { 1758 if( !temp.isEmpty()) {
1754 mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), temp, -1); 1759 mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), temp, -1);
1755 } 1760 }
1756 } 1761 }
1757} 1762}
@@ -1759,38 +1764,38 @@ void Gutenbrowser::fillWithTitles() {
1759void Gutenbrowser::listClickedSlot( QListBoxItem * index) { 1764void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
1760 // if( !working) { 1765 // if( !working) {
1761 // working=true; 1766 // working=true;
1762 if(index) { 1767 if(index) {
1763 // QCopEnvelope ( "QPE/System", "busy()" ); 1768 // QCopEnvelope ( "QPE/System", "busy()" );
1764 title = index->text(); 1769 title = index->text();
1765 showMainList=FALSE; 1770 showMainList=FALSE;
1766 mainList->hide(); 1771 mainList->hide();
1767 Lview->show(); 1772 Lview->show();
1768 qApp->processEvents(); 1773 qApp->processEvents();
1769 QString temp; 1774 QString temp;
1770 temp.setNum( mainList->currentItem() + 1); 1775 temp.setNum( mainList->currentItem() + 1);
1771 // openFileTitle = title; 1776 // openFileTitle = title;
1772 Config config("Gutenbrowser"); 1777 Config config("Gutenbrowser");
1773 config.setGroup( "Files" ); 1778 config.setGroup( "Files" );
1774 QString file = config.readEntry(temp, ""); 1779 QString file = config.readEntry(temp, "");
1775 qDebug("About to load"); 1780 odebug << "About to load" << oendl;
1776 if( Lview->isVisible()) 1781 if( Lview->isVisible())
1777 load(file); 1782 load(file);
1778 1783
1779 config.setGroup( title); 1784 config.setGroup( title);
1780 file_name = config.readEntry("File Name", ""); 1785 file_name = config.readEntry("File Name", "");
1781 i_pageNum = config.readNumEntry("Page Number", 1); 1786 i_pageNum = config.readNumEntry("Page Number", 1);
1782 int Bmrkrow = config.readNumEntry("LineNumber", -1); 1787 int Bmrkrow = config.readNumEntry("LineNumber", -1);
1783 if(Bmrkrow > -1) { 1788 if(Bmrkrow > -1) {
1784 if( Bmrkrow > Lview->topRow() ) { 1789 if( Bmrkrow > Lview->topRow() ) {
1785 Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE ); 1790 Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE );
1786 Lview->ScrollUp( Bmrkrow - Lview->topRow() ); 1791 Lview->ScrollUp( Bmrkrow - Lview->topRow() );
1787 // AdjustStatus(); 1792 // AdjustStatus();
1788 } 1793 }
1789 else if( Bmrkrow < Lview->topRow() ) { 1794 else if( Bmrkrow < Lview->topRow() ) {
1790 Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE ); 1795 Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
1791 Lview->ScrollDown( Lview->topRow() - Bmrkrow ); 1796 Lview->ScrollDown( Lview->topRow() - Bmrkrow );
1792 // AdjustStatus(); 1797 // AdjustStatus();
1793 } 1798 }
1794 } 1799 }
1795 } 1800 }
1796} 1801}
@@ -1798,5 +1803,5 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
1798void Gutenbrowser::infoGutenbrowser() { 1803void Gutenbrowser::infoGutenbrowser() {
1799 QMessageBox::message("Info","Gutenbrowser was developed by\n" 1804 QMessageBox::message("Info","Gutenbrowser was developed by\n"
1800 "Lorn Potter\n" 1805 "Lorn Potter\n"
1801 "ljp<ljp@llornkcor.com>\n"); 1806 "ljp<ljp@llornkcor.com>\n");
1802} 1807}
@@ -1804,20 +1809,20 @@ void Gutenbrowser::infoGutenbrowser() {
1804void Gutenbrowser::setDocument(const QString & frozenBoogers) { 1809void Gutenbrowser::setDocument(const QString & frozenBoogers) {
1805 this->hide(); 1810 this->hide();
1806 if(showMainList) { 1811 if(showMainList) {
1807 showMainList=FALSE; 1812 showMainList=FALSE;
1808 if(!mainList->isHidden()) 1813 if(!mainList->isHidden())
1809 mainList->hide(); 1814 mainList->hide();
1810 if(Lview->isHidden()) 1815 if(Lview->isHidden())
1811 Lview->show(); 1816 Lview->show();
1812 qApp->processEvents(); 1817 qApp->processEvents();
1813 } 1818 }
1814 DocLnk lnk; 1819 DocLnk lnk;
1815 lnk = DocLnk(frozenBoogers); 1820 lnk = DocLnk(frozenBoogers);
1816 // qDebug(lnk.file() ); 1821 // odebug << lnk.file() << oendl;
1817 title=lnk.comment(); 1822 title=lnk.comment();
1818 load( lnk.file()); 1823 load( lnk.file());
1819 this->show(); 1824 this->show();
1820 // qDebug(title); 1825 // odebug << title << oendl;
1821 // qApp->processEvents(); 1826 // qApp->processEvents();
1822 // repaint(); 1827 // repaint();
1823} 1828}
@@ -1826,17 +1831,17 @@ void Gutenbrowser::mainListPressed(int mouse, QListBoxItem * , const QPoint & )
1826{ 1831{
1827 switch (mouse) { 1832 switch (mouse) {
1828 case 1: 1833 case 1:
1829 break; 1834 break;
1830 case 2: { 1835 case 2: {
1831 QPopupMenu m;// = new QPopupMenu( Local_View ); 1836 QPopupMenu m;// = new QPopupMenu( Local_View );
1832 m.insertItem( tr( "Open" ), this, SLOT( menuOpen() )); 1837 m.insertItem( tr( "Open" ), this, SLOT( menuOpen() ));
1833 m.insertSeparator(); 1838 m.insertSeparator();
1834 m.insertItem( tr( "Search google.com" ), this, SLOT( menuGoogle())); 1839 m.insertItem( tr( "Search google.com" ), this, SLOT( menuGoogle()));
1835 m.insertItem( tr( "Edit Title" ), this, SLOT( menuEditTitle())); 1840 m.insertItem( tr( "Edit Title" ), this, SLOT( menuEditTitle()));
1836 // m.insertSeparator(); 1841 // m.insertSeparator();
1837 // m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); 1842 // m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
1838 m.exec( QCursor::pos() ); 1843 m.exec( QCursor::pos() );
1839 } 1844 }
1840 break; 1845 break;
1841 }; 1846 };
1842} 1847}
@@ -1844,3 +1849,3 @@ void Gutenbrowser::mainListPressed(int mouse, QListBoxItem * , const QPoint & )
1844void Gutenbrowser::menuOpen() { 1849void Gutenbrowser::menuOpen() {
1845 listClickedSlot( mainList->item( mainList->currentItem())); 1850 listClickedSlot( mainList->item( mainList->currentItem()));
1846} 1851}
@@ -1848,3 +1853,3 @@ void Gutenbrowser::menuOpen() {
1848void Gutenbrowser::menuGoogle() { 1853void Gutenbrowser::menuGoogle() {
1849 searchGoogle( mainList->text(mainList->currentItem())); 1854 searchGoogle( mainList->text(mainList->currentItem()));
1850} 1855}
@@ -1852,18 +1857,18 @@ void Gutenbrowser::menuGoogle() {
1852void Gutenbrowser::searchGoogle( const QString &tempText) { 1857void Gutenbrowser::searchGoogle( const QString &tempText) {
1853 QString text = tempText; 1858 QString text = tempText;
1854 1859
1855 int eexit=QMessageBox::information(this, "Note","Do you want to search for\n"+text+ 1860 int eexit=QMessageBox::information(this, "Note","Do you want to search for\n"+text+
1856 "\non google.com?",QMessageBox::Yes, QMessageBox::No); 1861 "\non google.com?",QMessageBox::Yes, QMessageBox::No);
1857 if (eexit== 3) { 1862 if (eexit== 3) {
1858 qApp->processEvents(); 1863 qApp->processEvents();
1859 text.replace( QRegExp("\\s"), "%20"); 1864 text.replace( QRegExp("\\s"), "%20");
1860 text.replace( QRegExp("#"), ""); 1865 text.replace( QRegExp("#"), "");
1861 text.replace( QRegExp(","), "%20"); 1866 text.replace( QRegExp(","), "%20");
1862 text.replace( QRegExp("'"), "%20"); 1867 text.replace( QRegExp("'"), "%20");
1863 text.replace( QRegExp("("), ""); 1868 text.replace( QRegExp("("), "");
1864 text.replace( QRegExp(")"), ""); 1869 text.replace( QRegExp(")"), "");
1865 // text.replace( QRegExp("[0-9]"), ""); 1870 // text.replace( QRegExp("[0-9]"), "");
1866 QString s_lookup = "http://google.com/search?q="+text+"&num=30&sa=Google+Search"; 1871 QString s_lookup = "http://google.com/search?q="+text+"&num=30&sa=Google+Search";
1867 goGetit( s_lookup, true); 1872 goGetit( s_lookup, true);
1868 } 1873 }
1869 1874
@@ -1873,36 +1878,36 @@ void Gutenbrowser::menuEditTitle()
1873{ 1878{
1874 int currentItem = mainList->currentItem(); 1879 int currentItem = mainList->currentItem();
1875 QString title_text = mainList->text( currentItem); 1880 QString title_text = mainList->text( currentItem);
1876 //qDebug("Selected "+title_text); 1881 //odebug << "Selected "+title_text << oendl;
1877 1882
1878 Config config("Gutenbrowser"); 1883 Config config("Gutenbrowser");
1879 config.setGroup( "Files" ); 1884 config.setGroup( "Files" );
1880 QString s_numofFiles = config.readEntry("NumberOfFiles", "0"); 1885 QString s_numofFiles = config.readEntry("NumberOfFiles", "0");
1881 int i_numofFiles = s_numofFiles.toInt(); 1886 int i_numofFiles = s_numofFiles.toInt();
1882 QString fileNum; 1887 QString fileNum;
1883 for (int i = 1; i <= i_numofFiles+1; i++) { 1888 for (int i = 1; i <= i_numofFiles+1; i++) {
1884 1889
1885 fileNum.setNum(i); 1890 fileNum.setNum(i);
1886 config.setGroup( "Files" ); 1891 config.setGroup( "Files" );
1887 QString s_filename = config.readEntry(fileNum, "" ); 1892 QString s_filename = config.readEntry(fileNum, "" );
1888 config.setGroup( "Titles" ); 1893 config.setGroup( "Titles" );
1889 QString file_title = config.readEntry( s_filename, ""); 1894 QString file_title = config.readEntry( s_filename, "");
1890 //qDebug("file_title is "+file_title); 1895 //odebug << "file_title is "+file_title << oendl;
1891 if(title_text == file_title ) { 1896 if(title_text == file_title ) {
1892 // selFile = s_filename; 1897 // selFile = s_filename;
1893 //qDebug("Edit: "+ file_title ); 1898 //odebug << "Edit: "+ file_title << oendl;
1894 i=i_numofFiles+1; 1899 i=i_numofFiles+1;
1895 Edit_Title *titleEdit; 1900 Edit_Title *titleEdit;
1896 titleEdit = new Edit_Title(this,file_title ,TRUE); 1901 titleEdit = new Edit_Title(this,file_title ,TRUE);
1897 if(titleEdit->exec() !=0) { 1902 if(titleEdit->exec() !=0) {
1898 //qDebug(titleEdit->newTitle); 1903 //odebug << titleEdit->newTitle << oendl;
1899 config.writeEntry( s_filename, titleEdit->newTitle); 1904 config.writeEntry( s_filename, titleEdit->newTitle);
1900 mainList->removeItem(currentItem); 1905 mainList->removeItem(currentItem);
1901 mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem); 1906 mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem);
1902 } 1907 }
1903 } 1908 }
1904 } 1909 }
1905 1910
1906 // getTitles(); 1911 // getTitles();
1907 mainList->triggerUpdate(true); 1912 mainList->triggerUpdate(true);
1908 1913
@@ -1913,70 +1918,70 @@ void Gutenbrowser::menuEditTitle()
1913bool Gutenbrowser::UnZipIt(const QString &zipFile) { 1918bool Gutenbrowser::UnZipIt(const QString &zipFile) {
1914 qDebug(zipFile); 1919 odebug << zipFile << oendl;
1915#ifndef Q_WS_QWS 1920#ifndef Q_WS_QWS
1916 if( QFile::exists( zipFile)) { // TODO findsome other way of dealingwithzip files. 1921 if( QFile::exists( zipFile)) { // TODO findsome other way of dealingwithzip files.
1917 bool isPgWhole=false; 1922 bool isPgWhole=false;
1918 QString thatFile; 1923 QString thatFile;
1919 if(zipFile.find("pgwhole",0,TRUE)) { 1924 if(zipFile.find("pgwhole",0,TRUE)) {
1920 isPgWhole=TRUE; 1925 isPgWhole=TRUE;
1921 thatFile= local_library +"PGWHOLE.TXT"; 1926 thatFile= local_library +"PGWHOLE.TXT";
1922 } 1927 }
1923 // else { 1928 // else {
1924 // thatFile=zipFile.left(4); 1929 // thatFile=zipFile.left(4);
1925 // } 1930 // }
1926 // qDebug((const char*)local_library.latin1()); 1931 // odebug << (const char*)local_library.latin1() << oendl;
1927 QString cmd; 1932 QString cmd;
1928#if defined(_WS_X11_) 1933#if defined(_WS_X11_)
1929 if( chdir((const char*)local_library.latin1())!=0) 1934 if( chdir((const char*)local_library.latin1())!=0)
1930 qDebug("chdir failed."); 1935 odebug << "chdir failed." << oendl;
1931 cmd = "gunzip -S .zip " + local_library+zipFile; 1936 cmd = "gunzip -S .zip " + local_library+zipFile;
1932 //cmd = "gunzip -d " + zipFile /*newestLibraryFile */+" -d " + local_library; 1937 //cmd = "gunzip -d " + zipFile /*newestLibraryFile */+" -d " + local_library;
1933#endif 1938#endif
1934#ifdef Q_WS_QWS 1939#ifdef Q_WS_QWS
1935 if( chdir((const char*)local_library.latin1())!=0) 1940 if( chdir((const char*)local_library.latin1())!=0)
1936 qDebug("chdir failed."); 1941 odebug << "chdir failed." << oendl;
1937 cmd = "unzip " + local_library+zipFile; 1942 cmd = "unzip " + local_library+zipFile;
1938 // cmd = "/usr/bin/unzip -o " + local_library+zipFile +" -d /usr/share/doc/gutenbrowser" ;//+ local_library; 1943 // cmd = "/usr/bin/unzip -o " + local_library+zipFile +" -d /usr/share/doc/gutenbrowser" ;//+ local_library;
1939#endif 1944#endif
1940 int exit=QMessageBox::information(this, "Ok to unzip?", 1945 int exit=QMessageBox::information(this, "Ok to unzip?",
1941 "Ok to unnzip\n"+ zipFile+" ?", 1946 "Ok to unnzip\n"+ zipFile+" ?",
1942 QMessageBox::Yes, QMessageBox::No); 1947 QMessageBox::Yes, QMessageBox::No);
1943 if (exit==QMessageBox::Yes) { 1948 if (exit==QMessageBox::Yes) {
1944#if defined(_WS_X11_)// 1949#if defined(_WS_X11_)//
1945 qDebug("Issuing the command "+cmd); 1950 odebug << "Issuing the command "+cmd << oendl;
1946 system( cmd); 1951 system( cmd);
1947 if( QFile::exists(thatFile)) 1952 if( QFile::exists(thatFile))
1948 remove (thatFile); 1953 remove (thatFile);
1949 if(isPgWhole) { 1954 if(isPgWhole) {
1950 if( rename("pgwhole","PGWHOLE.TXT") !=0) 1955 if( rename("pgwhole","PGWHOLE.TXT") !=0)
1951 qDebug("rename failed"); 1956 odebug << "rename failed" << oendl;
1952 } else { 1957 } else {
1953 if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0) 1958 if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
1954 qDebug("rename failed"); 1959 odebug << "rename failed" << oendl;
1955 } 1960 }
1956#endif 1961#endif
1957#ifdef Q_WS_QWS 1962#ifdef Q_WS_QWS
1958 qDebug("Issuing the command "+cmd); 1963 odebug << "Issuing the command "+cmd << oendl;
1959 system( cmd); 1964 system( cmd);
1960 if( QFile::exists(thatFile)) 1965 if( QFile::exists(thatFile))
1961 remove(thatFile); 1966 remove(thatFile);
1962 if(isPgWhole) { 1967 if(isPgWhole) {
1963 if( rename("pgwhole","PGWHOLE.TXT") !=0) 1968 if( rename("pgwhole","PGWHOLE.TXT") !=0)
1964 qDebug("rename failed"); 1969 odebug << "rename failed" << oendl;
1965 } else { 1970 } else {
1966 if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0) 1971 if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
1967 qDebug("rename failed"); 1972 odebug << "rename failed" << oendl;
1968 } 1973 }
1969#endif 1974#endif
1970 // remove( zipFile); 1975 // remove( zipFile);
1971 return true; 1976 return true;
1972 } 1977 }
1973 else if(exit==QMessageBox::No) { 1978 else if(exit==QMessageBox::No) {
1974 // qDebug("unzip"); 1979 // odebug << "unzip" << oendl;
1975 return false; 1980 return false;
1976 } 1981 }
1977 } 1982 }
1978 else 1983 else
1979 QMessageBox::message( "Note",( tr("Please install unzip in your PATH")) ); 1984 QMessageBox::message( "Note",( tr("Please install unzip in your PATH")) );
1980#endif 1985#endif
1981 return false; 1986 return false;
1982} 1987}
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
index c9149ac..a226258 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
@@ -13,2 +13,3 @@
13 ***************************************************************************/ 13 ***************************************************************************/
14
14//#include "gutenbrowserData.h" 15//#include "gutenbrowserData.h"
@@ -16,2 +17,4 @@
16 17
18/* OPIE */
19#include <opie2/odebug.h>
17#include <qpe/config.h> 20#include <qpe/config.h>
@@ -22,2 +25,3 @@
22 25
26/* QT */
23#include <qfontinfo.h> 27#include <qfontinfo.h>
@@ -37,3 +41,3 @@ void Gutenbrowser::initSlots() {
37 connect(mainList,SIGNAL(clicked(QListBoxItem *)),SLOT(listClickedSlot(QListBoxItem *))); 41 connect(mainList,SIGNAL(clicked(QListBoxItem *)),SLOT(listClickedSlot(QListBoxItem *)));
38 connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int))); 42 connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int)));
39} 43}
@@ -41,3 +45,3 @@ void Gutenbrowser::initSlots() {
41void Gutenbrowser::initConfig() { 45void Gutenbrowser::initConfig() {
42//qDebug("Starting configuration."); 46//odebug << "Starting configuration." << oendl;
43 QDir library(local_library); 47 QDir library(local_library);
@@ -59,3 +63,3 @@ void Gutenbrowser::initConfig() {
59 } 63 }
60 // qDebug( "init file is %s",iniFile.latin1()); 64 // odebug << "init file is " << iniFile << "" << oendl;
61 65
@@ -139,3 +143,3 @@ void Gutenbrowser::initConfig() {
139 143
140 //bool ok2; 144 //bool ok2;
141 QString temp; 145 QString temp;
@@ -149,5 +153,5 @@ void Gutenbrowser::initConfig() {
149 b_queryExit=TRUE; 153 b_queryExit=TRUE;
150// qDebug("Please query before leaving the library."); 154// odebug << "Please query before leaving the library." << oendl;
151 } else { 155 } else {
152// qDebug("Please DO NOT query before leaving the library."); 156// odebug << "Please DO NOT query before leaving the library." << oendl;
153 b_queryExit=FALSE; 157 b_queryExit=FALSE;
@@ -157,3 +161,3 @@ void Gutenbrowser::initConfig() {
157// QString tmpTitle=config.readEntry(file_name,""); 161// QString tmpTitle=config.readEntry(file_name,"");
158 162
159 163
@@ -163,3 +167,3 @@ void Gutenbrowser::initMenuBar()
163{ 167{
164// qDebug("Starting menu init."); 168// odebug << "Starting menu init." << oendl;
165 // menuBar entry fileMenu 169 // menuBar entry fileMenu
@@ -178,5 +182,5 @@ void Gutenbrowser::initMenuBar()
178 editMenu=new QPopupMenu(); 182 editMenu=new QPopupMenu();
179 183
180 editMenu->insertItem(Resource::loadPixmap("up"), "Top", 184 editMenu->insertItem(Resource::loadPixmap("up"), "Top",
181 this, SLOT(TopBtn()) ); 185 this, SLOT(TopBtn()) );
182 editMenu->insertItem( Resource::loadPixmap("back"), "Beginning", 186 editMenu->insertItem( Resource::loadPixmap("back"), "Beginning",
@@ -185,3 +189,3 @@ void Gutenbrowser::initMenuBar()
185 this, SLOT(SearchBtn()) ); 189 this, SLOT(SearchBtn()) );
186 190
187 editMenu->insertItem("Clear", this, SLOT(ClearEdit()) ); 191 editMenu->insertItem("Clear", this, SLOT(ClearEdit()) );
@@ -209,3 +213,3 @@ void Gutenbrowser::initButtonBar()
209{ 213{
210//qDebug("Starting buttonbar init."); 214//odebug << "Starting buttonbar init." << oendl;
211 215
@@ -224,3 +228,3 @@ void Gutenbrowser::initButtonBar()
224// ForwardButton->setAutoRepeat(TRUE); 228// ForwardButton->setAutoRepeat(TRUE);
225 229
226 SearchButton = new QPushButton( this, "SearchButton" ); 230 SearchButton = new QPushButton( this, "SearchButton" );
@@ -236,3 +240,3 @@ void Gutenbrowser::initButtonBar()
236 bookmarksMenu->insertItem("Last Set", this, SLOT(Bookmark( int) )); 240 bookmarksMenu->insertItem("Last Set", this, SLOT(Bookmark( int) ));
237 241
238 lastBmkButton->setPopup(bookmarksMenu); 242 lastBmkButton->setPopup(bookmarksMenu);
@@ -243,3 +247,3 @@ void Gutenbrowser::initButtonBar()
243 InfoBar = new QPushButton( this, "Info_Bar" ); 247 InfoBar = new QPushButton( this, "Info_Bar" );
244// qDebug("Infobar"); 248// odebug << "Infobar" << oendl;
245// if(!useSplitter) { 249// if(!useSplitter) {
@@ -278,3 +282,3 @@ void Gutenbrowser::initView()
278 Lview = new MultiLine_Ex(this); 282 Lview = new MultiLine_Ex(this);
279 283
280 Config cfg("Gutenbrowser"); 284 Config cfg("Gutenbrowser");
@@ -295,3 +299,3 @@ void Gutenbrowser::initView()
295 if(italic=="TRUE") { 299 if(italic=="TRUE") {
296 qDebug("Set Italic font"); 300 odebug << "Set Italic font" << oendl;
297 defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround 301 defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround
diff --git a/noncore/apps/opie-gutenbrowser/helpme.cpp b/noncore/apps/opie-gutenbrowser/helpme.cpp
index 6a9b8c0..53e0236 100644
--- a/noncore/apps/opie-gutenbrowser/helpme.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpme.cpp
@@ -16,4 +16,2 @@
16 ***************************************************************************/ 16 ***************************************************************************/
17#include <qpe/qcopenvelope_qws.h>
18#include <qpe/qpeapplication.h>
19 17
@@ -22,2 +20,8 @@
22 20
21/* OPIE */
22#include <qpe/qcopenvelope_qws.h>
23#include <qpe/qpeapplication.h>
24#include <opie2/odebug.h>
25
26/* QT */
23#include <qprogressdialog.h> 27#include <qprogressdialog.h>
@@ -25,2 +29,3 @@
25 29
30/* STD */
26#include <sys/stat.h> 31#include <sys/stat.h>
@@ -113,3 +118,3 @@ void HelpMe::help()
113 msg=QPEApplication::qpeDir()+"help/html/gutenbrowser-index.html"; // or where ever this ends up to be 118 msg=QPEApplication::qpeDir()+"help/html/gutenbrowser-index.html"; // or where ever this ends up to be
114qDebug(msg); 119odebug << msg << oendl;
115 QString url = "file://"+msg; 120 QString url = "file://"+msg;
@@ -119,3 +124,3 @@ qDebug(msg);
119// e << msg; 124// e << msg;
120 125
121// goGetit( msg); 126// goGetit( msg);
diff --git a/noncore/apps/opie-gutenbrowser/main.cpp b/noncore/apps/opie-gutenbrowser/main.cpp
index 5c3348c..71c836d 100644
--- a/noncore/apps/opie-gutenbrowser/main.cpp
+++ b/noncore/apps/opie-gutenbrowser/main.cpp
@@ -39,3 +39,3 @@ OPIE_EXPORT_APP( OApplicationFactory<Gutenbrowser> )
39// // printf("Gutenbrowser: "VERSION"\n"); 39// // printf("Gutenbrowser: "VERSION"\n");
40// // // qDebug("Gutenbrowser: "VERSION); 40// // // odebug << "Gutenbrowser: "VERSION << oendl;
41// // // return 0; 41// // // return 0;
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index bd44ce6..0267416 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -20,2 +20,3 @@
20#include <opie2/ofiledialog.h> 20#include <opie2/ofiledialog.h>
21#include <opie2/odebug.h>
21#include <qpe/applnk.h> 22#include <qpe/applnk.h>
@@ -25,3 +26,3 @@ using namespace Opie::Ui;
25 26
26#include <stdlib.h> 27/* QT */
27#include <qtextstream.h> 28#include <qtextstream.h>
@@ -29,2 +30,3 @@ using namespace Opie::Ui;
29 30
31/* STD */
30#if defined(_WS_WIN_) 32#if defined(_WS_WIN_)
@@ -33,3 +35,4 @@ using namespace Opie::Ui;
33#include <unistd.h> 35#include <unistd.h>
34#include "sys/stat.h" 36#include <stdlib.h>
37#include <sys/stat.h>
35#endif 38#endif
@@ -136,3 +139,3 @@ OpenFileButton->setDown(TRUE);
136 139
137 qDebug("Open file: "+str); 140 odebug << "Open file: "+str << oendl;
138 141
@@ -166,3 +169,3 @@ OpenFileButton->setDown(TRUE);
166 if( chdir((const char*)local_library.latin1())!=0) 169 if( chdir((const char*)local_library.latin1())!=0)
167 qDebug("chdir failed.");// QString cmd = "gunzip -d " + filer + " -d " + local_library; 170 odebug << "chdir failed." << oendl; // QString cmd = "gunzip -d " + filer + " -d " + local_library;
168 cmd = "gunzip -S .zip " + filer; 171 cmd = "gunzip -S .zip " + filer;
@@ -173,3 +176,3 @@ OpenFileButton->setDown(TRUE);
173 else /*if( s_fileName.right(4) == ".txt" || if( s_fileName.right(4) == ".TXT"))*/ { 176 else /*if( s_fileName.right(4) == ".txt" || if( s_fileName.right(4) == ".TXT"))*/ {
174// qDebug("Filename is "+fileName); 177// odebug << "Filename is "+fileName << oendl;
175 s_fileName = fileName; 178 s_fileName = fileName;
@@ -178,3 +181,3 @@ OpenFileButton->setDown(TRUE);
178 fileName = s_fileName; 181 fileName = s_fileName;
179// qDebug("Filename is now "+fileName); 182// odebug << "Filename is now "+fileName << oendl;
180 } 183 }
@@ -189,7 +192,7 @@ OpenFileButton->setDown(TRUE);
189 192
190 qDebug("Setting doclink"); 193 odebug << "Setting doclink" << oendl;
191 DocLnk lnk; 194 DocLnk lnk;
192 qDebug("name is " + name_file); 195 odebug << "name is " + name_file << oendl;
193 lnk.setName(name_file); //sets file name 196 lnk.setName(name_file); //sets file name
194 qDebug("Title is "+title); 197 odebug << "Title is "+title << oendl;
195 lnk.setComment(title); 198 lnk.setComment(title);
@@ -198,3 +201,3 @@ OpenFileButton->setDown(TRUE);
198 getTitles(); 201 getTitles();
199 qDebug("Filename is "+fileName); 202 odebug << "Filename is "+fileName << oendl;
200 lnk.setFile(fileName); //sets File property 203 lnk.setFile(fileName); //sets File property
@@ -204,3 +207,3 @@ OpenFileButton->setDown(TRUE);
204 if(!lnk.writeLink()) 207 if(!lnk.writeLink())
205 qDebug("Writing doclink did not work"); 208 odebug << "Writing doclink did not work" << oendl;
206 209
@@ -221,3 +224,3 @@ bool OpenEtext::FindTitle( QString filename)
221 name = fi.fileName(); 224 name = fi.fileName();
222 qDebug("filename to open is " + name); 225 odebug << "filename to open is " + name << oendl;
223 QFile indexLib( filename); 226 QFile indexLib( filename);
@@ -227,3 +230,3 @@ bool OpenEtext::FindTitle( QString filename)
227 if ( indexLib.open( IO_ReadOnly) ) { 230 if ( indexLib.open( IO_ReadOnly) ) {
228 qDebug("file opened successfully"); 231 odebug << "file opened successfully" << oendl;
229 QTextStream indexStream( &indexLib ); 232 QTextStream indexStream( &indexLib );
@@ -241,3 +244,3 @@ bool OpenEtext::FindTitle( QString filename)
241 title = title.stripWhiteSpace (); 244 title = title.stripWhiteSpace ();
242// qDebug("Found the title 1 and it is %s", title.latin1()); 245// odebug << "Found the title 1 and it is " << title << "" << oendl;
243// QListBox_1->insertItem ( title); 246// QListBox_1->insertItem ( title);
@@ -249,3 +252,3 @@ bool OpenEtext::FindTitle( QString filename)
249 title = title.stripWhiteSpace (); 252 title = title.stripWhiteSpace ();
250// qDebug("Found the title 2 and it is %s", title.latin1()); 253// odebug << "Found the title 2 and it is " << title << "" << oendl;
251// QListBox_1->insertItem ( title); 254// QListBox_1->insertItem ( title);
@@ -257,3 +260,3 @@ bool OpenEtext::FindTitle( QString filename)
257 title = title.stripWhiteSpace (); 260 title = title.stripWhiteSpace ();
258// qDebug("Found the title 3 and it is %s", title.latin1()); 261// odebug << "Found the title 3 and it is " << title << "" << oendl;
259 } 262 }
@@ -264,3 +267,3 @@ bool OpenEtext::FindTitle( QString filename)
264 title = title.stripWhiteSpace (); 267 title = title.stripWhiteSpace ();
265// qDebug("Found the title 4 and it is %s", title.latin1()); 268// odebug << "Found the title 4 and it is " << title << "" << oendl;
266 } 269 }
@@ -270,3 +273,3 @@ bool OpenEtext::FindTitle( QString filename)
270 if( !findCheck || title.length() < 2) { 273 if( !findCheck || title.length() < 2) {
271 qDebug("Trying hard to find title from GUTINDEX.ALL"); 274 odebug << "Trying hard to find title from GUTINDEX.ALL" << oendl;
272 title = titleFromLibrary( filename); 275 title = titleFromLibrary( filename);
@@ -295,3 +298,3 @@ bool OpenEtext::FindTitle( QString filename)
295 if(title.length()<3) { 298 if(title.length()<3) {
296// qDebug("title is empty"); 299// odebug << "title is empty" << oendl;
297 title="Unknown"; 300 title="Unknown";
@@ -345,3 +348,3 @@ QString OpenEtext::titleFromLibrary( QString fileName)
345 title = title.stripWhiteSpace (); 348 title = title.stripWhiteSpace ();
346// qDebug("Finally Found the title and it is\n %s", title.latin1()); 349// odebug << "Finally Found the title and it is\n " << title << "" << oendl;
347// QListBox_1->insertItem ( title); 350// QListBox_1->insertItem ( title);
@@ -351,3 +354,3 @@ QString OpenEtext::titleFromLibrary( QString fileName)
351 else 354 else
352 qDebug("Error opening library index "+ local_index); 355 odebug << "Error opening library index "+ local_index << oendl;
353 return title; 356 return title;
@@ -416,3 +419,3 @@ void OpenEtext::removeSelection()
416 rem=i; 419 rem=i;
417//qDebug("file title to remove is "+file_title); 420//odebug << "file title to remove is "+file_title << oendl;
418 selFile = s_filename; 421 selFile = s_filename;
@@ -484,3 +487,3 @@ void OpenEtext::editTitle() {
484 QString title_text = QListBox_1->text( currentItem); 487 QString title_text = QListBox_1->text( currentItem);
485//qDebug("Selected "+title_text); 488//odebug << "Selected "+title_text << oendl;
486 489
@@ -498,6 +501,6 @@ void OpenEtext::editTitle() {
498 QString file_title = config.readEntry( s_filename, ""); 501 QString file_title = config.readEntry( s_filename, "");
499//qDebug("file_title is "+file_title); 502//odebug << "file_title is "+file_title << oendl;
500 if(title_text == file_title ) { 503 if(title_text == file_title ) {
501 selFile = s_filename; 504 selFile = s_filename;
502//qDebug("Edit: "+ file_title ); 505//odebug << "Edit: "+ file_title << oendl;
503 i=i_numofFiles+1; 506 i=i_numofFiles+1;
@@ -506,3 +509,3 @@ void OpenEtext::editTitle() {
506 if(titleEdit->exec() !=0) { 509 if(titleEdit->exec() !=0) {
507//qDebug(titleEdit->newTitle); 510//odebug << titleEdit->newTitle << oendl;
508 config.writeEntry( s_filename, titleEdit->newTitle); 511 config.writeEntry( s_filename, titleEdit->newTitle);
diff --git a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
index bfd9c26..8cc83da 100644
--- a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
@@ -15,10 +15,6 @@
15 ***************************************************************************/ 15 ***************************************************************************/
16#include "optionsDialog.h"
17#include <qpe/config.h>
18#include "fontDialog.h"
19 16
20// #include <unistd.h>
21// #include <stdio.h>
22// #include <stdlib.h>
23 17
18#include "optionsDialog.h"
19#include "fontDialog.h"
24//#include "ftpsitedlg.h" 20//#include "ftpsitedlg.h"
@@ -26,2 +22,8 @@
26//#define Inherited QDialog 22//#define Inherited QDialog
23
24/* OPIE */
25#include <opie2/odebug.h>
26#include <qpe/config.h>
27
28/* QT */
27#include <qfont.h> 29#include <qfont.h>
@@ -40,2 +42,8 @@
40#endif 42#endif
43
44/* STD */
45// #include <unistd.h>
46// #include <stdio.h>
47// #include <stdlib.h>
48
41/* 49/*
@@ -62,3 +70,3 @@ optionsDialog::~optionsDialog()
62{ 70{
63//qDebug("OnExit()"); 71//odebug << "OnExit()" << oendl;
64// writeConfig(); 72// writeConfig();
@@ -127,3 +135,3 @@ void optionsDialog::getConfig()
127 cb_queryExit->setChecked(TRUE); 135 cb_queryExit->setChecked(TRUE);
128 qDebug("Config Setting b_qExit=TRUE;"); 136 odebug << "Config Setting b_qExit=TRUE;" << oendl;
129 b_qExit=TRUE; 137 b_qExit=TRUE;
@@ -131,3 +139,3 @@ void optionsDialog::getConfig()
131 cb_queryExit->setChecked(FALSE); 139 cb_queryExit->setChecked(FALSE);
132 qDebug("ConfigSetting b_qExit=FALSE;"); 140 odebug << "ConfigSetting b_qExit=FALSE;" << oendl;
133 b_qExit=FALSE; 141 b_qExit=FALSE;
@@ -135,3 +143,3 @@ void optionsDialog::getConfig()
135 143
136 144
137 useWordWrap_CheckBox->setChecked( config.readBoolEntry("WordWrap", 1)); 145 useWordWrap_CheckBox->setChecked( config.readBoolEntry("WordWrap", 1));
@@ -143,3 +151,3 @@ void optionsDialog::getConfig()
143 151
144// // qDebug("Set style%d",index); 152// // odebug << "Set style" << index << "" << oendl;
145// // //int styleInt= index; 153// // //int styleInt= index;
@@ -169,3 +177,3 @@ void optionsDialog::slotQueryExit()
169 config.setGroup("General"); 177 config.setGroup("General");
170 qDebug("writing queryExit"); 178 odebug << "writing queryExit" << oendl;
171 if(cb_queryExit->isChecked()) { 179 if(cb_queryExit->isChecked()) {
@@ -173,3 +181,3 @@ void optionsDialog::slotQueryExit()
173 config.writeEntry("queryExit","TRUE"); 181 config.writeEntry("queryExit","TRUE");
174 qDebug("WritingConfig queryExit=TRUE"); 182 odebug << "WritingConfig queryExit=TRUE" << oendl;
175 } else { 183 } else {
@@ -177,3 +185,3 @@ void optionsDialog::slotQueryExit()
177 config.writeEntry("queryExit","FALSE"); 185 config.writeEntry("queryExit","FALSE");
178 qDebug("WritingConfig queryExit=FALSE"); 186 odebug << "WritingConfig queryExit=FALSE" << oendl;
179 } 187 }
@@ -189,6 +197,6 @@ void optionsDialog::slotQueryExit()
189// void optionsDialog::lineEditChanged(const QString &editText) { 197// void optionsDialog::lineEditChanged(const QString &editText) {
190// qDebug(editText); 198// odebug << editText << oendl;
191// } 199// }
192 200
193void optionsDialog::changeFonts() 201void optionsDialog::changeFonts()
194{ 202{
@@ -205,3 +213,3 @@ void optionsDialog::slotWordWrap(bool b) {
205 config.write(); 213 config.write();
206 214
207} 215}
diff --git a/noncore/apps/opie-reader/Aportis.cpp b/noncore/apps/opie-reader/Aportis.cpp
index 2f8cdc3..06f44a4 100644
--- a/noncore/apps/opie-reader/Aportis.cpp
+++ b/noncore/apps/opie-reader/Aportis.cpp
@@ -30,3 +30,3 @@ CList<Bkmk>* Aportis::getbkmklist()
30 name[16] = '\0'; 30 name[16] = '\0';
31 // qDebug("Record:%d, Length:%u",i,recordlength(i)); 31 // odebug << "Record:" << i << ", Length:" << recordlength(i) << "" << oendl;
32 gotorecordnumber(i); 32 gotorecordnumber(i);
@@ -37,3 +37,3 @@ CList<Bkmk>* Aportis::getbkmklist()
37 lcn = SwapLong(lcn); 37 lcn = SwapLong(lcn);
38 // qDebug("Bookmark:%s:%u", name,lcn); 38 // odebug << "Bookmark:" << name << ":" << lcn << "" << oendl;
39 tchar tname[17]; 39 tchar tname[17];
@@ -123,3 +123,3 @@ int Aportis::OpenFile(const char *src)
123 fread(&hdr0, sizeof(hdr0), 1, fin); 123 fread(&hdr0, sizeof(hdr0), 1, fin);
124// qDebug("Version:%x", ntohs(hdr0.Version)); 124// odebug << "Version:" << ntohs(hdr0.Version) << "" << oendl;
125 if (hdr0.Version && 0x0200) 125 if (hdr0.Version && 0x0200)
@@ -184,3 +184,3 @@ int Aportis::OpenFile(const char *src)
184 refreshbuffer(); 184 refreshbuffer();
185// qDebug("Number of records:[%u,%u]", nRecs, nRecs2); 185// odebug << "Number of records:[" << nRecs << "," << nRecs2 << "]" << oendl;
186 return ret; 186 return ret;
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 16bc1f1..480c240 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -219,3 +219,3 @@ CList<Bkmk>* BkmkFile::readall()
219 bl = readall00(read06); 219 bl = readall00(read06);
220 // qDebug("Correct version!"); 220 // odebug << "Correct version!" << oendl;
221 break; 221 break;
@@ -224,6 +224,6 @@ CList<Bkmk>* BkmkFile::readall()
224 bl = readall00(read05); 224 bl = readall00(read05);
225 // qDebug("Known version!"); 225 // odebug << "Known version!" << oendl;
226 break; 226 break;
227 default: 227 default:
228 // qDebug("Unknown version!"); 228 // odebug << "Unknown version!" << oendl;
229 isUpgraded = true; 229 isUpgraded = true;
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index 4fbab93..68391b8 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -34,3 +34,3 @@ void BuffDoc::locate(unsigned int n)
34{ 34{
35 // //qDebug("BuffDoc:locating:%u",n); 35 // //odebug << "BuffDoc:locating:" << n << "" << oendl;
36 lastword.empty(); 36 lastword.empty();
@@ -44,3 +44,3 @@ void BuffDoc::locate(unsigned int n)
44 if (exp != NULL) exp->locate(n); 44 if (exp != NULL) exp->locate(n);
45 // //qDebug("BuffDoc:Located"); 45 // //odebug << "BuffDoc:Located" << oendl;
46} 46}
@@ -190,3 +190,3 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border)
190 else buff->empty(); 190 else buff->empty();
191// //qDebug("Buff:%s Lastword:%s", (const char*)toQString(buff->data()), (const char*)toQString(lastword.data())); 191// //odebug << "Buff:" << toQString(buff->data()) << " Lastword:" << toQString(lastword.data()) << "" << oendl;
192 lastcheck = len = buff->length(); 192 lastcheck = len = buff->length();
@@ -324,4 +324,4 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
324{ 324{
325 // //qDebug("BuffDoc:Openfile:%s", src); 325 // //odebug << "BuffDoc:Openfile:" << src << "" << oendl;
326 // //qDebug("Trying aportis %x",exp); 326 // //odebug << "Trying aportis " << exp << "" << oendl;
327 if (exp != NULL) delete exp; 327 if (exp != NULL) delete exp;
@@ -380,3 +380,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
380 delete exp; 380 delete exp;
381 //qDebug("Trying ppms"); 381 //odebug << "Trying ppms" << oendl;
382 exp = new ppm_expander; 382 exp = new ppm_expander;
@@ -388,3 +388,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
388 exp = new Text; 388 exp = new Text;
389 // //qDebug("Trying text"); 389 // //odebug << "Trying text" << oendl;
390 ret = exp->openfile(src); 390 ret = exp->openfile(src);
@@ -398,3 +398,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
398 } 398 }
399 // //qDebug("Doing final open:%x:%x",exp,filt); 399 // //odebug << "Doing final open:" << exp << ":" << filt << "" << oendl;
400 400
@@ -409,3 +409,3 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
409 filt->setsource(exp); 409 filt->setsource(exp);
410 // //qDebug("BuffDoc:file opened"); 410 // //odebug << "BuffDoc:file opened" << oendl;
411 return 0; 411 return 0;
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index ec36fb2..b137ac3 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -42,3 +42,3 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
42 int i; 42 int i;
43// //qDebug("Trying 2"); 43// //odebug << "Trying 2" << oendl;
44 len = rhs.len; 44 len = rhs.len;
@@ -60,3 +60,3 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
60 len = i; 60 len = i;
61// //qDebug("Tried 2"); 61// //odebug << "Tried 2" << oendl;
62 return *this; 62 return *this;
@@ -210,3 +210,3 @@ int CDrawBuffer::width(int numchars, bool onscreen, int scwidth, unsigned char _
210 QString nstr = str.mid(lastspace+1, nsp-lastspace); 210 QString nstr = str.mid(lastspace+1, nsp-lastspace);
211 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr); 211 // odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
212 int lw = fm.width(nstr); 212 int lw = fm.width(nstr);
@@ -319,3 +319,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
319 //f.setUnderline(currentstyle.isUnderline()); 319 //f.setUnderline(currentstyle.isUnderline());
320 //if (currentstyle.isUnderline()) qDebug("UNDERLINE"); 320 //if (currentstyle.isUnderline()) odebug << "UNDERLINE" << oendl;
321 _p->setFont(f); 321 _p->setFont(f);
@@ -410,3 +410,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
410 QString nstr = str.mid(lastspace+1, nsp-lastspace); 410 QString nstr = str.mid(lastspace+1, nsp-lastspace);
411 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr); 411 // odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
412 int lw = fm.width(nstr); 412 int lw = fm.width(nstr);
@@ -420,3 +420,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
420 QString nstr = str.mid(lastspace+1, nsp-lastspace); 420 QString nstr = str.mid(lastspace+1, nsp-lastspace);
421 // qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr); 421 // odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
422 int lw = fm.width(nstr); 422 int lw = fm.width(nstr);
@@ -472,5 +472,5 @@ linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
472/* 472/*
473 if (currentstyle.isPicture()) qDebug("Passed thru picture"); 473 if (currentstyle.isPicture()) odebug << "Passed thru picture" << oendl;
474 if (currentstyle.getLink()) qDebug("Passed thru link"); 474 if (currentstyle.getLink()) odebug << "Passed thru link" << oendl;
475 //qDebug("islink:%d - %d", numchars, end); 475 //odebug << "islink:" << numchars << " - " << end << "" << oendl;
476*/ 476*/
@@ -479,3 +479,3 @@ linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
479 while (textend != segs.end() && end <= numchars); 479 while (textend != segs.end() && end <= numchars);
480// if (currentstyle.isPicture()) qDebug("Clicked on picture"); 480// if (currentstyle.isPicture()) odebug << "Clicked on picture" << oendl;
481 if (currentstyle.getPictureLink()) 481 if (currentstyle.getPictureLink())
@@ -541,3 +541,3 @@ void CDrawBuffer::resize()
541 int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10; 541 int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10;
542 //qDebug("ExtraSpace:%d", xt); 542 //odebug << "ExtraSpace:" << xt << "" << oendl;
543 m_ascent += xt; 543 m_ascent += xt;
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index d64abb4..b356ba5 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -82,3 +82,3 @@ QTReader::QTReader( const QString& filename, QWidget *parent=0, const tchar *nam
82 init(); 82 init();
83// // qDebug("Load_file(1)"); 83// // odebug << "Load_file(1)" << oendl;
84 load_file((const tchar*)filename); 84 load_file((const tchar*)filename);
@@ -93,3 +93,3 @@ void QTReader::mouseMoveEvent(QMouseEvent* _e)
93 93
94 qDebug("MouseMove:[%d, %d]", _e->pos().x(), _e->pos().y()); 94 odebug << "MouseMove:[" << _e->pos().x() << ", " << _e->pos().y() << "]" << oendl;
95} 95}
@@ -106,3 +106,3 @@ void QTReader::mousePressEvent( QMouseEvent* _e )
106 { 106 {
107 //qDebug("MousePress"); 107 //odebug << "MousePress" << oendl;
108 mouseUpOn = false; 108 mouseUpOn = false;
@@ -319,3 +319,3 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
319 wrd = toQString(t->data()+first, i - first); 319 wrd = toQString(t->data()+first, i - first);
320 // qDebug("Got %s", (const char *)wrd); 320 // odebug << "Got " << (const char *)wrd << "" << oendl;
321 break; 321 break;
@@ -329,3 +329,3 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
329 { 329 {
330 //qDebug("Selected:%s", (const char*)wrd); 330 //odebug << "Selected:" << wrd << "" << oendl;
331 emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data())); 331 emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data()));
@@ -341,3 +341,3 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
341 { 341 {
342 // qDebug("MouseRelease"); 342 // odebug << "MouseRelease" << oendl;
343 if (_e->x() > width() - m_border) 343 if (_e->x() > width() - m_border)
@@ -396,3 +396,3 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
396 { 396 {
397 // qDebug("Picture:%x", tgt); 397 // odebug << "Picture:" << tgt << "" << oendl;
398 QImage* pm = buffdoc.getPicture(tgt); 398 QImage* pm = buffdoc.getPicture(tgt);
@@ -412,3 +412,3 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
412 default: 412 default:
413 // qDebug("Unknown linktype"); 413 // odebug << "Unknown linktype" << oendl;
414 return; 414 return;
@@ -698,3 +698,3 @@ void QTReader::setautoscroll(bool _sc)
698 { 698 {
699 // qDebug("Opening pipe to %s", (const char*)m_pipetarget); 699 // odebug << "Opening pipe to " << m_pipetarget << "" << oendl;
700 m_pipeout = popen((const char*)m_pipetarget, "w"); 700 m_pipeout = popen((const char*)m_pipetarget, "w");
@@ -825,3 +825,3 @@ void QTReader::drawFonts( QPainter *p )
825 { 825 {
826 //qDebug("How refreshing..."); 826 //odebug << "How refreshing..." << oendl;
827 if (buffdoc.empty()) return; 827 if (buffdoc.empty()) return;
@@ -830,3 +830,3 @@ void QTReader::drawFonts( QPainter *p )
830 { 830 {
831 // qDebug("Not Optimised %d", m_lastwidth); 831 // odebug << "Not Optimised " << m_lastwidth << "" << oendl;
832 m_lastwidth = width(); 832 m_lastwidth = width();
@@ -835,3 +835,3 @@ void QTReader::drawFonts( QPainter *p )
835 locate(pagelocate()); 835 locate(pagelocate());
836 // qDebug("Not Optimised %d", m_lastwidth); 836 // odebug << "Not Optimised " << m_lastwidth << "" << oendl;
837 } 837 }
@@ -842,3 +842,3 @@ void QTReader::drawFonts( QPainter *p )
842 { 842 {
843 // qDebug("Optimised < %d %d %d", numlines, m_lastheight, newht); 843 // odebug << "Optimised < " << numlines << " " << m_lastheight << " " << newht << "" << oendl;
844 int ypos = 0; 844 int ypos = 0;
@@ -853,3 +853,3 @@ void QTReader::drawFonts( QPainter *p )
853 } 853 }
854 // qDebug("Optimised < %d", numlines); 854 // odebug << "Optimised < " << numlines << "" << oendl;
855 m_lastheight = newht; 855 m_lastheight = newht;
@@ -858,3 +858,3 @@ void QTReader::drawFonts( QPainter *p )
858 { 858 {
859 // qDebug("Optimised > %d", numlines); 859 // odebug << "Optimised > " << numlines << "" << oendl;
860 int ypos = 0; 860 int ypos = 0;
@@ -865,3 +865,3 @@ void QTReader::drawFonts( QPainter *p )
865 fillbuffer(numlines+1, ypos, newht); 865 fillbuffer(numlines+1, ypos, newht);
866 // qDebug("Optimised > %d", numlines); 866 // odebug << "Optimised > " << numlines << "" << oendl;
867 } 867 }
@@ -899,3 +899,3 @@ void QTReader::drawFonts( QPainter *p )
899 { 899 {
900 qDebug("Not so refreshing..."); 900 odebug << "Not so refreshing..." << oendl;
901 } 901 }
@@ -1030,3 +1030,3 @@ void QTReader::resizeEvent( QResizeEvent * )
1030{ 1030{
1031// // qDebug("resize:(%u,%u)", width(), height()); 1031// // odebug << "resize:(" << width() << "," << height() << ")" << oendl;
1032 // bgroup->move( width()-bgroup->width(), 0 ); 1032 // bgroup->move( width()-bgroup->width(), 0 );
@@ -1055,7 +1055,7 @@ bool QTReader::locate(unsigned long n) {
1055 buffdoc.locate(n); 1055 buffdoc.locate(n);
1056// // qDebug("&buffdoc.located"); 1056// // odebug << "&buffdoc.located" << oendl;
1057 fillbuffer(); 1057 fillbuffer();
1058// // qDebug("&Buffer filled"); 1058// // odebug << "&Buffer filled" << oendl;
1059 update(); 1059 update();
1060// // qDebug("&Located"); 1060// // odebug << "&Located" << oendl;
1061 return true; 1061 return true;
@@ -1119,3 +1119,3 @@ void QTReader::dopagedn()
1119{ 1119{
1120// qDebug("HEIGHT(2):%d", m_lastheight); 1120// odebug << "HEIGHT(2):" << m_lastheight << "" << oendl;
1121 buffdoc.unsuspend(); 1121 buffdoc.unsuspend();
@@ -1124,3 +1124,3 @@ void QTReader::dopagedn()
1124 { 1124 {
1125 ////qDebug("Jumping to %u", mylastpos); 1125 ////odebug << "Jumping to " << mylastpos << "" << oendl;
1126 jumpto(mylastpos); 1126 jumpto(mylastpos);
@@ -1315,5 +1315,5 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
1315 buffdoc.setContinuous(m_continuousDocument); 1315 buffdoc.setContinuous(m_continuousDocument);
1316// // qDebug("buffdoc.openfile done"); 1316// // odebug << "buffdoc.openfile done" << oendl;
1317 locate(lcn); 1317 locate(lcn);
1318// // qDebug("buffdoc.locate done"); 1318// // odebug << "buffdoc.locate done" << oendl;
1319 } 1319 }
@@ -1321,3 +1321,3 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
1321 update(); 1321 update();
1322// // qDebug("Updated"); 1322// // odebug << "Updated" << oendl;
1323 return bRC; 1323 return bRC;
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index b072854..f18cb59 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -19,6 +19,35 @@
19**********************************************************************/ 19**********************************************************************/
20
20#include "useqpe.h" 21#include "useqpe.h"
21#include <qregexp.h> 22#include "QTReader.h"
22#include <qclipboard.h> 23#include "GraphicWin.h"
23#include <qwidgetstack.h> 24#include "Bkmks.h"
25#include "cbkmkselector.h"
26#include "infowin.h"
27#include "ToolbarPrefs.h"
28#include "Prefs.h"
29#include "CAnnoEdit.h"
30#include "QFloatBar.h"
31#include "FixedFont.h"
32#include "URLDialog.h"
33#include "QTReaderApp.h"
34#include "CDrawBuffer.h"
35#include "Filedata.h"
36#include "opie.h"
37#include "names.h"
38#include "CEncoding_tables.h"
39#include "CloseDialog.h"
40
41/* OPIE */
42#include <opie2/odebug.h>
43#ifdef USEQPE
44#include <qpe/menubutton.h>
45#include <qpe/fontdatabase.h>
46#include <qpe/global.h>
47#include <qpe/applnk.h>
48#include <qpe/config.h>
49#include <qpe/qcopenvelope_qws.h>
50#endif
51
52/* QT */
24#ifdef USEQPE 53#ifdef USEQPE
@@ -27,8 +56,7 @@
27#endif 56#endif
57#include <qregexp.h>
58#include <qclipboard.h>
59#include <qwidgetstack.h>
28#include <qmenubar.h> 60#include <qmenubar.h>
29#include <qtoolbar.h> 61#include <qtoolbar.h>
30#ifdef USEQPE
31#include <qpe/menubutton.h>
32#include <qpe/fontdatabase.h>
33#endif
34#include <qcombobox.h> 62#include <qcombobox.h>
@@ -41,29 +69,10 @@
41#include <qobjectlist.h> 69#include <qobjectlist.h>
42#ifdef USEQPE
43#include <qpe/global.h>
44#include <qpe/applnk.h>
45#endif
46#include <qfileinfo.h> 70#include <qfileinfo.h>
47#include <stdlib.h> //getenv
48#include <qprogressbar.h> 71#include <qprogressbar.h>
49#ifdef USEQPE
50#include <qpe/config.h>
51#endif
52#include <qbuttongroup.h> 72#include <qbuttongroup.h>
53#include <qradiobutton.h> 73#include <qradiobutton.h>
54#ifdef USEQPE 74
55#include <qpe/qcopenvelope_qws.h> 75/* STD */
56#endif 76#include <stdlib.h> //getenv
57#include "QTReader.h" 77
58#include "GraphicWin.h"
59#include "Bkmks.h"
60#include "cbkmkselector.h"
61#include "infowin.h"
62#include "ToolbarPrefs.h"
63#include "Prefs.h"
64#include "CAnnoEdit.h"
65#include "QFloatBar.h"
66#include "FixedFont.h"
67#include "URLDialog.h"
68//#include <qpe/fontdatabase.h>
69 78
@@ -77,10 +86,2 @@
77 86
78#include "QTReaderApp.h"
79#include "CDrawBuffer.h"
80#include "Filedata.h"
81#include "opie.h"
82#include "names.h"
83#include "CEncoding_tables.h"
84#include "CloseDialog.h"
85
86bool CheckVersion(int&, int&, char&); 87bool CheckVersion(int&, int&, char&);
@@ -127,6 +128,6 @@ void QTReaderApp::listBkmkFiles()
127 if ( !d.cd(APPDIR) ) { // "/tmp" 128 if ( !d.cd(APPDIR) ) { // "/tmp"
128 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 129 owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
129 d = QDir::home(); 130 d = QDir::home();
130 d.mkdir(APPDIR); 131 d.mkdir(APPDIR);
131 d.cd(APPDIR); 132 d.cd(APPDIR);
132 } 133 }
@@ -145,6 +146,6 @@ void QTReaderApp::listBkmkFiles()
145 146
146 bkmkselector->insertItem(fi->fileName()); 147 bkmkselector->insertItem(fi->fileName());
147 cnt++; 148 cnt++;
148 149
149 //qDebug( "%10li %s", fi->size(), fi->fileName().data() ); 150 //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
150 ++it; // goto next list element 151 ++it; // goto next list element
@@ -159,12 +160,12 @@ void QTReaderApp::listBkmkFiles()
159 { 160 {
160 struct dirent* de; 161 struct dirent* de;
161 struct stat buf; 162 struct stat buf;
162 de = readdir(d); 163 de = readdir(d);
163 if (de == NULL) break; 164 if (de == NULL) break;
164 165
165 if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode)) 166 if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
166 { 167 {
167 bkmkselector->insertItem(de->d_name); 168 bkmkselector->insertItem(de->d_name);
168 cnt++; 169 cnt++;
169 } 170 }
170 } 171 }
@@ -178,3 +179,3 @@ void QTReaderApp::listBkmkFiles()
178 hidetoolbars(); 179 hidetoolbars();
179 m_nBkmkAction = cRmBkmkFile; 180 m_nBkmkAction = cRmBkmkFile;
180 } 181 }
@@ -195,5 +196,5 @@ void QTReaderApp::hidetoolbars()
195#ifdef USEQPE 196#ifdef USEQPE
196 Global::hideInputMethod(); 197 Global::hideInputMethod();
197#endif 198#endif
198 regBar->hide(); 199 regBar->hide();
199 } 200 }
@@ -202,5 +203,5 @@ void QTReaderApp::hidetoolbars()
202#ifdef USEQPE 203#ifdef USEQPE
203 Global::hideInputMethod(); 204 Global::hideInputMethod();
204#endif 205#endif
205 searchBar->hide(); 206 searchBar->hide();
206 } 207 }
@@ -212,8 +213,8 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
212{ 213{
213 m_url_clipboard = false; 214 m_url_clipboard = false;
214 m_url_localfile = false; 215 m_url_localfile = false;
215 m_url_globalfile = false; 216 m_url_globalfile = false;
216 ftime(&m_lastkeytime); 217 ftime(&m_lastkeytime);
217//// qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir()); 218//// odebug << "Application directory = " << (const tchar *)QPEApplication::documentDir() << "" << oendl;
218//// qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml")); 219//// odebug << "Application directory = " << (const tchar *)Global::applicationFileName("uqtreader" << "" << oendl;
219 220
@@ -225,4 +226,4 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
225 226
226 m_fBkmksChanged = false; 227 m_fBkmksChanged = false;
227 228
228 QString lang = getenv( "LANG" ); 229 QString lang = getenv( "LANG" );
@@ -245,3 +246,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
245 246
246// qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot); 247// odebug << "Initial Rotation(" << m_rot << "):" << rot << "" << oendl;
247*/ 248*/
@@ -262,9 +263,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
262 if ( !d.cd(APPDIR) ) { // "/tmp" 263 if ( !d.cd(APPDIR) ) { // "/tmp"
263 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 264 owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
264 d = QDir::home(); 265 d = QDir::home();
265 d.mkdir(APPDIR); 266 d.mkdir(APPDIR);
266 d.cd(APPDIR); 267 d.cd(APPDIR);
267 } 268 }
268 QFileInfo fi(d, INIFILE); 269 QFileInfo fi(d, INIFILE);
269// qDebug("Path:%s", (const char*)fi.absFilePath()); 270// odebug << "Path:" << fi.absFilePath() << "" << oendl;
270 Config config(fi.absFilePath()); 271 Config config(fi.absFilePath());
@@ -357,4 +358,4 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
357 importSelector->setCloseVisible( FALSE ); 358 importSelector->setCloseVisible( FALSE );
358*/ 359*/
359// qDebug("Reading file list"); 360// odebug << "Reading file list" << oendl;
360 readfilelist(); 361 readfilelist();
@@ -369,3 +370,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
369 370
370// qDebug("Reading config"); 371// odebug << "Reading config" << oendl;
371// Config config( APPDIR ); 372// Config config( APPDIR );
@@ -439,9 +440,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
439#ifndef USEQPE 440#ifndef USEQPE
440 config.setGroup( "Geometry" ); 441 config.setGroup( "Geometry" );
441 setGeometry(0,0, 442 setGeometry(0,0,
442 config.readNumEntry( "width", QApplication::desktop()->width()/2 ), 443 config.readNumEntry( "width", QApplication::desktop()->width()/2 ),
443 config.readNumEntry( "height", QApplication::desktop()->height()/2 )); 444 config.readNumEntry( "height", QApplication::desktop()->height()/2 ));
444 move( 445 move(
445 config.readNumEntry( "x", 20 ), 446 config.readNumEntry( "x", 20 ),
446 config.readNumEntry( "y", 20 )); 447 config.readNumEntry( "y", 20 ));
447#endif 448#endif
@@ -548,3 +549,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
548 m_pageup_action->addTo( navigation ); 549 m_pageup_action->addTo( navigation );
549 550
550 m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 ); 551 m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 );
@@ -729,6 +730,6 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
729 connect( searchEdit, SIGNAL( textChanged(const QString&) ), 730 connect( searchEdit, SIGNAL( textChanged(const QString&) ),
730 this, SLOT( search(const QString&) ) ); 731 this, SLOT( search(const QString&) ) );
731#else 732#else
732 connect( searchEdit, SIGNAL( returnPressed() ), 733 connect( searchEdit, SIGNAL( returnPressed() ),
733 this, SLOT( search() ) ); 734 this, SLOT( search() ) );
734#endif 735#endif
@@ -755,3 +756,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
755 connect( regEdit, SIGNAL( returnPressed() ), 756 connect( regEdit, SIGNAL( returnPressed() ),
756 this, SLOT( do_regaction() ) ); 757 this, SLOT( do_regaction() ) );
757 758
@@ -771,3 +772,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
771 772
772// qDebug("Font selector"); 773// odebug << "Font selector" << oendl;
773 m_fontSelector = new QComboBox(false, m_fontBar); 774 m_fontSelector = new QComboBox(false, m_fontBar);
@@ -776,22 +777,22 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
776#ifndef USEQPE 777#ifndef USEQPE
777 QFontDatabase f; 778 QFontDatabase f;
778#else 779#else
779 FontDatabase f; 780 FontDatabase f;
780#endif 781#endif
781 QStringList flist = f.families(); 782 QStringList flist = f.families();
782 bool realfont = false; 783 bool realfont = false;
783 for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++) 784 for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++)
784 { 785 {
785 if (reader->m_fontname == *nm) 786 if (reader->m_fontname == *nm)
786 { 787 {
787 realfont = true; 788 realfont = true;
788 } 789 }
789 if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm); 790 if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm);
790 } 791 }
791 if (!realfont) reader->m_fontname = flist[0]; 792 if (!realfont) reader->m_fontname = flist[0];
792 } // delete the FontDatabase!!! 793 } // delete the FontDatabase!!!
793 connect( m_fontSelector, SIGNAL( activated(const QString&) ), 794 connect( m_fontSelector, SIGNAL( activated(const QString&) ),
794 this, SLOT( do_setfont(const QString&) ) ); 795 this, SLOT( do_setfont(const QString&) ) );
795 connect( m_fontSelector, SIGNAL( activated(int) ), 796 connect( m_fontSelector, SIGNAL( activated(int) ),
796 this, SLOT( do_setencoding(int) ) ); 797 this, SLOT( do_setencoding(int) ) );
797 798
@@ -801,9 +802,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
801 connect(qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), 802 connect(qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
802 this, SLOT( msgHandler(const QCString&,const QByteArray&) ) ); 803 this, SLOT( msgHandler(const QCString&,const QByteArray&) ) );
803#endif 804#endif
804// qDebug("Initing"); 805// odebug << "Initing" << oendl;
805 reader->init(); 806 reader->init();
806// qDebug("Inited"); 807// odebug << "Inited" << oendl;
807// m_buttonAction[m_spaceTarget]->setOn(true); 808// m_buttonAction[m_spaceTarget]->setOn(true);
808// qDebug("fonting"); 809// odebug << "fonting" << oendl;
809 do_setfont(reader->m_fontname); 810 do_setfont(reader->m_fontname);
@@ -811,45 +812,45 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
811 { 812 {
812 //qDebug("doclnk"); 813// odebug << "doclnk" << oendl;
813 //doc = new DocLnk(reader->m_lastfile); 814// doc = new DocLnk(reader->m_lastfile);
814 //qDebug("doclnk done"); 815// odebug << "doclnk done" << oendl;
815 if (pOpenlist != NULL) 816 if (pOpenlist != NULL)
816 { 817 {
817 818
818/* 819/*
819 int ind = 0; 820 int ind = 0;
820 Bkmk* p = (*pOpenlist)[ind]; 821 Bkmk* p = (*pOpenlist)[ind];
821 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile) 822 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
822 { 823 {
823 p = (*pOpenlist)[++ind]; 824 p = (*pOpenlist)[++ind];
824 } 825 }
825*/ 826*/
826 Bkmk* p = NULL; 827 Bkmk* p = NULL;
827 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++) 828 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
828 { 829 {
829 p = iter.pContent(); 830 p = iter.pContent();
830 if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile) 831 if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
831 { 832 {
832 break; 833 break;
833 } 834 }
834 // qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name())); 835// odebug << "Item:" << toQString(CFiledata(p->anno()).name()) << "" << oendl;
835 p = NULL; 836 p = NULL;
836 } 837 }
837 if (p != NULL) 838 if (p != NULL)
838 { 839 {
839 //qDebug("openfrombkmk"); 840// odebug << "openfrombkmk" << oendl;
840 if (!openfrombkmk(p)) 841 if (!openfrombkmk(p))
841 showEditTools(); 842 showEditTools();
842 } 843 }
843 else 844 else
844 { 845 {
845 //qDebug("openfile"); 846// odebug << "openfile" << oendl;
846 openFile( reader->m_lastfile ); 847 openFile( reader->m_lastfile );
847 } 848 }
848 } 849 }
849 else 850 else
850 { 851 {
851 // qDebug("Openfile 2"); 852// odebug << "Openfile 2" << oendl;
852 if (!reader->m_lastfile.isEmpty()) 853 if (!reader->m_lastfile.isEmpty())
853 openFile( reader->m_lastfile ); 854 openFile( reader->m_lastfile );
854 } 855 }
855 } 856 }
@@ -868,7 +869,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
868 { 869 {
869 config.writeEntry("Major", major); 870 config.writeEntry("Major", major);
870 config.writeEntry("BkmkType", bkmktype); 871 config.writeEntry("BkmkType", bkmktype);
871 config.writeEntry("Minor", (int)minor); 872 config.writeEntry("Minor", (int)minor);
872 } 873 }
873// qDebug("finished update"); 874// odebug << "finished update" << oendl;
874} 875}
@@ -881,15 +882,15 @@ void QTReaderApp::addtoolbars(Config* config)
881 { 882 {
882 if (fileBar != menubar) 883 if (fileBar != menubar)
883 { 884 {
884 fileBar->clear(); 885 fileBar->clear();
885 } 886 }
886 else 887 else
887 { 888 {
888 m_preferences_action->removeFrom( filebar() ); 889 m_preferences_action->removeFrom( filebar() );
889 m_open_action->removeFrom( filebar() ); 890 m_open_action->removeFrom( filebar() );
890 m_close_action->removeFrom( filebar() ); 891 m_close_action->removeFrom( filebar() );
891 m_info_action->removeFrom( filebar() ); 892 m_info_action->removeFrom( filebar() );
892 m_touch_action->removeFrom( filebar() ); 893 m_touch_action->removeFrom( filebar() );
893 m_find_action->removeFrom( filebar() ); 894 m_find_action->removeFrom( filebar() );
894 } 895 }
895 } 896 }
@@ -905,19 +906,19 @@ void QTReaderApp::addtoolbars(Config* config)
905 { 906 {
906 if ((navBar == fileBar) && (fileBar == menubar)) 907 if ((navBar == fileBar) && (fileBar == menubar))
907 { 908 {
908 m_scrollButton->removeFrom( navbar() ); 909 m_scrollButton->removeFrom( navbar() );
909 m_start_action->removeFrom( navbar() ); 910 m_start_action->removeFrom( navbar() );
910 m_end_action->removeFrom( navbar() ); 911 m_end_action->removeFrom( navbar() );
911 m_jump_action->removeFrom( navbar() ); 912 m_jump_action->removeFrom( navbar() );
912 m_pageline_action->removeFrom( navbar() ); 913 m_pageline_action->removeFrom( navbar() );
913 m_pageup_action->removeFrom( navbar() ); 914 m_pageup_action->removeFrom( navbar() );
914 m_pagedn_action->removeFrom( navbar() ); 915 m_pagedn_action->removeFrom( navbar() );
915 m_back_action->removeFrom( navbar() ); 916 m_back_action->removeFrom( navbar() );
916 m_home_action->removeFrom( navbar() ); 917 m_home_action->removeFrom( navbar() );
917 m_forward_action->removeFrom( navbar() ); 918 m_forward_action->removeFrom( navbar() );
918 } 919 }
919 else if (navBar != fileBar) 920 else if (navBar != fileBar)
920 { 921 {
921 navBar->clear(); 922 navBar->clear();
922 } 923 }
923 } 924 }
@@ -940,15 +941,15 @@ void QTReaderApp::addtoolbars(Config* config)
940 { 941 {
941 if ((viewBar == fileBar) && (fileBar == menubar)) 942 if ((viewBar == fileBar) && (fileBar == menubar))
942 { 943 {
943 m_actFullscreen->removeFrom( filebar() ); 944 m_actFullscreen->removeFrom( filebar() );
944 m_zoomin_action->removeFrom( viewbar() ); 945 m_zoomin_action->removeFrom( viewbar() );
945 m_zoomout_action->removeFrom( viewbar() ); 946 m_zoomout_action->removeFrom( viewbar() );
946 m_setfont_action->removeFrom( viewbar() ); 947 m_setfont_action->removeFrom( viewbar() );
947 m_setenc_action->removeFrom( viewbar() ); 948 m_setenc_action->removeFrom( viewbar() );
948 m_setmono_action->removeFrom( viewbar() ); 949 m_setmono_action->removeFrom( viewbar() );
949 } 950 }
950 else if (viewBar != fileBar) 951 else if (viewBar != fileBar)
951 { 952 {
952 viewBar->clear(); 953 viewBar->clear();
953 } 954 }
954 } 955 }
@@ -964,19 +965,19 @@ void QTReaderApp::addtoolbars(Config* config)
964 { 965 {
965 if ((markBar == fileBar) && (fileBar == menubar)) 966 if ((markBar == fileBar) && (fileBar == menubar))
966 { 967 {
967 m_mark_action->removeFrom( markbar() ); 968 m_mark_action->removeFrom( markbar() );
968 m_annotate_action->removeFrom( markbar()); 969 m_annotate_action->removeFrom( markbar());
969 m_goto_action->removeFrom( markbar() ); 970 m_goto_action->removeFrom( markbar() );
970 m_delete_action->removeFrom( markbar() ); 971 m_delete_action->removeFrom( markbar() );
971 m_autogen_action->removeFrom( markbar() ); 972 m_autogen_action->removeFrom( markbar() );
972 m_clear_action->removeFrom( markbar() ); 973 m_clear_action->removeFrom( markbar() );
973 m_save_action->removeFrom( markbar() ); 974 m_save_action->removeFrom( markbar() );
974 m_tidy_action->removeFrom( markbar() ); 975 m_tidy_action->removeFrom( markbar() );
975 m_startBlock_action->removeFrom( markbar() ); 976 m_startBlock_action->removeFrom( markbar() );
976 m_endBlock_action->removeFrom( markbar() ); 977 m_endBlock_action->removeFrom( markbar() );
977 } 978 }
978 else if (markBar != fileBar) 979 else if (markBar != fileBar)
979 { 980 {
980 markBar->clear(); 981 markBar->clear();
981 } 982 }
982 } 983 }
@@ -994,13 +995,13 @@ void QTReaderApp::addtoolbars(Config* config)
994 { 995 {
995 if (m_bkmkAvail == NULL) 996 if (m_bkmkAvail == NULL)
996 { 997 {
997 m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 ); 998 m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 );
998 connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) ); 999 connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) );
999 1000
1000 m_bkmkAvail->setEnabled(false); 1001 m_bkmkAvail->setEnabled(false);
1001 } 1002 }
1002 QLabel *spacer = new QLabel(markBar, ""); 1003 QLabel *spacer = new QLabel(markBar, "");
1003 markbar()->setStretchableWidget(spacer); 1004 markbar()->setStretchableWidget(spacer);
1004 m_bkmkAvail->removeFrom( markbar() ); 1005 m_bkmkAvail->removeFrom( markbar() );
1005 m_bkmkAvail->addTo( markbar() ); 1006 m_bkmkAvail->addTo( markbar() );
1006 } 1007 }
@@ -1008,8 +1009,8 @@ void QTReaderApp::addtoolbars(Config* config)
1008 { 1009 {
1009 if (m_bkmkAvail != NULL) 1010 if (m_bkmkAvail != NULL)
1010 { 1011 {
1011 m_bkmkAvail->removeFrom( markbar() ); 1012 m_bkmkAvail->removeFrom( markbar() );
1012 delete m_bkmkAvail; 1013 delete m_bkmkAvail;
1013 m_bkmkAvail = NULL; 1014 m_bkmkAvail = NULL;
1014 } 1015 }
1015 } 1016 }
@@ -1027,17 +1028,17 @@ QToolBar* QTReaderApp::filebar()
1027 { 1028 {
1028 switch (m_tbpol) 1029 switch (m_tbpol)
1029 { 1030 {
1030 case cesSingle: 1031 case cesSingle:
1031 // qDebug("Setting filebar to menubar"); 1032// odebug << "Setting filebar to menubar" << oendl;
1032 fileBar = menubar; 1033 fileBar = menubar;
1033 break; 1034 break;
1034 default: 1035 default:
1035 qDebug("Incorrect toolbar policy set"); 1036 odebug << "Incorrect toolbar policy set" << oendl;
1036 case cesMenuTool: 1037 case cesMenuTool:
1037 case cesMultiple: 1038 case cesMultiple:
1038 // qDebug("Creating new file bar"); 1039// odebug << "Creating new file bar" << oendl;
1039 fileBar = new QToolBar("File", this, m_tbposition); 1040 fileBar = new QToolBar("File", this, m_tbposition);
1040 break; 1041 break;
1041 } 1042 }
1042 //fileBar->setHorizontalStretchable( true ); 1043// fileBar->setHorizontalStretchable( true );
1043 } 1044 }
@@ -1049,14 +1050,14 @@ QToolBar* QTReaderApp::viewbar()
1049 { 1050 {
1050 switch (m_tbpol) 1051 switch (m_tbpol)
1051 { 1052 {
1052 case cesMultiple: 1053 case cesMultiple:
1053 viewBar = new QToolBar("View", this, m_tbposition); 1054 viewBar = new QToolBar("View", this, m_tbposition);
1054 break; 1055 break;
1055 default: 1056 default:
1056 qDebug("Incorrect toolbar policy set"); 1057 odebug << "Incorrect toolbar policy set" << oendl;
1057 case cesSingle: 1058 case cesSingle:
1058 case cesMenuTool: 1059 case cesMenuTool:
1059 viewBar = fileBar; 1060 viewBar = fileBar;
1060 break; 1061 break;
1061 } 1062 }
1062 } 1063 }
@@ -1068,16 +1069,16 @@ QToolBar* QTReaderApp::navbar()
1068 { 1069 {
1069 switch (m_tbpol) 1070 switch (m_tbpol)
1070 { 1071 {
1071 case cesMultiple: 1072 case cesMultiple:
1072 // qDebug("Creating new nav bar"); 1073// odebug << "Creating new nav bar" << oendl;
1073 navBar = new QToolBar("Navigation", this, m_tbposition); 1074 navBar = new QToolBar("Navigation", this, m_tbposition);
1074 break; 1075 break;
1075 default: 1076 default:
1076 qDebug("Incorrect toolbar policy set"); 1077 odebug << "Incorrect toolbar policy set" << oendl;
1077 case cesSingle: 1078 case cesSingle:
1078 case cesMenuTool: 1079 case cesMenuTool:
1079 navBar = fileBar; 1080 navBar = fileBar;
1080 // qDebug("Setting navbar to filebar"); 1081// odebug << "Setting navbar to filebar" << oendl;
1081 break; 1082 break;
1082 } 1083 }
1083 } 1084 }
@@ -1089,14 +1090,14 @@ QToolBar* QTReaderApp::markbar()
1089 { 1090 {
1090 switch (m_tbpol) 1091 switch (m_tbpol)
1091 { 1092 {
1092 case cesMultiple: 1093 case cesMultiple:
1093 markBar = new QToolBar("Marks", this, m_tbposition); 1094 markBar = new QToolBar("Marks", this, m_tbposition);
1094 break; 1095 break;
1095 default: 1096 default:
1096 qDebug("Incorrect toolbar policy set"); 1097 odebug << "Incorrect toolbar policy set" << oendl;
1097 case cesSingle: 1098 case cesSingle:
1098 case cesMenuTool: 1099 case cesMenuTool:
1099 markBar = fileBar; 1100 markBar = fileBar;
1100 break; 1101 break;
1101 } 1102 }
1102 } 1103 }
@@ -1129,3 +1130,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1129 1130
1130//// qDebug("Received:%s", (const char*)msg); 1131//// odebug << "Received:" << msg << "" << oendl;
1131 1132
@@ -1134,5 +1135,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1134 { 1135 {
1135 QString info; 1136 QString info;
1136 stream >> info; 1137 stream >> info;
1137 QMessageBox::information(this, PROGNAME, info); 1138 QMessageBox::information(this, PROGNAME, info);
1138 } 1139 }
@@ -1140,13 +1141,13 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1140 { 1141 {
1141 int info; 1142 int info;
1142 stream >> info; 1143 stream >> info;
1143 if (info) 1144 if (info)
1144 { 1145 {
1145 reader->bDoUpdates = true; 1146 reader->bDoUpdates = true;
1146 reader->refresh(); 1147 reader->refresh();
1147 } 1148 }
1148 else 1149 else
1149 { 1150 {
1150 reader->bDoUpdates = false; 1151 reader->bDoUpdates = false;
1151 } 1152 }
1152 } 1153 }
@@ -1154,5 +1155,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1154 { 1155 {
1155 QString info; 1156 QString info;
1156 stream >> info; 1157 stream >> info;
1157 QMessageBox::warning(this, PROGNAME, info); 1158 QMessageBox::warning(this, PROGNAME, info);
1158 } 1159 }
@@ -1160,4 +1161,4 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1160 { 1161 {
1161 m_dontSave = true; 1162 m_dontSave = true;
1162 close(); 1163 close();
1163 } 1164 }
@@ -1165,3 +1166,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1165 { 1166 {
1166 reader->dopagedn(); 1167 reader->dopagedn();
1167 } 1168 }
@@ -1169,3 +1170,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1169 { 1170 {
1170 reader->dopageup(); 1171 reader->dopageup();
1171 } 1172 }
@@ -1173,3 +1174,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1173 { 1174 {
1174 reader->lineDown(); 1175 reader->lineDown();
1175 } 1176 }
@@ -1177,3 +1178,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1177 { 1178 {
1178 reader->lineUp(); 1179 reader->lineUp();
1179 } 1180 }
@@ -1181,3 +1182,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1181 { 1182 {
1182 showEditTools(); 1183 showEditTools();
1183 } 1184 }
@@ -1185,3 +1186,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1185 { 1186 {
1186 reader->goHome(); 1187 reader->goHome();
1187 } 1188 }
@@ -1189,3 +1190,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1189 { 1190 {
1190 reader->goBack(); 1191 reader->goBack();
1191 } 1192 }
@@ -1193,3 +1194,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1193 { 1194 {
1194 reader->goForward(); 1195 reader->goForward();
1195 } 1196 }
@@ -1197,5 +1198,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1197 { 1198 {
1198 QString info; 1199 QString info;
1199 stream >> info; 1200 stream >> info;
1200 openFile( info ); 1201 openFile( info );
1201 } 1202 }
@@ -1203,3 +1204,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1203 { 1204 {
1204 showinfo(); 1205 showinfo();
1205 } 1206 }
@@ -1207,5 +1208,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1207 { 1208 {
1208 QString info; 1209 QString info;
1209 stream >> info; 1210 stream >> info;
1210 m_spaceTarget = ActNameToInt(info); 1211 m_spaceTarget = ActNameToInt(info);
1211 } 1212 }
@@ -1213,5 +1214,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1213 { 1214 {
1214 int info; 1215 int info;
1215 stream >> info; 1216 stream >> info;
1216 autoScroll(info); 1217 autoScroll(info);
1217 } 1218 }
@@ -1220,3 +1221,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1220 { 1221 {
1221 gotoStart(); 1222 gotoStart();
1222 } 1223 }
@@ -1224,3 +1225,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1224 { 1225 {
1225 gotoEnd(); 1226 gotoEnd();
1226 } 1227 }
@@ -1228,5 +1229,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1228 { 1229 {
1229 int info; 1230 int info;
1230 stream >> info; 1231 stream >> info;
1231 reader->locate(info); 1232 reader->locate(info);
1232 } 1233 }
@@ -1234,5 +1235,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1234 { 1235 {
1235 int info; 1236 int info;
1236 stream >> info; 1237 stream >> info;
1237 pagemode(info); 1238 pagemode(info);
1238 } 1239 }
@@ -1240,5 +1241,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1240 { 1241 {
1241 int info; 1242 int info;
1242 stream >> info; 1243 stream >> info;
1243 reader->m_overlap = info; 1244 reader->m_overlap = info;
1244 } 1245 }
@@ -1246,5 +1247,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1246 { 1247 {
1247 int info; 1248 int info;
1248 stream >> info; 1249 stream >> info;
1249 do_margin(info); 1250 do_margin(info);
1250 } 1251 }
@@ -1252,5 +1253,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1252 { 1253 {
1253 QString info; 1254 QString info;
1254 stream >> info; 1255 stream >> info;
1255 do_settarget(info); 1256 do_settarget(info);
1256 } 1257 }
@@ -1259,5 +1260,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1259 { 1260 {
1260 QString info; 1261 QString info;
1261 stream >> info; 1262 stream >> info;
1262 reader->m_pipetarget = info; 1263 reader->m_pipetarget = info;
1263 } 1264 }
@@ -1266,5 +1267,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1266 { 1267 {
1267 int info; 1268 int info;
1268 stream >> info; 1269 stream >> info;
1269 setTwoTouch(info); 1270 setTwoTouch(info);
1270 } 1271 }
@@ -1272,5 +1273,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1272 { 1273 {
1273 int info; 1274 int info;
1274 stream >> info; 1275 stream >> info;
1275 OnAnnotation(info); 1276 OnAnnotation(info);
1276 } 1277 }
@@ -1278,5 +1279,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1278 { 1279 {
1279 int info; 1280 int info;
1280 stream >> info; 1281 stream >> info;
1281 OnDictionary(info); 1282 OnDictionary(info);
1282 } 1283 }
@@ -1284,5 +1285,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1284 { 1285 {
1285 int info; 1286 int info;
1286 stream >> info; 1287 stream >> info;
1287 OnClipboard(info); 1288 OnClipboard(info);
1288 } 1289 }
@@ -1290,20 +1291,20 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1290 { 1291 {
1291 QString info; 1292 QString info;
1292 stream >> info; 1293 stream >> info;
1293 QRegExp arg(info); 1294 QRegExp arg(info);
1294 size_t pos = reader->pagelocate(); 1295 size_t pos = reader->pagelocate();
1295 size_t start = pos; 1296 size_t start = pos;
1296 CDrawBuffer test(&(reader->m_fontControl)); 1297 CDrawBuffer test(&(reader->m_fontControl));
1297 reader->getline(&test); 1298 reader->getline(&test);
1298 while (arg.match(toQString(test.data())) == -1) 1299 while (arg.match(toQString(test.data())) == -1)
1299 { 1300 {
1300 pos = reader->locate(); 1301 pos = reader->locate();
1301 if (!reader->getline(&test)) 1302 if (!reader->getline(&test))
1302 { 1303 {
1303 QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info); 1304 QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info);
1304 pos = start; 1305 pos = start;
1305 break; 1306 break;
1306 } 1307 }
1307 } 1308 }
1308 reader->locate(pos); 1309 reader->locate(pos);
1309 } 1310 }
@@ -1311,5 +1312,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1311 { 1312 {
1312 int info; 1313 int info;
1313 stream >> info; 1314 stream >> info;
1314 setfullscreen(info); 1315 setfullscreen(info);
1315 } 1316 }
@@ -1317,5 +1318,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1317 { 1318 {
1318 int info; 1319 int info;
1319 stream >> info; 1320 stream >> info;
1320 setcontinuous(info); 1321 setcontinuous(info);
1321 } 1322 }
@@ -1323,27 +1324,27 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1323 { 1324 {
1324 QString info; 1325 QString info;
1325 stream >> info; 1326 stream >> info;
1326 if (info == "Auto") 1327 if (info == "Auto")
1327 { 1328 {
1328 autofmt(true); 1329 autofmt(true);
1329 } 1330 }
1330 if (info == "None") 1331 if (info == "None")
1331 { 1332 {
1332 autofmt(false); 1333 autofmt(false);
1333 textfmt(false); 1334 textfmt(false);
1334 striphtml(false); 1335 striphtml(false);
1335 peanut(false); 1336 peanut(false);
1336 } 1337 }
1337 if (info == "Text") 1338 if (info == "Text")
1338 { 1339 {
1339 textfmt(true); 1340 textfmt(true);
1340 } 1341 }
1341 if (info == "HTML") 1342 if (info == "HTML")
1342 { 1343 {
1343 striphtml(true); 1344 striphtml(true);
1344 } 1345 }
1345 if (info == "Peanut/PML") 1346 if (info == "Peanut/PML")
1346 { 1347 {
1347 peanut(true); 1348 peanut(true);
1348 } 1349 }
1349 } 1350 }
@@ -1351,5 +1352,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1351 { 1352 {
1352 int info; 1353 int info;
1353 stream >> info; 1354 stream >> info;
1354 stripcr(info); 1355 stripcr(info);
1355 } 1356 }
@@ -1357,5 +1358,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1357 { 1358 {
1358 int info; 1359 int info;
1359 stream >> info; 1360 stream >> info;
1360 dehyphen(info); 1361 dehyphen(info);
1361 } 1362 }
@@ -1363,5 +1364,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1363 { 1364 {
1364 int info; 1365 int info;
1365 stream >> info; 1366 stream >> info;
1366 depluck(info); 1367 depluck(info);
1367 } 1368 }
@@ -1369,5 +1370,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1369 { 1370 {
1370 int info; 1371 int info;
1371 stream >> info; 1372 stream >> info;
1372 dejpluck(info); 1373 dejpluck(info);
1373 } 1374 }
@@ -1375,5 +1376,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1375 { 1376 {
1376 int info; 1377 int info;
1377 stream >> info; 1378 stream >> info;
1378 onespace(info); 1379 onespace(info);
1379 } 1380 }
@@ -1382,5 +1383,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1382 { 1383 {
1383 int info; 1384 int info;
1384 stream >> info; 1385 stream >> info;
1385 repalm(info); 1386 repalm(info);
1386 } 1387 }
@@ -1389,5 +1390,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1389 { 1390 {
1390 int info; 1391 int info;
1391 stream >> info; 1392 stream >> info;
1392 unindent(info); 1393 unindent(info);
1393 } 1394 }
@@ -1395,5 +1396,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1395 { 1396 {
1396 int info; 1397 int info;
1397 stream >> info; 1398 stream >> info;
1398 repara(info); 1399 repara(info);
1399 } 1400 }
@@ -1401,5 +1402,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1401 { 1402 {
1402 int info; 1403 int info;
1403 stream >> info; 1404 stream >> info;
1404 dblspce(info); 1405 dblspce(info);
1405 } 1406 }
@@ -1407,6 +1408,6 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1407 { 1408 {
1408 int info; 1409 int info;
1409 stream >> info; 1410 stream >> info;
1410 reader->bindenter = info; 1411 reader->bindenter = info;
1411 reader->setfilter(reader->getfilter()); 1412 reader->setfilter(reader->getfilter());
1412 } 1413 }
@@ -1414,5 +1415,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1414 { 1415 {
1415 int info; 1416 int info;
1416 stream >> info; 1417 stream >> info;
1417 remap(info); 1418 remap(info);
1418 } 1419 }
@@ -1420,5 +1421,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1420 { 1421 {
1421 int info; 1422 int info;
1422 stream >> info; 1423 stream >> info;
1423 embolden(info); 1424 embolden(info);
1424 } 1425 }
@@ -1426,5 +1427,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1426 { 1427 {
1427 int info; 1428 int info;
1428 stream >> info; 1429 stream >> info;
1429 monospace(info); 1430 monospace(info);
1430 } 1431 }
@@ -1432,7 +1433,7 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1432 { 1433 {
1433 int info; 1434 int info;
1434 stream >> info; 1435 stream >> info;
1435 reader->m_charpc = info; 1436 reader->m_charpc = info;
1436 reader->setfont(); 1437 reader->setfont();
1437 reader->refresh(); 1438 reader->refresh();
1438 } 1439 }
@@ -1440,7 +1441,7 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1440 { 1441 {
1441 QString fontname; 1442 QString fontname;
1442 int size; 1443 int size;
1443 stream >> fontname; 1444 stream >> fontname;
1444 stream >> size; 1445 stream >> size;
1445 setfontHelper(fontname, size); 1446 setfontHelper(fontname, size);
1446 } 1447 }
@@ -1448,5 +1449,5 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1448 { 1449 {
1449 QString info; 1450 QString info;
1450 stream >> info; 1451 stream >> info;
1451 do_autogen(info); 1452 do_autogen(info);
1452 } 1453 }
@@ -1454,3 +1455,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1454 { 1455 {
1455 editMark(); 1456 editMark();
1456 } 1457 }
@@ -1458,3 +1459,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
1458 { 1459 {
1459 editCopy(); 1460 editCopy();
1460 } 1461 }
@@ -1466,3 +1467,3 @@ ActionTypes QTReaderApp::ActNameToInt(const QString& _enc)
1466 { 1467 {
1467 if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i; 1468 if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i;
1468 } 1469 }
@@ -1483,3 +1484,3 @@ void QTReaderApp::buttonActionSelected(QAction* _a)
1483{ 1484{
1484//// qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text())); 1485//// odebug << "es:" << _a << " : " << (const char *)(_a->text()) << " (" << ActNameToInt(_a->text()) << ")" << oendl;
1485 m_spaceTarget = ActNameToInt(_a->text()); 1486 m_spaceTarget = ActNameToInt(_a->text());
@@ -1509,5 +1510,5 @@ void QTReaderApp::clearBkmkList()
1509{ 1510{
1510 delete pBkmklist; 1511 delete pBkmklist;
1511 pBkmklist = NULL; 1512 pBkmklist = NULL;
1512 m_fBkmksChanged = false; 1513 m_fBkmksChanged = false;
1513} 1514}
@@ -1519,38 +1520,38 @@ void QTReaderApp::fileClose()
1519 { 1520 {
1520 if (pOpenlist != NULL) 1521 if (pOpenlist != NULL)
1521 { 1522 {
1522 int ind = 0; 1523 int ind = 0;
1523 Bkmk* p = (*pOpenlist)[ind]; 1524 Bkmk* p = (*pOpenlist)[ind];
1524 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile) 1525 while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
1525 { 1526 {
1526 p = (*pOpenlist)[++ind]; 1527 p = (*pOpenlist)[++ind];
1527 } 1528 }
1528 if (p != NULL) pOpenlist->erase(ind); 1529 if (p != NULL) pOpenlist->erase(ind);
1529 if (cd->delFile()) 1530 if (cd->delFile())
1530 { 1531 {
1531 unlink((const char*)reader->m_lastfile); 1532 unlink((const char*)reader->m_lastfile);
1532 } 1533 }
1533 if (cd->delMarks()) 1534 if (cd->delMarks())
1534 { 1535 {
1535#ifndef USEQPE 1536#ifndef USEQPE
1536 QDir d = QDir::home(); // "/" 1537 QDir d = QDir::home(); // "/"
1537 d.cd(APPDIR); 1538 d.cd(APPDIR);
1538 d.remove(reader->m_string); 1539 d.remove(reader->m_string);
1539#else /* USEQPE */ 1540#else /* USEQPE */
1540 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); 1541 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
1541#endif /* USEQPE */ 1542#endif /* USEQPE */
1542 } 1543 }
1543 if (cd->delConfig()) 1544 if (cd->delConfig())
1544 { 1545 {
1545#ifndef USEQPE 1546#ifndef USEQPE
1546 QDir d = QDir::home(); // "/" 1547 QDir d = QDir::home(); // "/"
1547 d.cd(APPDIR "/configs"); 1548 d.cd(APPDIR "/configs");
1548 d.remove(reader->m_string); 1549 d.remove(reader->m_string);
1549#else /* USEQPE */ 1550#else /* USEQPE */
1550 unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string)); 1551 unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string));
1551#endif /* USEQPE */ 1552#endif /* USEQPE */
1552 } 1553 }
1553 } 1554 }
1554 1555
1555 fileOpen2(); 1556 fileOpen2();
1556 } 1557 }
@@ -1565,3 +1566,3 @@ void QTReaderApp::updatefileinfo()
1565 tchar* fl = fromQString(reader->m_lastfile); 1566 tchar* fl = fromQString(reader->m_lastfile);
1566// qDebug("Lastfile:%x", fl); 1567// odebug << "Lastfile:" << fl << "" << oendl;
1567 bool notadded = true; 1568 bool notadded = true;
@@ -1570,32 +1571,32 @@ void QTReaderApp::updatefileinfo()
1570 { 1571 {
1571 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++) 1572 for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
1572 { 1573 {
1573 if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0) 1574 if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0)
1574 { 1575 {
1575 iter->value(reader->pagelocate()); 1576 iter->value(reader->pagelocate());
1576 unsigned short dlen; 1577 unsigned short dlen;
1577 unsigned char* data; 1578 unsigned char* data;
1578 CFiledata fd(iter->anno()); 1579 CFiledata fd(iter->anno());
1579 reader->setSaveData(data, dlen, fd.content(), fd.length()); 1580 reader->setSaveData(data, dlen, fd.content(), fd.length());
1580 // qDebug("Filedata(1):%u, %u", fd.length(), dlen); 1581// odebug << "Filedata(1):" << fd.length() << ", " << dlen << "" << oendl;
1581 // getstate(data, dlen); 1582// getstate(data, dlen);
1582 iter->setAnno(data, dlen); 1583 iter->setAnno(data, dlen);
1583 notadded = false; 1584 notadded = false;
1584 delete [] data; 1585 delete [] data;
1585 break; 1586 break;
1586 } 1587 }
1587 } 1588 }
1588 } 1589 }
1589// qDebug("Added?:%x", notadded); 1590// odebug << "Added?:" << notadded << "" << oendl;
1590 if (notadded) 1591 if (notadded)
1591 { 1592 {
1592 struct stat fnstat; 1593 struct stat fnstat;
1593 stat((const char *)reader->m_lastfile, &fnstat); 1594 stat((const char *)reader->m_lastfile, &fnstat);
1594 CFiledata fd(fnstat.st_mtime, fl); 1595 CFiledata fd(fnstat.st_mtime, fl);
1595 unsigned short dlen; 1596 unsigned short dlen;
1596 unsigned char* data; 1597 unsigned char* data;
1597 reader->setSaveData(data, dlen, fd.content(), fd.length()); 1598 reader->setSaveData(data, dlen, fd.content(), fd.length());
1598 pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate())); 1599 pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate()));
1599 //qDebug("Filedata(2):%u, %u", fd.length(), dlen); 1600// odebug << "Filedata(2):" << fd.length() << ", " << dlen << "" << oendl;
1600 delete [] data; 1601 delete [] data;
1601 } 1602 }
@@ -1613,3 +1614,3 @@ void QTReaderApp::fileOpen()
1613*/ 1614*/
1614// qDebug("fileOpen"); 1615// odebug << "fileOpen" << oendl;
1615// if (!reader->m_lastfile.isEmpty()) 1616// if (!reader->m_lastfile.isEmpty())
@@ -1623,10 +1624,10 @@ void QTReaderApp::fileOpen2()
1623 { 1624 {
1624 if (m_fBkmksChanged) 1625 if (m_fBkmksChanged)
1625 { 1626 {
1626 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0) 1627 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
1627 savebkmks(); 1628 savebkmks();
1628 } 1629 }
1629 delete pBkmklist; 1630 delete pBkmklist;
1630 pBkmklist = NULL; 1631 pBkmklist = NULL;
1631 m_fBkmksChanged = false; 1632 m_fBkmksChanged = false;
1632 } 1633 }
@@ -1640,4 +1641,4 @@ void QTReaderApp::fileOpen2()
1640 { 1641 {
1641 m_nBkmkAction = cOpenFile; 1642 m_nBkmkAction = cOpenFile;
1642 if (listbkmk(pOpenlist, "Browse")) usebrowser = false; 1643 if (listbkmk(pOpenlist, "Browse")) usebrowser = false;
1643 } 1644 }
@@ -1645,12 +1646,12 @@ void QTReaderApp::fileOpen2()
1645 { 1646 {
1646 QString fn = usefilebrowser(); 1647 QString fn = usefilebrowser();
1647 //qApp->processEvents(); 1648// qApp->processEvents();
1648 if (!fn.isEmpty() && QFileInfo(fn).isFile()) 1649 if (!fn.isEmpty() && QFileInfo(fn).isFile())
1649 { 1650 {
1650 openFile(fn); 1651 openFile(fn);
1651 } 1652 }
1652 reader->setFocus(); 1653 reader->setFocus();
1653 } 1654 }
1654// reader->refresh(); 1655// reader->refresh();
1655// qDebug("HEIGHT:%d", reader->m_lastheight); 1656// odebug << "HEIGHT:" << reader->m_lastheight << "" << oendl;
1656} 1657}
@@ -1664,5 +1665,5 @@ QString QTReaderApp::usefilebrowser()
1664 fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog, 1665 fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog,
1665 0, 1666 0,
1666 // WStyle_Customize | WStyle_NoBorderEx, 1667// WStyle_Customize | WStyle_NoBorderEx,
1667 "*", QFileInfo(reader->m_lastfile).dirPath(true)); 1668 "*", QFileInfo(reader->m_lastfile).dirPath(true));
1668 1669
@@ -1672,5 +1673,5 @@ QString QTReaderApp::usefilebrowser()
1672 { 1673 {
1673 fn = fb->getCurrentFile(); 1674 fn = fb->getCurrentFile();
1674 } 1675 }
1675// qDebug("Selected %s", (const char*)fn); 1676// odebug << "Selected " << fn << "" << oendl;
1676 delete fb; 1677 delete fb;
@@ -1695,3 +1696,3 @@ void QTReaderApp::showprefs()
1695 1696
1696 prefwin->twotouch(m_twoTouch); 1697 prefwin->twotouch(m_twoTouch);
1697 prefwin->propfontchange(m_propogatefontchange); 1698 prefwin->propfontchange(m_propogatefontchange);
@@ -1712,3 +1713,3 @@ void QTReaderApp::showprefs()
1712 { 1713 {
1713 prefwin->Markup(0); 1714 prefwin->Markup(0);
1714 } 1715 }
@@ -1716,3 +1717,3 @@ void QTReaderApp::showprefs()
1716 { 1717 {
1717 prefwin->Markup(2); 1718 prefwin->Markup(2);
1718 } 1719 }
@@ -1720,3 +1721,3 @@ void QTReaderApp::showprefs()
1720 { 1721 {
1721 prefwin->Markup(3); 1722 prefwin->Markup(3);
1722 } 1723 }
@@ -1724,3 +1725,3 @@ void QTReaderApp::showprefs()
1724 { 1725 {
1725 prefwin->Markup(4); 1726 prefwin->Markup(4);
1726 } 1727 }
@@ -1728,3 +1729,3 @@ void QTReaderApp::showprefs()
1728 { 1729 {
1729 prefwin->Markup(1); 1730 prefwin->Markup(1);
1730 } 1731 }
@@ -1770,80 +1771,80 @@ void QTReaderApp::showprefs()
1770 { 1771 {
1771 m_twoTouch = prefwin->twotouch(); 1772 m_twoTouch = prefwin->twotouch();
1772 reader->setTwoTouch(m_twoTouch); 1773 reader->setTwoTouch(m_twoTouch);
1773 m_touch_action->setOn(m_twoTouch); 1774 m_touch_action->setOn(m_twoTouch);
1774 1775
1775 reader->bstripcr = prefwin->StripCR(); 1776 reader->bstripcr = prefwin->StripCR();
1776 reader->bdehyphen = prefwin->Dehyphen(); 1777 reader->bdehyphen = prefwin->Dehyphen();
1777 reader->bonespace = prefwin->SingleSpace(); 1778 reader->bonespace = prefwin->SingleSpace();
1778 reader->bunindent = prefwin->Unindent(); 1779 reader->bunindent = prefwin->Unindent();
1779 reader->brepara = prefwin->Reparagraph(); 1780 reader->brepara = prefwin->Reparagraph();
1780 reader->bdblspce = prefwin->DoubleSpace(); 1781 reader->bdblspce = prefwin->DoubleSpace();
1781 reader->bremap = prefwin->Remap(); 1782 reader->bremap = prefwin->Remap();
1782 reader->bmakebold = prefwin->Embolden(); 1783 reader->bmakebold = prefwin->Embolden();
1783 reader->bfulljust = prefwin->FullJustify(); 1784 reader->bfulljust = prefwin->FullJustify();
1784 reader->setextraspace(prefwin->ParaLead()); 1785 reader->setextraspace(prefwin->ParaLead());
1785 reader->setlead(prefwin->LineLead()); 1786 reader->setlead(prefwin->LineLead());
1786 reader->m_border = prefwin->Margin(); 1787 reader->m_border = prefwin->Margin();
1787 reader->bindenter = prefwin->Indent(); 1788 reader->bindenter = prefwin->Indent();
1788 reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false; 1789 reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false;
1789 switch (prefwin->Markup()) 1790 switch (prefwin->Markup())
1790 { 1791 {
1791 case 0: 1792 case 0:
1792 reader->bautofmt = true; 1793 reader->bautofmt = true;
1793 break; 1794 break;
1794 case 1: 1795 case 1:
1795 break; 1796 break;
1796 case 2: 1797 case 2:
1797 reader->btextfmt = true; 1798 reader->btextfmt = true;
1798 break; 1799 break;
1799 case 3: 1800 case 3:
1800 reader->bstriphtml = true; 1801 reader->bstriphtml = true;
1801 break; 1802 break;
1802 case 4: 1803 case 4:
1803 reader->bpeanut = true; 1804 reader->bpeanut = true;
1804 break; 1805 break;
1805 default: 1806 default:
1806 qDebug("Format out of range"); 1807 odebug << "Format out of range" << oendl;
1807 } 1808 }
1808 reader->bdepluck = prefwin->Depluck(); 1809 reader->bdepluck = prefwin->Depluck();
1809 reader->bdejpluck = prefwin->Dejpluck(); 1810 reader->bdejpluck = prefwin->Dejpluck();
1810 reader->setContinuous(prefwin->Continuous()); 1811 reader->setContinuous(prefwin->Continuous());
1811 1812
1812 m_spaceTarget = (ActionTypes)prefwin->spaceAction(); 1813 m_spaceTarget = (ActionTypes)prefwin->spaceAction();
1813 m_escapeTarget = (ActionTypes)prefwin->escapeAction(); 1814 m_escapeTarget = (ActionTypes)prefwin->escapeAction();
1814 m_returnTarget = (ActionTypes)prefwin->returnAction(); 1815 m_returnTarget = (ActionTypes)prefwin->returnAction();
1815 m_leftTarget = (ActionTypes)prefwin->leftAction(); 1816 m_leftTarget = (ActionTypes)prefwin->leftAction();
1816 m_rightTarget = (ActionTypes)prefwin->rightAction(); 1817 m_rightTarget = (ActionTypes)prefwin->rightAction();
1817 m_upTarget = (ActionTypes)prefwin->upAction(); 1818 m_upTarget = (ActionTypes)prefwin->upAction();
1818 m_downTarget = (ActionTypes)prefwin->downAction(); 1819 m_downTarget = (ActionTypes)prefwin->downAction();
1819 m_leftScroll = prefwin->leftScroll(); 1820 m_leftScroll = prefwin->leftScroll();
1820 m_rightScroll = prefwin->rightScroll(); 1821 m_rightScroll = prefwin->rightScroll();
1821 m_upScroll = prefwin->upScroll(); 1822 m_upScroll = prefwin->upScroll();
1822 m_downScroll = prefwin->downScroll(); 1823 m_downScroll = prefwin->downScroll();
1823 1824
1824 m_targetapp = prefwin->dictApplication(); 1825 m_targetapp = prefwin->dictApplication();
1825 m_targetmsg = prefwin->dictMessage(); 1826 m_targetmsg = prefwin->dictMessage();
1826 1827
1827 m_doAnnotation = prefwin->miscannotation(); 1828 m_doAnnotation = prefwin->miscannotation();
1828 m_doDictionary = prefwin->miscdictionary(); 1829 m_doDictionary = prefwin->miscdictionary();
1829 m_doClipboard = prefwin->miscclipboard(); 1830 m_doClipboard = prefwin->miscclipboard();
1830 reader->m_swapmouse = prefwin->SwapMouse(); 1831 reader->m_swapmouse = prefwin->SwapMouse();
1831 reader->setBaseSize(prefwin->gfxsize()); 1832 reader->setBaseSize(prefwin->gfxsize());
1832 reader->m_overlap = prefwin->pageoverlap(); 1833 reader->m_overlap = prefwin->pageoverlap();
1833 reader->m_bMonoSpaced = prefwin->ideogram(); 1834 reader->m_bMonoSpaced = prefwin->ideogram();
1834 m_setmono_action->setOn(reader->m_bMonoSpaced); 1835 m_setmono_action->setOn(reader->m_bMonoSpaced);
1835 reader->m_encd = prefwin->encoding(); 1836 reader->m_encd = prefwin->encoding();
1836 reader->m_charpc = prefwin->ideogramwidth(); 1837 reader->m_charpc = prefwin->ideogramwidth();
1837 1838
1838 if ( 1839 if (
1839 reader->m_fontname != prefwin->Font() 1840 reader->m_fontname != prefwin->Font()
1840 || 1841 ||
1841 m_propogatefontchange != prefwin->propfontchange()) 1842 m_propogatefontchange != prefwin->propfontchange())
1842 { 1843 {
1843 m_propogatefontchange = prefwin->propfontchange(); 1844 m_propogatefontchange = prefwin->propfontchange();
1844 setfontHelper(prefwin->Font()); 1845 setfontHelper(prefwin->Font());
1845 } 1846 }
1846 delete prefwin; 1847 delete prefwin;
1847 reader->setfilter(reader->getfilter()); 1848 reader->setfilter(reader->getfilter());
1848 reader->refresh(); 1849 reader->refresh();
1849 1850
@@ -1852,3 +1853,3 @@ void QTReaderApp::showprefs()
1852 { 1853 {
1853 delete prefwin; 1854 delete prefwin;
1854 } 1855 }
@@ -1861,12 +1862,12 @@ void QTReaderApp::showtoolbarprefs()
1861#else 1862#else
1862 QFileInfo fi; 1863 QFileInfo fi;
1863 QDir d = QDir::home(); // "/" 1864 QDir d = QDir::home(); // "/"
1864 if ( !d.cd(APPDIR) ) 1865 if ( !d.cd(APPDIR) )
1865 { // "/tmp" 1866 { // "/tmp"
1866 qWarning( "Cannot find the \"~/%s\" directory", APPDIR ); 1867 owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
1867 d = QDir::home(); 1868 d = QDir::home();
1868 d.mkdir(APPDIR); 1869 d.mkdir(APPDIR);
1869 d.cd(APPDIR); 1870 d.cd(APPDIR);
1870 } 1871 }
1871 fi.setFile(d, INIFILE); 1872 fi.setFile(d, INIFILE);
1872 CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this); 1873 CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);
@@ -1879,34 +1880,34 @@ void QTReaderApp::showtoolbarprefs()
1879 { 1880 {
1880 m_bFloatingDialog = prefwin->floating(); 1881 m_bFloatingDialog = prefwin->floating();
1881 if ( 1882 if (
1882 m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy() 1883 m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy()
1883 || 1884 ||
1884 m_tbposition != (ToolBarDock)(prefwin->tbposition()+2) 1885 m_tbposition != (ToolBarDock)(prefwin->tbposition()+2)
1885 || 1886 ||
1886 m_tbmovesave != prefwin->tbmovable() 1887 m_tbmovesave != prefwin->tbmovable()
1887 ) 1888 )
1888 { 1889 {
1889 QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started"); 1890 QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started");
1890 } 1891 }
1891 m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy(); 1892 m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy();
1892 m_tbposition = (ToolBarDock)(prefwin->tbposition()+2); 1893 m_tbposition = (ToolBarDock)(prefwin->tbposition()+2);
1893 m_tbmovesave = prefwin->tbmovable(); 1894 m_tbmovesave = prefwin->tbmovable();
1894 bool isChanged = prefwin->isChanged(); 1895 bool isChanged = prefwin->isChanged();
1895 delete prefwin; 1896 delete prefwin;
1896#ifdef USEQPE 1897#ifdef USEQPE
1897 Config config( APPDIR ); 1898 Config config( APPDIR );
1898#else 1899#else
1899 QFileInfo fi; 1900 QFileInfo fi;
1900 QDir d = QDir::home(); // "/" 1901 QDir d = QDir::home(); // "/"
1901 if ( !d.cd(APPDIR) ) 1902 if ( !d.cd(APPDIR) )
1902 { // "/tmp" 1903 { // "/tmp"
1903 qWarning( "Cannot find the \"~/%s\" directory", APPDIR ); 1904 owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
1904 d = QDir::home(); 1905 d = QDir::home();
1905 d.mkdir(APPDIR); 1906 d.mkdir(APPDIR);
1906 d.cd(APPDIR); 1907 d.cd(APPDIR);
1907 } 1908 }
1908 fi.setFile(d, INIFILE); 1909 fi.setFile(d, INIFILE);
1909 Config config( fi.absFilePath() ); 1910 Config config( fi.absFilePath() );
1910#endif 1911#endif
1911 if (isChanged) addtoolbars(&config); 1912 if (isChanged) addtoolbars(&config);
1912 } 1913 }
@@ -1914,3 +1915,3 @@ void QTReaderApp::showtoolbarprefs()
1914 { 1915 {
1915 delete prefwin; 1916 delete prefwin;
1916 } 1917 }
@@ -1923,3 +1924,3 @@ void QTReaderApp::showinfo()
1923 { 1924 {
1924 QMessageBox::information(this, PROGNAME, "No file loaded", 1); 1925 QMessageBox::information(this, PROGNAME, "No file loaded", 1);
1925 } 1926 }
@@ -1927,11 +1928,11 @@ void QTReaderApp::showinfo()
1927 { 1928 {
1928 reader->sizes(fs,ts); 1929 reader->sizes(fs,ts);
1929 pl = reader->pagelocate(); 1930 pl = reader->pagelocate();
1930 m_infoWin->setFileSize(fs); 1931 m_infoWin->setFileSize(fs);
1931 m_infoWin->setTextSize(ts); 1932 m_infoWin->setTextSize(ts);
1932 m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts); 1933 m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
1933 m_infoWin->setLocation(pl); 1934 m_infoWin->setLocation(pl);
1934 m_infoWin->setRead((100*pl + (ts >> 1))/ts); 1935 m_infoWin->setRead((100*pl + (ts >> 1))/ts);
1935 editorStack->raiseWidget( m_infoWin ); 1936 editorStack->raiseWidget( m_infoWin );
1936 m_infoWin->setFocus(); 1937 m_infoWin->setFocus();
1937 } 1938 }
@@ -1947,3 +1948,3 @@ void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn)
1947 { 1948 {
1948 buff[i] = name[i].unicode(); 1949 buff[i] = name[i].unicode();
1949 } 1950 }
@@ -1953,3 +1954,3 @@ void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn)
1953 { 1954 {
1954 buff2[i] = text[i].unicode(); 1955 buff2[i] = text[i].unicode();
1955 } 1956 }
@@ -1968,11 +1969,31 @@ void QTReaderApp::addAnno(const QString& name, const QString& text)
1968 { 1969 {
1969 if (name.isEmpty()) 1970 if (name.isEmpty())
1970 { 1971 {
1971 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1); 1972 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1);
1972 } 1973 }
1973 else 1974 else
1974 { 1975 {
1975 addAnno(name, text, m_annoWin->getPosn()); 1976 addAnno(name, text, m_annoWin->getPosn());
1976 } 1977 }
1977 showEditTools(); 1978 showEditTools();
1979 }
1980 else
1981 {
1982 if (m_annoWin->edited())
1983 {
1984 CBuffer buff(text.length()+1);
1985 int i;
1986 for (i = 0; i < text.length(); i++)
1987 {
1988 buff[i] = text[i].unicode();
1989 }
1990 buff[i] = 0;
1991 m_fBkmksChanged = true;
1992 m_anno->setAnno(buff.data());
1993 }
1994 bool found = findNextBookmark(m_anno->value()+1);
1995 if (found)
1996 {
1997 m_annoWin->setName(toQString(m_anno->name()));
1998 m_annoWin->setAnno(toQString(m_anno->anno()));
1978 } 1999 }
@@ -1980,24 +2001,4 @@ void QTReaderApp::addAnno(const QString& name, const QString& text)
1980 { 2001 {
1981 if (m_annoWin->edited()) 2002 showEditTools();
1982 { 2003 }
1983 CBuffer buff(text.length()+1);
1984 int i;
1985 for (i = 0; i < text.length(); i++)
1986 {
1987 buff[i] = text[i].unicode();
1988 }
1989 buff[i] = 0;
1990 m_fBkmksChanged = true;
1991 m_anno->setAnno(buff.data());
1992 }
1993 bool found = findNextBookmark(m_anno->value()+1);
1994 if (found)
1995 {
1996 m_annoWin->setName(toQString(m_anno->name()));
1997 m_annoWin->setAnno(toQString(m_anno->anno()));
1998 }
1999 else
2000 {
2001 showEditTools();
2002 }
2003 } 2004 }
@@ -2010,11 +2011,11 @@ bool QTReaderApp::findNextBookmark(size_t start)
2010 { 2011 {
2011 if (iter->value() >= start) 2012 if (iter->value() >= start)
2012 { 2013 {
2013 if (iter->value() < reader->locate()) 2014 if (iter->value() < reader->locate())
2014 { 2015 {
2015 found = true; 2016 found = true;
2016 m_anno = iter.pContent(); 2017 m_anno = iter.pContent();
2017 } 2018 }
2018 break; 2019 break;
2019 } 2020 }
2020 } 2021 }
@@ -2027,3 +2028,3 @@ void QTReaderApp::addanno()
2027 { 2028 {
2028 QMessageBox::information(this, PROGNAME, "No file loaded", 1); 2029 QMessageBox::information(this, PROGNAME, "No file loaded", 1);
2029 } 2030 }
@@ -2031,11 +2032,11 @@ void QTReaderApp::addanno()
2031 { 2032 {
2032 m_annoWin->setName(""); 2033 m_annoWin->setName("");
2033 m_annoWin->setAnno(""); 2034 m_annoWin->setAnno("");
2034 m_annoWin->setPosn(reader->pagelocate()); 2035 m_annoWin->setPosn(reader->pagelocate());
2035 m_annoIsEditing = true; 2036 m_annoIsEditing = true;
2036 editorStack->raiseWidget( m_annoWin ); 2037 editorStack->raiseWidget( m_annoWin );
2037#ifdef USEQPE 2038#ifdef USEQPE
2038 Global::showInputMethod(); 2039 Global::showInputMethod();
2039#endif 2040#endif
2040 m_annoWin->setFocus(); 2041 m_annoWin->setFocus();
2041 } 2042 }
@@ -2069,19 +2070,19 @@ void QTReaderApp::editCopy()
2069{ 2070{
2070 QClipboard* cb = QApplication::clipboard(); 2071 QClipboard* cb = QApplication::clipboard();
2071 QString text; 2072 QString text;
2072 int ch; 2073 int ch;
2073 unsigned long currentpos = reader->pagelocate(); 2074 unsigned long currentpos = reader->pagelocate();
2074 unsigned long endpos = reader->locate(); 2075 unsigned long endpos = reader->locate();
2075 if (m_savedpos == 0xffffffff) 2076 if (m_savedpos == 0xffffffff)
2076 { 2077 {
2077 m_savedpos = currentpos; 2078 m_savedpos = currentpos;
2078 } 2079 }
2079 reader->jumpto(m_savedpos); 2080 reader->jumpto(m_savedpos);
2080 while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF) 2081 while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)
2081 { 2082 {
2082 text += ch; 2083 text += ch;
2083 } 2084 }
2084 cb->setText(text); 2085 cb->setText(text);
2085 reader->locate(currentpos); 2086 reader->locate(currentpos);
2086 m_savedpos = 0xffffffff; 2087 m_savedpos = 0xffffffff;
2087} 2088}
@@ -2127,4 +2128,4 @@ void QTReaderApp::settarget()
2127 QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp) 2128 QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp)
2128 + "/" 2129 + "/"
2129 + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg); 2130 + ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg);
2130 regEdit->setText(text); 2131 regEdit->setText(text);
@@ -2140,9 +2141,9 @@ void QTReaderApp::do_mono(const QString& lcn)
2140 { 2141 {
2141 reader->m_charpc = ulcn; 2142 reader->m_charpc = ulcn;
2142 reader->setfont(); 2143 reader->setfont();
2143 reader->refresh(); 2144 reader->refresh();
2144 //reader->setmono(true); 2145// reader->setmono(true);
2145 } 2146 }
2146 else 2147 else
2147 QMessageBox::information(this, PROGNAME, "Must be a number"); 2148 QMessageBox::information(this, PROGNAME, "Must be a number");
2148} 2149}
@@ -2177,3 +2178,3 @@ void QTReaderApp::findNext()
2177{ 2178{
2178// // qDebug("findNext called\n"); 2179// // odebug << "findNext called\n" << oendl;
2179#ifdef __ISEARCH 2180#ifdef __ISEARCH
@@ -2251,30 +2252,30 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
2251 { 2252 {
2252 pos = reader->locate(); 2253 pos = reader->locate();
2253 int pc = (100*pos)/ts; 2254 int pc = (100*pos)/ts;
2254 if (pc != lastpc) 2255 if (pc != lastpc)
2255 { 2256 {
2256 pbar->setProgress(pc); 2257 pbar->setProgress(pc);
2257 qApp->processEvents(); 2258 qApp->processEvents();
2258 reader->setFocus(); 2259 reader->setFocus();
2259 lastpc = pc; 2260 lastpc = pc;
2260 }
2261
2262 if (reader->buffdoc.getpara(test) < 0)
2263 {
2264 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
2265 pos = searchStart;
2266 else
2267 pos = start;
2268 findClose();
2269 pbar->hide();
2270 reader->locate(pos);
2271 return false;
2272 }
2273 } 2261 }
2274// qDebug("Found it at %u:%u", pos, offset); 2262
2263 if (reader->buffdoc.getpara(test) < 0)
2264 {
2265 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
2266 pos = searchStart;
2267 else
2268 pos = start;
2269 findClose();
2270 pbar->hide();
2271 reader->locate(pos);
2272 return false;
2273 }
2274 }
2275// odebug << "Found it at " << pos << ":" << offset << "" << oendl;
2275 pbar->hide(); 2276 pbar->hide();
2276// qDebug("Hid"); 2277// odebug << "Hid" << oendl;
2277 reader->locate(pos+offset); 2278 reader->locate(pos+offset);
2278// qDebug("Loacted"); 2279// odebug << "Loacted" << oendl;
2279// qDebug("page up"); 2280// odebug << "page up" << oendl;
2280 ret = true; 2281 ret = true;
@@ -2283,8 +2284,8 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
2283 { 2284 {
2284 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2) 2285 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
2285 pos = searchStart; 2286 pos = searchStart;
2286 else 2287 else
2287 pos = start; 2288 pos = start;
2288 ret = false; 2289 ret = false;
2289 findClose(); 2290 findClose();
2290 } 2291 }
@@ -2335,3 +2336,3 @@ void QTReaderApp::openFile( const QString &f )
2335{ 2336{
2336// qDebug("File:%s", (const char*)f); 2337// odebug << "File:" << f << "" << oendl;
2337// openFile(DocLnk(f)); 2338// openFile(DocLnk(f));
@@ -2347,9 +2348,9 @@ void QTReaderApp::openFile( const QString &f )
2347#ifdef USEQPE 2348#ifdef USEQPE
2348 if (fm.extension( FALSE ) == "desktop") 2349 if (fm.extension( FALSE ) == "desktop")
2349 { 2350 {
2350 DocLnk d(f); 2351 DocLnk d(f);
2351 QFileInfo fnew(d.file()); 2352 QFileInfo fnew(d.file());
2352 fm = fnew; 2353 fm = fnew;
2353 if (!fm.exists()) return; 2354 if (!fm.exists()) return;
2354 } 2355 }
2355#endif 2356#endif
@@ -2368,3 +2369,3 @@ void QTReaderApp::openFile( const QString &f )
2368 } 2369 }
2369 2370
2370} 2371}
@@ -2375,4 +2376,4 @@ void QTReaderApp::resizeEvent(QResizeEvent* e)
2375 { 2376 {
2376 showNormal(); 2377 showNormal();
2377 showFullScreen(); 2378 showFullScreen();
2378 } 2379 }
@@ -2382,3 +2383,3 @@ void QTReaderApp::handlekey(QKeyEvent* e)
2382{ 2383{
2383// qDebug("Keypress event"); 2384// odebug << "Keypress event" << oendl;
2384 timeb now; 2385 timeb now;
@@ -2388,3 +2389,3 @@ void QTReaderApp::handlekey(QKeyEvent* e)
2388 { 2389 {
2389 return; 2390 return;
2390 } 2391 }
@@ -2393,91 +2394,91 @@ void QTReaderApp::handlekey(QKeyEvent* e)
2393 { 2394 {
2394 case Key_Escape: 2395 case Key_Escape:
2395 // qDebug("escape event"); 2396// odebug << "escape event" << oendl;
2396 if (m_disableesckey) 2397 if (m_disableesckey)
2397 { 2398 {
2398 m_disableesckey = false; 2399 m_disableesckey = false;
2399 } 2400 }
2400 else 2401 else
2401 { 2402 {
2402 m_bcloseDisabled = true; 2403 m_bcloseDisabled = true;
2403 if (m_fullscreen) 2404 if (m_fullscreen)
2404 { 2405 {
2405 m_actFullscreen->setOn(false); 2406 m_actFullscreen->setOn(false);
2406 e->accept(); 2407 e->accept();
2407 } 2408 }
2408 else 2409 else
2409 { 2410 {
2410 // qDebug("escape action"); 2411// odebug << "escape action" << oendl;
2411 doAction(m_escapeTarget, e); 2412 doAction(m_escapeTarget, e);
2412 } 2413 }
2413 } 2414 }
2414 break; 2415 break;
2415 case Key_Space: 2416 case Key_Space:
2416 { 2417 {
2417 doAction(m_spaceTarget, e); 2418 doAction(m_spaceTarget, e);
2418 } 2419 }
2419 break; 2420 break;
2420 case Key_Return: 2421 case Key_Return:
2421 { 2422 {
2422 doAction(m_returnTarget, e); 2423 doAction(m_returnTarget, e);
2423 } 2424 }
2424 break; 2425 break;
2425 case Key_Left: 2426 case Key_Left:
2426 { 2427 {
2427 if (reader->m_autoScroll && m_leftScroll) 2428 if (reader->m_autoScroll && m_leftScroll)
2428 { 2429 {
2429 reader->reduceScroll(); 2430 reader->reduceScroll();
2430 } 2431 }
2431 else 2432 else
2432 { 2433 {
2433 doAction(m_leftTarget, e); 2434 doAction(m_leftTarget, e);
2434 } 2435 }
2435 } 2436 }
2436 break; 2437 break;
2437 case Key_Right: 2438 case Key_Right:
2438 { 2439 {
2439 if (reader->m_autoScroll && m_rightScroll) 2440 if (reader->m_autoScroll && m_rightScroll)
2440 { 2441 {
2441 reader->increaseScroll(); 2442 reader->increaseScroll();
2442 } 2443 }
2443 else 2444 else
2444 { 2445 {
2445 doAction(m_rightTarget, e); 2446 doAction(m_rightTarget, e);
2446 } 2447 }
2447 } 2448 }
2448 break; 2449 break;
2449 case Key_Up: 2450 case Key_Up:
2450 { 2451 {
2451 if (reader->m_autoScroll && m_upScroll) 2452 if (reader->m_autoScroll && m_upScroll)
2452 { 2453 {
2453 reader->increaseScroll(); 2454 reader->increaseScroll();
2454 } 2455 }
2455 else 2456 else
2456 { 2457 {
2457 doAction(m_upTarget, e); 2458 doAction(m_upTarget, e);
2458 } 2459 }
2459 } 2460 }
2460 break; 2461 break;
2461 case Key_Down: 2462 case Key_Down:
2462 { 2463 {
2463 if (reader->m_autoScroll && m_downScroll) 2464 if (reader->m_autoScroll && m_downScroll)
2464 { 2465 {
2465 reader->reduceScroll(); 2466 reader->reduceScroll();
2466 } 2467 }
2467 else 2468 else
2468 { 2469 {
2469 doAction(m_downTarget, e); 2470 doAction(m_downTarget, e);
2470 } 2471 }
2471 } 2472 }
2472 break; 2473 break;
2473 default: 2474 default:
2474 { 2475 {
2475 e->ignore(); 2476 e->ignore();
2476 } 2477 }
2477 2478
2478/* 2479/*
2479 QString msg("Key press was:"); 2480 QString msg("Key press was:");
2480 QString key; 2481 QString key;
2481 msg += key.setNum(e->key()); 2482 msg += key.setNum(e->key());
2482 QMessageBox::information(this, PROGNAME, msg); 2483 QMessageBox::information(this, PROGNAME, msg);
2483*/ 2484*/
@@ -2489,18 +2490,18 @@ void QTReaderApp::showEditTools()
2489// if ( !doc ) 2490// if ( !doc )
2490 //close(); 2491// close();
2491 if (m_fullscreen) 2492 if (m_fullscreen)
2492 { 2493 {
2493 if (menubar != NULL) menubar->hide(); 2494 if (menubar != NULL) menubar->hide();
2494 if (fileBar != NULL) fileBar->hide(); 2495 if (fileBar != NULL) fileBar->hide();
2495 if (viewBar != NULL) viewBar->hide(); 2496 if (viewBar != NULL) viewBar->hide();
2496 if (navBar != NULL) navBar->hide(); 2497 if (navBar != NULL) navBar->hide();
2497 if (markBar != NULL) markBar->hide(); 2498 if (markBar != NULL) markBar->hide();
2498 searchBar->hide(); 2499 searchBar->hide();
2499 regBar->hide(); 2500 regBar->hide();
2500#ifdef USEQPE 2501#ifdef USEQPE
2501 Global::hideInputMethod(); 2502 Global::hideInputMethod();
2502#endif 2503#endif
2503 m_fontBar->hide(); 2504 m_fontBar->hide();
2504 //showNormal(); 2505// showNormal();
2505 showFullScreen(); 2506 showFullScreen();
2506 } 2507 }
@@ -2508,42 +2509,42 @@ void QTReaderApp::showEditTools()
2508 { 2509 {
2509 //qDebug("him"); 2510// odebug << "him" << oendl;
2510#ifdef USEQPE 2511#ifdef USEQPE
2511 Global::hideInputMethod(); 2512 Global::hideInputMethod();
2512#endif 2513#endif
2513 //qDebug("eb"); 2514// odebug << "eb" << oendl;
2514 menubar->show(); 2515 menubar->show();
2515 if (fileBar != NULL) fileBar->show(); 2516 if (fileBar != NULL) fileBar->show();
2516 if (viewBar != NULL) viewBar->show(); 2517 if (viewBar != NULL) viewBar->show();
2517 if (navBar != NULL) navBar->show(); 2518 if (navBar != NULL) navBar->show();
2518 if (markBar != NULL) markBar->show(); 2519 if (markBar != NULL) markBar->show();
2519 mb->show(); 2520 mb->show();
2520 if ( searchVisible ) 2521 if ( searchVisible )
2521 { 2522 {
2522#ifdef USEQPE 2523#ifdef USEQPE
2523 Global::showInputMethod(); 2524 Global::showInputMethod();
2524#endif 2525#endif
2525 searchBar->show(); 2526 searchBar->show();
2526 } 2527 }
2527 if ( regVisible ) 2528 if ( regVisible )
2528 { 2529 {
2529#ifdef USEQPE 2530#ifdef USEQPE
2530 Global::showInputMethod(); 2531 Global::showInputMethod();
2531#endif 2532#endif
2532 regBar->show(); 2533 regBar->show();
2533 } 2534 }
2534 if (m_fontVisible) m_fontBar->show(); 2535 if (m_fontVisible) m_fontBar->show();
2535 //qDebug("sn"); 2536// odebug << "sn" << oendl;
2536 showNormal(); 2537 showNormal();
2537 //qDebug("sm"); 2538// odebug << "sm" << oendl;
2538#ifdef USEQPE 2539#ifdef USEQPE
2539 showMaximized(); 2540 showMaximized();
2540#endif 2541#endif
2541 //setCentralWidget(reader); 2542// setCentralWidget(reader);
2542 } 2543 }
2543 2544
2544// qDebug("uc"); 2545// odebug << "uc" << oendl;
2545 updateCaption(); 2546 updateCaption();
2546// qDebug("rw"); 2547// odebug << "rw" << oendl;
2547 editorStack->raiseWidget( reader ); 2548 editorStack->raiseWidget( reader );
2548// qDebug("sf"); 2549// odebug << "sf" << oendl;
2549 reader->setFocus(); 2550 reader->setFocus();
@@ -2555,5 +2556,5 @@ void QTReaderApp::save()
2555 if ( !doc ) 2556 if ( !doc )
2556 return; 2557 return;
2557 if ( !editor->edited() ) 2558 if ( !editor->edited() )
2558 return; 2559 return;
2559 2560
@@ -2563,15 +2564,15 @@ void QTReaderApp::save()
2563 if ( doc->name().isEmpty() ) { 2564 if ( doc->name().isEmpty() ) {
2564 unsigned ispace = pt.find( ' ' ); 2565 unsigned ispace = pt.find( ' ' );
2565 unsigned ienter = pt.find( '\n' ); 2566 unsigned ienter = pt.find( '\n' );
2566 int i = (ispace < ienter) ? ispace : ienter; 2567 int i = (ispace < ienter) ? ispace : ienter;
2567 QString docname; 2568 QString docname;
2568 if ( i == -1 ) { 2569 if ( i == -1 ) {
2569 if ( pt.isEmpty() ) 2570 if ( pt.isEmpty() )
2570 docname = "Empty Text"; 2571 docname = "Empty Text";
2571 else 2572 else
2572 docname = pt; 2573 docname = pt;
2573 } else { 2574 } else {
2574 docname = pt.left( i ); 2575 docname = pt.left( i );
2575 } 2576 }
2576 doc->setName(docname); 2577 doc->setName(docname);
2577 } 2578 }
@@ -2587,5 +2588,5 @@ void QTReaderApp::clear()
2587// QMessageBox::information(this, PROGNAME, "Deleting doc", 1); 2588// QMessageBox::information(this, PROGNAME, "Deleting doc", 1);
2588 //delete doc; 2589// delete doc;
2589// QMessageBox::information(this, PROGNAME, "Deleted doc", 1); 2590// QMessageBox::information(this, PROGNAME, "Deleted doc", 1);
2590 //doc = 0; 2591// doc = 0;
2591 // } 2592 // }
@@ -2597,8 +2598,8 @@ void QTReaderApp::updateCaption()
2597// if ( !doc ) 2598// if ( !doc )
2598 //setCaption( tr("QTReader") ); 2599// setCaption( tr("QTReader") );
2599// else { 2600// else {
2600 //QString s = doc->name(); 2601// QString s = doc->name();
2601 //if ( s.isEmpty() ) 2602// if ( s.isEmpty() )
2602 // s = tr( "Unnamed" ); 2603// s = tr( "Unnamed" );
2603 setCaption( reader->m_string + " - " + tr("Reader") ); 2604 setCaption( reader->m_string + " - " + tr("Reader") );
2604// } 2605// }
@@ -2616,8 +2617,8 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
2616{ 2617{
2617// qDebug("Close event"); 2618// odebug << "Close event" << oendl;
2618 if (m_fullscreen) 2619 if (m_fullscreen)
2619 { 2620 {
2620 m_fullscreen = false; 2621 m_fullscreen = false;
2621 showEditTools(); 2622 showEditTools();
2622 e->accept(); 2623 e->accept();
2623 } 2624 }
@@ -2625,3 +2626,3 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
2625 { 2626 {
2626 e->accept(); 2627 e->accept();
2627 } 2628 }
@@ -2629,54 +2630,54 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
2629 { 2630 {
2630 if (editorStack->visibleWidget() == reader) 2631 if (editorStack->visibleWidget() == reader)
2631 { 2632 {
2632 if ((m_escapeTarget != cesNone) && m_bcloseDisabled) 2633 if ((m_escapeTarget != cesNone) && m_bcloseDisabled)
2633 { 2634 {
2634 //qDebug("Close disabled"); 2635// odebug << "Close disabled" << oendl;
2635 m_bcloseDisabled = false; 2636 m_bcloseDisabled = false;
2636 e->ignore(); 2637 e->ignore();
2637 } 2638 }
2638 else 2639 else
2639 { 2640 {
2640 if (m_fontVisible) 2641 if (m_fontVisible)
2641 { 2642 {
2642 m_fontBar->hide(); 2643 m_fontBar->hide();
2643 m_fontVisible = false; 2644 m_fontVisible = false;
2644 } 2645 }
2645 if (regVisible) 2646 if (regVisible)
2646 { 2647 {
2647 regBar->hide(); 2648 regBar->hide();
2648#ifdef USEQPE 2649#ifdef USEQPE
2649 Global::hideInputMethod(); 2650 Global::hideInputMethod();
2650#endif 2651#endif
2651 regVisible = false; 2652 regVisible = false;
2652 return; 2653 return;
2653 } 2654 }
2654 if (searchVisible) 2655 if (searchVisible)
2655 { 2656 {
2656 searchBar->hide(); 2657 searchBar->hide();
2657#ifdef USEQPE 2658#ifdef USEQPE
2658 Global::hideInputMethod(); 2659 Global::hideInputMethod();
2659#endif 2660#endif
2660 searchVisible = false; 2661 searchVisible = false;
2661 return; 2662 return;
2662 } 2663 }
2663 if (m_fBkmksChanged && pBkmklist != NULL) 2664 if (m_fBkmksChanged && pBkmklist != NULL)
2664 { 2665 {
2665 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0) 2666 if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
2666 savebkmks(); 2667 savebkmks();
2667 delete pBkmklist; 2668 delete pBkmklist;
2668 pBkmklist = NULL; 2669 pBkmklist = NULL;
2669 m_fBkmksChanged = false; 2670 m_fBkmksChanged = false;
2670 } 2671 }
2671 bFromDocView = FALSE; 2672 bFromDocView = FALSE;
2672 updatefileinfo(); 2673 updatefileinfo();
2673 saveprefs(); 2674 saveprefs();
2674 e->accept(); 2675 e->accept();
2675 } 2676 }
2676 } 2677 }
2677 else 2678 else
2678 { 2679 {
2679 showEditTools(); 2680 showEditTools();
2680 m_disableesckey = true; 2681 m_disableesckey = true;
2681 } 2682 }
2682 } 2683 }
@@ -2688,3 +2689,3 @@ void QTReaderApp::do_gotomark()
2688 if (!listbkmk(pBkmklist)) 2689 if (!listbkmk(pBkmklist))
2689 QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); 2690 QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
2690} 2691}
@@ -2695,3 +2696,3 @@ void QTReaderApp::do_delmark()
2695 if (!listbkmk(pBkmklist)) 2696 if (!listbkmk(pBkmklist))
2696 QMessageBox::information(this, PROGNAME, "No bookmarks in memory"); 2697 QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
2697} 2698}
@@ -2702,5 +2703,5 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
2702 if (_lab.isEmpty()) 2703 if (_lab.isEmpty())
2703 bkmkselector->setText("Cancel"); 2704 bkmkselector->setText("Cancel");
2704 else 2705 else
2705 bkmkselector->setText(_lab); 2706 bkmkselector->setText(_lab);
2706 int cnt = 0; 2707 int cnt = 0;
@@ -2708,12 +2709,12 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
2708 { 2709 {
2709 for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++) 2710 for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
2710 { 2711 {
2711#ifdef _UNICODE 2712#ifdef _UNICODE
2712 // qDebug("Item:%s", (const char*)toQString(i->name())); 2713// odebug << "Item:" << toQString(i->name()) << "" << oendl;
2713 bkmkselector->insertItem(toQString(i->name())); 2714 bkmkselector->insertItem(toQString(i->name()));
2714#else 2715#else
2715 bkmkselector->insertItem(i->name()); 2716 bkmkselector->insertItem(i->name());
2716#endif 2717#endif
2717 cnt++; 2718 cnt++;
2718 } 2719 }
2719 } 2720 }
@@ -2721,8 +2722,8 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
2721 { 2722 {
2722 hidetoolbars(); 2723 hidetoolbars();
2723 editorStack->raiseWidget( bkmkselector ); 2724 editorStack->raiseWidget( bkmkselector );
2724 return true; 2725 return true;
2725 } 2726 }
2726 else 2727 else
2727 return false; 2728 return false;
2728} 2729}
@@ -2740,5 +2741,5 @@ void QTReaderApp::do_regedit()
2740 reader->bDoUpdates = false; 2741 reader->bDoUpdates = false;
2741// qDebug("Showing regbar"); 2742// odebug << "Showing regbar" << oendl;
2742 regBar->show(); 2743 regBar->show();
2743// qDebug("Showing kbd"); 2744// odebug << "Showing kbd" << oendl;
2744#ifdef USEQPE 2745#ifdef USEQPE
@@ -2756,34 +2757,18 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
2756 QString fn = toQString( 2757 QString fn = toQString(
2757 CFiledata(bk->anno()).name() 2758 CFiledata(bk->anno()).name()
2758 ); 2759 );
2759 //qDebug("fileinfo"); 2760// odebug << "fileinfo" << oendl;
2760 if (!fn.isEmpty() && QFileInfo(fn).isFile()) 2761 if (!fn.isEmpty() && QFileInfo(fn).isFile())
2761 { 2762 {
2762 //qDebug("Opening"); 2763// odebug << "Opening" << oendl;
2763 openFile(fn); 2764 openFile(fn);
2764 struct stat fnstat; 2765 struct stat fnstat;
2765 stat((const char *)reader->m_lastfile, &fnstat); 2766 stat((const char *)reader->m_lastfile, &fnstat);
2766 2767
2767 if (CFiledata(bk->anno()).date() 2768 if (CFiledata(bk->anno()).date()
2768 != fnstat.st_mtime) 2769 != fnstat.st_mtime)
2769 { 2770 {
2770 CFiledata fd(bk->anno()); 2771 CFiledata fd(bk->anno());
2771 fd.setdate(fnstat.st_mtime); 2772 fd.setdate(fnstat.st_mtime);
2772 bk->value(0); 2773 bk->value(0);
2773 }
2774 else
2775 {
2776 unsigned short svlen = bk->filedatalen();
2777 unsigned char* svdata = bk->filedata();
2778 reader->putSaveData(svdata, svlen);
2779 // setstate(svdata, svlen);
2780 if (svlen != 0)
2781 {
2782 QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
2783 }
2784 // qDebug("updating");
2785 // showEditTools();
2786 reader->locate(bk->value());
2787 }
2788 return true;
2789 } 2774 }
@@ -2791,3 +2776,19 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
2791 { 2776 {
2792 return false; 2777 unsigned short svlen = bk->filedatalen();
2778 unsigned char* svdata = bk->filedata();
2779 reader->putSaveData(svdata, svlen);
2780// setstate(svdata, svlen);
2781 if (svlen != 0)
2782 {
2783 QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
2784 }
2785// odebug << "updating" << oendl;
2786// showEditTools();
2787 reader->locate(bk->value());
2788 }
2789 return true;
2790 }
2791 else
2792 {
2793 return false;
2793 } 2794 }
@@ -2800,143 +2801,143 @@ void QTReaderApp::gotobkmk(int ind)
2800 { 2801 {
2801 case cOpenFile: 2802 case cOpenFile:
2802 { 2803 {
2803 // qApp->processEvents(); 2804// qApp->processEvents();
2804 if (!openfrombkmk((*pOpenlist)[ind])) 2805 if (!openfrombkmk((*pOpenlist)[ind]))
2805 { 2806 {
2806 pOpenlist->erase(ind); 2807 pOpenlist->erase(ind);
2807 QMessageBox::information(this, PROGNAME, "Can't find file"); 2808 QMessageBox::information(this, PROGNAME, "Can't find file");
2808 } 2809 }
2809 } 2810 }
2810 break; 2811 break;
2811 case cGotoBkmk: 2812 case cGotoBkmk:
2812 reader->locate((*pBkmklist)[ind]->value()); 2813 reader->locate((*pBkmklist)[ind]->value());
2813 break; 2814 break;
2814 case cDelBkmk: 2815 case cDelBkmk:
2815 //// qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name()); 2816//// odebug << "Deleting:" << (*pBkmklist)[ind]->name() << "\n" << oendl;
2816 pBkmklist->erase(ind); 2817 pBkmklist->erase(ind);
2817 m_fBkmksChanged = true; 2818 m_fBkmksChanged = true;
2818 // pBkmklist->sort(); 2819// pBkmklist->sort();
2819 break; 2820 break;
2820 case cRmBkmkFile: 2821 case cRmBkmkFile:
2821 { 2822 {
2822#ifndef USEQPE 2823#ifndef USEQPE
2823 QDir d = QDir::home(); // "/" 2824 QDir d = QDir::home(); // "/"
2824 d.cd(APPDIR); 2825 d.cd(APPDIR);
2825 d.remove(bkmkselector->text(ind)); 2826 d.remove(bkmkselector->text(ind));
2826#else /* USEQPE */ 2827#else /* USEQPE */
2827 unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind))); 2828 unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind)));
2828#endif /* USEQPE */ 2829#endif /* USEQPE */
2829 } 2830 }
2830 break; 2831 break;
2831 case cLdConfig: 2832 case cLdConfig:
2832 readconfig(bkmkselector->text(ind), false); 2833 readconfig(bkmkselector->text(ind), false);
2833 break; 2834 break;
2834 case cRmConfig: 2835 case cRmConfig:
2835 { 2836 {
2836#ifndef USEQPE 2837#ifndef USEQPE
2837 QDir d = QDir::home(); // "/" 2838 QDir d = QDir::home(); // "/"
2838 d.cd(APPDIR "/configs"); 2839 d.cd(APPDIR "/configs");
2839 d.remove(bkmkselector->text(ind)); 2840 d.remove(bkmkselector->text(ind));
2840#else /* USEQPE */ 2841#else /* USEQPE */
2841 unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind))); 2842 unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind)));
2842#endif /* USEQPE */ 2843#endif /* USEQPE */
2843 } 2844 }
2844 break; 2845 break;
2845 case cExportLinks: 2846 case cExportLinks:
2846 { 2847 {
2847#ifndef USEQPE 2848#ifndef USEQPE
2848 QDir d = QDir::home(); // "/" 2849 QDir d = QDir::home(); // "/"
2849 d.cd(APPDIR "/urls"); 2850 d.cd(APPDIR "/urls");
2850 QFileInfo fi(d, bkmkselector->text(ind)); 2851 QFileInfo fi(d, bkmkselector->text(ind));
2851 if (fi.exists()) 2852 if (fi.exists())
2852 { 2853 {
2853 QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) ); 2854 QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) );
2854 if (!outfile.isEmpty()) 2855 if (!outfile.isEmpty())
2855 { 2856 {
2856 FILE* fout = fopen((const char *)outfile, "w"); 2857 FILE* fout = fopen((const char *)outfile, "w");
2857 if (fout != NULL) 2858 if (fout != NULL)
2858 { 2859 {
2859 FILE* fin = fopen((const char *)fi.absFilePath(), "r"); 2860 FILE* fin = fopen((const char *)fi.absFilePath(), "r");
2860 if (fin != NULL) 2861 if (fin != NULL)
2861 { 2862 {
2862 fprintf(fout, "<html><body>\n"); 2863 fprintf(fout, "<html><body>\n");
2863 int ch = 0; 2864 int ch = 0;
2864 while ((ch = fgetc(fin)) != EOF) 2865 while ((ch = fgetc(fin)) != EOF)
2865 { 2866 {
2866 fputc(ch, fout); 2867 fputc(ch, fout);
2867 } 2868 }
2868 fclose(fin); 2869 fclose(fin);
2869 fprintf(fout, "</html></body>\n"); 2870 fprintf(fout, "</html></body>\n");
2870 d.remove(bkmkselector->text(ind)); 2871 d.remove(bkmkselector->text(ind));
2871 } 2872 }
2872 fclose(fout); 2873 fclose(fout);
2873 } 2874 }
2874 else 2875 else
2875 QMessageBox::information(this, PROGNAME, "Couldn't open output"); 2876 QMessageBox::information(this, PROGNAME, "Couldn't open output");
2876 } 2877 }
2877 } 2878 }
2878#else /* USEQPE */ 2879#else /* USEQPE */
2879 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r"); 2880 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
2880 if (fin != NULL) 2881 if (fin != NULL)
2881 { 2882 {
2882 bool allok = false; 2883 bool allok = false;
2883 fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null); 2884 fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null);
2884 if (fb->exec()) 2885 if (fb->exec())
2885 { 2886 {
2886 QString outfile = fb->getCurrentFile(); 2887 QString outfile = fb->getCurrentFile();
2887 FILE* fout = fopen((const char *)outfile, "w"); 2888 FILE* fout = fopen((const char *)outfile, "w");
2888 if (fout != NULL) 2889 if (fout != NULL)
2889 { 2890 {
2890 fprintf(fout, "<html><body>\n"); 2891 fprintf(fout, "<html><body>\n");
2891 int ch = 0; 2892 int ch = 0;
2892 while ((ch = fgetc(fin)) != EOF) 2893 while ((ch = fgetc(fin)) != EOF)
2893 { 2894 {
2894 fputc(ch, fout); 2895 fputc(ch, fout);
2895 } 2896 }
2896 fprintf(fout, "</html></body>\n"); 2897 fprintf(fout, "</html></body>\n");
2897 fclose(fout); 2898 fclose(fout);
2898 allok = true; 2899 allok = true;
2899 } 2900 }
2900 else 2901 else
2901 QMessageBox::information(this, PROGNAME, "Couldn't open output"); 2902 QMessageBox::information(this, PROGNAME, "Couldn't open output");
2902 } 2903 }
2903 delete fb; 2904 delete fb;
2904 fclose(fin); 2905 fclose(fin);
2905 if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind))); 2906 if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
2906 } 2907 }
2907 else 2908 else
2908 { 2909 {
2909 QMessageBox::information(this, PROGNAME, "Couldn't open input"); 2910 QMessageBox::information(this, PROGNAME, "Couldn't open input");
2910 } 2911 }
2911 2912
2912/* 2913/*
2913 CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE ); 2914 CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );
2914 int ret = f->exec(); 2915 int ret = f->exec();
2915 qDebug("Return:%d", ret); 2916 odebug << "Return:" << ret << "" << oendl;
2916 DocLnk* doc = f->getDoc(); 2917 DocLnk* doc = f->getDoc();
2917 if (doc != NULL) 2918 if (doc != NULL)
2918 { 2919 {
2919 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r"); 2920 FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
2920 QString rt; 2921 QString rt;
2921 rt = "<html><body>\n"; 2922 rt = "<html><body>\n";
2922 int ch = 0; 2923 int ch = 0;
2923 while ((ch = fgetc(fin)) != EOF) 2924 while ((ch = fgetc(fin)) != EOF)
2924 { 2925 {
2925 rt += (char)ch; 2926 rt += (char)ch;
2926 } 2927 }
2927 fclose(fin); 2928 fclose(fin);
2928 rt += "</html></body>\n"; 2929 rt += "</html></body>\n";
2929 if ( doc->name().isEmpty() ) 2930 if ( doc->name().isEmpty() )
2930 { 2931 {
2931 doc->setName(bkmkselector->text(ind)); 2932 doc->setName(bkmkselector->text(ind));
2932 } 2933 }
2933 FileManager fm; 2934 FileManager fm;
2934 fm.saveFile( *doc, rt ); 2935 fm.saveFile( *doc, rt );
2935 qDebug("YES"); 2936 odebug << "YES" << oendl;
2936 } 2937 }
2937 else 2938 else
2938 { 2939 {
2939 qDebug("NO"); 2940 odebug << "NO" << oendl;
2940 } 2941 }
2941 delete f; 2942 delete f;
2942*/ 2943*/
@@ -2944,4 +2945,4 @@ void QTReaderApp::gotobkmk(int ind)
2944#endif /* USEQPE */ 2945#endif /* USEQPE */
2945 } 2946 }
2946 break; 2947 break;
2947 } 2948 }
@@ -2953,4 +2954,4 @@ void QTReaderApp::cancelbkmk()
2953 { 2954 {
2954 QString fn = usefilebrowser(); 2955 QString fn = usefilebrowser();
2955 if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn); 2956 if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
2956 } 2957 }
@@ -2973,5 +2974,5 @@ void QTReaderApp::do_jump(const QString& lcn)
2973 if (ok) 2974 if (ok)
2974 reader->locate(ulcn); 2975 reader->locate(ulcn);
2975 else 2976 else
2976 QMessageBox::information(this, PROGNAME, "Must be a number"); 2977 QMessageBox::information(this, PROGNAME, "Must be a number");
2977} 2978}
@@ -2989,27 +2990,27 @@ void QTReaderApp::do_regaction()
2989 case cAutoGen: 2990 case cAutoGen:
2990 do_autogen(regEdit->text()); 2991 do_autogen(regEdit->text());
2991 break; 2992 break;
2992 case cAddBkmk: 2993 case cAddBkmk:
2993 do_addbkmk(regEdit->text()); 2994 do_addbkmk(regEdit->text());
2994 break; 2995 break;
2995 case cJump: 2996 case cJump:
2996 do_jump(regEdit->text()); 2997 do_jump(regEdit->text());
2997 break; 2998 break;
2998/* 2999/*
2999 case cMonoSpace: 3000 case cMonoSpace:
3000 do_mono(regEdit->text()); 3001 do_mono(regEdit->text());
3001 break; 3002 break;
3002*/ 3003*/
3003 case cSetTarget: 3004 case cSetTarget:
3004 do_settarget(regEdit->text()); 3005 do_settarget(regEdit->text());
3005 break; 3006 break;
3006#ifdef _SCROLLPIPE 3007#ifdef _SCROLLPIPE
3007 case cSetPipeTarget: 3008 case cSetPipeTarget:
3008 do_setpipetarget(regEdit->text()); 3009 do_setpipetarget(regEdit->text());
3009 break; 3010 break;
3010#endif 3011#endif
3011 case cSetConfigName: 3012 case cSetConfigName:
3012 // qDebug("Saving config"); 3013// odebug << "Saving config" << oendl;
3013 do_saveconfig(regEdit->text(), false); 3014 do_saveconfig(regEdit->text(), false);
3014 break; 3015 break;
3015 } 3016 }
@@ -3028,5 +3029,5 @@ void QTReaderApp::do_settarget(const QString& _txt)
3028 { 3029 {
3029 m_targetapp = ""; 3030 m_targetapp = "";
3030 m_targetmsg = ""; 3031 m_targetmsg = "";
3031 QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename"); 3032 QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename");
3032 } 3033 }
@@ -3034,4 +3035,4 @@ void QTReaderApp::do_settarget(const QString& _txt)
3034 { 3035 {
3035 m_targetapp = _txt.left(ind); 3036 m_targetapp = _txt.left(ind);
3036 m_targetmsg = _txt.right(_txt.length()-ind-1); 3037 m_targetmsg = _txt.right(_txt.length()-ind-1);
3037 } 3038 }
@@ -3049,3 +3050,3 @@ void QTReaderApp::chooseencoding()
3049 { 3050 {
3050 m_fontSelector->insertItem(iter->mime); 3051 m_fontSelector->insertItem(iter->mime);
3051 } // delete the FontDatabase!!! 3052 } // delete the FontDatabase!!!
@@ -3062,8 +3063,8 @@ void QTReaderApp::setfont()
3062#ifdef USEQPE 3063#ifdef USEQPE
3063 FontDatabase f; 3064 FontDatabase f;
3064#else 3065#else
3065 QFontDatabase f; 3066 QFontDatabase f;
3066#endif 3067#endif
3067 QStringList flist = f.families(); 3068 QStringList flist = f.families();
3068 m_fontSelector->insertStringList(flist); 3069 m_fontSelector->insertStringList(flist);
3069 } // delete the FontDatabase!!! 3070 } // delete the FontDatabase!!!
@@ -3072,7 +3073,7 @@ void QTReaderApp::setfont()
3072 { 3073 {
3073 if (m_fontSelector->text(i) == reader->m_fontname) 3074 if (m_fontSelector->text(i) == reader->m_fontname)
3074 { 3075 {
3075 m_fontSelector->setCurrentItem(i); 3076 m_fontSelector->setCurrentItem(i);
3076 break; 3077 break;
3077 } 3078 }
3078 } 3079 }
@@ -3088,7 +3089,7 @@ void QTReaderApp::setfontHelper(const QString& lcn, int size)
3088 { 3089 {
3089 QFont f(lcn, 10); 3090 QFont f(lcn, 10);
3090 bkmkselector->setFont( f ); 3091 bkmkselector->setFont( f );
3091 regEdit->setFont( f ); 3092 regEdit->setFont( f );
3092 searchEdit->setFont( f ); 3093 searchEdit->setFont( f );
3093 m_annoWin->setFont( f ); 3094 m_annoWin->setFont( f );
3094 } 3095 }
@@ -3097,3 +3098,3 @@ void QTReaderApp::setfontHelper(const QString& lcn, int size)
3097 { 3098 {
3098 reader->ChangeFont(size); 3099 reader->ChangeFont(size);
3099 } 3100 }
@@ -3103,6 +3104,6 @@ void QTReaderApp::do_setencoding(int i)
3103{ 3104{
3104// qDebug("setencoding:%d", i); 3105// odebug << "setencoding:" << i << "" << oendl;
3105 if (m_fontAction == cChooseEncoding) 3106 if (m_fontAction == cChooseEncoding)
3106 { 3107 {
3107 reader->setencoding(i); 3108 reader->setencoding(i);
3108 } 3109 }
@@ -3111,5 +3112,5 @@ void QTReaderApp::do_setencoding(int i)
3111 m_fontVisible = false; 3112 m_fontVisible = false;
3112// qDebug("showedit"); 3113// odebug << "showedit" << oendl;
3113 if (reader->isVisible()) showEditTools(); 3114 if (reader->isVisible()) showEditTools();
3114// qDebug("showeditdone"); 3115// odebug << "showeditdone" << oendl;
3115} 3116}
@@ -3120,3 +3121,3 @@ void QTReaderApp::do_setfont(const QString& lcn)
3120 { 3121 {
3121 setfontHelper(lcn); 3122 setfontHelper(lcn);
3122 } 3123 }
@@ -3125,6 +3126,6 @@ void QTReaderApp::do_setfont(const QString& lcn)
3125 m_fontVisible = false; 3126 m_fontVisible = false;
3126// qDebug("showedit"); 3127// odebug << "showedit" << oendl;
3127 //if (reader->isVisible()) 3128 //if (reader->isVisible())
3128 showEditTools(); 3129 showEditTools();
3129// qDebug("showeditdone"); 3130// odebug << "showeditdone" << oendl;
3130} 3131}
@@ -3135,3 +3136,3 @@ void QTReaderApp::do_autogen(const QString& regText)
3135 reader->sizes(fs,ts); 3136 reader->sizes(fs,ts);
3136// // qDebug("Reg:%s\n", (const tchar*)(regEdit->text())); 3137// // odebug << "Reg:" << (const tchar*)(regEdit->text()) << "\n" << oendl;
3137 m_autogenstr = regText; 3138 m_autogenstr = regText;
@@ -3160,5 +3161,5 @@ void QTReaderApp::do_autogen(const QString& regText)
3160 pbar->setProgress(pc); 3161 pbar->setProgress(pc);
3161 qApp->processEvents(); 3162 qApp->processEvents();
3162 if (reader->locate() != lcn) reader->jumpto(lcn); 3163 if (reader->locate() != lcn) reader->jumpto(lcn);
3163 reader->setFocus(); 3164 reader->setFocus();
3164 lastpc = pc; 3165 lastpc = pc;
@@ -3171,3 +3172,3 @@ void QTReaderApp::do_autogen(const QString& regText)
3171#endif 3172#endif
3172 pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn)); 3173 pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn));
3173 } 3174 }
@@ -3182,13 +3183,13 @@ void QTReaderApp::saveprefs()
3182{ 3183{
3183// qDebug("saveprefs"); 3184// odebug << "saveprefs" << oendl;
3184// reader->saveprefs("uqtreader"); 3185// reader->saveprefs("uqtreader");
3185// if (!m_loadedconfig) 3186// if (!m_loadedconfig)
3186 do_saveconfig( APPDIR, true ); 3187 do_saveconfig( APPDIR, true );
3187 3188
3188/* 3189/*
3189 Config config( APPDIR ); 3190 Config config( APPDIR );
3190 config.setGroup( "View" ); 3191 config.setGroup( "View" );
3191 3192
3192 reader->m_lastposn = reader->pagelocate(); 3193 reader->m_lastposn = reader->pagelocate();
3193 3194
3194 config.writeEntry("FloatDialogs", m_bFloatingDialog); 3195 config.writeEntry("FloatDialogs", m_bFloatingDialog);
@@ -3263,7 +3264,7 @@ void QTReaderApp::oldFile()
3263{ 3264{
3264// qDebug("oldFile called"); 3265// odebug << "oldFile called" << oendl;
3265 reader->setText(true); 3266 reader->setText(true);
3266// qDebug("settext called"); 3267// odebug << "settext called" << oendl;
3267 showEditTools(); 3268 showEditTools();
3268// qDebug("showedit called"); 3269// odebug << "showedit called" << oendl;
3269} 3270}
@@ -3277,14 +3278,14 @@ void info_cb(Fl_Widget* o, void* _data)
3277 { 3278 {
3278 3279
3279 infowin = new Fl_Window(160,240); 3280 infowin = new Fl_Window(160,240);
3280 filename = new Fl_Output(45,5,110,14,"Filename"); 3281 filename = new Fl_Output(45,5,110,14,"Filename");
3281 filesize = new Fl_Output(45,25,110,14,"Filesize"); 3282 filesize = new Fl_Output(45,25,110,14,"Filesize");
3282 textsize = new Fl_Output(45,45,110,14,"Textsize"); 3283 textsize = new Fl_Output(45,45,110,14,"Textsize");
3283 comprat = new CBar(45,65,110,14,"Ratio %"); 3284 comprat = new CBar(45,65,110,14,"Ratio %");
3284 posn = new Fl_Output(45,85,110,14,"Location"); 3285 posn = new Fl_Output(45,85,110,14,"Location");
3285 frcn = new CBar(45,105,110,14,"% Read"); 3286 frcn = new CBar(45,105,110,14,"% Read");
3286 about = new Fl_Multiline_Output(5,125,150,90); 3287 about = new Fl_Multiline_Output(5,125,150,90);
3287 about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files"); 3288 about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");
3288 Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay"); 3289 Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");
3289 infowin->set_modal(); 3290 infowin->set_modal();
3290 } 3291 }
@@ -3292,21 +3293,21 @@ void info_cb(Fl_Widget* o, void* _data)
3292 { 3293 {
3293 unsigned long fs,ts; 3294 unsigned long fs,ts;
3294 tchar sz[20]; 3295 tchar sz[20];
3295 ((reader_ui *)_data)->input->sizes(fs,ts); 3296 ((reader_ui *)_data)->input->sizes(fs,ts);
3296 unsigned long pl = ((reader_ui *)_data)->input->locate(); 3297 unsigned long pl = ((reader_ui *)_data)->input->locate();
3297 3298
3298 filename->value(((reader_ui *)_data)->g_filename); 3299 filename->value(((reader_ui *)_data)->g_filename);
3299 3300
3300 sprintf(sz,"%u",fs); 3301 sprintf(sz,"%u",fs);
3301 filesize->value(sz); 3302 filesize->value(sz);
3302 3303
3303 sprintf(sz,"%u",ts); 3304 sprintf(sz,"%u",ts);
3304 textsize->value(sz); 3305 textsize->value(sz);
3305 3306
3306 comprat->value(100-(100*fs + (ts >> 1))/ts); 3307 comprat->value(100-(100*fs + (ts >> 1))/ts);
3307 3308
3308 sprintf(sz,"%u",pl); 3309 sprintf(sz,"%u",pl);
3309 posn->value(sz); 3310 posn->value(sz);
3310 3311
3311 frcn->value((100*pl + (ts >> 1))/ts); 3312 frcn->value((100*pl + (ts >> 1))/ts);
3312 } 3313 }
@@ -3321,12 +3322,12 @@ void QTReaderApp::savebkmks()
3321#ifndef USEQPE 3322#ifndef USEQPE
3322 QDir d = QDir::home(); // "/" 3323 QDir d = QDir::home(); // "/"
3323 d.cd(APPDIR); 3324 d.cd(APPDIR);
3324 QFileInfo fi(d, reader->m_string); 3325 QFileInfo fi(d, reader->m_string);
3325 BkmkFile bf((const char *)fi.absFilePath(), true); 3326 BkmkFile bf((const char *)fi.absFilePath(), true);
3326#else /* USEQPE */ 3327#else /* USEQPE */
3327 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true); 3328 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true);
3328#endif /* USEQPE */ 3329#endif /* USEQPE */
3329 bf.write(*pBkmklist); 3330 bf.write(*pBkmklist);
3330 } 3331 }
3331 m_fBkmksChanged = false; 3332 m_fBkmksChanged = false;
3332} 3333}
@@ -3336,5 +3337,5 @@ void QTReaderApp::readfilelist()
3336#ifndef USEQPE 3337#ifndef USEQPE
3337 QDir d = QDir::home(); // "/" 3338 QDir d = QDir::home(); // "/"
3338 d.cd(APPDIR); 3339 d.cd(APPDIR);
3339 QFileInfo fi(d, ".openfiles"); 3340 QFileInfo fi(d, ".openfiles");
3340 BkmkFile bf((const char *)fi.absFilePath()); 3341 BkmkFile bf((const char *)fi.absFilePath());
@@ -3343,6 +3344,6 @@ void QTReaderApp::readfilelist()
3343#endif /* USEQPE */ 3344#endif /* USEQPE */
3344// qDebug("Reading open files"); 3345// odebug << "Reading open files" << oendl;
3345 pOpenlist = bf.readall(); 3346 pOpenlist = bf.readall();
3346// if (pOpenlist != NULL) qDebug("...with success"); 3347// if (pOpenlist != NULL) odebug << "...with success" << oendl;
3347// else qDebug("...without success!"); 3348// else odebug << "...without success!" << oendl;
3348} 3349}
@@ -3354,11 +3355,11 @@ void QTReaderApp::savefilelist()
3354#ifndef USEQPE 3355#ifndef USEQPE
3355 QDir d = QDir::home(); // "/" 3356 QDir d = QDir::home(); // "/"
3356 d.cd(APPDIR); 3357 d.cd(APPDIR);
3357 QFileInfo fi(d, ".openfiles"); 3358 QFileInfo fi(d, ".openfiles");
3358 BkmkFile bf((const char *)fi.absFilePath(), true); 3359 BkmkFile bf((const char *)fi.absFilePath(), true);
3359#else /* USEQPE */ 3360#else /* USEQPE */
3360 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true); 3361 BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true);
3361#endif /* USEQPE */ 3362#endif /* USEQPE */
3362 //qDebug("Writing open files"); 3363// odebug << "Writing open files" << oendl;
3363 bf.write(*pOpenlist); 3364 bf.write(*pOpenlist);
3364 } 3365 }
@@ -3370,3 +3371,3 @@ void QTReaderApp::readbkmks()
3370 { 3371 {
3371 delete pBkmklist; 3372 delete pBkmklist;
3372 } 3373 }
@@ -3375,24 +3376,24 @@ void QTReaderApp::readbkmks()
3375#ifndef USEQPE 3376#ifndef USEQPE
3376 QDir d = QDir::home(); // "/" 3377 QDir d = QDir::home(); // "/"
3377 d.cd(APPDIR); 3378 d.cd(APPDIR);
3378 QFileInfo fi(d, reader->m_string); 3379 QFileInfo fi(d, reader->m_string);
3379#endif /* ! USEQPE */ 3380#endif /* ! USEQPE */
3380 if ( 3381 if (
3381 stat((const char *)reader->m_lastfile, &fnstat) == 0 3382 stat((const char *)reader->m_lastfile, &fnstat) == 0
3382 && 3383 &&
3383#ifndef USEQPE 3384#ifndef USEQPE
3384 stat((const char *)fi.absFilePath(), &bkstat) == 0 3385 stat((const char *)fi.absFilePath(), &bkstat) == 0
3385#else /* USEQPE */ 3386#else /* USEQPE */
3386 stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0 3387 stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0
3387#endif /* USEQPE */ 3388#endif /* USEQPE */
3388 ) 3389 )
3390 {
3391 if (bkstat.st_mtime < fnstat.st_mtime)
3389 { 3392 {
3390 if (bkstat.st_mtime < fnstat.st_mtime)
3391 {
3392#ifndef USEQPE 3393#ifndef USEQPE
3393 unlink((const char *)fi.absFilePath()); 3394 unlink((const char *)fi.absFilePath());
3394#else /* USEQPE */ 3395#else /* USEQPE */
3395 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string)); 3396 unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
3396#endif /* USEQPE */ 3397#endif /* USEQPE */
3397 } 3398 }
3398 } 3399 }
@@ -3409,6 +3410,6 @@ void QTReaderApp::readbkmks()
3409 { 3410 {
3410 pBkmklist = reader->getbkmklist(); 3411 pBkmklist = reader->getbkmklist();
3411 } 3412 }
3412 if (pBkmklist != NULL) 3413 if (pBkmklist != NULL)
3413 pBkmklist->sort(); 3414 pBkmklist->sort();
3414} 3415}
@@ -3424,24 +3425,24 @@ void QTReaderApp::do_addbkmk(const QString& text)
3424{ 3425{
3425 if (text.isEmpty()) 3426 if (text.isEmpty())
3426 { 3427 {
3427 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1); 3428 QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1);
3428 } 3429 }
3429 else 3430 else
3430 { 3431 {
3431 if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>; 3432 if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;
3432#ifdef _UNICODE 3433#ifdef _UNICODE
3433 CBuffer buff; 3434 CBuffer buff;
3434 int i = 0; 3435 int i = 0;
3435 for (i = 0; i < text.length(); i++) 3436 for (i = 0; i < text.length(); i++)
3436 { 3437 {
3437 buff[i] = text[i].unicode(); 3438 buff[i] = text[i].unicode();
3438 } 3439 }
3439 buff[i] = 0; 3440 buff[i] = 0;
3440 pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate())); 3441 pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate()));
3441#else 3442#else
3442 pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate())); 3443 pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate()));
3443#endif 3444#endif
3444 m_fBkmksChanged = true; 3445 m_fBkmksChanged = true;
3445 pBkmklist->sort(); 3446 pBkmklist->sort();
3446 } 3447 }
3447} 3448}
@@ -3452,4 +3453,4 @@ void QTReaderApp::OnRedraw()
3452 { 3453 {
3453 bool found = findNextBookmark(reader->pagelocate()); 3454 bool found = findNextBookmark(reader->pagelocate());
3454 m_bkmkAvail->setEnabled(found); 3455 m_bkmkAvail->setEnabled(found);
3455 } 3456 }
@@ -3471,3 +3472,3 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString&
3471{ 3472{
3472//// qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd); 3473//// odebug << "OnWordSelected(" << posn << "):" << wrd << "" << oendl;
3473 3474
@@ -3475,13 +3476,13 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString&
3475 { 3476 {
3476 QClipboard* cb = QApplication::clipboard(); 3477 QClipboard* cb = QApplication::clipboard();
3477 cb->setText(wrd); 3478 cb->setText(wrd);
3478#ifdef USEQPE 3479#ifdef USEQPE
3479 if (wrd.length() > 10) 3480 if (wrd.length() > 10)
3480 { 3481 {
3481 Global::statusMessage(wrd.left(8) + ".."); 3482 Global::statusMessage(wrd.left(8) + "..");
3482 } 3483 }
3483 else 3484 else
3484 { 3485 {
3485 Global::statusMessage(wrd); 3486 Global::statusMessage(wrd);
3486 } 3487 }
3487#endif 3488#endif
@@ -3490,11 +3491,11 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString&
3490 { 3491 {
3491 //addAnno(wrd, "Need to be able to edit this", posn); 3492// addAnno(wrd, "Need to be able to edit this", posn);
3492 m_annoWin->setName(line); 3493 m_annoWin->setName(line);
3493 m_annoWin->setAnno(""); 3494 m_annoWin->setAnno("");
3494 m_annoWin->setPosn(posn); 3495 m_annoWin->setPosn(posn);
3495 m_annoIsEditing = true; 3496 m_annoIsEditing = true;
3496#ifdef USEQPE 3497#ifdef USEQPE
3497 Global::showInputMethod(); 3498 Global::showInputMethod();
3498#endif 3499#endif
3499 editorStack->raiseWidget( m_annoWin ); 3500 editorStack->raiseWidget( m_annoWin );
3500 } 3501 }
@@ -3503,7 +3504,7 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString&
3503 { 3504 {
3504 if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty()) 3505 if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty())
3505 { 3506 {
3506 QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8()); 3507 QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8());
3507 e << wrd; 3508 e << wrd;
3508 } 3509 }
3509 } 3510 }
@@ -3516,3 +3517,3 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
3516 { 3517 {
3517 e->ignore(); 3518 e->ignore();
3518 } 3519 }
@@ -3520,69 +3521,69 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
3520 { 3521 {
3521 e->accept(); 3522 e->accept();
3522 //qDebug("Accepted"); 3523// odebug << "Accepted" << oendl;
3523 switch (a) 3524 switch (a)
3524 { 3525 {
3525 case cesOpenFile: 3526 case cesOpenFile:
3526 { 3527 {
3527 fileOpen(); 3528 fileOpen();
3528 } 3529 }
3529 break; 3530 break;
3530 case cesAutoScroll: 3531 case cesAutoScroll:
3531 { 3532 {
3532 reader->setautoscroll(!reader->m_autoScroll); 3533 reader->setautoscroll(!reader->m_autoScroll);
3533 setScrollState(reader->m_autoScroll); 3534 setScrollState(reader->m_autoScroll);
3534 } 3535 }
3535 break; 3536 break;
3536 case cesActionMark: 3537 case cesActionMark:
3537 { 3538 {
3538 addbkmk(); 3539 addbkmk();
3539 } 3540 }
3540 break; 3541 break;
3541 case cesFullScreen: 3542 case cesFullScreen:
3542 { 3543 {
3543 m_actFullscreen->setOn(!m_fullscreen); 3544 m_actFullscreen->setOn(!m_fullscreen);
3544 } 3545 }
3545 break; 3546 break;
3546 case cesActionAnno: 3547 case cesActionAnno:
3547 { 3548 {
3548 addanno(); 3549 addanno();
3549 } 3550 }
3550 break; 3551 break;
3551 case cesZoomIn: 3552 case cesZoomIn:
3552 zoomin(); 3553 zoomin();
3553 break; 3554 break;
3554 case cesZoomOut: 3555 case cesZoomOut:
3555 zoomout(); 3556 zoomout();
3556 break; 3557 break;
3557 case cesBack: 3558 case cesBack:
3558 reader->goBack(); 3559 reader->goBack();
3559 break; 3560 break;
3560 case cesForward: 3561 case cesForward:
3561 reader->goForward(); 3562 reader->goForward();
3562 break; 3563 break;
3563 case cesHome: 3564 case cesHome:
3564 reader->goHome(); 3565 reader->goHome();
3565 break; 3566 break;
3566 case cesPageUp: 3567 case cesPageUp:
3567 reader->dopageup(); 3568 reader->dopageup();
3568 break; 3569 break;
3569 case cesPageDown: 3570 case cesPageDown:
3570 reader->dopagedn(); 3571 reader->dopagedn();
3571 break; 3572 break;
3572 case cesLineUp: 3573 case cesLineUp:
3573 reader->lineUp(); 3574 reader->lineUp();
3574 break; 3575 break;
3575 case cesLineDown: 3576 case cesLineDown:
3576 reader->lineDown(); 3577 reader->lineDown();
3577 break; 3578 break;
3578 case cesStartDoc: 3579 case cesStartDoc:
3579 gotoStart(); 3580 gotoStart();
3580 break; 3581 break;
3581 case cesEndDoc: 3582 case cesEndDoc:
3582 gotoEnd(); 3583 gotoEnd();
3583 break; 3584 break;
3584 default: 3585 default:
3585 qDebug("Unknown ActionType:%u", a); 3586 odebug << "Unknown ActionType:" << a << "" << oendl;
3586 break; 3587 break;
3587 } 3588 }
3588 } 3589 }
@@ -3591,3 +3592,3 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
3591void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); } 3592void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }
3592void QTReaderApp::restoreFocus() { reader->setFocus(); } 3593void QTReaderApp::restoreFocus() { reader->setFocus(); }
3593 3594
@@ -3602,3 +3603,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
3602{ 3603{
3603// qDebug("do_saveconfig:%s", (const char*)_txt); 3604// odebug << "do_saveconfig:" << _txt << "" << oendl;
3604#ifdef USEQPE 3605#ifdef USEQPE
@@ -3609,4 +3610,4 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
3609 { 3610 {
3610 configname = _txt; 3611 configname = _txt;
3611 dom = Config::User; 3612 dom = Config::User;
3612 } 3613 }
@@ -3614,4 +3615,4 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
3614 { 3615 {
3615 configname = Global::applicationFileName(APPDIR "/configs", _txt); 3616 configname = Global::applicationFileName(APPDIR "/configs", _txt);
3616 dom = Config::File; 3617 dom = Config::File;
3617 } 3618 }
@@ -3622,38 +3623,38 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
3622#else 3623#else
3623 QFileInfo fi; 3624 QFileInfo fi;
3624 if (full) 3625 if (full)
3625 { 3626 {
3626 // qDebug("full:%s", (const char*)_txt); 3627// odebug << "full:" << _txt << "" << oendl;
3627 QDir d = QDir::home(); // "/" 3628 QDir d = QDir::home(); // "/"
3628 if ( !d.cd(_txt) ) 3629 if ( !d.cd(_txt) )
3629 { // "/tmp" 3630 { // "/tmp"
3630 qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt ); 3631 owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
3631 d = QDir::home(); 3632 d = QDir::home();
3632 d.mkdir(_txt); 3633 d.mkdir(_txt);
3633 d.cd(_txt); 3634 d.cd(_txt);
3634 } 3635 }
3635 fi.setFile(d, INIFILE); 3636 fi.setFile(d, INIFILE);
3636 } 3637 }
3637 else 3638 else
3638 { 3639 {
3639 QDir d = QDir::home(); // "/" 3640 QDir d = QDir::home(); // "/"
3640 if ( !d.cd(APPDIR) ) 3641 if ( !d.cd(APPDIR) )
3641 { // "/tmp" 3642 { // "/tmp"
3642 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 3643 owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
3643 d = QDir::home(); 3644 d = QDir::home();
3644 d.mkdir(APPDIR); 3645 d.mkdir(APPDIR);
3645 d.cd(APPDIR); 3646 d.cd(APPDIR);
3646 } 3647 }
3647 if ( !d.cd("configs") ) 3648 if ( !d.cd("configs") )
3648 { // "/tmp" 3649 { // "/tmp"
3649 qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" ); 3650 owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
3650 d = QDir::home(); 3651 d = QDir::home();
3651 d.cd(APPDIR); 3652 d.cd(APPDIR);
3652 d.mkdir("configs"); 3653 d.mkdir("configs");
3653 d.cd("configs"); 3654 d.cd("configs");
3654 } 3655 }
3655 fi.setFile(d, _txt); 3656 fi.setFile(d, _txt);
3656 } 3657 }
3657 //qDebug("Path:%s", (const char*)fi.absFilePath()); 3658// odebug << "Path:" << fi.absFilePath() << "" << oendl;
3658 Config config(fi.absFilePath()); 3659 Config config(fi.absFilePath());
3659#endif 3660#endif
@@ -3677,7 +3678,7 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
3677 { 3678 {
3678 config.writeEntry("Debounce", m_debounce); 3679 config.writeEntry("Debounce", m_debounce);
3679 config.writeEntry("FloatDialogs", m_bFloatingDialog); 3680 config.writeEntry("FloatDialogs", m_bFloatingDialog);
3680 reader->m_lastposn = reader->pagelocate(); 3681 reader->m_lastposn = reader->pagelocate();
3681 config.writeEntry( "LastFile", reader->m_lastfile ); 3682 config.writeEntry( "LastFile", reader->m_lastfile );
3682 config.writeEntry( "LastPosn", (int)(reader->pagelocate()) ); 3683 config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );
3683 } 3684 }
@@ -3726,12 +3727,12 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
3726 { 3727 {
3727 config.setGroup( "Toolbar" ); 3728 config.setGroup( "Toolbar" );
3728 config.writeEntry("Movable", m_tbmovesave); 3729 config.writeEntry("Movable", m_tbmovesave);
3729 config.writeEntry("Policy", m_tbpolsave); 3730 config.writeEntry("Policy", m_tbpolsave);
3730 config.writeEntry("Position", m_tbposition); 3731 config.writeEntry("Position", m_tbposition);
3731#ifndef USEQPE 3732#ifndef USEQPE
3732 config.setGroup( "Geometry" ); 3733 config.setGroup( "Geometry" );
3733 config.writeEntry( "x", x() ); 3734 config.writeEntry( "x", x() );
3734 config.writeEntry( "y", y() ); 3735 config.writeEntry( "y", y() );
3735 config.writeEntry( "width", width() ); 3736 config.writeEntry( "width", width() );
3736 config.writeEntry( "height", height() ); 3737 config.writeEntry( "height", height() );
3737#endif 3738#endif
@@ -3751,3 +3752,3 @@ void QTReaderApp::setstate(unsigned char* _sd, unsigned short _sdlen)
3751 { 3752 {
3752 sdlen = sizeof(statedata)+1; 3753 sdlen = sizeof(statedata)+1;
3753 } 3754 }
@@ -3803,5 +3804,5 @@ void QTReaderApp::RunScript()
3803 fileBrowser* fb = new fileBrowser(this,"OpieReader",!m_bFloatingDialog, 3804 fileBrowser* fb = new fileBrowser(this,"OpieReader",!m_bFloatingDialog,
3804 0, 3805 0,
3805 // WStyle_Customize | WStyle_NoBorderEx, 3806// WStyle_Customize | WStyle_NoBorderEx,
3806 "*", Global::applicationFileName(APPDIR "/scripts", "")); 3807 "*", Global::applicationFileName(APPDIR "/scripts", ""));
3807 3808
@@ -3810,3 +3811,3 @@ void QTReaderApp::RunScript()
3810 { 3811 {
3811 fn = fb->fileList[0]; 3812 fn = fb->fileList[0];
3812 } 3813 }
@@ -3815,3 +3816,3 @@ void QTReaderApp::RunScript()
3815 { 3816 {
3816 execlp((const char *)fn,(const char *)fn,NULL); 3817 execlp((const char *)fn,(const char *)fn,NULL);
3817 } 3818 }
@@ -3825,43 +3826,43 @@ void QTReaderApp::SaveScript(const char* sname)
3825#ifdef OPIE 3826#ifdef OPIE
3826 fprintf(f, "#!/bin/sh\nmsg() {\n\tqcop QPE/Application/reader \"$1\" \"$2\" \"$3\"\n}\n"); 3827 fprintf(f, "#!/bin/sh\nmsg() {\n\tqcop QPE/Application/reader \"$1\" \"$2\" \"$3\"\n}\n");
3827#else 3828#else
3828 fprintf(f, "#!/bin/bash\nmsg() {\n\tqcop QPE/Application/uqtreader \"$1\" \"$2\" \"$3\"\n}\n"); 3829 fprintf(f, "#!/bin/bash\nmsg() {\n\tqcop QPE/Application/uqtreader \"$1\" \"$2\" \"$3\"\n}\n");
3829#endif 3830#endif
3830 fprintf(f, "msg \"Update(int)\" 0\n"); 3831 fprintf(f, "msg \"Update(int)\" 0\n");
3831 fprintf(f, "msg \"Layout/StripCR(int)\" %d\n", (reader->bstripcr) ? 1:0); 3832 fprintf(f, "msg \"Layout/StripCR(int)\" %d\n", (reader->bstripcr) ? 1:0);
3832 if (reader->btextfmt) fprintf(f, "msg \"Markup(QString)\" \"Text\"\n"); 3833 if (reader->btextfmt) fprintf(f, "msg \"Markup(QString)\" \"Text\"\n");
3833 else if (reader->bautofmt) fprintf(f, "msg \"Markup(QString)\" \"Auto\"\n"); 3834 else if (reader->bautofmt) fprintf(f, "msg \"Markup(QString)\" \"Auto\"\n");
3834 else if (reader->bstriphtml) fprintf(f, "msg \"Markup(QString)\" \"HTML\"\n"); 3835 else if (reader->bstriphtml) fprintf(f, "msg \"Markup(QString)\" \"HTML\"\n");
3835 else if (reader->bpeanut) fprintf(f, "msg \"Markup(QString)\" \"Peanut/PML\"\n"); 3836 else if (reader->bpeanut) fprintf(f, "msg \"Markup(QString)\" \"Peanut/PML\"\n");
3836 else fprintf(f, "msg \"Markup(QString)\" \"None\"\n"); 3837 else fprintf(f, "msg \"Markup(QString)\" \"None\"\n");
3837 fprintf(f, "msg \"Layout/Dehyphen(int)\" %d\n", (reader->bdehyphen) ? 1:0); 3838 fprintf(f, "msg \"Layout/Dehyphen(int)\" %d\n", (reader->bdehyphen) ? 1:0);
3838 fprintf(f, "msg \"Layout/Depluck(int)\" %d\n", (reader->bdepluck) ? 1:0); 3839 fprintf(f, "msg \"Layout/Depluck(int)\" %d\n", (reader->bdepluck) ? 1:0);
3839 fprintf(f, "msg \"Layout/Dejpluck(int)\" %d\n", (reader->bdejpluck) ? 1:0); 3840 fprintf(f, "msg \"Layout/Dejpluck(int)\" %d\n", (reader->bdejpluck) ? 1:0);
3840 fprintf(f, "msg \"Layout/SingleSpace(int)\" %d\n", (reader->bonespace) ? 1:0); 3841 fprintf(f, "msg \"Layout/SingleSpace(int)\" %d\n", (reader->bonespace) ? 1:0);
3841 fprintf(f, "msg \"Layout/Unindent(int)\" %d\n", (reader->bunindent) ? 1:0); 3842 fprintf(f, "msg \"Layout/Unindent(int)\" %d\n", (reader->bunindent) ? 1:0);
3842 fprintf(f, "msg \"Layout/Re-paragraph(int)\" %d\n", (reader->brepara) ? 1:0); 3843 fprintf(f, "msg \"Layout/Re-paragraph(int)\" %d\n", (reader->brepara) ? 1:0);
3843 fprintf(f, "msg \"Layout/DoubleSpace(int)\" %d\n", (reader->bdblspce) ? 1:0); 3844 fprintf(f, "msg \"Layout/DoubleSpace(int)\" %d\n", (reader->bdblspce) ? 1:0);
3844 fprintf(f, "msg \"Layout/Indent(int)\" %d\n", reader->bindenter); 3845 fprintf(f, "msg \"Layout/Indent(int)\" %d\n", reader->bindenter);
3845 fprintf(f, "msg \"Format/SetFont(QString,int)\" \"%s\" %d\n", (const char*)reader->m_fontname, reader->m_textsize); 3846 fprintf(f, "msg \"Format/SetFont(QString,int)\" \"%s\" %d\n", (const char*)reader->m_fontname, reader->m_textsize);
3846 fprintf(f, "msg \"Navigation/Page/LineScroll(int)\" %d\n", (reader->m_bpagemode) ? 1:0); 3847 fprintf(f, "msg \"Navigation/Page/LineScroll(int)\" %d\n", (reader->m_bpagemode) ? 1:0);
3847 fprintf(f, "msg \"Format/Ideogram/Word(int)\" %d\n", (reader->m_bMonoSpaced) ? 1:0); 3848 fprintf(f, "msg \"Format/Ideogram/Word(int)\" %d\n", (reader->m_bMonoSpaced) ? 1:0);
3848 fprintf(f, "msg \"Format/Encoding(QString)\" \"%s\"\n", (const char*)m_EncodingAction[reader->m_encd]->text()); 3849 fprintf(f, "msg \"Format/Encoding(QString)\" \"%s\"\n", (const char*)m_EncodingAction[reader->m_encd]->text());
3849 fprintf(f, "msg \"Format/SetWidth(int)\" %d\n", reader->m_charpc); 3850 fprintf(f, "msg \"Format/SetWidth(int)\" %d\n", reader->m_charpc);
3850 fprintf(f, "msg \"Navigation/SetOverlap(int)\" %d\n", reader->m_overlap); 3851 fprintf(f, "msg \"Navigation/SetOverlap(int)\" %d\n", reader->m_overlap);
3851 fprintf(f, "msg \"Layout/Remap(int)\" %d\n", (reader->bremap) ? 1:0); 3852 fprintf(f, "msg \"Layout/Remap(int)\" %d\n", (reader->bremap) ? 1:0);
3852 fprintf(f, "msg \"Layout/Embolden(int)\" %d\n", (reader->bmakebold) ? 1:0); 3853 fprintf(f, "msg \"Layout/Embolden(int)\" %d\n", (reader->bmakebold) ? 1:0);
3853 fprintf(f, "msg \"File/Continuous(int)\" %d\n", (reader->m_continuousDocument) ? 1:0); 3854 fprintf(f, "msg \"File/Continuous(int)\" %d\n", (reader->m_continuousDocument) ? 1:0);
3854 fprintf(f, "msg \"File/SetDictionary(QString)\" \"%s/%s\"\n", (const char *)m_targetapp, (const char *)m_targetmsg); 3855 fprintf(f, "msg \"File/SetDictionary(QString)\" \"%s/%s\"\n", (const char *)m_targetapp, (const char *)m_targetmsg);
3855#ifdef _SCROLLPIPE 3856#ifdef _SCROLLPIPE
3856 fprintf(f, "msg \"File/SetScrollTarget(QString)\" \"%s\"\n", (const char *)reader->m_pipetarget); 3857 fprintf(f, "msg \"File/SetScrollTarget(QString)\" \"%s\"\n", (const char *)reader->m_pipetarget);
3857#endif 3858#endif
3858 fprintf(f, "msg \"File/Two/OneTouch(int)\" %d\n", (m_twoTouch) ? 1:0); 3859 fprintf(f, "msg \"File/Two/OneTouch(int)\" %d\n", (m_twoTouch) ? 1:0);
3859 fprintf(f, "msg \"Target/Annotation(int)\" %d\n", (m_doAnnotation) ? 1:0); 3860 fprintf(f, "msg \"Target/Annotation(int)\" %d\n", (m_doAnnotation) ? 1:0);
3860 fprintf(f, "msg \"Target/Dictionary(int)\" %d\n", (m_doDictionary) ? 1:0); 3861 fprintf(f, "msg \"Target/Dictionary(int)\" %d\n", (m_doDictionary) ? 1:0);
3861 fprintf(f, "msg \"Target/Clipboard(int)\" %d\n", (m_doClipboard) ? 1:0); 3862 fprintf(f, "msg \"Target/Clipboard(int)\" %d\n", (m_doClipboard) ? 1:0);
3862 fprintf(f, "msg \"File/Action(QString)\" \"%s\"\n", (const char *)m_buttonAction[m_spaceTarget]->text()); 3863 fprintf(f, "msg \"File/Action(QString)\" \"%s\"\n", (const char *)m_buttonAction[m_spaceTarget]->text());
3863 fprintf(f, "msg \"Update(int)\" 1\n"); 3864 fprintf(f, "msg \"Update(int)\" 1\n");
3864 fprintf(f, "msg \"info(QString)\" \"All Done\"\n"); 3865 fprintf(f, "msg \"info(QString)\" \"All Done\"\n");
3865 fclose(f); 3866 fclose(f);
3866 chmod(sname, S_IXUSR | S_IXGRP | S_IXOTH); 3867 chmod(sname, S_IXUSR | S_IXGRP | S_IXOTH);
3867 } 3868 }
@@ -3915,4 +3916,4 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
3915 { 3916 {
3916 configname = _txt; 3917 configname = _txt;
3917 dom = Config::User; 3918 dom = Config::User;
3918 } 3919 }
@@ -3920,6 +3921,6 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
3920 { 3921 {
3921 configname = Global::applicationFileName(APPDIR "/configs", _txt); 3922 configname = Global::applicationFileName(APPDIR "/configs", _txt);
3922 QFileInfo fm(configname); 3923 QFileInfo fm(configname);
3923 if ( !fm.exists() ) return false; 3924 if ( !fm.exists() ) return false;
3924 dom = Config::File; 3925 dom = Config::File;
3925 } 3926 }
@@ -3930,41 +3931,41 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
3930#else 3931#else
3931 QFileInfo fi; 3932 QFileInfo fi;
3932 if (full) 3933 if (full)
3933 { 3934 {
3934 QDir d = QDir::home(); // "/" 3935 QDir d = QDir::home(); // "/"
3935 if ( !d.cd(_txt) ) 3936 if ( !d.cd(_txt) )
3936 { // "/tmp" 3937 { // "/tmp"
3937 qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt ); 3938 owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
3938 d = QDir::home(); 3939 d = QDir::home();
3939 d.mkdir(_txt); 3940 d.mkdir(_txt);
3940 d.cd(_txt); 3941 d.cd(_txt);
3941 } 3942 }
3942 fi.setFile(d, INIFILE); 3943 fi.setFile(d, INIFILE);
3943 } 3944 }
3944 else 3945 else
3945 { 3946 {
3946 QDir d = QDir::home(); // "/" 3947 QDir d = QDir::home(); // "/"
3947 if ( !d.cd(APPDIR) ) 3948 if ( !d.cd(APPDIR) )
3948 { // "/tmp" 3949 { // "/tmp"
3949 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 3950 owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
3950 d = QDir::home(); 3951 d = QDir::home();
3951 d.mkdir(APPDIR); 3952 d.mkdir(APPDIR);
3952 d.cd(APPDIR); 3953 d.cd(APPDIR);
3953 } 3954 }
3954 if ( !d.cd("configs") ) 3955 if ( !d.cd("configs") )
3955 { // "/tmp" 3956 { // "/tmp"
3956 qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" ); 3957 owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
3957 d = QDir::home(); 3958 d = QDir::home();
3958 d.mkdir("configs"); 3959 d.mkdir("configs");
3959 d.cd("configs"); 3960 d.cd("configs");
3960 } 3961 }
3961 fi.setFile(d, _txt); 3962 fi.setFile(d, _txt);
3962 } 3963 }
3963#ifdef _WINDOWS 3964#ifdef _WINDOWS
3964 struct stat fnstat; 3965 struct stat fnstat;
3965 if (stat((const char *)reader->m_lastfile, &fnstat) == 0) return false; // get round fileinfo bug on windows 3966 if (stat((const char *)reader->m_lastfile, &fnstat) == 0) return false; // get round fileinfo bug on windows
3966#else 3967#else
3967 if (!fi.exists()) return false; 3968 if (!fi.exists()) return false;
3968#endif 3969#endif
3969 Config config(fi.absFilePath()); 3970 Config config(fi.absFilePath());
3970#endif 3971#endif
@@ -3972,6 +3973,6 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
3972 { 3973 {
3973 config.setGroup("Toolbar"); 3974 config.setGroup("Toolbar");
3974 m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false); 3975 m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);
3975 m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1); 3976 m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);
3976 m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2); 3977 m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);
3977 } 3978 }
@@ -3999,4 +4000,4 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
3999 { 4000 {
4000 reader->m_lastfile = config.readEntry( "LastFile", QString::null ); 4001 reader->m_lastfile = config.readEntry( "LastFile", QString::null );
4001 reader->m_lastposn = config.readNumEntry( "LastPosn", 0 ); 4002 reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );
4002 } 4003 }
@@ -4047,3 +4048,3 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
4047 { 4048 {
4048 addtoolbars(&config); 4049 addtoolbars(&config);
4049 } 4050 }
@@ -4063,12 +4064,12 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
4063 if ( !d.cd(APPDIR) ) { // "/tmp" 4064 if ( !d.cd(APPDIR) ) { // "/tmp"
4064 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 4065 owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
4065 d = QDir::home(); 4066 d = QDir::home();
4066 d.mkdir(APPDIR); 4067 d.mkdir(APPDIR);
4067 d.cd(APPDIR); 4068 d.cd(APPDIR);
4068 } 4069 }
4069 if ( !d.cd(tgtdir) ) { // "/tmp" 4070 if ( !d.cd(tgtdir) ) { // "/tmp"
4070 qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir ); 4071 owarn << "Cannot find the \"~/" APPDIR "/" << tgtdir << "\" directory" << oendl;
4071 d = QDir::home(); 4072 d = QDir::home();
4072 d.mkdir(tgtdir); 4073 d.mkdir(tgtdir);
4073 d.cd(tgtdir); 4074 d.cd(tgtdir);
4074 } 4075 }
@@ -4082,10 +4083,10 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
4082 while ( (fi=it.current()) ) { // for each file... 4083 while ( (fi=it.current()) ) { // for each file...
4083 4084
4084 bkmkselector->insertItem(fi->fileName()); 4085 bkmkselector->insertItem(fi->fileName());
4085 cnt++; 4086 cnt++;
4086 4087
4087 //qDebug( "%10li %s", fi->size(), fi->fileName().data() ); 4088 //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
4088 ++it; // goto next list element 4089 ++it; // goto next list element
4089 } 4090 }
4090 4091
4091#else /* USEQPE */ 4092#else /* USEQPE */
@@ -4102,12 +4103,12 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
4102 { 4103 {
4103 struct dirent* de; 4104 struct dirent* de;
4104 struct stat buf; 4105 struct stat buf;
4105 de = readdir(d); 4106 de = readdir(d);
4106 if (de == NULL) break; 4107 if (de == NULL) break;
4107 4108
4108 if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode)) 4109 if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
4109 { 4110 {
4110 bkmkselector->insertItem(de->d_name); 4111 bkmkselector->insertItem(de->d_name);
4111 cnt++; 4112 cnt++;
4112 } 4113 }
4113 } 4114 }
@@ -4125,3 +4126,3 @@ void QTReaderApp::LoadConfig()
4125 hidetoolbars(); 4126 hidetoolbars();
4126 m_nBkmkAction = cLdConfig; 4127 m_nBkmkAction = cLdConfig;
4127 } 4128 }
@@ -4137,3 +4138,3 @@ void QTReaderApp::TidyConfig()
4137 hidetoolbars(); 4138 hidetoolbars();
4138 m_nBkmkAction = cRmConfig; 4139 m_nBkmkAction = cRmConfig;
4139 } 4140 }
@@ -4149,3 +4150,3 @@ void QTReaderApp::ExportLinks()
4149 hidetoolbars(); 4150 hidetoolbars();
4150 m_nBkmkAction = cExportLinks; 4151 m_nBkmkAction = cExportLinks;
4151 } 4152 }
@@ -4163,19 +4164,19 @@ void QTReaderApp::OnURLSelected(const QString& href)
4163 { 4164 {
4164 m_url_clipboard = urld->clipboard(); 4165 m_url_clipboard = urld->clipboard();
4165 m_url_localfile = urld->localfile(); 4166 m_url_localfile = urld->localfile();
4166 m_url_globalfile = urld->globalfile(); 4167 m_url_globalfile = urld->globalfile();
4167 if (m_url_clipboard) 4168 if (m_url_clipboard)
4168 { 4169 {
4169 QClipboard* cb = QApplication::clipboard(); 4170 QClipboard* cb = QApplication::clipboard();
4170 cb->setText(href); 4171 cb->setText(href);
4171 qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href); 4172 odebug << "<a href=\"" << href << "\">" << href << "</a>" << oendl;
4172 } 4173 }
4173 if (m_url_localfile) 4174 if (m_url_localfile)
4174 { 4175 {
4175 writeUrl(reader->m_string, href); 4176 writeUrl(reader->m_string, href);
4176 } 4177 }
4177 if (m_url_globalfile) 4178 if (m_url_globalfile)
4178 { 4179 {
4179 writeUrl("GlobalURLFile", href); 4180 writeUrl("GlobalURLFile", href);
4180 } 4181 }
4181 } 4182 }
@@ -4194,6 +4195,6 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
4194 { // "/tmp" 4195 { // "/tmp"
4195 qWarning( "Cannot find the \"~/" APPDIR "\" directory" ); 4196 owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
4196 d = QDir::home(); 4197 d = QDir::home();
4197 d.mkdir(APPDIR); 4198 d.mkdir(APPDIR);
4198 d.cd(APPDIR); 4199 d.cd(APPDIR);
4199 } 4200 }
@@ -4201,7 +4202,7 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
4201 { // "/tmp" 4202 { // "/tmp"
4202 qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" ); 4203 owarn << "Cannot find the \"~/" APPDIR "/urls\" directory" << oendl;
4203 d = QDir::home(); 4204 d = QDir::home();
4204 d.cd(APPDIR); 4205 d.cd(APPDIR);
4205 d.mkdir("urls"); 4206 d.mkdir("urls");
4206 d.cd("urls"); 4207 d.cd("urls");
4207 } 4208 }
@@ -4213,4 +4214,4 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
4213 { 4214 {
4214 fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href); 4215 fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href);
4215 fclose(fout); 4216 fclose(fout);
4216 } 4217 }
@@ -4218,3 +4219,3 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
4218 { 4219 {
4219 QMessageBox::warning(this, PROGNAME, "Problem with writing URL"); 4220 QMessageBox::warning(this, PROGNAME, "Problem with writing URL");
4220 } 4221 }
diff --git a/noncore/apps/opie-reader/StyleConsts.cpp b/noncore/apps/opie-reader/StyleConsts.cpp
index 9fb56b7..f47acee 100644
--- a/noncore/apps/opie-reader/StyleConsts.cpp
+++ b/noncore/apps/opie-reader/StyleConsts.cpp
@@ -8,3 +8,3 @@ pmstore::~pmstore()
8{ 8{
9//// qDebug("Deleting image"); 9//// odebug << "Deleting image" << oendl;
10 delete graphic; 10 delete graphic;
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index e1cde6c..72a1222 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -134,3 +134,3 @@ void fileBrowser::populateList()
134 ListView->clear(); 134 ListView->clear();
135////qDebug(currentDir.canonicalPath()); 135////odebug << currentDir.canonicalPath() << oendl;
136// currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks ); 136// currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks );
@@ -158,3 +158,3 @@ void fileBrowser::populateList()
158 { 158 {
159//// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); 159//// odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl;
160 } 160 }
@@ -171,3 +171,3 @@ void fileBrowser::upDir()
171{ 171{
172//// qDebug(currentDir.canonicalPath()); 172//// odebug << currentDir.canonicalPath() << oendl;
173} 173}
@@ -179,3 +179,3 @@ void fileBrowser::listClicked(QListViewItem *selectedItem)
179 179
180//// qDebug("%s", (const char*)strItem); 180//// odebug << "" << strItem << "" << oendl;
181 181
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index e42204a..dbf6964 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -1,3 +1,3 @@
1 CONFIG = qt warn_on 1CONFIG = qt warn_on
2 HEADERS = Aportis.h \ 2HEADERS = Aportis.h \
3 Bkmks.h \ 3 Bkmks.h \
@@ -51,3 +51,3 @@ HEADERS = Aportis.h \
51 51
52 SOURCES = Aportis.cpp \ 52SOURCES = Aportis.cpp \
53 Bkmks.cpp \ 53 Bkmks.cpp \
@@ -85,5 +85,5 @@ TARGET = reader
85 85
86 INCLUDEPATH+= $(OPIEDIR)/include 86INCLUDEPATH += $(OPIEDIR)/include
87 DEPENDPATH+= $(OPIEDIR)/include 87DEPENDPATH += $(OPIEDIR)/include
88 LIBS += -lqpe 88LIBS += -lqpe -lopiecore2
89 89
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp
index e52fd6a..a8e688f 100644
--- a/noncore/apps/opie-reader/plucker.cpp
+++ b/noncore/apps/opie-reader/plucker.cpp
@@ -59,3 +59,3 @@ int CPlucker::bgetch()
59 if (bufferrec >= ntohs(head.recordList.numRecords) - 1) return EOF; 59 if (bufferrec >= ntohs(head.recordList.numRecords) - 1) return EOF;
60 ////qDebug("Passing through %u", currentpos); 60 ////odebug << "Passing through " << currentpos << "" << oendl;
61 if (!expand(bufferrec+1)) return EOF; 61 if (!expand(bufferrec+1)) return EOF;
@@ -66,3 +66,3 @@ int CPlucker::bgetch()
66 { 66 {
67 // qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7); 67 // odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
68 m_nextParaIndex++; 68 m_nextParaIndex++;
@@ -71,3 +71,3 @@ int CPlucker::bgetch()
71 mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2); 71 mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
72 //qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7); 72 //odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
73 ch = 10; 73 ch = 10;
@@ -81,3 +81,3 @@ int CPlucker::bgetch()
81 m_nextParaIndex++; 81 m_nextParaIndex++;
82 // qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7); 82 // odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
83 if (m_nextParaIndex == m_nParas) 83 if (m_nextParaIndex == m_nParas)
@@ -93,3 +93,3 @@ int CPlucker::bgetch()
93 mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2); 93 mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
94 //qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7); 94 //odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
95 if (m_lastBreak == locate()) 95 if (m_lastBreak == locate())
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index caa945d..b523a54 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,13 +1,15 @@
1
2
1#include "useqpe.h" 3#include "useqpe.h"
2#include <stdio.h> 4#include "plucker_base.h"
3#include <string.h> 5#include "Aportis.h"
6#include "Palm2QImage.h"
7
8/* OPIE */
9#include <opie2/odebug.h>
4#ifdef USEQPE 10#ifdef USEQPE
5#include <qpe/qcopenvelope_qws.h> 11#include <qpe/qcopenvelope_qws.h>
6#endif /* USEQPE */
7#ifdef LOCALPICTURES
8#include <qscrollview.h>
9#endif
10#ifdef USEQPE
11#include <qpe/global.h> 12#include <qpe/global.h>
12#endif /* USEQPE */ 13#endif /* USEQPE */
14
13#ifndef USEQPE 15#ifndef USEQPE
@@ -18,5 +20,11 @@
18 20
19#include "plucker_base.h" 21/* QT */
20#include "Aportis.h" 22#ifdef LOCALPICTURES
21#include "Palm2QImage.h" 23#include <qscrollview.h>
24#endif
25
26/* STD */
27#include <stdio.h>
28#include <string.h>
29
22 30
@@ -37,3 +45,3 @@ void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buff
37 { 45 {
38 fread(buffer, reclen, sizeof(char), fin); 46 fread(buffer, reclen, sizeof(char), fin);
39 } 47 }
@@ -41,28 +49,28 @@ void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buff
41 { 49 {
42 UInt8* readbuffer = NULL; 50 UInt8* readbuffer = NULL;
43 if (reclen > compressedbuffersize) 51 if (reclen > compressedbuffersize)
44 { 52 {
45 readbuffer = new UInt8[reclen]; 53 readbuffer = new UInt8[reclen];
46 } 54 }
47 else 55 else
48 { 56 {
49 readbuffer = compressedtextbuffer; 57 readbuffer = compressedtextbuffer;
50 } 58 }
51 if (readbuffer != NULL) 59 if (readbuffer != NULL)
52 { 60 {
53 fread(readbuffer, reclen, sizeof(char), fin); 61 fread(readbuffer, reclen, sizeof(char), fin);
54 switch (ntohs(hdr0.version)) 62 switch (ntohs(hdr0.version))
55 { 63 {
56 case 2: 64 case 2:
57 UnZip(readbuffer, reclen, buffer, buffersize); 65 UnZip(readbuffer, reclen, buffer, buffersize);
58 break; 66 break;
59 case 1: 67 case 1:
60 UnDoc(readbuffer, reclen, buffer, buffersize); 68 UnDoc(readbuffer, reclen, buffer, buffersize);
61 break; 69 break;
62 } 70 }
63 if (reclen > compressedbuffersize) 71 if (reclen > compressedbuffersize)
64 { 72 {
65 delete [] readbuffer; 73 delete [] readbuffer;
66 } 74 }
67 } 75 }
68 } 76 }
@@ -75,11 +83,11 @@ void CPlucker_base::sizes(unsigned long& _file, unsigned long& _text)
75 { 83 {
76 for (int recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++) 84 for (int recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
77 { 85 {
78 gotorecordnumber(recptr); 86 gotorecordnumber(recptr);
79 UInt16 thishdr_uid, thishdr_nParagraphs; 87 UInt16 thishdr_uid, thishdr_nParagraphs;
80 UInt32 thishdr_size; 88 UInt32 thishdr_size;
81 UInt8 thishdr_type, thishdr_reserved; 89 UInt8 thishdr_type, thishdr_reserved;
82 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 90 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
83 if (thishdr_type < 2) textlength += thishdr_size; 91 if (thishdr_type < 2) textlength += thishdr_size;
84 } 92 }
85 } 93 }
@@ -95,3 +103,3 @@ char* CPlucker_base::geturl(UInt16 tgt)
95 unsigned int nrecs = ntohs(hdr0.nRecords); 103 unsigned int nrecs = ntohs(hdr0.nRecords);
96 //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs); 104 //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
97 UInt16 urlid = 0; 105 UInt16 urlid = 0;
@@ -102,13 +110,13 @@ char* CPlucker_base::geturl(UInt16 tgt)
102 { 110 {
103 UInt16 id, name; 111 UInt16 id, name;
104 fread(&name, 1, sizeof(name), fin); 112 fread(&name, 1, sizeof(name), fin);
105 fread(&id, 1, sizeof(id), fin); 113 fread(&id, 1, sizeof(id), fin);
106 //qDebug("N:%d, I:%d", ntohs(name), ntohs(id)); 114 //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
107 if (ntohs(name) == 2) 115 if (ntohs(name) == 2)
108 { 116 {
109 urlsfound = true; 117 urlsfound = true;
110 urlid = id; 118 urlid = id;
111 //qDebug("Found url index:%d", ntohs(urlid)); 119 //odebug << "Found url index:" << ntohs(urlid) << "" << oendl;
112 } 120 }
113 ////qDebug("%x", id); 121// //odebug << "" << id << "" << oendl;
114 } 122 }
@@ -116,53 +124,53 @@ char* CPlucker_base::geturl(UInt16 tgt)
116 { 124 {
117 unsigned short recptr = finduid(ntohs(urlid)); 125 unsigned short recptr = finduid(ntohs(urlid));
118 if (recptr != 0) 126 if (recptr != 0)
119 { 127 {
120 gotorecordnumber(recptr); 128 gotorecordnumber(recptr);
121 UInt16 thishdr_uid, thishdr_nParagraphs; 129 UInt16 thishdr_uid, thishdr_nParagraphs;
122 UInt32 thishdr_size; 130 UInt32 thishdr_size;
123 UInt8 thishdr_type, thishdr_reserved; 131 UInt8 thishdr_type, thishdr_reserved;
124 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 132 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
125 UInt16 urlctr = 0; 133 UInt16 urlctr = 0;
126 while (1) 134 while (1)
127 { 135 {
128 UInt16 tctr; 136 UInt16 tctr;
129 fread(&tctr, 1, sizeof(tctr), fin); 137 fread(&tctr, 1, sizeof(tctr), fin);
130 fread(&urlid, 1, sizeof(urlid), fin); 138 fread(&urlid, 1, sizeof(urlid), fin);
131 tctr = ntohs(tctr); 139 tctr = ntohs(tctr);
132 //qDebug("tgt:%u urlctr:%u tctr:%u", tgt, urlctr, tctr); 140 //odebug << "tgt:" << tgt << " urlctr:" << urlctr << " tctr:" << tctr << "" << oendl;
133 if (tctr >= tgt) 141 if (tctr >= tgt)
134 { 142 {
135 break; 143 break;
136 } 144 }
137 urlctr = tctr; 145 urlctr = tctr;
138 } 146 }
139 //qDebug("urls are in %d", ntohs(urlid)); 147 //odebug << "urls are in " << ntohs(urlid) << "" << oendl;
140 recptr = finduid(ntohs(urlid)); 148 recptr = finduid(ntohs(urlid));
141 if (recptr != 0) 149 if (recptr != 0)
142 { 150 {
143 UInt32 reclen = recordlength(recptr) - HeaderSize(); 151 UInt32 reclen = recordlength(recptr) - HeaderSize();
144 gotorecordnumber(recptr); 152 gotorecordnumber(recptr);
145 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 153 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
146 //qDebug("Found urls:%x",thishdr_type); 154 //odebug << "Found urls:" << thishdr_type << "" << oendl;
147 urlsize = thishdr_size; 155 urlsize = thishdr_size;
148 urls = new char[urlsize]; 156 urls = new char[urlsize];
149 Expand(reclen, thishdr_type, (UInt8*)urls, urlsize); 157 Expand(reclen, thishdr_type, (UInt8*)urls, urlsize);
150 char* ptr = urls; 158 char* ptr = urls;
151 int rn = urlctr+1; 159 int rn = urlctr+1;
152 while (ptr - urls < urlsize) 160 while (ptr - urls < urlsize)
153 { 161 {
154 if (rn == tgt) 162 if (rn == tgt)
155 { 163 {
156 //qDebug("URL:%s", ptr); 164 //odebug << "URL:" << ptr << "" << oendl;
157 int len = strlen(ptr)+1; 165 int len = strlen(ptr)+1;
158 pRet = new char[len]; 166 pRet = new char[len];
159 memcpy(pRet, ptr, len); 167 memcpy(pRet, ptr, len);
160 break; 168 break;
161 } 169 }
162 ptr += strlen(ptr)+1; 170 ptr += strlen(ptr)+1;
163 rn++; 171 rn++;
164 } 172 }
165 delete [] urls; 173 delete [] urls;
166 } 174 }
167 } 175 }
168 } 176 }
@@ -170,6 +178,6 @@ char* CPlucker_base::geturl(UInt16 tgt)
170 { 178 {
171 QMessageBox::information(NULL, 179 QMessageBox::information(NULL,
172 QString(PROGNAME), 180 QString(PROGNAME),
173 QString("No external links\nin this pluck") 181 QString("No external links\nin this pluck")
174 ); 182 );
175 } 183 }
@@ -208,5 +216,5 @@ unsigned int CPlucker_base::locate()
208 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 216 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
209 if (thishdr_type < 2) locpos += thishdr_size; 217 if (thishdr_type < 2) locpos += thishdr_size;
210 thisrec++; 218 thisrec++;
211 gotorecordnumber(thisrec); 219 gotorecordnumber(thisrec);
212 } 220 }
@@ -224,20 +232,20 @@ void CPlucker_base::locate(unsigned int n)
224 { 232 {
225 textlength = 0; 233 textlength = 0;
226 UInt16 thishdr_uid, thishdr_nParagraphs; 234 UInt16 thishdr_uid, thishdr_nParagraphs;
227 UInt32 thishdr_size = buffercontent; 235 UInt32 thishdr_size = buffercontent;
228 UInt8 thishdr_type, thishdr_reserved; 236 UInt8 thishdr_type, thishdr_reserved;
229 for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++) 237 for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
230 { 238 {
231 gotorecordnumber(recptr); 239 gotorecordnumber(recptr);
232 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 240 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
233 if (thishdr_type < 2) 241 if (thishdr_type < 2)
234 { 242 {
235 textlength += thishdr_size; 243 textlength += thishdr_size;
236 if (textlength > n) 244 if (textlength > n)
237 { 245 {
238 textlength -= thishdr_size; 246 textlength -= thishdr_size;
239 break; 247 break;
240 } 248 }
241 } 249 }
242 } 250 }
243 } 251 }
@@ -245,16 +253,16 @@ void CPlucker_base::locate(unsigned int n)
245 { 253 {
246 UInt16 thishdr_uid, thishdr_nParagraphs; 254 UInt16 thishdr_uid, thishdr_nParagraphs;
247 UInt32 thishdr_size; 255 UInt32 thishdr_size;
248 UInt8 thishdr_type, thishdr_reserved; 256 UInt8 thishdr_type, thishdr_reserved;
249 while (n < textlength && recptr > 1) 257 while (n < textlength && recptr > 1)
250 { 258 {
251 recptr--; 259 recptr--;
252 gotorecordnumber(recptr); 260 gotorecordnumber(recptr);
253 //qDebug("recptr:%u", recptr); 261 //odebug << "recptr:" << recptr << "" << oendl;
254 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 262 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
255 if (thishdr_type < 2) 263 if (thishdr_type < 2)
256 { 264 {
257 textlength -= thishdr_size; 265 textlength -= thishdr_size;
258 } 266 }
259 } 267 }
260 } 268 }
@@ -262,18 +270,18 @@ void CPlucker_base::locate(unsigned int n)
262 { 270 {
263 UInt16 thishdr_uid, thishdr_nParagraphs; 271 UInt16 thishdr_uid, thishdr_nParagraphs;
264 UInt32 thishdr_size = buffercontent; 272 UInt32 thishdr_size = buffercontent;
265 UInt8 thishdr_type, thishdr_reserved; 273 UInt8 thishdr_type, thishdr_reserved;
266 while (n > textlength + thishdr_size && recptr < ntohs(head.recordList.numRecords)-1) 274 while (n > textlength + thishdr_size && recptr < ntohs(head.recordList.numRecords)-1)
267 { 275 {
268 textlength += thishdr_size; 276 textlength += thishdr_size;
269 recptr++; 277 recptr++;
270 gotorecordnumber(recptr); 278 gotorecordnumber(recptr);
271 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 279 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
272 if (!(thishdr_type < 2)) 280 if (!(thishdr_type < 2))
273 { 281 {
274 thishdr_size = 0; 282 thishdr_size = 0;
275 } 283 }
276 } 284 }
277 } 285 }
278// qDebug("Time(1): %u", clock()-start); 286// odebug << "Time(1): " << clock()-start << "" << oendl;
279/* 287/*
@@ -285,12 +293,12 @@ void CPlucker_base::locate(unsigned int n)
285 { 293 {
286 UInt16 attr = m_ParaAttrs[m_nextParaIndex]; 294 UInt16 attr = m_ParaAttrs[m_nextParaIndex];
287 m_nextParaIndex++; 295 m_nextParaIndex++;
288 if (m_nextParaIndex == m_nParas) 296 if (m_nextParaIndex == m_nParas)
289 { 297 {
290 m_nextPara = -1; 298 m_nextPara = -1;
291 } 299 }
292 else 300 else
293 { 301 {
294 m_nextPara += m_ParaOffsets[m_nextParaIndex]; 302 m_nextPara += m_ParaOffsets[m_nextParaIndex];
295 } 303 }
296 } 304 }
@@ -309,30 +317,30 @@ void CPlucker_base::locate(unsigned int n)
309 { 317 {
310 thisrec++; 318 thisrec++;
311 locpos += bs; 319 locpos += bs;
312 gotorecordnumber(thisrec); 320 gotorecordnumber(thisrec);
313 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 321 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
314 if (thishdr_type < 2) 322 if (thishdr_type < 2)
315 { 323 {
316 bs = thishdr_size; 324 bs = thishdr_size;
317 } 325 }
318 else 326 else
319 { 327 {
320 bs = 0; 328 bs = 0;
321 } 329 }
322 } while (locpos + bs <= n); 330 } while (locpos + bs <= n);
323 331
324// qDebug("Time(2): %u", clock()-start); 332// odebug << "Time(2): " << clock()-start << "" << oendl;
325 if (recptr != thisrec) 333 if (recptr != thisrec)
326 { 334 {
327 qDebug("Disaster:recptr:%u thisrec:%u", recptr, thisrec); 335 odebug << "Disaster:recptr:" << recptr << " thisrec:" << thisrec << "" << oendl;
328 UInt16 thishdr_uid, thishdr_nParagraphs; 336 UInt16 thishdr_uid, thishdr_nParagraphs;
329 UInt32 thishdr_size = buffercontent; 337 UInt32 thishdr_size = buffercontent;
330 UInt8 thishdr_type, thishdr_reserved; 338 UInt8 thishdr_type, thishdr_reserved;
331 for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++) 339 for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
332 { 340 {
333 gotorecordnumber(recptr); 341 gotorecordnumber(recptr);
334 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 342 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
335 // qDebug("UID:%u Paras:%u Size:%u Type:%u Reserved:%u", thishdr_uid, thishdr_nParagraphs, thishdr_size, (unsigned int)thishdr_type, (unsigned int)thishdr_reserved); 343// odebug << "UID:" << thishdr_uid << " Paras:" << thishdr_nParagraphs << " Size:" << thishdr_size << " Type:" << (unsigned int)thishdr_type << " Reserved:" << (unsigned int)thishdr_reserved << "" << oendl;
336 } 344 }
337 //QApplication::exit ( 100 ); 345// QApplication::exit ( 100 );
338 } 346 }
@@ -348,12 +356,12 @@ void CPlucker_base::locate(unsigned int n)
348 { 356 {
349 UInt16 attr = m_ParaAttrs[m_nextParaIndex]; 357 UInt16 attr = m_ParaAttrs[m_nextParaIndex];
350 m_nextParaIndex++; 358 m_nextParaIndex++;
351 if (m_nextParaIndex == m_nParas) 359 if (m_nextParaIndex == m_nParas)
352 { 360 {
353 m_nextPara = -1; 361 m_nextPara = -1;
354 } 362 }
355 else 363 else
356 { 364 {
357 m_nextPara += m_ParaOffsets[m_nextParaIndex]; 365 m_nextPara += m_ParaOffsets[m_nextParaIndex];
358 } 366 }
359 } 367 }
@@ -372,9 +380,9 @@ bool CPlucker_base::expand(int thisrec)
372 { 380 {
373 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 381 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
374 //qDebug("This (%d) type is %d, uid is %u", thisrec, thishdr_type, thishdr_uid); 382 //odebug << "This (" << thisrec << ") type is " << thishdr_type << ", uid is " << thishdr_uid << "" << oendl;
375 if (thishdr_type < 2) break; 383 if (thishdr_type < 2) break;
376 //qDebug("Skipping paragraph of type %d", thishdr_type); 384 //odebug << "Skipping paragraph of type " << thishdr_type << "" << oendl;
377 if (++thisrec >= ntohs(head.recordList.numRecords) - 1) return false; 385 if (++thisrec >= ntohs(head.recordList.numRecords) - 1) return false;
378 reclen = recordlength(thisrec); 386 reclen = recordlength(thisrec);
379 gotorecordnumber(thisrec); 387 gotorecordnumber(thisrec);
380 } 388 }
@@ -382,3 +390,3 @@ bool CPlucker_base::expand(int thisrec)
382 m_bufferisreserved = (thishdr_reserved != 0); 390 m_bufferisreserved = (thishdr_reserved != 0);
383 //qDebug("It has %u paragraphs and is %u bytes", thishdr_nParagraphs, thishdr_size); 391 //odebug << "It has " << thishdr_nParagraphs << " paragraphs and is " << thishdr_size << " bytes" << oendl;
384 uid = thishdr_uid; 392 uid = thishdr_uid;
@@ -388,8 +396,8 @@ bool CPlucker_base::expand(int thisrec)
388 { 396 {
389 UInt16 ubytes, attrs; 397 UInt16 ubytes, attrs;
390 fread(&ubytes, 1, sizeof(ubytes), fin); 398 fread(&ubytes, 1, sizeof(ubytes), fin);
391 fread(&attrs, 1, sizeof(attrs), fin); 399 fread(&attrs, 1, sizeof(attrs), fin);
392 m_ParaOffsets[i] = ntohs(ubytes); 400 m_ParaOffsets[i] = ntohs(ubytes);
393 m_ParaAttrs[i] = ntohs(attrs); 401 m_ParaAttrs[i] = ntohs(attrs);
394 ////qDebug("Bytes %u, Attr %x", ntohs(ubytes), ntohs(attrs)); 402// //odebug << "Bytes " << ntohs(ubytes) << ", Attr " << ntohs(attrs) << "" << oendl;
395 } 403 }
@@ -397,5 +405,5 @@ bool CPlucker_base::expand(int thisrec)
397 { 405 {
398 m_nextPara = m_ParaOffsets[0]; 406 m_nextPara = m_ParaOffsets[0];
399 //qDebug("First offset = %u", m_nextPara); 407 //odebug << "First offset = " << m_nextPara << "" << oendl;
400 m_nextParaIndex = 0; 408 m_nextParaIndex = 0;
401 } 409 }
@@ -403,3 +411,3 @@ bool CPlucker_base::expand(int thisrec)
403 { 411 {
404 m_nextPara = -1; 412 m_nextPara = -1;
405 } 413 }
@@ -412,5 +420,5 @@ bool CPlucker_base::expand(int thisrec)
412 { 420 {
413 delete [] expandedtextbuffer; 421 delete [] expandedtextbuffer;
414 buffersize = thishdr_size; 422 buffersize = thishdr_size;
415 expandedtextbuffer = new UInt8[buffersize]; 423 expandedtextbuffer = new UInt8[buffersize];
416 } 424 }
@@ -420,3 +428,3 @@ bool CPlucker_base::expand(int thisrec)
420 bufferrec = thisrec; 428 bufferrec = thisrec;
421 //qDebug("BC:%u, HS:%u", buffercontent, thishdr_size); 429 //odebug << "BC:" << buffercontent << ", HS:" << thishdr_size << "" << oendl;
422 return true; 430 return true;
@@ -438,5 +446,5 @@ void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuff
438 zstream.opaque = Z_NULL; 446 zstream.opaque = Z_NULL;
439 447
440// printf("Initialising\n"); 448// printf("Initialising\n");
441 449
442 inflateInit(&zstream); 450 inflateInit(&zstream);
@@ -454,3 +462,3 @@ void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuff
454 462
455 ////qDebug("err:%d - %u", err, zstream.avail_in); 463// //odebug << "err:" << err << " - " << zstream.avail_in << "" << oendl;
456 464
@@ -529,12 +537,12 @@ CList<Bkmk>* CPlucker_base::getbkmklist()
529 { 537 {
530 gotorecordnumber(i); 538 gotorecordnumber(i);
531 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 539 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
532 if (thishdr_type == 8) 540 if (thishdr_type == 8)
533 { 541 {
534 UInt16 n; 542 UInt16 n;
535 fread(&n, 1, sizeof(n), fin); 543 fread(&n, 1, sizeof(n), fin);
536 n = ntohs(n); 544 n = ntohs(n);
537 //qDebug("Found %u bookmarks", n); 545 //odebug << "Found " << n << " bookmarks" << oendl;
538 } 546 }
539 //qDebug("Found:%d, %u", i , thishdr_type); 547 //odebug << "Found:" << i << ", " << thishdr_type << "" << oendl;
540 } 548 }
@@ -552,10 +560,10 @@ QImage* CPlucker_base::expandimg(UInt16 tgt, bool border)
552 { 560 {
553 QPixmap* image = new QPixmap(0,0); 561 QPixmap* image = new QPixmap(0,0);
554 image->convertFromImage(*qimage); 562 image->convertFromImage(*qimage);
555 delete qimage; 563 delete qimage;
556 QPixmap* pret = new QPixmap(image->width()+4, image->height()+4); 564 QPixmap* pret = new QPixmap(image->width()+4, image->height()+4);
557 pret->fill(Qt::red); 565 pret->fill(Qt::red);
558 bitBlt(pret, 2, 2, image, 0, 0, -1, -1);//, Qt::RasterOp::CopyROP); 566 bitBlt(pret, 2, 2, image, 0, 0, -1, -1);//, Qt::RasterOp::CopyROP);
559 delete image; 567 delete image;
560 ret = new QImage(pret->convertToImage()); 568 ret = new QImage(pret->convertToImage());
561 } 569 }
@@ -563,3 +571,3 @@ QImage* CPlucker_base::expandimg(UInt16 tgt, bool border)
563 { 571 {
564 ret = qimage; 572 ret = qimage;
565 } 573 }
@@ -579,7 +587,7 @@ QImage* CPlucker_base::getPicture(unsigned long tgt)
579 { 587 {
580 pix[tgt] = *expandimg(tgt); 588 pix[tgt] = *expandimg(tgt);
581 return &pix[tgt]; 589 return &pix[tgt];
582 } 590 }
583 else 591 else
584 return &(t.data()); 592 return &(t.data());
585#else 593#else
@@ -594,3 +602,3 @@ void CPlucker_base::showimg(UInt16 tgt)
594{ 602{
595 //qDebug("Crassssssh!"); 603 //odebug << "Crassssssh!" << oendl;
596 QPixmap* qimage = expandimg(tgt); 604 QPixmap* qimage = expandimg(tgt);
@@ -605,3 +613,3 @@ void CPlucker_base::showimg(UInt16 tgt)
605 QPixmap* image = new QPixmap(0,0); 613 QPixmap* image = new QPixmap(0,0);
606// //qDebug("New image"); 614// //odebug << "New image" << oendl;
607 image->convertFromImage(*qimage); 615 image->convertFromImage(*qimage);
@@ -612,7 +620,7 @@ void CPlucker_base::showimg(UInt16 tgt)
612 close(f); 620 close(f);
613 //qDebug("TMPFILE:%s", tmpfile); 621 //odebug << "TMPFILE:" << tmpfile << "" << oendl;
614 if (image->save(tmpfile,"PNG")) 622 if (image->save(tmpfile,"PNG"))
615 { 623 {
616 QCopEnvelope e("QPE/Application/showimg", "setDocument(QString)"); 624 QCopEnvelope e("QPE/Application/showimg", "setDocument(QString)");
617 e << QString(tmpfile); 625 e << QString(tmpfile);
618 } 626 }
@@ -629,3 +637,3 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
629{ 637{
630// //qDebug("Finding %u", urlid); 638// //odebug << "Finding " << urlid << "" << oendl;
631 unsigned short jmin = 1, jmax = ntohs(head.recordList.numRecords); 639 unsigned short jmin = 1, jmax = ntohs(head.recordList.numRecords);
@@ -634,22 +642,22 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
634 { 642 {
635 gotorecordnumber(jmid); 643 gotorecordnumber(jmid);
636 UInt16 thishdr_uid, thishdr_nParagraphs; 644 UInt16 thishdr_uid, thishdr_nParagraphs;
637 UInt32 thishdr_size; 645 UInt32 thishdr_size;
638 UInt8 thishdr_type, thishdr_reserved; 646 UInt8 thishdr_type, thishdr_reserved;
639 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 647 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
640 unsigned short luid = thishdr_uid; 648 unsigned short luid = thishdr_uid;
641 ////qDebug("%u %u %u : %u", jmin, jmid, jmax, urlid); 649// //odebug << "" << jmin << " " << jmid << " " << jmax << " : " << urlid << "" << oendl;
642 if (luid == urlid) 650 if (luid == urlid)
643 { 651 {
644 return jmid; 652 return jmid;
645 } 653 }
646 if (luid < urlid) 654 if (luid < urlid)
647 { 655 {
648 jmin = jmid; 656 jmin = jmid;
649 } 657 }
650 else 658 else
651 { 659 {
652 jmax = jmid; 660 jmax = jmid;
653 } 661 }
654 jmid = (jmin+jmax) >> 1; 662 jmid = (jmin+jmax) >> 1;
655 } 663 }
@@ -661,6 +669,6 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
661 unsigned short luid = thishdr_uid; 669 unsigned short luid = thishdr_uid;
662 //qDebug("jmin at end:%u,%u", jmin, luid); 670 //odebug << "jmin at end:" << jmin << "," << luid << "" << oendl;
663 if (luid == urlid) 671 if (luid == urlid)
664 { 672 {
665 return jmin; 673 return jmin;
666 } 674 }
@@ -669,8 +677,8 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
669 luid = thishdr_uid; 677 luid = thishdr_uid;
670 //qDebug("jmax at end:%u,%u", jmax, luid); 678 //odebug << "jmax at end:" << jmax << "," << luid << "" << oendl;
671 if (luid == urlid) 679 if (luid == urlid)
672 { 680 {
673 return jmax; 681 return jmax;
674 } 682 }
675 //qDebug("Couldn't find %u", urlid); 683 //odebug << "Couldn't find " << urlid << "" << oendl;
676 return 0; // Not found! 684 return 0; // Not found!
@@ -684,3 +692,3 @@ void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsig
684 { 692 {
685 sz++; 693 sz++;
686 } 694 }
@@ -699,6 +707,6 @@ void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsig
699 { 707 {
700 unsigned long t = *it; 708 unsigned long t = *it;
701 //qDebug("[%u]", t); 709// odebug << "[" << t << "]" << oendl;
702 memcpy(newdata, &t, sizeof(t)); 710 memcpy(newdata, &t, sizeof(t));
703 newdata += sizeof(t); 711 newdata += sizeof(t);
704 } 712 }
@@ -713,5 +721,5 @@ void CPlucker_base::putSaveData(unsigned char*& src, unsigned short& srclen)
713 { 721 {
714 memcpy(&sz, src, sizeof(sz)); 722 memcpy(&sz, src, sizeof(sz));
715 src += sizeof(sz); 723 src += sizeof(sz);
716 srclen -= sizeof(sz); 724 srclen -= sizeof(sz);
717 } 725 }
@@ -719,16 +727,16 @@ void CPlucker_base::putSaveData(unsigned char*& src, unsigned short& srclen)
719 { 727 {
720 unsigned long t; 728 unsigned long t;
721 if (srclen >= sizeof(t)) 729 if (srclen >= sizeof(t))
722 { 730 {
723 memcpy(&t, src, sizeof(t)); 731 memcpy(&t, src, sizeof(t));
724 // qDebug("[%u]", t); 732// odebug << "[" << t << "]" << oendl;
725 visited.push_front(t); 733 visited.push_front(t);
726 src += sizeof(t); 734 src += sizeof(t);
727 srclen -= sizeof(t); 735 srclen -= sizeof(t);
728 } 736 }
729 else 737 else
730 { 738 {
731 QMessageBox::warning(NULL, PROGNAME, "File data mismatch\nMight fix itself"); 739 QMessageBox::warning(NULL, PROGNAME, "File data mismatch\nMight fix itself");
732 break; 740 break;
733 } 741 }
734 } 742 }
@@ -742,3 +750,3 @@ int CPlucker_base::OpenFile(const char *src)
742 { 750 {
743 return -1; 751 return -1;
744 } 752 }
@@ -753,6 +761,6 @@ int CPlucker_base::OpenFile(const char *src)
753 761
754 //qDebug("Total number of records:%u", ntohs(head.recordList.numRecords)); 762 //odebug << "Total number of records:" << ntohs(head.recordList.numRecords) << "" << oendl;
755 763
756 unsigned int nrecs = ntohs(hdr0.nRecords); 764 unsigned int nrecs = ntohs(hdr0.nRecords);
757 //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs); 765 //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
758 UInt16 homerecid = 1; 766 UInt16 homerecid = 1;
@@ -760,7 +768,7 @@ int CPlucker_base::OpenFile(const char *src)
760 { 768 {
761 UInt16 id, name; 769 UInt16 id, name;
762 fread(&name, 1, sizeof(name), fin); 770 fread(&name, 1, sizeof(name), fin);
763 fread(&id, 1, sizeof(id), fin); 771 fread(&id, 1, sizeof(id), fin);
764 //qDebug("N:%d, I:%d", ntohs(name), ntohs(id)); 772 //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
765 if (ntohs(name) == 0) homerecid = ntohs(id); 773 if (ntohs(name) == 0) homerecid = ntohs(id);
766 } 774 }
@@ -770,13 +778,13 @@ int CPlucker_base::OpenFile(const char *src)
770 { 778 {
771 gotorecordnumber(recptr); 779 gotorecordnumber(recptr);
772 UInt16 thishdr_uid, thishdr_nParagraphs; 780 UInt16 thishdr_uid, thishdr_nParagraphs;
773 UInt32 thishdr_size; 781 UInt32 thishdr_size;
774 UInt8 thishdr_type, thishdr_reserved; 782 UInt8 thishdr_type, thishdr_reserved;
775 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 783 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
776 if (thishdr_uid == homerecid) 784 if (thishdr_uid == homerecid)
777 { 785 {
778 m_homepos = textlength; 786 m_homepos = textlength;
779 break; 787 break;
780 } 788 }
781 if (thishdr_type < 2) textlength += thishdr_size; 789 if (thishdr_type < 2) textlength += thishdr_size;
782 } 790 }
@@ -787,5 +795,5 @@ int CPlucker_base::OpenFile(const char *src)
787 { 795 {
788 m_viewer = new QScrollView(NULL); 796 m_viewer = new QScrollView(NULL);
789 m_picture = new QWidget(m_viewer->viewport()); 797 m_picture = new QWidget(m_viewer->viewport());
790 m_viewer->addChild(m_picture); 798 m_viewer->addChild(m_picture);
791 } 799 }
@@ -810,3 +818,3 @@ QImage* CPlucker_base::getimg(UInt16 tgt)
810 UInt8* imgbuffer = new UInt8[imgsize]; 818 UInt8* imgbuffer = new UInt8[imgsize];
811 819
812 Expand(reclen, thishdr_type, imgbuffer, imgsize); 820 Expand(reclen, thishdr_type, imgbuffer, imgsize);
@@ -821,3 +829,3 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
821 n &= 0xffff; 829 n &= 0xffff;
822// //qDebug("Hyper:<%u,%u>", tuid, n); 830// //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
823 UInt16 thisrec = 1; 831 UInt16 thisrec = 1;
@@ -830,38 +838,38 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
830 { 838 {
831 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved); 839 GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
832 if (tuid == thishdr_uid) break; 840 if (tuid == thishdr_uid) break;
833 if (thishdr_type < 2) currentpos += thishdr_size; 841 if (thishdr_type < 2) currentpos += thishdr_size;
834 ////qDebug("hyper-cp:%u", currentpos); 842// //odebug << "hyper-cp:" << currentpos << "" << oendl;
835 thisrec++; 843 thisrec++;
836 if (thisrec >= ntohs(head.recordList.numRecords)) 844 if (thisrec >= ntohs(head.recordList.numRecords))
837 { 845 {
838 char *turl = geturl(tuid); 846 char *turl = geturl(tuid);
839 if (turl == NULL) 847 if (turl == NULL)
840 { 848 {
841 QMessageBox::information(NULL, 849 QMessageBox::information(NULL,
842 QString(PROGNAME), 850 QString(PROGNAME),
843 QString("Couldn't find link") 851 QString("Couldn't find link")
844 ); 852 );
845 } 853 }
846 else 854 else
847 { 855 {
848 wrd = turl; 856 wrd = turl;
849#ifdef USEQPE 857#ifdef USEQPE
850 if (wrd.length() > 10) 858 if (wrd.length() > 10)
851 { 859 {
852 Global::statusMessage(wrd.left(8) + ".."); 860 Global::statusMessage(wrd.left(8) + "..");
853 } 861 }
854 else 862 else
855 { 863 {
856 Global::statusMessage(wrd); 864 Global::statusMessage(wrd);
857 } 865 }
858#else 866#else
859#endif /* USEQPE */ 867#endif /* USEQPE */
860 //qDebug("Link:%s", (const char*)wrd); 868 //odebug << "Link:" << wrd << "" << oendl;
861 // setlink(fn, wrd); 869// setlink(fn, wrd);
862 delete [] turl; 870 delete [] turl;
863 } 871 }
864 return eNone; 872 return eNone;
865 } 873 }
866 gotorecordnumber(thisrec); 874 gotorecordnumber(thisrec);
867 } 875 }
@@ -869,28 +877,28 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
869 { 877 {
870 if (thishdr_type == 4) 878 if (thishdr_type == 4)
871 { 879 {
872 QMessageBox::information(NULL, 880 QMessageBox::information(NULL,
873 QString(PROGNAME), 881 QString(PROGNAME),
874 QString("Mailto links\nnot yet supported (2)")); 882 QString("Mailto links\nnot yet supported (2)"));
875 } 883 }
876 else 884 else
877 { 885 {
878 if (thishdr_type > 3) 886 if (thishdr_type > 3)
879 { 887 {
880 QMessageBox::information(NULL, 888 QMessageBox::information(NULL,
881 QString(PROGNAME), 889 QString(PROGNAME),
882 QString("External links\nnot yet supported (2)") 890 QString("External links\nnot yet supported (2)")
883 ); 891 );
884 return eNone; 892 return eNone;
885 } 893 }
886 else 894 else
887 { 895 {
888#ifdef LOCALPICTURES 896#ifdef LOCALPICTURES
889 showimg(tuid); 897 showimg(tuid);
890#else 898#else
891 return ePicture; 899 return ePicture;
892#endif 900#endif
893 } 901 }
894 } 902 }
895 return eNone; 903 return eNone;
896 } 904 }
@@ -899,3 +907,3 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
899 { 907 {
900 expandimg(thisrec); 908 expandimg(thisrec);
901 909
@@ -905,44 +913,44 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
905 { 913 {
906 expand(thisrec); 914 expand(thisrec);
907 if (n != 0) 915 if (n != 0)
908 { 916 {
909 if (n >= m_nParas) 917 if (n >= m_nParas)
910 { 918 {
911 QMessageBox::information(NULL, 919 QMessageBox::information(NULL,
912 QString(PROGNAME), 920 QString(PROGNAME),
913 QString("Error in link\nPara # too big") 921 QString("Error in link\nPara # too big")
914 ); 922 );
915 return eNone; 923 return eNone;
916 } 924 }
917 unsigned int noff = 0; 925 unsigned int noff = 0;
918 for (unsigned int i = 0; i < n; i++) noff += m_ParaOffsets[i]; 926 for (unsigned int i = 0; i < n; i++) noff += m_ParaOffsets[i];
919 n = noff; 927 n = noff;
920 } 928 }
921 if (n > thishdr_size) 929 if (n > thishdr_size)
922 { 930 {
923 QMessageBox::information(NULL, 931 QMessageBox::information(NULL,
924 QString(PROGNAME), 932 QString(PROGNAME),
925 QString("Error in link\nOffset too big") 933 QString("Error in link\nOffset too big")
926 ); 934 );
927 return eNone; 935 return eNone;
928 } 936 }
929 //qDebug("Hyper:<%u,%u>", tuid, n); 937 //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
930 while (bufferpos < n && bufferpos < buffercontent) getch_base(true); 938 while (bufferpos < n && bufferpos < buffercontent) getch_base(true);
931/* // This is faster but the alignment doesn't get set 939/* // This is faster but the alignment doesn't get set
932 mystyle.unset(); 940 mystyle.unset();
933 bufferpos = n; 941 bufferpos = n;
934 currentpos += n; 942 currentpos += n;
935 while (bufferpos >= m_nextPara && m_nextPara >= 0) 943 while (bufferpos >= m_nextPara && m_nextPara >= 0)
936 { 944 {
937 UInt16 attr = m_ParaAttrs[m_nextParaIndex]; 945 UInt16 attr = m_ParaAttrs[m_nextParaIndex];
938 m_nextParaIndex++; 946 m_nextParaIndex++;
939 if (m_nextParaIndex == m_nParas) 947 if (m_nextParaIndex == m_nParas)
940 { 948 {
941 m_nextPara = -1; 949 m_nextPara = -1;
942 } 950 }
943 else 951 else
944 { 952 {
945 m_nextPara += m_ParaOffsets[m_nextParaIndex]; 953 m_nextPara += m_ParaOffsets[m_nextParaIndex];
946 } 954 }
947 } 955 }
948*/ 956*/
@@ -957,266 +965,266 @@ tchar CPlucker_base::getch_base(bool fast)
957 { 965 {
958 ch = bgetch(); 966 ch = bgetch();
959 ////qDebug("Function:%x", ch); 967// //odebug << "Function:" << ch << "" << oendl;
960 switch (ch) 968 switch (ch)
961 { 969 {
962 case 0x38: 970 case 0x38:
963 // //qDebug("Break:%u", locate()); 971// //odebug << "Break:" << locate() << "" << oendl;
964 if (m_lastBreak == locate()) 972 if (m_lastBreak == locate())
965 { 973 {
966 ch = bgetch(); 974 ch = bgetch();
967 } 975 }
968 else 976 else
969 { 977 {
970 ch = 10; 978 ch = 10;
971 } 979 }
972 m_lastBreak = locate(); 980 m_lastBreak = locate();
973 break; 981 break;
974 case 0x0a: 982 case 0x0a:
975 case 0x0c: 983 case 0x0c:
976 { 984 {
977 unsigned long ln = 0; 985 unsigned long ln = 0;
978 int skip = ch & 7; 986 int skip = ch & 7;
979 for (int i = 0; i < 2; i++) 987 for (int i = 0; i < 2; i++)
980 { 988 {
981 int ch = bgetch(); 989 int ch = bgetch();
982 ln = (ln << 8) + ch; 990 ln = (ln << 8) + ch;
983 // //qDebug("ch:%d, ln:%u", ch, ln); 991// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
984 } 992 }
985 if (skip == 2) 993 if (skip == 2)
986 { 994 {
987 ln <<= 16; 995 ln <<= 16;
988 } 996 }
989 else 997 else
990 { 998 {
991 for (int i = 0; i < 2; i++) 999 for (int i = 0; i < 2; i++)
992 { 1000 {
993 int ch = bgetch(); 1001 int ch = bgetch();
994 ln = (ln << 8) + ch; 1002 ln = (ln << 8) + ch;
995 // //qDebug("ch:%d, ln:%u", ch, ln); 1003// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
996 } 1004 }
997 } 1005 }
998 // //qDebug("ln:%u", ln); 1006// //odebug << "ln:" << ln << "" << oendl;
999 mystyle.setLink(true); 1007 mystyle.setLink(true);
1000 mystyle.setData(ln); 1008 mystyle.setData(ln);
1001 // mystyle.setColour(255, 0, 0); 1009// mystyle.setColour(255, 0, 0);
1002 bool hasseen = false; 1010 bool hasseen = false;
1003 for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++) 1011 for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
1004 { 1012 {
1005 if (*it == ln) 1013 if (*it == ln)
1006 { 1014 {
1007 hasseen = true; 1015 hasseen = true;
1008 break; 1016 break;
1009 } 1017 }
1010 } 1018 }
1011 if (hasseen) 1019 if (hasseen)
1012 { 1020 {
1013 mystyle.setStrikethru(); 1021 mystyle.setStrikethru();
1014 } 1022 }
1015 else 1023 else
1016 { 1024 {
1017 mystyle.setUnderline(); 1025 mystyle.setUnderline();
1018 } 1026 }
1019 ch = bgetch(); 1027 ch = bgetch();
1020 } 1028 }
1021 break; 1029 break;
1022 case 0x08: 1030 case 0x08:
1023 ch = bgetch(); 1031 ch = bgetch();
1024 // mystyle.setColour(0, 0, 0); 1032// mystyle.setColour(0, 0, 0);
1025 mystyle.unsetUnderline(); 1033 mystyle.unsetUnderline();
1026 mystyle.unsetStrikethru(); 1034 mystyle.unsetStrikethru();
1027 mystyle.setLink(false); 1035 mystyle.setLink(false);
1028 mystyle.setData(0); 1036 mystyle.setData(0);
1029 break; 1037 break;
1030 case 0x40: 1038 case 0x40:
1031 mystyle.setItalic(); 1039 mystyle.setItalic();
1032 ch = bgetch(); 1040 ch = bgetch();
1033 break; 1041 break;
1034 case 0x48: 1042 case 0x48:
1035 mystyle.unsetItalic(); 1043 mystyle.unsetItalic();
1036 ch = bgetch(); 1044 ch = bgetch();
1037 break; 1045 break;
1038 case 0x11: 1046 case 0x11:
1039 { 1047 {
1040 ch = bgetch(); 1048 ch = bgetch();
1041 // //qDebug("Font:%d",ch); 1049// //odebug << "Font:" << ch << "" << oendl;
1042 mystyle.setVOffset(0); 1050 mystyle.setVOffset(0);
1043 mystyle.unsetMono(); 1051 mystyle.unsetMono();
1044 mystyle.unsetBold(); 1052 mystyle.unsetBold();
1045 mystyle.setFontSize(0); 1053 mystyle.setFontSize(0);
1046 switch (ch) 1054 switch (ch)
1047 { 1055 {
1048 case 0: 1056 case 0:
1049 break; 1057 break;
1050 case 1: 1058 case 1:
1051 mystyle.setBold(); 1059 mystyle.setBold();
1052 mystyle.setFontSize(3); 1060 mystyle.setFontSize(3);
1053 break; 1061 break;
1054 case 2: 1062 case 2:
1055 mystyle.setBold(); 1063 mystyle.setBold();
1056 mystyle.setFontSize(2); 1064 mystyle.setFontSize(2);
1057 break; 1065 break;
1058 case 3: 1066 case 3:
1059 mystyle.setBold(); 1067 mystyle.setBold();
1060 mystyle.setFontSize(1); 1068 mystyle.setFontSize(1);
1061 break; 1069 break;
1062 case 4: 1070 case 4:
1063 mystyle.setBold(); 1071 mystyle.setBold();
1064 break; 1072 break;
1065 case 5: 1073 case 5:
1066 mystyle.setBold(); 1074 mystyle.setBold();
1067 break; 1075 break;
1068 case 6: 1076 case 6:
1069 mystyle.setBold(); 1077 mystyle.setBold();
1070 break; 1078 break;
1071 case 7: 1079 case 7:
1072 mystyle.setBold(); 1080 mystyle.setBold();
1073 break; 1081 break;
1074 case 8: // should be fixed width 1082 case 8: // should be fixed width
1075 //qDebug("Trying fixed width"); 1083 //odebug << "Trying fixed width" << oendl;
1076 mystyle.setMono(); 1084 mystyle.setMono();
1077 break; 1085 break;
1078 case 9: 1086 case 9:
1079 mystyle.setFontSize(-1); 1087 mystyle.setFontSize(-1);
1080 break; 1088 break;
1081 case 10: 1089 case 10:
1082 mystyle.setFontSize(-2); 1090 mystyle.setFontSize(-2);
1083 mystyle.setVOffset(1); 1091 mystyle.setVOffset(1);
1084 break; 1092 break;
1085 case 11: 1093 case 11:
1086 mystyle.setFontSize(-2); 1094 mystyle.setFontSize(-2);
1087 mystyle.setVOffset(-1); 1095 mystyle.setVOffset(-1);
1088 break; 1096 break;
1089 default: 1097 default:
1090 qDebug("Unrecognised font"); 1098 odebug << "Unrecognised font" << oendl;
1091 break; 1099 break;
1092 } 1100 }
1093 ch = bgetch(); 1101 ch = bgetch();
1094 } 1102 }
1095 break; 1103 break;
1096 case 0x29: 1104 case 0x29:
1097 ch = bgetch(); 1105 ch = bgetch();
1098 switch (ch) 1106 switch (ch)
1099 { 1107 {
1100 case 0: 1108 case 0:
1101 mystyle.setLeftJustify(); 1109 mystyle.setLeftJustify();
1102 // //qDebug("left"); 1110// //odebug << "left" << oendl;
1103 break; 1111 break;
1104 case 1: 1112 case 1:
1105 mystyle.setRightJustify(); 1113 mystyle.setRightJustify();
1106 // //qDebug("right"); 1114// //odebug << "right" << oendl;
1107 break; 1115 break;
1108 case 2: 1116 case 2:
1109 mystyle.setCentreJustify(); 1117 mystyle.setCentreJustify();
1110 // //qDebug("centre"); 1118// //odebug << "centre" << oendl;
1111 break; 1119 break;
1112 case 3: 1120 case 3:
1113 mystyle.setFullJustify(); 1121 mystyle.setFullJustify();
1114 // //qDebug("full"); 1122// //odebug << "full" << oendl;
1115 break; 1123 break;
1116 1124
1117 } 1125 }
1118 ch = bgetch(); 1126 ch = bgetch();
1119 break; 1127 break;
1120 case 0x53: 1128 case 0x53:
1121 { 1129 {
1122 int r = bgetch(); 1130 int r = bgetch();
1123 int g = bgetch(); 1131 int g = bgetch();
1124 int b = bgetch(); 1132 int b = bgetch();
1125 mystyle.setColour(r,g,b); 1133 mystyle.setColour(r,g,b);
1126 ch = bgetch(); 1134 ch = bgetch();
1127 } 1135 }
1128 break; 1136 break;
1129 case 0x1a: 1137 case 0x1a:
1130 case 0x5c: 1138 case 0x5c:
1131 { 1139 {
1132 bool hasalternate = (ch == 0x5c); 1140 bool hasalternate = (ch == 0x5c);
1133 UInt16 ir = bgetch(); 1141 UInt16 ir = bgetch();
1134 ir = (ir << 8) + bgetch(); 1142 ir = (ir << 8) + bgetch();
1135 if (hasalternate) 1143 if (hasalternate)
1136 { 1144 {
1137 //qDebug("Alternate image:%x", ir); 1145 //odebug << "Alternate image:" << ir << "" << oendl;
1138 UInt16 ir2 = bgetch(); 1146 UInt16 ir2 = bgetch();
1139 ir2 = (ir2 << 8) + bgetch(); 1147 ir2 = (ir2 << 8) + bgetch();
1140 if (!fast) mystyle.setPicture(true, expandimg(ir2, true), true, ir << 16); 1148 if (!fast) mystyle.setPicture(true, expandimg(ir2, true), true, ir << 16);
1141#ifdef LOCALPICTURES 1149#ifdef LOCALPICTURES
1142 UInt32 ln = ir; 1150 UInt32 ln = ir;
1143 ln <<= 16; 1151 ln <<= 16;
1144 mystyle.setLink(true); 1152 mystyle.setLink(true);
1145 mystyle.setData(ln); 1153 mystyle.setData(ln);
1146#endif 1154#endif
1147 } 1155 }
1148 else 1156 else
1149 { 1157 {
1150 if (!fast) mystyle.setPicture(true, expandimg(ir)); 1158 if (!fast) mystyle.setPicture(true, expandimg(ir));
1151 } 1159 }
1152 // if (mystyle.getLink()) qDebug("Picture link!"); 1160// if (mystyle.getLink()) odebug << "Picture link!" << oendl;
1153 ch = '#'; 1161 ch = '#';
1154 } 1162 }
1155 // ch = bgetch(); 1163// ch = bgetch();
1156 break; 1164 break;
1157 case 0x33: 1165 case 0x33:
1158 { 1166 {
1159 UInt8 h = bgetch(); 1167 UInt8 h = bgetch();
1160 UInt8 wc = bgetch(); 1168 UInt8 wc = bgetch();
1161 UInt8 pc = bgetch(); 1169 UInt8 pc = bgetch();
1162 UInt16 w = wc; 1170 UInt16 w = wc;
1163 // //qDebug("h,w,pc [%u, %u, %u]", h, w, pc); 1171// //odebug << "h,w,pc [" << h << ", " << w << ", " << pc << "]" << oendl;
1164 if (w == 0) 1172 if (w == 0)
1165 { 1173 {
1166 w = (m_scrWidth*(unsigned long)pc)/100; 1174 w = (m_scrWidth*(unsigned long)pc)/100;
1167 } 1175 }
1168 if (w == 0) w = m_scrWidth; 1176 if (w == 0) w = m_scrWidth;
1169 mystyle.setPicture(false, hRule(w,h,mystyle.Red(),mystyle.Green(),mystyle.Blue())); 1177 mystyle.setPicture(false, hRule(w,h,mystyle.Red(),mystyle.Green(),mystyle.Blue()));
1170 // if (mystyle.getLink()) //qDebug("hRule link!"); 1178// if (mystyle.getLink()) //odebug << "hRule link!" << oendl;
1171 ch = '#'; 1179 ch = '#';
1172 } 1180 }
1173 break; 1181 break;
1174 case 0x60: 1182 case 0x60:
1175 mystyle.setUnderline(); 1183 mystyle.setUnderline();
1176 ch = bgetch(); 1184 ch = bgetch();
1177 break; 1185 break;
1178 case 0x68: 1186 case 0x68:
1179 mystyle.unsetUnderline(); 1187 mystyle.unsetUnderline();
1180 ch = bgetch(); 1188 ch = bgetch();
1181 break; 1189 break;
1182 case 0x22: 1190 case 0x22:
1183 ch = bgetch(); 1191 ch = bgetch();
1184 mystyle.setLeftMargin(ch); 1192 mystyle.setLeftMargin(ch);
1185 // //qDebug("Left margin:%d", ch); 1193// //odebug << "Left margin:" << ch << "" << oendl;
1186 ch = bgetch(); 1194 ch = bgetch();
1187 mystyle.setRightMargin(ch); 1195 mystyle.setRightMargin(ch);
1188 // //qDebug("Right margin:%d", ch); 1196// //odebug << "Right margin:" << ch << "" << oendl;
1189 ch = bgetch(); 1197 ch = bgetch();
1190 break; 1198 break;
1191 case 0x70: 1199 case 0x70:
1192 mystyle.setStrikethru(); 1200 mystyle.setStrikethru();
1193 ch = bgetch(); 1201 ch = bgetch();
1194 break; 1202 break;
1195 case 0x78: 1203 case 0x78:
1196 mystyle.unsetStrikethru(); 1204 mystyle.unsetStrikethru();
1197 ch = bgetch(); 1205 ch = bgetch();
1198 break; 1206 break;
1199 case 0x83: 1207 case 0x83:
1200 { 1208 {
1201 int tlen = bgetch(); 1209 int tlen = bgetch();
1202 ch = bgetch(); 1210 ch = bgetch();
1203 ch <<= 8; 1211 ch <<= 8;
1204 ch |= (tchar)bgetch(); 1212 ch |= (tchar)bgetch();
1205 for (int i = 0; i < tlen; i++) bgetch(); 1213 for (int i = 0; i < tlen; i++) bgetch();
1206 //qDebug("Function 83"); 1214 //odebug << "Function 83" << oendl;
1207 } 1215 }
1208 break; 1216 break;
1209 case 0x85: 1217 case 0x85:
1210 default: 1218 default:
1211 qDebug("Function:%x NOT IMPLEMENTED", ch); 1219 odebug << "Function:" << ch << " NOT IMPLEMENTED" << oendl;
1212 { 1220 {
1213 int skip = ch & 7; 1221 int skip = ch & 7;
1214 for (int i = 0; i < skip; i++) 1222 for (int i = 0; i < skip; i++)
1215 { 1223 {
1216 ch = bgetch(); 1224 ch = bgetch();
1217 //qDebug("Arg %d, %d", i, ch); 1225 //odebug << "Arg " << i << ", " << ch << "" << oendl;
1218 } 1226 }
1219 ch = bgetch(); 1227 ch = bgetch();
1220 } 1228 }
1221 } 1229 }
1222 } 1230 }
@@ -1225,6 +1233,6 @@ tchar CPlucker_base::getch_base(bool fast)
1225 { 1233 {
1226 while (ch == ' ') 1234 while (ch == ' ')
1227 { 1235 {
1228 ch = getch(false); 1236 ch = getch(false);
1229 } 1237 }
1230 } 1238 }
diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
index 22a4917..4c15fd0 100644
--- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp
+++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
@@ -24,13 +24,10 @@
24#include "katebuffer.h" 24#include "katebuffer.h"
25#include "kdebug.h"
25 26
26// Includes for reading file 27/* OPIE */
27#include <sys/types.h> 28#include <opie2/odebug.h>
28#include <sys/stat.h>
29#include <fcntl.h>
30#include <errno.h>
31#include <unistd.h>
32 29
30/* QT */
33#include <qfile.h> 31#include <qfile.h>
34#include <qtextstream.h> 32#include <qtextstream.h>
35
36#include <qtimer.h> 33#include <qtimer.h>
@@ -38,6 +35,10 @@
38 35
39// 36/* STD */
40 37// Includes for reading file
38#include <sys/types.h>
39#include <sys/stat.h>
40#include <fcntl.h>
41#include <errno.h>
42#include <unistd.h>
41#include <assert.h> 43#include <assert.h>
42#include <kdebug.h>
43 44
@@ -67,31 +68,31 @@ KWBuffer::insertFile(int line, const QString &file, QTextCodec *codec)
67{ 68{
68 if (line) { 69 if (line) {
69 qDebug("insert File only supports insertion at line 0 == file opening"); 70 odebug << "insert File only supports insertion at line 0 == file opening" << oendl;
70 return; 71 return;
71 } 72 }
72 clear(); 73 clear();
73 QFile iofile(file); 74 QFile iofile(file);
74 iofile.open(IO_ReadOnly); 75 iofile.open(IO_ReadOnly);
75 QTextStream stream(&iofile); 76 QTextStream stream(&iofile);
76 stream.setCodec(codec); 77 stream.setCodec(codec);
77 QString qsl; 78 QString qsl;
78 int count=0; 79 int count=0;
79 for (count=0;((qsl=stream.readLine())!=QString::null);count++) 80 for (count=0;((qsl=stream.readLine())!=QString::null); count++)
80 { 81 {
81 if (count==0) 82 if (count==0)
82 { 83 {
83 (*m_stringListIt)->append(qsl.unicode(),qsl.length()); 84 (*m_stringListIt)->append(qsl.unicode(),qsl.length());
84 } 85 }
85 else 86 else
86 { 87 {
87 TextLine::Ptr tl=new TextLine(); 88 TextLine::Ptr tl=new TextLine();
88 tl ->append(qsl.unicode(),qsl.length()); 89 tl ->append(qsl.unicode(),qsl.length());
89 m_stringListIt=m_stringList.append(tl); 90 m_stringListIt=m_stringList.append(tl);
90 } 91 }
91 } 92 }
92 if (count!=0) 93 if (count!=0)
93 { 94 {
94 m_stringListCurrent=count-1; 95 m_stringListCurrent=count-1;
95 m_lineCount=count; 96 m_lineCount=count;
96 } 97 }
97} 98}
@@ -123,5 +124,5 @@ KWBuffer::count()
123{ 124{
124 qDebug("m_stringList.count %d",m_stringList.count()); 125 odebug << "m_stringList.count " << m_stringList.count() << "" << oendl;
125 return m_lineCount; 126 return m_lineCount;
126 //return m_stringList.count(); 127// return m_stringList.count();
127// return m_totalLines; 128// return m_totalLines;
@@ -150,5 +151,5 @@ KWBuffer::line(int i)
150{ 151{
151 if (i>=m_stringList.count()) return 0; 152 if (i>=m_stringList.count()) return 0;
152 seek(i); 153 seek(i);
153 return *m_stringListIt; 154 return *m_stringListIt;
154} 155}
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 0c742d7..6dc4fd2 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -8,3 +8,3 @@
8 jowenn@kde.org 8 jowenn@kde.org
9 9
10***************************************************************************/ 10***************************************************************************/
@@ -41,16 +41,27 @@
41#include "katedocument.h" 41#include "katedocument.h"
42#include "kmessagebox.h"
43#include "kglobal.h"
42 44
45//#include "kcharsets.h"
46#include "kdebug.h"
47//#include "kinstance.h"
43 48
44#include <qfileinfo.h> 49#include "kglobalsettings.h"
45#include <qdatetime.h> 50//#include "kaction.h"
51//#include "kstdaction.h"
46 52
47#include <kmessagebox.h> 53#include "../view/kateview.h"
48#include <qpe/config.h> 54#include "katebuffer.h"
49#include <qstring.h> 55#include "katetextline.h"
50 56
51#include <sys/time.h> 57#include "katecmd.h"
52#include <unistd.h>
53 58
54#include <stdio.h> 59/* OPIE */
60#include <opie2/odebug.h>
61#include <qpe/config.h>
55 62
63/* QT */
64#include <qfileinfo.h>
65#include <qdatetime.h>
66#include <qstring.h>
56#include <qtimer.h> 67#include <qtimer.h>
@@ -64,17 +75,7 @@
64#include <qtextcodec.h> 75#include <qtextcodec.h>
65#include <kglobal.h>
66 76
67//#include <kcharsets.h> 77/* STD */
68#include <kdebug.h> 78#include <sys/time.h>
69//#include <kinstance.h> 79#include <unistd.h>
70 80#include <stdio.h>
71#include <kglobalsettings.h>
72//#include <kaction.h>
73//#include <kstdaction.h>
74
75#include "../view/kateview.h"
76#include "katebuffer.h"
77#include "katetextline.h"
78
79#include "katecmd.h"
80 81
@@ -132,3 +133,3 @@ uint KateDocument::uniqueID = 0;
132 133
133QPtrDict<KateDocument::KateDocPrivate>* KateDocument::d_ptr = 0; 134QPtrDict<KateDocument::KateDocPrivate>* KateDocument::d_ptr = 0;
134 135
@@ -143,4 +144,4 @@ KateDocument::KateDocument(bool bSingleViewMode, bool bBrowserView,
143{ 144{
144 145
145 d(this)->hlSetByUser = false; 146 d(this)->hlSetByUser = false;
146 PreHighlightedTill=0; 147 PreHighlightedTill=0;
@@ -154,3 +155,3 @@ KateDocument::KateDocument(bool bSingleViewMode, bool bBrowserView,
154 // NOTE: QFont::CharSet doesn't provide all the charsets KDE supports 155 // NOTE: QFont::CharSet doesn't provide all the charsets KDE supports
155 // (esp. it doesn't distinguish between UTF-8 and iso10646-1) 156 // (esp. it doesn't distinguish between UTF-8 and iso10646-1)
156 157
@@ -294,3 +295,3 @@ void KateDocument::openURL(const QString &filename)
294 295
295 m_file=filename; 296 m_file=filename;
296 fileInfo->setFile (m_file); 297 fileInfo->setFile (m_file);
@@ -300,3 +301,3 @@ void KateDocument::openURL(const QString &filename)
300 { 301 {
301 qDebug("File doesn't exit or couldn't be read"); 302 odebug << "File doesn't exit or couldn't be read" << oendl;
302 return ; 303 return ;
@@ -307,3 +308,3 @@ void KateDocument::openURL(const QString &filename)
307// buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding)); 308// buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding));
308 qDebug("Telling buffer to open file"); 309 odebug << "Telling buffer to open file" << oendl;
309 buffer->insertFile(0, m_file, QTextCodec::codecForLocale()); 310 buffer->insertFile(0, m_file, QTextCodec::codecForLocale());
@@ -323,3 +324,3 @@ void KateDocument::openURL(const QString &filename)
323 emit fileNameChanged(); 324 emit fileNameChanged();
324 325
325 return ; 326 return ;
@@ -329,3 +330,3 @@ bool KateDocument::saveFile()
329{ 330{
330 331
331 QFile f( m_file ); 332 QFile f( m_file );
@@ -613,3 +614,3 @@ void KateDocument::readConfig()
613 colors[1] = config->readColorEntry("Color Selected", colors[1]); 614 colors[1] = config->readColorEntry("Color Selected", colors[1]);
614 615
615// config->sync(); 616// config->sync();
@@ -685,3 +686,3 @@ void KateDocument::setHighlight(int n) {
685void KateDocument::makeAttribs() { 686void KateDocument::makeAttribs() {
686 qDebug("KateDocument::makeAttribs()"); 687 odebug << "KateDocument::makeAttribs()" << oendl;
687 m_numAttribs = hlManager->makeAttribs(m_highlight, m_attribs, maxAttribs); 688 m_numAttribs = hlManager->makeAttribs(m_highlight, m_attribs, maxAttribs);
@@ -1925,4 +1926,4 @@ void KateDocument::updateLines(int startLine, int endLine, int flags, int cursor
1925 endCtx = textLine->getContext(); 1926 endCtx = textLine->getContext();
1926// qDebug("DOHIGHLIGHT"); 1927// odebug << "DOHIGHLIGHT" << oendl;
1927 1928
1928 ctxNum = m_highlight->doHighlight(ctxNum,textLine); 1929 ctxNum = m_highlight->doHighlight(ctxNum,textLine);
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.cpp b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
index 0d2c283..539d356 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.cpp
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
@@ -3,4 +3,4 @@
3 digisnap@cs.tu-berlin.de 3 digisnap@cs.tu-berlin.de
4 (C) 2002, 2001 The Kate Team <kwrite-devel@kde.org> 4 (C) 2002, 2001 The Kate Team <kwrite-devel@kde.org>
5 (C) 2002 Joseph Wenninger <jowenn@kde.org> 5 (C) 2002 Joseph Wenninger <jowenn@kde.org>
6 This library is free software; you can redistribute it and/or 6 This library is free software; you can redistribute it and/or
@@ -21,18 +21,3 @@
21 21
22#include <string.h>
23
24#include <qtextstream.h>
25#include <qpe/config.h>
26#include <kglobal.h>
27//#include <kinstance.h>
28//#include <kmimemagic.h>
29#include <klocale.h>
30//#include <kregexp.h>
31#include <kglobalsettings.h>
32#include <kdebug.h>
33#include <kstddirs.h>
34
35#include "katehighlight.h" 22#include "katehighlight.h"
36
37
38#include "katetextline.h" 23#include "katetextline.h"
@@ -41,2 +26,21 @@
41 26
27#include "kglobal.h"
28//#include "kinstance.h"
29//#include "kmimemagic.h"
30#include "klocale.h"
31//#include "kregexp.h"
32#include "kglobalsettings.h"
33#include "kdebug.h"
34#include "kstddirs.h"
35
36/* OPIE */
37#include <opie2/odebug.h>
38#include <qpe/config.h>
39
40/* QT */
41#include <qtextstream.h>
42
43/* STD */
44#include <string.h>
45
42 46
@@ -122,4 +126,4 @@ const QChar *HlStringDetect::checkHgl(const QChar *s, int len, bool) {
122 { 126 {
123 QString tmp=QString(s,str.length()).upper(); 127 QString tmp=QString(s,str.length()).upper();
124 if (tmp==str) return s+str.length(); 128 if (tmp==str) return s+str.length();
125 } 129 }
@@ -215,6 +219,6 @@ const QChar *HlInt::checkHgl(const QChar *str, int len, bool) {
215 { 219 {
216 for (HlItem *it=subItems->first();it;it=subItems->next()) 220 for (HlItem *it=subItems->first();it;it=subItems->next())
217 { 221 {
218 s1=it->checkHgl(s, len, false); 222 s1=it->checkHgl(s, len, false);
219 if (s1) return s1; 223 if (s1) return s1;
220 } 224 }
@@ -250,10 +254,10 @@ const QChar *HlFloat::checkHgl(const QChar *s, int len, bool) {
250 if (!p) return 0L; 254 if (!p) return 0L;
251 else 255 else
252 { 256 {
253 if (subItems) 257 if (subItems)
254 { 258 {
255 for (HlItem *it=subItems->first();it;it=subItems->next()) 259 for (HlItem *it=subItems->first();it;it=subItems->next())
256 { 260 {
257 s1=it->checkHgl(s, len, false); 261 s1=it->checkHgl(s, len, false);
258 if (s1) return s1; 262 if (s1) return s1;
259 } 263 }
@@ -347,3 +351,3 @@ const QChar *HlCHex::checkHgl(const QChar *str, int len, bool) {
347 else 351 else
348 return 0L; 352 return 0L;
349 353
@@ -402,3 +406,3 @@ const QChar *HlRegExpr::checkHgl(const QChar *s, int len, bool lineStart)
402 else 406 else
403 return (s+Expr->matchedLength()); 407 return (s+Expr->matchedLength());
404}; 408};
@@ -413,5 +417,5 @@ const QChar *HlLineContinue::checkHgl(const QChar *s, int len, bool) {
413 if ((s[0].latin1() == '\\') && (len == 1)) 417 if ((s[0].latin1() == '\\') && (len == 1))
414 { 418 {
415 return s + 1; 419 return s + 1;
416 } 420 }
417 return 0L; 421 return 0L;
@@ -623,3 +627,3 @@ int Highlight::doHighlight(int ctxNum, TextLine *textLine)
623 { 627 {
624 qDebug("An item has been detected"); 628 odebug << "An item has been detected" << oendl;
625 textLine->setAttribs(item->attr,s1 - str,s2 - str); 629 textLine->setAttribs(item->attr,s1 - str,s2 - str);
@@ -855,3 +859,3 @@ void Highlight::createItemData(ItemDataList &list)
855{ 859{
856 qDebug("Highlight::createItemData"); 860 odebug << "Highlight::createItemData" << oendl;
857 861
@@ -876,3 +880,3 @@ void Highlight::createItemData(ItemDataList &list)
876 880
877 qDebug("Trying to read itemData section"); 881 odebug << "Trying to read itemData section" << oendl;
878 882
@@ -884,3 +888,3 @@ void Highlight::createItemData(ItemDataList &list)
884 { 888 {
885 qDebug("Setting up one itemData element"); 889 odebug << "Setting up one itemData element" << oendl;
886 // read all attributes 890 // read all attributes
@@ -935,8 +939,8 @@ int Highlight::lookupAttrName(const QString& name, ItemDataList &iDl)
935{ 939{
936 for (int i=0;i<iDl.count();i++) 940 for (int i=0;i<iDl.count();i++)
937 { 941 {
938 if (iDl.at(i)->name==name) return i; 942 if (iDl.at(i)->name==name) return i;
939 } 943 }
940 kdDebug(13010)<<"Couldn't resolve itemDataName"<<endl; 944 kdDebug(13010)<<"Couldn't resolve itemDataName"<<endl;
941 return 0; 945 return 0;
942} 946}
@@ -1079,7 +1083,7 @@ void Highlight::readCommentConfig()
1079 if (HlManager::self()->syntax->groupData(data,"name")=="singleLine") 1083 if (HlManager::self()->syntax->groupData(data,"name")=="singleLine")
1080 cslStart=HlManager::self()->syntax->groupData(data,"start"); 1084 cslStart=HlManager::self()->syntax->groupData(data,"start");
1081 if (HlManager::self()->syntax->groupData(data,"name")=="multiLine") 1085 if (HlManager::self()->syntax->groupData(data,"name")=="multiLine")
1082 { 1086 {
1083 cmlStart=HlManager::self()->syntax->groupData(data,"start"); 1087 cmlStart=HlManager::self()->syntax->groupData(data,"start");
1084 cmlEnd=HlManager::self()->syntax->groupData(data,"end"); 1088 cmlEnd=HlManager::self()->syntax->groupData(data,"end");
1085 } 1089 }
@@ -1114,6 +1118,6 @@ void Highlight::readGlobalKeywordConfig()
1114 { 1118 {
1115 kdDebug(13010)<<"Found global keyword config"<<endl; 1119 kdDebug(13010)<<"Found global keyword config"<<endl;
1116 1120
1117 if (HlManager::self()->syntax->groupItemData(data,QString("casesensitive"))!="0") 1121 if (HlManager::self()->syntax->groupItemData(data,QString("casesensitive"))!="0")
1118 casesensitive=true; else {casesensitive=false; kdDebug(13010)<<"Turning on case insensitiveness"<<endl;} 1122 casesensitive=true; else {casesensitive=false; kdDebug(13010)<<"Turning on case insensitiveness"<<endl;}
1119 //get the weak deliminators 1123 //get the weak deliminators
@@ -1135,3 +1139,3 @@ void Highlight::readGlobalKeywordConfig()
1135 1139
1136 HlManager::self()->syntax->freeGroupInfo(data); 1140 HlManager::self()->syntax->freeGroupInfo(data);
1137 } 1141 }
@@ -1206,6 +1210,6 @@ void Highlight::makeContextList()
1206 { 1210 {
1207 // kdDebug(13010)<< "In make Contextlist: Item:"<<endl; 1211// kdDebug(13010)<< "In make Contextlist: Item:"<<endl;
1208 c=createHlItem(data,iDl); 1212 c=createHlItem(data,iDl);
1209 if (c) 1213 if (c)
1210 { 1214 {
1211 contextList[i]->items.append(c); 1215 contextList[i]->items.append(c);
@@ -1213,14 +1217,14 @@ void Highlight::makeContextList()
1213 // Not supported completely atm and only one level. Subitems.(all have to be matched to at once) 1217 // Not supported completely atm and only one level. Subitems.(all have to be matched to at once)
1214 datasub=HlManager::self()->syntax->getSubItems(data); 1218 datasub=HlManager::self()->syntax->getSubItems(data);
1215 bool tmpbool; 1219 bool tmpbool;
1216 if (tmpbool=HlManager::self()->syntax->nextItem(datasub)) 1220 if (tmpbool=HlManager::self()->syntax->nextItem(datasub))
1217 { 1221 {
1218 c->subItems=new QList<HlItem>; 1222 c->subItems=new QList<HlItem>;
1219 for (;tmpbool;tmpbool=HlManager::self()->syntax->nextItem(datasub)) 1223 for (;tmpbool;tmpbool=HlManager::self()->syntax->nextItem(datasub))
1220 c->subItems->append(createHlItem(datasub,iDl)); 1224 c->subItems->append(createHlItem(datasub,iDl));
1221 } 1225 }
1222 HlManager::self()->syntax->freeGroupInfo(datasub); 1226 HlManager::self()->syntax->freeGroupInfo(datasub);
1223 // end of sublevel 1227 // end of sublevel
1224 } 1228 }
1225 // kdDebug(13010)<<"Last line in loop"<<endl; 1229// kdDebug(13010)<<"Last line in loop"<<endl;
1226 } 1230 }
@@ -1314,3 +1318,3 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
1314 1318
1315 qDebug("HlManager::makeAttribs"); 1319 odebug << "HlManager::makeAttribs" << oendl;
1316 1320
@@ -1323,3 +1327,3 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
1323 for (z = 0; z < nAttribs; z++) { 1327 for (z = 0; z < nAttribs; z++) {
1324 qDebug("HlManager::makeAttribs: createing one attribute definition"); 1328 odebug << "HlManager::makeAttribs: createing one attribute definition" << oendl;
1325 itemData = itemDataList.at(z); 1329 itemData = itemDataList.at(z);
@@ -1417,3 +1421,3 @@ void HlManager::setDefaults(ItemStyleList &list) {
1417#warning fixme 1421#warning fixme
1418/* 1422/*
1419 config = KateFactory::instance()->config(); 1423 config = KateFactory::instance()->config();
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 6059e9b..9fa4452 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -18,11 +18,16 @@
18#include "katesyntaxdocument.h" 18#include "katesyntaxdocument.h"
19#include <kateconfig.h> 19#include "kateconfig.h"
20#include "kdebug.h"
21#include "kstddirs.h"
22#include "klocale.h"
23#include "kmessagebox.h"
24#include "kglobal.h"
25
26/* OPIE */
27#include <opie2/odebug.h>
28#include <qpe/qpeapplication.h>
29
30/* QT */
20#include <qfile.h> 31#include <qfile.h>
21#include <kdebug.h>
22#include <kstddirs.h>
23#include <klocale.h>
24#include <kmessagebox.h>
25#include <qstringlist.h> 32#include <qstringlist.h>
26#include <kglobal.h>
27#include <qpe/qpeapplication.h>
28#include <qdir.h> 33#include <qdir.h>
@@ -41,3 +46,3 @@ void SyntaxDocument::setIdentifier(const QString& identifier)
41 if (!m_root) KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) ); 46 if (!m_root) KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) );
42 47
43} 48}
@@ -78,3 +83,3 @@ void SyntaxDocument::setupModeList(bool force)
78 { 83 {
79 qDebug("Found a description file:"+path+(*it)); 84 odebug << "Found a description file:"+path+(*it) << oendl;
80 setIdentifier(path+(*it)); 85 setIdentifier(path+(*it));
@@ -83,4 +88,4 @@ void SyntaxDocument::setupModeList(bool force)
83 { 88 {
84 e=e->firstChild(); 89 e=e->firstChild();
85 qDebug(e->tagName()); 90 odebug << e->tagName() << oendl;
86 if (e->tagName()=="language") 91 if (e->tagName()=="language")
@@ -92,3 +97,3 @@ void SyntaxDocument::setupModeList(bool force)
92 mli->extension = e->attribute("extensions"); 97 mli->extension = e->attribute("extensions");
93 qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name)); 98 odebug << QString("valid description for: %1/%2").arg(mli->section).arg(mli->name) << oendl;
94 if (mli->section.isEmpty()) 99 if (mli->section.isEmpty())
@@ -182,5 +187,5 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
182 syntaxContextData *retval=new syntaxContextData; 187 syntaxContextData *retval=new syntaxContextData;
183 retval->parent=0; 188 retval->parent=0;
184 retval->currentGroup=0; 189 retval->currentGroup=0;
185 retval->item=0; 190 retval->item=0;
186 if (data != 0) 191 if (data != 0)
@@ -214,4 +219,4 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
214 syntaxContextData *data=new ( syntaxContextData); 219 syntaxContextData *data=new ( syntaxContextData);
215 data->currentGroup=0; 220 data->currentGroup=0;
216 data->parent=0; 221 data->parent=0;
217 data->item=e1; 222 data->item=e1;
@@ -256,4 +261,4 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
256 data->parent=e1; 261 data->parent=e1;
257 data->currentGroup=0; 262 data->currentGroup=0;
258 data->item=0; 263 data->item=0;
259 return data; 264 return data;
@@ -286,15 +291,15 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
286 { 291 {
287 for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild()) 292 for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
288 { 293 {
289 if (e1->tagName()!="list") continue; 294 if (e1->tagName()!="list") continue;
290 295
291 if (e1->attribute("name")==type) 296 if (e1->attribute("name")==type)
292 { 297 {
293 for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild()) 298 for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
294 { 299 {
295 qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value()); 300 odebug << "FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value() << oendl;
296 m_data+=e2->firstChild()->value().stripWhiteSpace(); 301 m_data+=e2->firstChild()->value().stripWhiteSpace();
297 } 302 }
298 break; 303 break;
299 } 304 }
300 } 305 }
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 96f91fb..782b629 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -20,2 +20,10 @@
20 20
21#define QTOPIA_INTERNAL_LANGLIST
22#include "kateconfig.h"
23
24/* OPIE */
25#include <opie2/odebug.h>
26#include <qpe/global.h>
27
28/* QT */
21#include <qdir.h> 29#include <qdir.h>
@@ -27,2 +35,3 @@
27 35
36/* STD */
28#include <sys/stat.h> 37#include <sys/stat.h>
@@ -33,6 +42,2 @@
33 42
34#define QTOPIA_INTERNAL_LANGLIST
35#include "kateconfig.h"
36#include <qpe/global.h>
37
38 43
@@ -44,10 +49,10 @@ QString KateConfig::configFilename(const QString& name, Domain d)
44 switch (d) { 49 switch (d) {
45 case File: 50 case File:
46 return name; 51 return name;
47 case User: { 52 case User: {
48 QDir dir = (QString(getenv("HOME")) + "/Settings"); 53 QDir dir = (QString(getenv("HOME")) + "/Settings");
49 if ( !dir.exists() ) 54 if ( !dir.exists() )
50 mkdir(dir.path().local8Bit(),0700); 55 mkdir(dir.path().local8Bit(),0700);
51 return dir.path() + "/" + name + ".conf"; 56 return dir.path() + "/" + name + ".conf";
52 } 57 }
53 } 58 }
@@ -95,3 +100,3 @@ KateConfig::KateConfig( const QString &name, Domain domain )
95{ 100{
96 qWarning("KateConfig constructor\n"); 101 owarn << "KateConfig constructor\n" << oendl;
97 git = groups.end(); 102 git = groups.end();
@@ -106,3 +111,3 @@ KateConfig::KateConfig( const QString &name, Domain domain )
106KateConfig::KateConfig ( const QString &name, bool what ) 111KateConfig::KateConfig ( const QString &name, bool what )
107 : filename( configFilename(name,what ? User : File) ) 112 : filename( configFilename(name,what ? User : File) )
108{ 113{
@@ -120,5 +125,5 @@ KateConfig::~KateConfig()
120{ 125{
121 qWarning("KateConfig destructor\n"); 126 owarn << "KateConfig destructor\n" << oendl;
122 if ( changed ) 127 if ( changed )
123 write(); 128 write();
124} 129}
@@ -131,3 +136,3 @@ bool KateConfig::hasKey( const QString &key ) const
131 if ( groups.end() == git ) 136 if ( groups.end() == git )
132 return FALSE; 137 return FALSE;
133 KateConfigGroup::ConstIterator it = ( *git ).find( key ); 138 KateConfigGroup::ConstIterator it = ( *git ).find( key );
@@ -149,5 +154,5 @@ void KateConfig::setGroup( const QString &gname )
149 if ( it == groups.end() ) { 154 if ( it == groups.end() ) {
150 git = groups.insert( gname, KateConfigGroup() ); 155 git = groups.insert( gname, KateConfigGroup() );
151 changed = TRUE; 156 changed = TRUE;
152 return; 157 return;
153 } 158 }
@@ -174,8 +179,8 @@ void KateConfig::writeEntry( const QString &key, const QString &value )
174 if ( git == groups.end() ) { 179 if ( git == groups.end() ) {
175 qWarning( "no group set" ); 180 owarn << "no group set" << oendl;
176 return; 181 return;
177 } 182 }
178 if ( (*git)[key] != value ) { 183 if ( (*git)[key] != value ) {
179 ( *git ).insert( key, value ); 184 ( *git ).insert( key, value );
180 changed = TRUE; 185 changed = TRUE;
181 } 186 }
@@ -198,8 +203,8 @@ static QString encipher(const QString& plain)
198 for (int i=0; i<(int)plain.length(); i++) { 203 for (int i=0; i<(int)plain.length(); i++) {
199 int u = plain[i].unicode(); 204 int u = plain[i].unicode();
200 int c = u ^ mix; 205 int c = u ^ mix;
201 QString x = QString::number(c,36); 206 QString x = QString::number(c,36);
202 cipher.append(QChar('a'+x.length())); 207 cipher.append(QChar('a'+x.length()));
203 cipher.append(x); 208 cipher.append(x);
204 mix *= u; 209 mix *= u;
205 } 210 }
@@ -213,7 +218,7 @@ static QString decipher(const QString& cipher)
213 for (int i=0; i<(int)cipher.length();) { 218 for (int i=0; i<(int)cipher.length();) {
214 int l = cipher[i].unicode()-'a'; 219 int l = cipher[i].unicode()-'a';
215 QString x = cipher.mid(i+1,l); i+=l+1; 220 QString x = cipher.mid(i+1,l); i+=l+1;
216 int u = x.toInt(0,36) ^ mix; 221 int u = x.toInt(0,36) ^ mix;
217 plain.append(QChar(u)); 222 plain.append(QChar(u));
218 mix *= u; 223 mix *= u;
219 } 224 }
@@ -234,4 +239,4 @@ void KateConfig::writeEntryCrypt( const QString &key, const QString &value )
234 if ( git == groups.end() ) { 239 if ( git == groups.end() ) {
235 qWarning( "no group set" ); 240 owarn << "no group set" << oendl;
236 return; 241 return;
237 } 242 }
@@ -239,4 +244,4 @@ void KateConfig::writeEntryCrypt( const QString &key, const QString &value )
239 if ( (*git)[key] != evalue ) { 244 if ( (*git)[key] != evalue ) {
240 ( *git ).insert( key, evalue ); 245 ( *git ).insert( key, evalue );
241 changed = TRUE; 246 changed = TRUE;
242 } 247 }
@@ -289,3 +294,3 @@ void KateConfig::writeEntry( const QString &key, const QStringList &lst, const Q
289 for ( ; it != lst.end(); ++it ) 294 for ( ; it != lst.end(); ++it )
290 s += *it + sep; 295 s += *it + sep;
291 writeEntry( key, s ); 296 writeEntry( key, s );
@@ -299,3 +304,3 @@ void KateConfig::writeEntry( const QString &key, const QColor &val )
299 l.append( QString().setNum(val.blue()) ); 304 l.append( QString().setNum(val.blue()) );
300 305
301 writeEntry( key, l, QChar(',') ); 306 writeEntry( key, l, QChar(',') );
@@ -311,3 +316,3 @@ void KateConfig::writeEntry( const QString &key, const QFont &val )
311 l.append( QString().setNum((int)val.charSet()) ); 316 l.append( QString().setNum((int)val.charSet()) );
312 317
313 writeEntry( key, l, QChar(',') ); 318 writeEntry( key, l, QChar(',') );
@@ -323,4 +328,4 @@ void KateConfig::removeEntry( const QString &key )
323 if ( git == groups.end() ) { 328 if ( git == groups.end() ) {
324 qWarning( "no group set" ); 329 owarn << "no group set" << oendl;
325 return; 330 return;
326 } 331 }
@@ -356,7 +361,7 @@ QString KateConfig::readEntry( const QString &key, const QString &deflt )
356 if ( !res.isNull() ) 361 if ( !res.isNull() )
357 return res; 362 return res;
358 if ( !glang.isEmpty() ) { 363 if ( !glang.isEmpty() ) {
359 res = readEntryDirect( key+"["+glang+"]" ); 364 res = readEntryDirect( key+"["+glang+"]" );
360 if ( !res.isNull() ) 365 if ( !res.isNull() )
361 return res; 366 return res;
362 } 367 }
@@ -379,7 +384,7 @@ QString KateConfig::readEntryCrypt( const QString &key, const QString &deflt )
379 if ( res.isNull() && glang.isEmpty() ) 384 if ( res.isNull() && glang.isEmpty() )
380 res = readEntryDirect( key+"["+glang+"]" ); 385 res = readEntryDirect( key+"["+glang+"]" );
381 if ( res.isNull() ) 386 if ( res.isNull() )
382 res = readEntryDirect( key, QString::null ); 387 res = readEntryDirect( key, QString::null );
383 if ( res.isNull() ) 388 if ( res.isNull() )
384 return deflt; 389 return deflt;
385 return decipher(res); 390 return decipher(res);
@@ -399,4 +404,4 @@ QString KateConfig::readEntryDirect( const QString &key, const QString &deflt )
399 if ( git == groups.end() ) { 404 if ( git == groups.end() ) {
400 //qWarning( "no group set" ); 405 //owarn << "no group set" << oendl;
401 return deflt; 406 return deflt;
402 } 407 }
@@ -404,5 +409,5 @@ QString KateConfig::readEntryDirect( const QString &key, const QString &deflt )
404 if ( it != ( *git ).end() ) 409 if ( it != ( *git ).end() )
405 return *it; 410 return *it;
406 else 411 else
407 return deflt; 412 return deflt;
408} 413}
@@ -422,5 +427,5 @@ int KateConfig::readNumEntry( const QString &key, int deflt )
422 if ( s.isEmpty() ) 427 if ( s.isEmpty() )
423 return deflt; 428 return deflt;
424 else 429 else
425 return s.toInt(); 430 return s.toInt();
426} 431}
@@ -440,5 +445,5 @@ bool KateConfig::readBoolEntry( const QString &key, bool deflt )
440 if ( s.isEmpty() ) 445 if ( s.isEmpty() )
441 return deflt; 446 return deflt;
442 else 447 else
443 return (bool)s.toInt(); 448 return (bool)s.toInt();
444} 449}
@@ -458,5 +463,5 @@ QStringList KateConfig::readListEntry( const QString &key, const QChar &sep )
458 if ( s.isEmpty() ) 463 if ( s.isEmpty() )
459 return QStringList(); 464 return QStringList();
460 else 465 else
461 return QStringList::split( sep, s ); 466 return QStringList::split( sep, s );
462} 467}
@@ -486,3 +491,3 @@ QValueList<int> KateConfig::readIntListEntry( const QString &key ) const
486 if ( s.isEmpty() ) 491 if ( s.isEmpty() )
487 return il; 492 return il;
488 493
@@ -502,8 +507,8 @@ void KateConfig::clearGroup()
502 if ( git == groups.end() ) { 507 if ( git == groups.end() ) {
503 qWarning( "no group set" ); 508 owarn << "no group set" << oendl;
504 return; 509 return;
505 } 510 }
506 if ( !(*git).isEmpty() ) { 511 if ( !(*git).isEmpty() ) {
507 ( *git ).clear(); 512 ( *git ).clear();
508 changed = TRUE; 513 changed = TRUE;
509 } 514 }
@@ -518,3 +523,3 @@ void KateConfig::write( const QString &fn )
518 if ( !fn.isEmpty() ) 523 if ( !fn.isEmpty() )
519 filename = fn; 524 filename = fn;
520 strNewFile = filename + ".new"; 525 strNewFile = filename + ".new";
@@ -523,9 +528,9 @@ void KateConfig::write( const QString &fn )
523 if ( !f.open( IO_WriteOnly|IO_Raw ) ) { 528 if ( !f.open( IO_WriteOnly|IO_Raw ) ) {
524 qWarning( "could not open for writing `%s'", strNewFile.latin1() ); 529 owarn << "could not open for writing `" << strNewFile << "'" << oendl;
525 git = groups.end(); 530 git = groups.end();
526 return; 531 return;
527 } 532 }
528 533
529 QString str; 534 QString str;
530 QCString cstr; 535 QCString cstr;
531 QMap< QString, KateConfigGroup >::Iterator g_it = groups.begin(); 536 QMap< QString, KateConfigGroup >::Iterator g_it = groups.begin();
@@ -533,9 +538,9 @@ void KateConfig::write( const QString &fn )
533 for ( ; g_it != groups.end(); ++g_it ) { 538 for ( ; g_it != groups.end(); ++g_it ) {
534 str += "[" + g_it.key() + "]\n"; 539 str += "[" + g_it.key() + "]\n";
535 KateConfigGroup::Iterator e_it = ( *g_it ).begin(); 540 KateConfigGroup::Iterator e_it = ( *g_it ).begin();
536 for ( ; e_it != ( *g_it ).end(); ++e_it ) 541 for ( ; e_it != ( *g_it ).end(); ++e_it )
537 str += e_it.key() + " = " + *e_it + "\n"; 542 str += e_it.key() + " = " + *e_it + "\n";
538 } 543 }
539 cstr = str.utf8(); 544 cstr = str.utf8();
540 545
541 int total_length; 546 int total_length;
@@ -543,9 +548,9 @@ void KateConfig::write( const QString &fn )
543 if ( total_length != int(cstr.length()) ) { 548 if ( total_length != int(cstr.length()) ) {
544 QMessageBox::critical( 0, QObject::tr("Out of Space"), 549 QMessageBox::critical( 0, QObject::tr("Out of Space"),
545 QObject::tr("There was a problem creating\nKateConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again.") ); 550 QObject::tr("There was a problem creating\nKateConfiguration Information \nfor this program.\n\nPlease free up some space and\ntry again.") );
546 f.close(); 551 f.close();
547 QFile::remove( strNewFile ); 552 QFile::remove( strNewFile );
548 return; 553 return;
549 } 554 }
550 555
551 f.close(); 556 f.close();
@@ -553,6 +558,6 @@ void KateConfig::write( const QString &fn )
553 if ( rename( strNewFile, filename ) < 0 ) { 558 if ( rename( strNewFile, filename ) < 0 ) {
554 qWarning( "problem renaming the file %s to %s", strNewFile.latin1(), 559 qWarning( "problem renaming the file %s to %s", strNewFile.latin1(),
555 filename.latin1() ); 560 filename.latin1() );
556 QFile::remove( strNewFile ); 561 QFile::remove( strNewFile );
557 } 562 }
558} 563}
@@ -575,4 +580,4 @@ void KateConfig::read()
575 if ( !QFileInfo( filename ).exists() ) { 580 if ( !QFileInfo( filename ).exists() ) {
576 git = groups.end(); 581 git = groups.end();
577 return; 582 return;
578 } 583 }
@@ -581,4 +586,4 @@ void KateConfig::read()
581 if ( !f.open( IO_ReadOnly ) ) { 586 if ( !f.open( IO_ReadOnly ) ) {
582 git = groups.end(); 587 git = groups.end();
583 return; 588 return;
584 } 589 }
@@ -610,21 +615,21 @@ bool KateConfig::parse( const QString &l )
610 QString line = l.stripWhiteSpace(); 615 QString line = l.stripWhiteSpace();
611 616
612 if ( line [0] == QChar ( '#' )) 617 if ( line [0] == QChar ( '#' ))
613 return true; // ignore comments 618 return true; // ignore comments
614 619
615 if ( line[ 0 ] == QChar( '[' ) ) { 620 if ( line[ 0 ] == QChar( '[' ) ) {
616 QString gname = line; 621 QString gname = line;
617 gname = gname.remove( 0, 1 ); 622 gname = gname.remove( 0, 1 );
618 if ( gname[ (int)gname.length() - 1 ] == QChar( ']' ) ) 623 if ( gname[ (int)gname.length() - 1 ] == QChar( ']' ) )
619 gname = gname.remove( gname.length() - 1, 1 ); 624 gname = gname.remove( gname.length() - 1, 1 );
620 git = groups.insert( gname, KateConfigGroup() ); 625 git = groups.insert( gname, KateConfigGroup() );
621 } else if ( !line.isEmpty() ) { 626 } else if ( !line.isEmpty() ) {
622 if ( git == groups.end() ) 627 if ( git == groups.end() )
623 return FALSE; 628 return FALSE;
624 int eq = line.find( '=' ); 629 int eq = line.find( '=' );
625 if ( eq == -1 ) 630 if ( eq == -1 )
626 return FALSE; 631 return FALSE;
627 QString key = line.left(eq).stripWhiteSpace(); 632 QString key = line.left(eq).stripWhiteSpace();
628 QString value = line.mid(eq+1).stripWhiteSpace(); 633 QString value = line.mid(eq+1).stripWhiteSpace();
629 ( *git ).insert( key, value ); 634 ( *git ).insert( key, value );
630 } 635 }
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 3c9a637..9865c35 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -16,14 +16,19 @@
16 ***************************************************************************/ 16 ***************************************************************************/
17#include <qaction.h>
18#include <qtoolbutton.h>
19#include <qmenubar.h>
20#include <qpe/resource.h>
21#include <qpe/qpeapplication.h>
22 17
18#include "tinykate.h"
19
20#include "katedocument.h"
21#include "kglobal.h"
22
23/* OPIE */
24#include <opie2/odebug.h>
23#include <opie2/ofiledialog.h> 25#include <opie2/ofiledialog.h>
26#include <qpe/resource.h>
27#include <qpe/qpeapplication.h>
24 28
25#include "tinykate.h" 29/* QT */
30#include <qaction.h>
31#include <qtoolbutton.h>
32#include <qmenubar.h>
26 33
27#include <katedocument.h>
28#include <kglobal.h>
29 34
@@ -154,3 +159,3 @@ TinyKate::~TinyKate( )
154{ 159{
155 qWarning("TinyKate destructor\n"); 160 owarn << "TinyKate destructor\n" << oendl;
156 161
@@ -162,3 +167,3 @@ TinyKate::~TinyKate( )
162 if( KGlobal::config() != 0 ) { 167 if( KGlobal::config() != 0 ) {
163 qWarning("deleting KateConfig object..\n"); 168 owarn << "deleting KateConfig object..\n" << oendl;
164 delete KGlobal::config(); 169 delete KGlobal::config();
@@ -183,3 +188,3 @@ void TinyKate::open(const QString & filename)
183 tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); 188 tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed );
184 qDebug(filename); 189 odebug << filename << oendl;
185 190
@@ -251,3 +256,3 @@ void TinyKate::slotSave() {
251 KateDocument *kd = (KateDocument*) currentView->document(); 256 KateDocument *kd = (KateDocument*) currentView->document();
252 // qDebug("saving file "+kd->docName()); 257 // odebug << "saving file "+kd->docName() << oendl;
253 if( kd->docName().isEmpty()) 258 if( kd->docName().isEmpty())
@@ -267,3 +272,3 @@ void TinyKate::slotSaveAs() {
267 if (!filename.isEmpty()) { 272 if (!filename.isEmpty()) {
268 qDebug("saving file "+filename); 273 odebug << "saving file "+filename << oendl;
269 QFileInfo fi(filename); 274 QFileInfo fi(filename);