summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.cpp27
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowser.cpp17
2 files changed, 31 insertions, 13 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 7426e80..549c1d2 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -118,49 +118,52 @@ void LibraryDialog::Newlibrary()
118 file = indexLine.mid( indexLine.find( "[", 0, TRUE )+1, 12 ); 118 file = indexLine.mid( indexLine.find( "[", 0, TRUE )+1, 12 );
119 file = file.stripWhiteSpace(); 119 file = file.stripWhiteSpace();
120 number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 ); 120 number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
121 if( year.toInt() < 1984) 121 if( year.toInt() < 1984)
122 number = number.left( number.length() -1 ); 122 number = number.left( number.length() -1 );
123 number = number.stripWhiteSpace(); 123 number = number.stripWhiteSpace();
124 title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() ); 124 title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
125 title = title.stripWhiteSpace(); 125 title = title.stripWhiteSpace();
126 126
127 getAuthor(); // groks author 127 getAuthor(); // groks author
128 author = author.stripWhiteSpace(); 128 author = author.stripWhiteSpace();
129 if (authBox->isChecked()) { // this reverses the first name and last name of the author 129 if (authBox->isChecked()) { // this reverses the first name and last name of the author
130 // odebug << "Sorting last name first" << oendl; 130 // odebug << "Sorting last name first" << oendl;
131 QString lastName, firstName=""; 131 QString lastName, firstName="";
132 int finder=author.findRev( ' ', -1, TRUE); 132 int finder=author.findRev( ' ', -1, TRUE);
133 lastName=author.right( author.length()-finder); 133 lastName=author.right( author.length()-finder);
134 firstName=author.left(finder); 134 firstName=author.left(finder);
135 lastName=lastName.stripWhiteSpace(); 135 lastName=lastName.stripWhiteSpace();
136 firstName=firstName.stripWhiteSpace(); 136 firstName=firstName.stripWhiteSpace();
137 137
138 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names 138 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
139 author=lastName+", "+firstName; 139 author=lastName+", "+firstName;
140 } 140 }
141 141
142 if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) && (file.find( "]",0, TRUE) == -1) ) { 142 if( !number.isEmpty()
143 && (title.find( "reserved",0, FALSE) == -1)
144 && (file.find( "]",0, TRUE) == -1)
145 && (title.find( "Audio",0, FALSE) == -1)) {
143 146
144 // fill string list or something to be able to resort the whole library 147 // fill string list or something to be able to resort the whole library
145 if( author.isEmpty() ) 148 if( author.isEmpty() )
146 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file ); 149 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
147 else { 150 else {
148 151
149 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) || 152 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
150 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) ) 153 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
151 QList_Item1 = new QListViewItem( ListView1,/* number,*/ title, author, year, file ); 154 QList_Item1 = new QListViewItem( ListView1,/* number,*/ title, author, year, file );
152 155
153 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) || 156 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
154 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) ) 157 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
155 QList_Item2 = new QListViewItem( ListView2, /*number, */title, author, year, file ); 158 QList_Item2 = new QListViewItem( ListView2, /*number, */title, author, year, file );
156 159
157 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) || 160 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
158 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) ) 161 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
159 QList_Item3 = new QListViewItem( ListView3, /*number,*/ title, author, year, file ); 162 QList_Item3 = new QListViewItem( ListView3, /*number,*/ title, author, year, file );
160 163
161 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) || 164 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
162 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) ) 165 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
163 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file ); 166 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
164 167
165 else 168 else
166 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file ); 169 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
@@ -185,72 +188,81 @@ void LibraryDialog::Library()
185 ListView3->clear(); 188 ListView3->clear();
186 ListView4->clear(); 189 ListView4->clear();
187 ListView5->clear(); 190 ListView5->clear();
188 191
189 odebug << "opening GUTINDEX.ALL file" << oendl; 192 odebug << "opening GUTINDEX.ALL file" << oendl;
190 IDontKnowWhy = ""; 193 IDontKnowWhy = "";
191 if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully 194 if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully
192 QTextStream indexStream( &indexLib ); 195 QTextStream indexStream( &indexLib );
193 QString indexLine; 196 QString indexLine;
194 qApp->processEvents(); 197 qApp->processEvents();
195 // int jig; 198 // int jig;
196 while ( !indexStream.eof() ) { 199 while ( !indexStream.eof() ) {
197 200
198 indexLine = indexStream.readLine(); 201 indexLine = indexStream.readLine();
199 if ( indexLine != "") { 202 if ( indexLine != "") {
200 if( (indexLine.mid(4,4)).toInt() /* && !( indexLine.left(3)).toInt()*/ ) { 203 if( (indexLine.mid(4,4)).toInt() /* && !( indexLine.left(3)).toInt()*/ ) {
201 // month = indexLine.left( 3); 204 // month = indexLine.left( 3);
202 year = indexLine.mid(4,4); 205 year = indexLine.mid(4,4);
203 // title = indexLine.mid( 9, 50); 206 // title = indexLine.mid( 9, 50);
204 file = indexLine.mid(60,12); 207 file = indexLine.mid(60,12);
205 if(file.left(1).find("[",0,TRUE) != -1) 208 if(file.left(1).find("[",0,TRUE) != -1)
206 file.remove(1,1); 209 file.remove(1,1);
207 if( file.find("]",0,TRUE) != -1) 210 if( file.find("]",0,TRUE) != -1)
208 file = file.left( file.find("]",0,TRUE)); 211 file = file.left( file.find("]",0,TRUE));
209 //odebug << "file is "+file << oendl; 212
210 /// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 ); 213
214 if(file.find("?", 0, false) != -1 ) {
215 QString tmpfile = file.replace(QRegExp("[?]"), "8");
216 // qDebug( "file is now " + tmpfile );
217 file = tmpfile;
218 }
219
220// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
211 number = indexLine.mid(55,5); 221 number = indexLine.mid(55,5);
212 number = number.stripWhiteSpace(); 222 number = number.stripWhiteSpace();
213 // title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() ); 223 // title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
214 title = indexLine.mid( 9, 50 ); 224 title = indexLine.mid( 9, 50 );
215 title = title.stripWhiteSpace(); 225 title = title.stripWhiteSpace();
216 //odebug << "title is "+title << oendl; 226 //odebug << "title is "+title << oendl;
217 getAuthor(); // grok author 227 getAuthor(); // grok author
218 author = author.stripWhiteSpace(); 228 author = author.stripWhiteSpace();
219 //odebug << "author is "+author << oendl; 229 //odebug << "author is "+author << oendl;
220 if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author 230 if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
221 QString lastName, firstName=""; 231 QString lastName, firstName="";
222 int finder=author.findRev( ' ', -1, TRUE); 232 int finder=author.findRev( ' ', -1, TRUE);
223 lastName=author.right( author.length()-finder); 233 lastName=author.right( author.length()-finder);
224 firstName=author.left(finder); 234 firstName=author.left(finder);
225 lastName=lastName.stripWhiteSpace(); 235 lastName=lastName.stripWhiteSpace();
226 firstName=firstName.stripWhiteSpace(); 236 firstName=firstName.stripWhiteSpace();
227 237
228 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names 238 if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
229 author=lastName+", "+firstName; 239 author=lastName+", "+firstName;
230 } 240 }
231 241
232 if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) /*&& (file.find( "]",0, TRUE))*/ ) { 242 if( !number.isEmpty()
243 && (title.find( "reserved",0, FALSE) == -1)
244 &&(title.find( "Audio",0, FALSE) == -1)) {
233 // fill string list or something to be able to sort by Author 245 // fill string list or something to be able to sort by Author
234 if( author.isEmpty() ) 246 if( author.isEmpty() )
235 QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file ); 247 QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file );
236 else { 248 else {
237 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) || 249 if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
238 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) ) 250 (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
239 QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file ); 251 QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file );
240 252
241 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) || 253 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
242 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) ) 254 (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
243 QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file ); 255 QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file );
244 256
245 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) || 257 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
246 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) ) 258 (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
247 QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file ); 259 QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file );
248 260
249 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) || 261 else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
250 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) ) 262 (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
251 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file ); 263 QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
252 } 264 }
253 } 265 }
254 } 266 }
255 } 267 }
256 } 268 }
@@ -575,59 +587,56 @@ void LibraryDialog::cancelIt()
575 587
576bool LibraryDialog::setTitle() 588bool LibraryDialog::setTitle()
577{ 589{
578 Config config("Gutenbrowser"); 590 Config config("Gutenbrowser");
579 odebug << "setting title" << oendl; 591 odebug << "setting title" << oendl;
580 odebug << DlglistItemTitle << oendl; 592 odebug << DlglistItemTitle << oendl;
581 593
582 if( DlglistItemTitle.find("[",0,TRUE) != -1) 594 if( DlglistItemTitle.find("[",0,TRUE) != -1)
583 DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" ); 595 DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
584 if( DlglistItemTitle.find("]",0,TRUE) !=-1) 596 if( DlglistItemTitle.find("]",0,TRUE) !=-1)
585 DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" ); 597 DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
586 odebug << "Title being set is "+DlglistItemTitle << oendl; 598 odebug << "Title being set is "+DlglistItemTitle << oendl;
587 int test = 0; 599 int test = 0;
588 QString ramble, temp; 600 QString ramble, temp;
589 config.setGroup("Files"); 601 config.setGroup("Files");
590 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" ); 602 QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
591 int i_numofFiles = s_numofFiles.toInt(); 603 int i_numofFiles = s_numofFiles.toInt();
592 for ( int i = 0; i <= i_numofFiles; i++){ 604 for ( int i = 0; i <= i_numofFiles; i++){
593 temp.setNum( i); 605 temp.setNum( i);
594 ramble = config.readEntry( temp, "" ); 606 ramble = config.readEntry( temp, "" );
595 if( strcmp( ramble, File_Name) == 0){ 607 if( strcmp( ramble, File_Name) == 0){
596 test = 1; 608 test = 1;
597 } 609 }
598 } 610 }
599
600 if(test == 0 ) {
601
602 config.setGroup("Files"); 611 config.setGroup("Files");
603 config.writeEntry( "NumberOfFiles", i_numofFiles +1 ); 612 config.writeEntry( "NumberOfFiles", i_numofFiles +1 );
604 QString interger; 613 QString interger;
605 interger.setNum( i_numofFiles +1); 614 interger.setNum( i_numofFiles +1);
606 config.writeEntry( interger, File_Name); 615 config.writeEntry( interger, File_Name);
607 config.setGroup( "Titles" ); 616 config.setGroup( "Titles" );
608 config.writeEntry( File_Name, DlglistItemTitle); 617 config.writeEntry( File_Name, DlglistItemTitle);
609 } 618
610 test = 0; 619 test = 0;
611 return true; 620 return true;
612} 621}
613 622
614 623
615void LibraryDialog::saveConfig() 624void LibraryDialog::saveConfig()
616{ 625{
617 Config config("Gutenbrowser"); 626 Config config("Gutenbrowser");
618 if( httpBox->isChecked() == TRUE) { 627 if( httpBox->isChecked() == TRUE) {
619 checked = 1; 628 checked = 1;
620 config.setGroup( "Proxy" ); 629 config.setGroup( "Proxy" );
621 config.writeEntry("IsChecked", "TRUE"); 630 config.writeEntry("IsChecked", "TRUE");
622 } else { 631 } else {
623 checked = 0; 632 checked = 0;
624 config.setGroup( "Proxy" ); 633 config.setGroup( "Proxy" );
625 config.writeEntry("IsChecked", "FALSE"); 634 config.writeEntry("IsChecked", "FALSE");
626 } 635 }
627 if (authBox->isChecked() == TRUE) { 636 if (authBox->isChecked() == TRUE) {
628 config.setGroup("SortAuth"); 637 config.setGroup("SortAuth");
629 config.writeEntry("authSort", "TRUE"); 638 config.writeEntry("authSort", "TRUE");
630 } else { 639 } else {
631 config.setGroup("SortAuth"); 640 config.setGroup("SortAuth");
632 config.writeEntry("authSort", "FALSE"); 641 config.writeEntry("authSort", "FALSE");
633 } 642 }
@@ -729,50 +738,48 @@ void LibraryDialog::onButtonSearch()
729 for ( ; it5.current(); ++it5 ) { 738 for ( ; it5.current(); ++it5 ) {
730 resultString = ( it5.current() )->text(0); 739 resultString = ( it5.current() )->text(0);
731 resultString += (" : "); 740 resultString += (" : ");
732 resultString += ( it5.current() )->text(2); 741 resultString += ( it5.current() )->text(2);
733 resultString += (" : "); 742 resultString += (" : ");
734 resultString += ( it5.current() )->text(3); 743 resultString += ( it5.current() )->text(3);
735 if( resultString.find( searcherStr, 0, cS) != -1) { 744 if( resultString.find( searcherStr, 0, cS) != -1) {
736 Searchlist.append( resultString); 745 Searchlist.append( resultString);
737 } 746 }
738 } 747 }
739 } 748 }
740 749
741 tabWidget->setCurrentPage( curTab); 750 tabWidget->setCurrentPage( curTab);
742 751
743 Searchlist.sort(); 752 Searchlist.sort();
744 SearchResultsDlg* SearchResultsDialog; 753 SearchResultsDlg* SearchResultsDialog;
745 SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist); 754 SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
746 755
747 SearchResultsDialog->showMaximized(); 756 SearchResultsDialog->showMaximized();
748 if( SearchResultsDialog->exec() != 0) { 757 if( SearchResultsDialog->exec() != 0) {
749 texter = SearchResultsDialog->selText; 758 texter = SearchResultsDialog->selText;
750 // odebug << texter << oendl; 759 // odebug << texter << oendl;
751 resultLs = SearchResultsDialog->resultsList; 760 resultLs = SearchResultsDialog->resultsList;
752 i_berger = 1; 761 i_berger = 1;
753 } else {
754 resultLs.clear();
755 } 762 }
756 Searchlist.clear(); 763 Searchlist.clear();
757 764
758 // if(SearchResultsDialog) 765 // if(SearchResultsDialog)
759 // delete SearchResultsDialog; 766 // delete SearchResultsDialog;
760 QString tester; 767 QString tester;
761 for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) { 768 for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
762 texter.sprintf("%s \n",(*it).latin1()); 769 texter.sprintf("%s \n",(*it).latin1());
763 // odebug << texter << oendl; 770 // odebug << texter << oendl;
764 if( tester!=texter) 771 if( tester!=texter)
765 parseSearchResults( texter); 772 parseSearchResults( texter);
766 tester = texter; 773 tester = texter;
767 } 774 }
768 if(searchDlg) 775 if(searchDlg)
769 delete searchDlg; 776 delete searchDlg;
770 } 777 }
771 if(checkBox->isChecked() ) { 778 if(checkBox->isChecked() ) {
772 accept(); 779 accept();
773 } else { 780 } else {
774 setActiveWindow(); 781 setActiveWindow();
775 } 782 }
776} 783}
777 784
778 /* 785 /*
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index fac21da..c7cdd83 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -200,65 +200,76 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
200 // int eexit=0; 200 // int eexit=0;
201 QString cmd; 201 QString cmd;
202 // config.read(); 202 // config.read();
203 qApp->processEvents(); 203 qApp->processEvents();
204 QString filename = QPEApplication::qpeDir(); 204 QString filename = QPEApplication::qpeDir();
205 if(filename.right(1)!="/") 205 if(filename.right(1)!="/")
206 filename+="/etc/gutenbrowser/"; 206 filename+="/etc/gutenbrowser/";
207 else 207 else
208 filename+="etc/gutenbrowser/"; 208 filename+="etc/gutenbrowser/";
209 odebug << "filename "+filename << oendl; 209 odebug << "filename "+filename << oendl;
210 // QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/"; 210 // QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
211 211
212 filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1); 212 filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
213 213
214 Config config("Gutenbrowser"); 214 Config config("Gutenbrowser");
215 config.setGroup( "Browser" ); 215 config.setGroup( "Browser" );
216 QString brow = config.readEntry("Preferred", "Opera"); 216 QString brow = config.readEntry("Preferred", "Opera");
217 odebug << "Preferred browser is "+brow << oendl; 217 odebug << "Preferred browser is "+brow << oendl;
218 if(!showMsg) { //if we just get the gutenindex.all 218 if(!showMsg) { //if we just get the gutenindex.all
219 cmd="wget -O " + filename +" " + url+" 2>&1" ; 219 cmd="wget -O " + filename +" " + url+" 2>&1" ;
220 chdir(local_library); 220 chdir(local_library);
221 odebug << "Issuing the system command: " << cmd << "" << oendl; 221 odebug << "Issuing the system command: " << cmd << "" << oendl;
222 222
223 Output *outDlg; 223 Output *outDlg;
224 outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE); 224
225 outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
226
225 outDlg->showMaximized(); 227 outDlg->showMaximized();
226 outDlg->show(); 228 outDlg->show();
227 qApp->processEvents(); 229 qApp->processEvents();
228 FILE *fp; 230 FILE *fp;
229 char line[130]; 231 char line[130];
230 outDlg->OutputEdit->append( tr("Running wget") ); 232 outDlg->OutputEdit->append( tr("Running wget") );
233 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
231 sleep(1); 234 sleep(1);
232 fp = popen( (const char *) cmd, "r"); 235 fp = popen( (const char *) cmd, "r");
233 odebug << "Issuing the command\n"+cmd << oendl; 236 if ( !fp ) {
237 } else {
238 //odebug << "Issuing the command\n"+cmd << oendl;
234 // system(cmd); 239 // system(cmd);
235 while ( fgets( line, sizeof line, fp)) { 240 while ( fgets( line, sizeof line, fp)) {
236 outDlg->OutputEdit->append(line); 241 outDlg->OutputEdit->append(line);
237// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 242 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
238 } 243 }
239 pclose(fp); 244 pclose(fp);
245 outDlg->OutputEdit->append("Finished downloading\n");
246 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
247 qApp->processEvents();
248
249 }
240 outDlg->close(); 250 outDlg->close();
251
241 if(outDlg) 252 if(outDlg)
242 delete outDlg; 253 delete outDlg;
243 } else { 254 } else {
244 if( brow == "Konq") { 255 if( brow == "Konq") {
245 cmd = "konqueror "+url+" &"; 256 cmd = "konqueror "+url+" &";
246 } 257 }
247 if( brow == "Opera") { //for desktop testing 258 if( brow == "Opera") { //for desktop testing
248 cmd = "opera "+url+" &"; 259 cmd = "opera "+url+" &";
249 } 260 }
250 // if( brow == "Opera") { // on Zaurus 261 // if( brow == "Opera") { // on Zaurus
251 // cmd = "operagui "+url+" &"; 262 // cmd = "operagui "+url+" &";
252 // } 263 // }
253 if( brow == "Mozilla") { 264 if( brow == "Mozilla") {
254 cmd = "mozilla "+url+" &"; 265 cmd = "mozilla "+url+" &";
255 } 266 }
256 if( brow == "Netscape") { 267 if( brow == "Netscape") {
257 cmd = "netscape "+url+" &"; 268 cmd = "netscape "+url+" &";
258 } 269 }
259 if(brow == "wget") { 270 if(brow == "wget") {
260 // cmd="wget -q "+url+" &"; 271 // cmd="wget -q "+url+" &";
261 QString tempHtml=local_library+"webster.html"; 272 QString tempHtml=local_library+"webster.html";
262 cmd="wget -O "+tempHtml+" -q "+url; 273 cmd="wget -O "+tempHtml+" -q "+url;
263 } 274 }
264 275