1 files changed, 14 insertions, 3 deletions

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
@@ -176,113 +176,124 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 Gutenbrowser::~Gutenbrowser() {
 			//  QPEApplication::grabKeyboard();
 			//  QPEApplication::ungrabKeyboard();
 		odebug << "Exit" << oendl;
 }
 
   /*
 		Google.com search */
 void Gutenbrowser::InfoBarClick() {
 		QString text;
 		if( Lview->hasSelectedText()) {
 				Lview->copy();
 				QClipboard *cb = QApplication::clipboard();
 				text = cb->text();
 		} else {
 					//    text=title;
 				text=this->caption();
 		}
 		searchGoogle(text);
 }
 
   /*
 		download http with wget or preferred browser */
 void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 			//    int eexit=0;
 		QString cmd;
 			//    config.read();
 		qApp->processEvents();
 		QString filename = QPEApplication::qpeDir();
 		if(filename.right(1)!="/")
 				filename+="/etc/gutenbrowser/";
 		else
 				filename+="etc/gutenbrowser/";
 		odebug << "filename "+filename << oendl;
 			//    QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
 
 		filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
 
 		Config config("Gutenbrowser");
 		config.setGroup( "Browser" );
 		QString brow = config.readEntry("Preferred", "Opera");
 		odebug << "Preferred browser is "+brow << oendl;
 		if(!showMsg) { //if we just get the gutenindex.all
 				cmd="wget -O " + filename +" " + url+" 2>&1" ;
 				chdir(local_library);
 				odebug << "Issuing the system command: " << cmd << "" << oendl;
 
 				Output *outDlg;
-				outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
+
+				outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
+
 				outDlg->showMaximized();
 				outDlg->show();
 				qApp->processEvents();
 				FILE *fp;
 				char line[130];
 				outDlg->OutputEdit->append( tr("Running wget") );
+				outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 				sleep(1);
 				fp = popen(  (const char *) cmd, "r");
-				odebug << "Issuing the command\n"+cmd << oendl;
+				if ( !fp ) {
+				} else {
+							//odebug << "Issuing the command\n"+cmd << oendl;
 					//                 system(cmd);
 				while ( fgets( line, sizeof line, fp)) {
 						outDlg->OutputEdit->append(line);
-//                        outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+								outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 				}
 				pclose(fp);
+						outDlg->OutputEdit->append("Finished downloading\n");
+						outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+						qApp->processEvents();
+
+				}
 				outDlg->close();
+
 				if(outDlg)
 						delete outDlg;
 		} else {
 				if( brow == "Konq") {
 						cmd = "konqueror "+url+" &";
 				}
 				if( brow == "Opera")  { //for desktop testing
 						cmd = "opera "+url+" &";
 				}
 					//              if( brow == "Opera")  { // on Zaurus
 					//                  cmd = "operagui "+url+" &";
 					//              }
 				if( brow == "Mozilla")  {
 						cmd = "mozilla "+url+" &";
 				}
 				if( brow == "Netscape")  {
 						cmd = "netscape "+url+" &";
 				}
 				if(brow == "wget") {
 							//                cmd="wget -q "+url+" &";
 						QString tempHtml=local_library+"webster.html";
 						cmd="wget -O "+tempHtml+" -q "+url;
 				}
 
 				chdir(local_library);
 				odebug << "Issuing the sys command: " << cmd << "" << oendl;
 				system(cmd);
 		}
 }
 
 void Gutenbrowser::toggleButtonIcons( bool useEm) {
 		QString pixDir;
 		if(useEm)
 				useEm=TRUE;
 		pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser";
 		odebug << "Docdir is "+QPEApplication::documentDir() << oendl;
 
 		if( useIcons && QDir( pixDir).exists() ) {
 				LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline
 				OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook"));
 				ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline
 				BackButton->setPixmap( Resource::loadPixmap("back") );//in inline
 				SearchButton->setPixmap( Resource::loadPixmap("gutenbrowser/search") );//in inline
 				lastBmkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark_folder"));
 				setBookmarkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark") );
 				dictionaryButton->setPixmap( Resource::loadPixmap("gutenbrowser/spellcheck") );
 				InfoBar->setPixmap( Resource::loadPixmap("gutenbrowser/google"));
 		}