-rw-r--r-- | noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | 88 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/openetext.cpp | 174 |
2 files changed, 128 insertions, 134 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp index 6c246e97..7f21ab3 100644 --- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | |||
@@ -19,9 +19,9 @@ | |||
19 | /* OPIE */ | 19 | /* OPIE */ |
20 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
21 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
22 | #include <qpe/qpedialog.h> | 22 | #include <qpe/qpedialog.h> |
23 | //#include <opie2///odebug.h> | 23 | #include <opie2/odebug.h> |
24 | 24 | ||
25 | /* QT */ | 25 | /* QT */ |
26 | #include <qpushbutton.h> | 26 | #include <qpushbutton.h> |
27 | #include <qmultilineedit.h> | 27 | #include <qmultilineedit.h> |
@@ -457,57 +457,60 @@ bool LibraryDialog::download_newEtext() | |||
457 | } | 457 | } |
458 | 458 | ||
459 | bool LibraryDialog::getEtext(const QStringList &networkList) | 459 | bool LibraryDialog::getEtext(const QStringList &networkList) |
460 | { | 460 | { |
461 | NetworkDialog *NetworkDlg; | 461 | NetworkDialog *NetworkDlg; |
462 | NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", true, 0, networkList); | 462 | NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", true, 0, networkList); |
463 | 463 | ||
464 | // use new, improved, *INSTANT* network-dialog-file-getterer | 464 | // use new, improved, *INSTANT* network-dialog-file-getterer |
465 | if( NetworkDlg->exec() != 0 ) { | 465 | if( NetworkDlg->exec() != 0 ) { |
466 | File_Name = NetworkDlg->localFileName; | 466 | File_Name = NetworkDlg->localFileName; |
467 | 467 | ||
468 | qDebug("Just downloaded " + NetworkDlg->localFileName); | 468 | qDebug("Just downloaded " + NetworkDlg->localFileName); |
469 | 469 | ||
470 | if(NetworkDlg->successDownload) { | 470 | if(NetworkDlg->successDownload) { |
471 | //odebug << "Filename is "+File_Name << oendl; | 471 | //odebug << "Filename is "+File_Name << oendl; |
472 | if(File_Name.right(4) == ".txt") { | 472 | if(File_Name.right(4) == ".txt") { |
473 | QString s_fileName = File_Name; | 473 | QString s_fileName = File_Name; |
474 | s_fileName.replace( s_fileName.length() - 3, 3, "gtn"); | 474 | s_fileName.replace( s_fileName.length() - 3, 3, "gtn"); |
475 | // s_fileName.replace( s_fileName.length()-3,3,"etx"); | 475 | if (rename( File_Name.latin1(), s_fileName.latin1()) == 1) { |
476 | rename( File_Name.latin1(), s_fileName.latin1()); | 476 | owarn << "Failed to rename " << File_Name.latin1() << " to " |
477 | File_Name = s_fileName; | 477 | << s_fileName.latin1() << oendl; |
478 | return false; | ||
479 | } | ||
478 | 480 | ||
479 | //odebug << "Filename is now "+File_Name << oendl; | 481 | File_Name = s_fileName; |
480 | 482 | ||
481 | } | 483 | //odebug << "Filename is now "+File_Name << oendl; |
482 | if(File_Name.length() > 5 ) { | ||
483 | setTitle(); | ||
484 | QFileInfo fi(File_Name); | ||
485 | QString name_file = fi.fileName(); | ||
486 | name_file = name_file.left( name_file.length() - 4); | ||
487 | |||
488 | //odebug << "Setting doclink" << oendl; | ||
489 | DocLnk lnk; | ||
490 | //odebug << "name is "+name_file << oendl; | ||
491 | lnk.setName(name_file); //sets file name | ||
492 | //odebug << "Title is "+DlglistItemTitle << oendl; | ||
493 | lnk.setComment(DlglistItemTitle); | ||
494 | 484 | ||
495 | //odebug << "Filename is "+File_Name << oendl; | ||
496 | lnk.setFile(File_Name); //sets File property | ||
497 | lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D | ||
498 | lnk.setExec(File_Name); | ||
499 | lnk.setIcon("gutenbrowser/Gutenbrowser"); | ||
500 | if(!lnk.writeLink()) { | ||
501 | //odebug << "Writing doclink did not work" << oendl; | ||
502 | } else { | ||
503 | } | 485 | } |
504 | } else | 486 | if(File_Name.length() > 5 ) { |
505 | QMessageBox::message("Note","<p>There was an error with the file</p>"); | 487 | setTitle(); |
506 | } | 488 | QFileInfo fi(File_Name); |
507 | } | 489 | QString name_file = fi.fileName(); |
490 | name_file = name_file.left( name_file.length() - 4); | ||
491 | |||
492 | //odebug << "Setting doclink" << oendl; | ||
493 | DocLnk lnk; | ||
494 | //odebug << "name is "+name_file << oendl; | ||
495 | lnk.setName(name_file); //sets file name | ||
496 | //odebug << "Title is "+DlglistItemTitle << oendl; | ||
497 | lnk.setComment(DlglistItemTitle); | ||
498 | |||
499 | //odebug << "Filename is "+File_Name << oendl; | ||
500 | lnk.setFile(File_Name); //sets File property | ||
501 | lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D | ||
502 | lnk.setExec(File_Name); | ||
503 | lnk.setIcon("gutenbrowser/Gutenbrowser"); | ||
504 | if(!lnk.writeLink()) { | ||
505 | //odebug << "Writing doclink did not work" << oendl; | ||
506 | } | ||
507 | } else | ||
508 | QMessageBox::message("Note","<p>There was an error with the file</p>"); | ||
509 | } | ||
510 | } | ||
508 | 511 | ||
509 | return true; | 512 | return true; |
510 | } | 513 | } |
511 | 514 | ||
512 | bool LibraryDialog::download_Etext() | 515 | bool LibraryDialog::download_Etext() |
513 | { // ftp method | 516 | { // ftp method |
@@ -700,9 +703,8 @@ void LibraryDialog::onButtonSearch() | |||
700 | 703 | ||
701 | int i_berger = 0; | 704 | int i_berger = 0; |
702 | if( searchDlg->exec() != 0 ) { | 705 | if( searchDlg->exec() != 0 ) { |
703 | QString searcherStr = searchDlg->get_text(); | 706 | QString searcherStr = searchDlg->get_text(); |
704 | int fluff = 0; | ||
705 | 707 | ||
706 | bool cS; | 708 | bool cS; |
707 | if( searchDlg->caseSensitiveCheckBox->isChecked()) | 709 | if( searchDlg->caseSensitiveCheckBox->isChecked()) |
708 | cS = true; //case sensitive | 710 | cS = true; //case sensitive |
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp index 0267416..a5d855d 100644 --- a/noncore/apps/opie-gutenbrowser/openetext.cpp +++ b/noncore/apps/opie-gutenbrowser/openetext.cpp | |||
@@ -56,10 +56,9 @@ void OpenEtext::getTitles() | |||
56 | QListBox_1->clear(); | 56 | QListBox_1->clear(); |
57 | Config config("Gutenbrowser"); | 57 | Config config("Gutenbrowser"); |
58 | config.setGroup( "Files" ); | 58 | config.setGroup( "Files" ); |
59 | s_numofFiles = config.readEntry("NumberOfFiles", "0"); | 59 | s_numofFiles = config.readEntry("NumberOfFiles", "0"); |
60 | QLabel_1->setText( tr( | 60 | QLabel_1->setText( tr( s_numofFiles+" etexts in your library." ) ); |
61 | s_numofFiles+" etexts in your library.")); | ||
62 | int i_numofFiles = s_numofFiles.toInt(); | 61 | int i_numofFiles = s_numofFiles.toInt(); |
63 | for (int i = 1; i <= i_numofFiles+1; i++) { | 62 | for (int i = 1; i <= i_numofFiles+1; i++) { |
64 | QString temp; | 63 | QString temp; |
65 | temp.setNum(i); | 64 | temp.setNum(i); |
@@ -67,9 +66,14 @@ void OpenEtext::getTitles() | |||
67 | QString ramble = config.readEntry(temp, "" ); | 66 | QString ramble = config.readEntry(temp, "" ); |
68 | config.setGroup( "Titles" ); | 67 | config.setGroup( "Titles" ); |
69 | title = config.readEntry(ramble, ""); | 68 | title = config.readEntry(ramble, ""); |
70 | if( !title.isEmpty()) { | 69 | if( !title.isEmpty()) { |
71 | QListBox_1->insertItem ( QPixmap( QPEApplication::qpeDir()+"pics/gutenbrowser/gutenbrowser_sm.png"), title, -1); | 70 | QListBox_1->insertItem ( QPixmap( |
71 | QPEApplication::qpeDir() + | ||
72 | "pics/gutenbrowser/gutenbrowser_sm.png" | ||
73 | ), | ||
74 | title, | ||
75 | -1); | ||
72 | } | 76 | } |
73 | } | 77 | } |
74 | } | 78 | } |
75 | 79 | ||
@@ -99,10 +103,11 @@ void OpenEtext::select_title(int index ) | |||
99 | file = config.readEntry(temp, ""); | 103 | file = config.readEntry(temp, ""); |
100 | OpenEtext::accept(); | 104 | OpenEtext::accept(); |
101 | } | 105 | } |
102 | 106 | ||
103 | /* | 107 | /*! |
104 | This function imports already existing etexts into the local library list*/ | 108 | * This function imports already existing etexts into the local library list |
109 | */ | ||
105 | void OpenEtext::open() | 110 | void OpenEtext::open() |
106 | { | 111 | { |
107 | OpenFileButton->setDown(TRUE); | 112 | OpenFileButton->setDown(TRUE); |
108 | title = ""; | 113 | title = ""; |
@@ -112,16 +117,8 @@ OpenFileButton->setDown(TRUE); | |||
112 | QString local ; | 117 | QString local ; |
113 | local = (QDir::homeDirPath () +"Applications/gutenbrowser"); | 118 | local = (QDir::homeDirPath () +"Applications/gutenbrowser"); |
114 | QDir library( local); | 119 | QDir library( local); |
115 | 120 | ||
116 | // fileBrowser *browseForFiles; | ||
117 | // browseForFiles=new fileBrowser(this,"Browse for File", TRUE, 0, "guten/plain;text/plain"); | ||
118 | // // browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*"); | ||
119 | // browseForFiles->setFileView( 0); | ||
120 | // browseForFiles->showMaximized(); | ||
121 | // browseForFiles->exec(); | ||
122 | // QString selFile= browseForFiles->selectedFileName; | ||
123 | // fileList=browseForFiles->fileList; | ||
124 | Config cfg("Gutenbrowser"); | 121 | Config cfg("Gutenbrowser"); |
125 | cfg. setGroup ( "View" ); | 122 | cfg. setGroup ( "View" ); |
126 | QString dir = cfg.readEntry("LastOpenDirectory", QPEApplication::documentDir()); | 123 | QString dir = cfg.readEntry("LastOpenDirectory", QPEApplication::documentDir()); |
127 | QMap<QString, QStringList> map; | 124 | QMap<QString, QStringList> map; |
@@ -133,57 +130,45 @@ OpenFileButton->setDown(TRUE); | |||
133 | map.insert(tr("All"), text ); | 130 | map.insert(tr("All"), text ); |
134 | 131 | ||
135 | QString str = OFileDialog::getOpenFileName( 2, dir , QString::null, map); | 132 | QString str = OFileDialog::getOpenFileName( 2, dir , QString::null, map); |
136 | 133 | ||
137 | if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() ) { | 134 | if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() ) { |
138 | filer = str; | 135 | filer = str; |
139 | 136 | ||
140 | odebug << "Open file: "+str << oendl; | 137 | odebug << "Open file: "+str << oendl; |
141 | 138 | ||
142 | // QStringList::ConstIterator f; | 139 | if( filer.right(4) == ".txt" || |
143 | // QString fileTemp; | 140 | filer.right(4) == ".TXT" || |
144 | // for ( f = fileList.begin(); f != fileList.end(); f++ ) { | 141 | filer.right(4) == ".etx" || |
145 | // fileTemp = *f; | 142 | filer.right(4) == ".ETX" || |
146 | // fileTemp.right( fileTemp.length()-5); | 143 | filer.right(4) == ".etx" || |
147 | // fileName = fileTemp; | 144 | filer.right(4) == ".ETX" || |
148 | // if( !fileName.isEmpty() ){ | 145 | filer.right(4) == ".zip" || |
149 | // filer = fileName; | 146 | filer.right(4) == ".ZIP" ) |
150 | // } else { //filename is empty | 147 | { |
151 | // // QString sMsg; | ||
152 | // // sMsg = "Error opening library filelist "+fileName; | ||
153 | // } | ||
154 | |||
155 | if( filer.right(4) == ".txt" | ||
156 | || filer.right(4) == ".TXT" | ||
157 | || filer.right(4) == ".etx" | ||
158 | || filer.right(4) == ".ETX" | ||
159 | || filer.right(4) == ".etx" | ||
160 | || filer.right(4) == ".ETX" | ||
161 | || filer.right(4) == ".zip" | ||
162 | || filer.right(4) == ".ZIP" ) { | ||
163 | QFileInfo zipFile( filer); | 148 | QFileInfo zipFile( filer); |
164 | QString s_fileName = zipFile.fileName(); | 149 | QString s_fileName = zipFile.fileName(); |
165 | QString cmd; | 150 | QString cmd; |
166 | 151 | ||
167 | if( s_fileName.right(4) == ".zip") { // unzip that sucker.... | 152 | if( s_fileName.right(4) == ".zip") { // unzip the file |
168 | s_fileName = s_fileName.left( s_fileName.length() - 4); | 153 | s_fileName = s_fileName.left( s_fileName.length() - 4); |
169 | if( chdir((const char*)local_library.latin1())!=0) | 154 | if( chdir((const char*)local_library.latin1())!=0) |
170 | odebug << "chdir failed." << oendl; // QString cmd = "gunzip -d " + filer + " -d " + local_library; | 155 | odebug << "chdir failed." << oendl; |
171 | cmd = "gunzip -S .zip " + filer; | 156 | cmd = "gunzip -S .zip " + filer; |
172 | fileName = local_library + s_fileName + ".txt"; | 157 | fileName = local_library + s_fileName + ".txt"; |
173 | system( cmd); | 158 | system( cmd); |
174 | } | 159 | } else { // else rename .txt to .etx |
175 | // this renames the .txt to .etx!! | 160 | // odebug << "Filename is "+fileName << oendl; |
176 | else /*if( s_fileName.right(4) == ".txt" || if( s_fileName.right(4) == ".TXT"))*/ { | ||
177 | // odebug << "Filename is "+fileName << oendl; | ||
178 | s_fileName = fileName; | 161 | s_fileName = fileName; |
179 | s_fileName.replace( s_fileName.length()-3,3,"gtn");// s_fileName.replace( s_fileName.length()-3,3,"etx"); | 162 | s_fileName.replace( s_fileName.length()-3,3,"gtn"); |
180 | rename(fileName.latin1(),s_fileName.latin1()); | 163 | if (rename(fileName.latin1(),s_fileName.latin1()) == -1) |
164 | owarn << "Rename of " << fileName.latin1() << " to " | ||
165 | << s_fileName.latin1() << " failed" << oendl; | ||
181 | fileName = s_fileName; | 166 | fileName = s_fileName; |
182 | // odebug << "Filename is now "+fileName << oendl; | 167 | // odebug << "Filename is now "+fileName << oendl; |
183 | } | 168 | } |
184 | } else | 169 | } else |
185 | fileName = str; | 170 | fileName = str; |
186 | 171 | ||
187 | FindTitle(fileName); | 172 | FindTitle(fileName); |
188 | 173 | ||
189 | QFileInfo fi( fileName); | 174 | QFileInfo fi( fileName); |
@@ -200,16 +185,19 @@ OpenFileButton->setDown(TRUE); | |||
200 | QListBox_1->clear(); | 185 | QListBox_1->clear(); |
201 | getTitles(); | 186 | getTitles(); |
202 | odebug << "Filename is "+fileName << oendl; | 187 | odebug << "Filename is "+fileName << oendl; |
203 | lnk.setFile(fileName); //sets File property | 188 | lnk.setFile(fileName); //sets File property |
204 | lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D | 189 | // @bug This is probably not a registered MIME type. Perhaps we should |
190 | // set a valid MIME type here instead. Or maybe register .etx as a | ||
191 | // Gutenberge etext? | ||
192 | lnk.setType("guten/plain"); | ||
205 | lnk.setExec(fileName); | 193 | lnk.setExec(fileName); |
206 | lnk.setIcon("gutenbrowser/Gutenbrowser"); | 194 | lnk.setIcon("gutenbrowser/Gutenbrowser"); |
207 | if(!lnk.writeLink()) | 195 | if(!lnk.writeLink()) |
208 | odebug << "Writing doclink did not work" << oendl; | 196 | odebug << "Writing doclink did not work" << oendl; |
209 | 197 | ||
210 | } // end of for each file name.... | 198 | } // end of for each file name.... |
211 | OpenFileButton->setDown(FALSE); | 199 | OpenFileButton->setDown(FALSE); |
212 | } | 200 | } |
213 | 201 | ||
214 | /* | 202 | /* |
215 | find the title in the config file */ | 203 | find the title in the config file */ |
@@ -223,36 +211,35 @@ bool OpenEtext::FindTitle( QString filename) | |||
223 | QFileInfo fi(filename); | 211 | QFileInfo fi(filename); |
224 | name = fi.fileName(); | 212 | name = fi.fileName(); |
225 | odebug << "filename to open is " + name << oendl; | 213 | odebug << "filename to open is " + name << oendl; |
226 | QFile indexLib( filename); | 214 | QFile indexLib( filename); |
227 | bool findCheck = FALSE; | 215 | bool findCheck = FALSE; |
228 | // int Titlenumber=0; | ||
229 | 216 | ||
230 | if ( indexLib.open( IO_ReadOnly) ) { | 217 | if ( indexLib.open( IO_ReadOnly) ) { |
231 | odebug << "file opened successfully" << oendl; | 218 | odebug << "file opened successfully" << oendl; |
232 | QTextStream indexStream( &indexLib ); | 219 | QTextStream indexStream( &indexLib ); |
233 | QString target = "Project Gutenberg Etext of"; | 220 | QString target = "Project Gutenberg Etext of"; |
234 | QString target2 = "Project Gutenberg Etext"; | 221 | QString target2 = "Project Gutenberg Etext"; |
235 | QString target3 = "Project Gutenberg's Etext of"; | 222 | QString target3 = "Project Gutenberg's Etext of"; |
236 | QString target4 = "Project Gutenberg's Etext"; | 223 | QString target4 = "Project Gutenberg's Etext"; |
237 | QString indexLine; | 224 | QString indexLine; |
238 | while ( !indexStream.eof() ) { | 225 | while ( !indexStream.eof() ) { |
239 | // until end of file.. | 226 | // until end of file.. |
240 | indexLine = indexStream.readLine(); | 227 | indexLine = indexStream.readLine(); |
241 | if( indexLine.find(target, 0, TRUE) > -1 && !findCheck) {findCheck = TRUE; | 228 | if( indexLine.find(target, 0, TRUE) > -1 && !findCheck) {findCheck = TRUE; |
242 | title = indexLine.mid( indexLine.find(target, 0, TRUE) + (target.length()) , indexLine.find("\r", 0, TRUE)); | 229 | title = indexLine.mid( indexLine.find(target, 0, TRUE) + (target.length()) , indexLine.find("\r", 0, TRUE)); |
243 | title = title.left( title.find( "*",0, TRUE)); | 230 | title = title.left( title.find( "*",0, TRUE)); |
244 | title = title.stripWhiteSpace (); | 231 | title = title.stripWhiteSpace (); |
245 | // odebug << "Found the title 1 and it is " << title << "" << oendl; | 232 | // odebug << "Found the title 1 and it is " << title << "" << oendl; |
246 | // QListBox_1->insertItem ( title); | 233 | // QListBox_1->insertItem ( title); |
247 | } | 234 | } |
248 | if( indexLine.find( target2, 0, TRUE) > -1 && !findCheck) { | 235 | if( indexLine.find( target2, 0, TRUE) > -1 && !findCheck) { |
249 | findCheck = TRUE; | 236 | findCheck = TRUE; |
250 | title = indexLine.mid( indexLine.find( target2, 0, TRUE ) + ( target2.length()) , indexLine.find("\r", 0, TRUE) ); | 237 | title = indexLine.mid( indexLine.find( target2, 0, TRUE ) + ( target2.length()) , indexLine.find("\r", 0, TRUE) ); |
251 | title = title.left( title.find( "*",0, TRUE)); | 238 | title = title.left( title.find( "*",0, TRUE)); |
252 | title = title.stripWhiteSpace (); | 239 | title = title.stripWhiteSpace (); |
253 | // odebug << "Found the title 2 and it is " << title << "" << oendl; | 240 | // odebug << "Found the title 2 and it is " << title << "" << oendl; |
254 | // QListBox_1->insertItem ( title); | 241 | // QListBox_1->insertItem ( title); |
255 | } | 242 | } |
256 | if( indexLine.find( target3, 0, TRUE) > -1 && !findCheck) { | 243 | if( indexLine.find( target3, 0, TRUE) > -1 && !findCheck) { |
257 | findCheck = TRUE; | 244 | findCheck = TRUE; |
258 | title = indexLine.mid( indexLine.find( target3, 0, TRUE) + ( target3.length()) , indexLine.find("\r", 0, TRUE)); | 245 | title = indexLine.mid( indexLine.find( target3, 0, TRUE) + ( target3.length()) , indexLine.find("\r", 0, TRUE)); |
@@ -276,9 +263,8 @@ bool OpenEtext::FindTitle( QString filename) | |||
276 | findCheck = TRUE; | 263 | findCheck = TRUE; |
277 | } | 264 | } |
278 | 265 | ||
279 | if ( checkConf() == false && findCheck == TRUE) { | 266 | if ( checkConf() == false && findCheck == TRUE) { |
280 | |||
281 | config.setGroup( "Files"); | 267 | config.setGroup( "Files"); |
282 | config.writeEntry("NumberOfFiles",i_numofFiles + 1 ); | 268 | config.writeEntry("NumberOfFiles",i_numofFiles + 1 ); |
283 | QString interger; | 269 | QString interger; |
284 | interger.setNum( i_numofFiles +1); | 270 | interger.setNum( i_numofFiles +1); |
@@ -314,12 +300,12 @@ QString OpenEtext::titleFromLibrary( QString fileName) | |||
314 | QFile indexLib( local_index); | 300 | QFile indexLib( local_index); |
315 | QString target; | 301 | QString target; |
316 | int find1 = fileName.findRev("/",-1,TRUE) + 1; | 302 | int find1 = fileName.findRev("/",-1,TRUE) + 1; |
317 | int find2 = fileName.findRev(".gtn",-1,TRUE) - find1; | 303 | int find2 = fileName.findRev(".gtn",-1,TRUE) - find1; |
318 | if(find2==-1-find1) | 304 | if(find2== (-1-find1)) |
319 | int find2 = fileName.findRev(".etx",-1,TRUE) - find1; | 305 | find2 = fileName.findRev(".etx",-1,TRUE) - find1; |
320 | else if(find2==-1-find1) | 306 | else if(find2==(-1-find1)) |
321 | int find2 = fileName.findRev(".txt",-1,TRUE) - find1; | 307 | find2 = fileName.findRev(".txt",-1,TRUE) - find1; |
322 | 308 | ||
323 | target = fileName.mid( find1, find2 ); | 309 | target = fileName.mid( find1, find2 ); |
324 | QString checker = target.right(1); | 310 | QString checker = target.right(1); |
325 | bool ok; | 311 | bool ok; |
@@ -333,27 +319,26 @@ QString OpenEtext::titleFromLibrary( QString fileName) | |||
333 | target = target.left( target.length()-1); | 319 | target = target.left( target.length()-1); |
334 | } | 320 | } |
335 | } | 321 | } |
336 | if ( indexLib.open( IO_ReadOnly) ) { | 322 | if ( indexLib.open( IO_ReadOnly) ) { |
337 | // file opened successfully | 323 | // file opened successfully |
338 | QTextStream indexStream( &indexLib ); | 324 | QTextStream indexStream( &indexLib ); |
339 | QString indexLine; | 325 | QString indexLine; |
340 | bool findCheck = FALSE; | 326 | bool findCheck = FALSE; |
341 | while ( !indexStream.atEnd() ) { // until end of file.. | 327 | while ( !indexStream.atEnd() ) { // until end of file.. |
342 | indexLine = indexStream.readLine(); | 328 | indexLine = indexStream.readLine(); |
343 | 329 | ||
344 | if( indexLine.find( target,0,FALSE) > 0 ) { | 330 | if( indexLine.find( target,0,FALSE) > 0 ) { |
345 | findCheck = TRUE; | 331 | findCheck = TRUE; |
346 | title = indexLine.mid( 9, 50); | 332 | title = indexLine.mid( 9, 50); |
347 | // title = indexLine.mid( 26, indexLine.length() ); | ||
348 | title = title.stripWhiteSpace (); | 333 | title = title.stripWhiteSpace (); |
349 | // odebug << "Finally Found the title and it is\n " << title << "" << oendl; | 334 | // odebug << "Finally Found the title and it is\n " << title << "" << oendl; |
350 | // QListBox_1->insertItem ( title); | 335 | // QListBox_1->insertItem ( title); |
351 | } | 336 | } |
352 | } //end while loop | 337 | } //end while loop |
353 | } | 338 | } |
354 | else | 339 | else |
355 | odebug << "Error opening library index "+ local_index << oendl; | 340 | odebug << "Error opening library index "+ local_index << oendl; |
356 | return title; | 341 | return title; |
357 | } | 342 | } |
358 | 343 | ||
359 | bool OpenEtext::checkConf() | 344 | bool OpenEtext::checkConf() |
@@ -380,24 +365,27 @@ bool OpenEtext::checkConf() | |||
380 | void OpenEtext::remove() | 365 | void OpenEtext::remove() |
381 | { | 366 | { |
382 | title_text = QListBox_1->text( QListBox_1->currentItem() ); | 367 | title_text = QListBox_1->text( QListBox_1->currentItem() ); |
383 | title_text=title_text.stripWhiteSpace(); | 368 | title_text=title_text.stripWhiteSpace(); |
384 | QString msg ="<p>Do you really want to REMOVE\n" +title_text +"?\nThis will not delete the file.</P>"; | 369 | QString msg ="<p>Do you really want to REMOVE\n" + title_text + |
385 | switch( QMessageBox::information( this, (tr("Remove Etext")), | 370 | "?\nThis will not delete the file.</P>"; |
386 | (tr(msg)), | 371 | switch( QMessageBox::information( this, tr("Remove Etext"), |
387 | (tr("&Yes")), (tr("&Cancel")), 0 )){ | 372 | tr(msg), |
373 | tr("&Yes"), tr("&Cancel"), 0 ) ) | ||
374 | { | ||
388 | case 0: // Yes clicked, | 375 | case 0: // Yes clicked, |
389 | removeSelection(); | 376 | removeSelection(); |
390 | QListBox_1->clear(); | 377 | QListBox_1->clear(); |
391 | getTitles(); | 378 | getTitles(); |
392 | break; | 379 | break; |
393 | case 1: // Cancel | 380 | case 1: |
394 | break; | 381 | default: |
395 | }; | 382 | } |
396 | } | 383 | } |
397 | 384 | ||
398 | /* | 385 | /*! |
399 | this removes selected title entry*/ | 386 | * This removes selected title entry |
387 | */ | ||
400 | void OpenEtext::removeSelection() | 388 | void OpenEtext::removeSelection() |
401 | { | 389 | { |
402 | Config config("Gutenbrowser"); | 390 | Config config("Gutenbrowser"); |
403 | config.setGroup( "Files" ); | 391 | config.setGroup( "Files" ); |
@@ -416,9 +404,9 @@ void OpenEtext::removeSelection() | |||
416 | 404 | ||
417 | QString file_title = config.readEntry( s_filename, ""); | 405 | QString file_title = config.readEntry( s_filename, ""); |
418 | if(title_text == file_title) { | 406 | if(title_text == file_title) { |
419 | rem=i; | 407 | rem=i; |
420 | //odebug << "file title to remove is "+file_title << oendl; | 408 | //odebug << "file title to remove is "+file_title << oendl; |
421 | selFile = s_filename; | 409 | selFile = s_filename; |
422 | config.removeEntry( s_filename); //removes file=title | 410 | config.removeEntry( s_filename); //removes file=title |
423 | } | 411 | } |
424 | } | 412 | } |
@@ -435,13 +423,13 @@ void OpenEtext::removeSelection() | |||
435 | } | 423 | } |
436 | } | 424 | } |
437 | config.writeEntry("NumberOfFiles", i_numofFiles - 1 ); | 425 | config.writeEntry("NumberOfFiles", i_numofFiles - 1 ); |
438 | config.removeEntry(fileNum2); | 426 | config.removeEntry(fileNum2); |
439 | // remFile(); | ||
440 | } | 427 | } |
441 | 428 | ||
442 | /* | 429 | /*! |
443 | removes file title name from list and config file*/ | 430 | * Removes file title name from list and config file |
431 | */ | ||
444 | void OpenEtext::remFile() | 432 | void OpenEtext::remFile() |
445 | { | 433 | { |
446 | Config config("Gutenbrowser"); | 434 | Config config("Gutenbrowser"); |
447 | config.setGroup( "Files" ); | 435 | config.setGroup( "Files" ); |
@@ -460,11 +448,10 @@ void OpenEtext::remFile() | |||
460 | QString fileNum2; | 448 | QString fileNum2; |
461 | fileNum2.setNum( fg + 1); | 449 | fileNum2.setNum( fg + 1); |
462 | QString s_filename2 = config.readEntry(fileNum2, "" ); | 450 | QString s_filename2 = config.readEntry(fileNum2, "" ); |
463 | 451 | ||
464 | if (!s_filename2.isEmpty()) { | 452 | if (!s_filename2.isEmpty()) |
465 | config.writeEntry(fileNum, s_filename2 ); | 453 | config.writeEntry(fileNum, s_filename2 ); |
466 | } | ||
467 | } | 454 | } |
468 | } | 455 | } |
469 | } | 456 | } |
470 | config.writeEntry("NumberOfFiles", i_numofFiles - 1 ); | 457 | config.writeEntry("NumberOfFiles", i_numofFiles - 1 ); |
@@ -472,10 +459,11 @@ void OpenEtext::remFile() | |||
472 | 459 | ||
473 | QListBox_1->triggerUpdate(true); | 460 | QListBox_1->triggerUpdate(true); |
474 | } | 461 | } |
475 | 462 | ||
476 | /* | 463 | /*! |
477 | sorts the list*/ | 464 | * Sorts the list |
465 | */ | ||
478 | void OpenEtext::scan() { | 466 | void OpenEtext::scan() { |
479 | 467 | ||
480 | QListBox_1->sort(TRUE); | 468 | QListBox_1->sort(TRUE); |
481 | QListBox_1->triggerUpdate(true); | 469 | QListBox_1->triggerUpdate(true); |
@@ -484,9 +472,9 @@ void OpenEtext::scan() { | |||
484 | void OpenEtext::editTitle() { | 472 | void OpenEtext::editTitle() { |
485 | 473 | ||
486 | int currentItem=QListBox_1->currentItem(); | 474 | int currentItem=QListBox_1->currentItem(); |
487 | QString title_text = QListBox_1->text( currentItem); | 475 | QString title_text = QListBox_1->text( currentItem); |
488 | //odebug << "Selected "+title_text << oendl; | 476 | //odebug << "Selected "+title_text << oendl; |
489 | 477 | ||
490 | Config config("Gutenbrowser"); | 478 | Config config("Gutenbrowser"); |
491 | config.setGroup( "Files" ); | 479 | config.setGroup( "Files" ); |
492 | s_numofFiles = config.readEntry("NumberOfFiles", "0"); | 480 | s_numofFiles = config.readEntry("NumberOfFiles", "0"); |
@@ -498,24 +486,28 @@ void OpenEtext::editTitle() { | |||
498 | config.setGroup( "Files" ); | 486 | config.setGroup( "Files" ); |
499 | QString s_filename = config.readEntry(fileNum, "" ); | 487 | QString s_filename = config.readEntry(fileNum, "" ); |
500 | config.setGroup( "Titles" ); | 488 | config.setGroup( "Titles" ); |
501 | QString file_title = config.readEntry( s_filename, ""); | 489 | QString file_title = config.readEntry( s_filename, ""); |
502 | //odebug << "file_title is "+file_title << oendl; | 490 | //odebug << "file_title is "+file_title << oendl; |
503 | if(title_text == file_title ) { | 491 | if(title_text == file_title ) { |
504 | selFile = s_filename; | 492 | selFile = s_filename; |
505 | //odebug << "Edit: "+ file_title << oendl; | 493 | //odebug << "Edit: "+ file_title << oendl; |
506 | i=i_numofFiles+1; | 494 | i=i_numofFiles+1; |
507 | Edit_Title *titleEdit; | 495 | Edit_Title *titleEdit; |
508 | titleEdit = new Edit_Title(this,file_title ,TRUE); | 496 | titleEdit = new Edit_Title(this,file_title ,TRUE); |
509 | if(titleEdit->exec() !=0) { | 497 | if(titleEdit->exec() !=0) { |
510 | //odebug << titleEdit->newTitle << oendl; | 498 | //odebug << titleEdit->newTitle << oendl; |
511 | config.writeEntry( s_filename, titleEdit->newTitle); | 499 | config.writeEntry( s_filename, titleEdit->newTitle); |
512 | QListBox_1->removeItem(currentItem); | 500 | QListBox_1->removeItem(currentItem); |
513 | QListBox_1->insertItem ( QPixmap( QPEApplication::qpeDir()+"pics/gutenbrowser/gutenbrowser_sm.png"), titleEdit->newTitle, currentItem); | 501 | QListBox_1->insertItem ( |
502 | QPixmap( QPEApplication::qpeDir()+ | ||
503 | "pics/gutenbrowser/gutenbrowser_sm.png"), | ||
504 | titleEdit->newTitle, currentItem | ||
505 | ); | ||
514 | } | 506 | } |
515 | } | 507 | } |
516 | } | 508 | } |
517 | 509 | ||
518 | // getTitles(); | 510 | //getTitles(); |
519 | QListBox_1->triggerUpdate(true); | 511 | QListBox_1->triggerUpdate(true); |
520 | } | 512 | } |
521 | 513 | ||