author | llornkcor <llornkcor> | 2005-02-06 04:30:34 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-02-06 04:30:34 (UTC) |
commit | 60a856903eb688b56c61fa787ac26b6be9f6d6c4 (patch) (side-by-side diff) | |
tree | 81848a11c6b006ed4b6ac5a036de8402dde8e25d /noncore/apps/opie-gutenbrowser | |
parent | e23dd592fc71aa22c449363231eac2f8ebd2a45b (diff) | |
download | opie-60a856903eb688b56c61fa787ac26b6be9f6d6c4.zip opie-60a856903eb688b56c61fa787ac26b6be9f6d6c4.tar.gz opie-60a856903eb688b56c61fa787ac26b6be9f6d6c4.tar.bz2 |
fix #1494 - download of file when search is canceled
Diffstat (limited to 'noncore/apps/opie-gutenbrowser') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | 185 |
1 files changed, 95 insertions, 90 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp index 3c096ed..7426e80 100644 --- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp @@ -576,35 +576,38 @@ void LibraryDialog::cancelIt() bool LibraryDialog::setTitle() { - Config config("Gutenbrowser"); - odebug << "setting title" << oendl; - odebug << DlglistItemTitle << oendl; - - if( DlglistItemTitle.find("[",0,TRUE) != -1) - DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" ); - if( DlglistItemTitle.find("]",0,TRUE) !=-1) - DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" ); - odebug << "Title being set is "+DlglistItemTitle << oendl; - int test = 0; - QString ramble, temp; - config.setGroup("Files"); - QString s_numofFiles = config.readEntry("NumberOfFiles", "0" ); - int i_numofFiles = s_numofFiles.toInt(); - for ( int i = 0; i <= i_numofFiles; i++){ - temp.setNum( i); - ramble = config.readEntry( temp, "" ); - if( strcmp( ramble, File_Name) == 0){ - test = 1; - } - } + Config config("Gutenbrowser"); + odebug << "setting title" << oendl; + odebug << DlglistItemTitle << oendl; + + if( DlglistItemTitle.find("[",0,TRUE) != -1) + DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" ); + if( DlglistItemTitle.find("]",0,TRUE) !=-1) + DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" ); + odebug << "Title being set is "+DlglistItemTitle << oendl; + int test = 0; + QString ramble, temp; + config.setGroup("Files"); + QString s_numofFiles = config.readEntry("NumberOfFiles", "0" ); + int i_numofFiles = s_numofFiles.toInt(); + for ( int i = 0; i <= i_numofFiles; i++){ + temp.setNum( i); + ramble = config.readEntry( temp, "" ); + if( strcmp( ramble, File_Name) == 0){ + test = 1; + } + } + + if(test == 0 ) { + config.setGroup("Files"); - config.writeEntry( "NumberOfFiles", i_numofFiles +1 ); - QString interger; - interger.setNum( i_numofFiles +1); - config.writeEntry( interger, File_Name); - config.setGroup( "Titles" ); - config.writeEntry( File_Name, DlglistItemTitle); - - test = 0; - return true; + config.writeEntry( "NumberOfFiles", i_numofFiles +1 ); + QString interger; + interger.setNum( i_numofFiles +1); + config.writeEntry( interger, File_Name); + config.setGroup( "Titles" ); + config.writeEntry( File_Name, DlglistItemTitle); + } + test = 0; + return true; } @@ -746,7 +749,9 @@ void LibraryDialog::onButtonSearch() texter = SearchResultsDialog->selText; // odebug << texter << oendl; - resultLs= SearchResultsDialog->resultsList; + resultLs = SearchResultsDialog->resultsList; i_berger = 1; - } + } else { + resultLs.clear(); + } Searchlist.clear(); @@ -929,62 +934,62 @@ void LibraryDialog::comboSelect(int index) void LibraryDialog::newList() { - if(indexLoaded) { - onButtonDownload(); - } else { - Output *outDlg; - buttonNewList->setDown(TRUE); - QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser"); - if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true); - if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) { - odebug << "changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser" << oendl; - QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; - QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1"; - - int result = QMessageBox::warning( this,"Download" - ,"<p>Ok to use /'wget/' to download a new library list?</P>" - ,"Yes","No",0,0,1); - qApp->processEvents(); - if(result == 0) { - outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE); - outDlg->showMaximized(); - outDlg->show(); - qApp->processEvents(); - FILE *fp; - char line[130]; - outDlg->OutputEdit->append( tr("Running wget") ); - outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); - sleep(1); - fp = popen( (const char *) cmd, "r"); - if ( !fp ) { - } else { - odebug << "Issuing the command\n"+cmd << oendl; - // system(cmd); - while ( fgets( line, sizeof line, fp)) { - outDlg->OutputEdit->append(line); - outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); - } - pclose(fp); - outDlg->OutputEdit->append("Finished downloading\n"); - outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); - qApp->processEvents(); - - // if( QFile(gutenindex1).exists() ) { - // QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; - // if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0) - // odebug << "renaming error" << oendl; - // } - - } - // outDlg->close(); - FindLibrary(); - if(outDlg) delete outDlg; - } - buttonNewList->setDown(FALSE); - } else { - QMessageBox::message("Note","Could not change directories"); - } - // if(outDlg) - // delete outDlg; - } + if(indexLoaded) { + onButtonDownload(); + } else { + Output *outDlg; + buttonNewList->setDown(TRUE); + QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser"); + if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true); + if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) { + odebug << "changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser" << oendl; + QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; + QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1"; + + int result = QMessageBox::warning( this,"Download" + ,"<p>Ok to use /'wget/' to download a new library list?</P>" + ,"Yes","No",0,0,1); + qApp->processEvents(); + if(result == 0) { + outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE); + outDlg->showMaximized(); + outDlg->show(); + qApp->processEvents(); + FILE *fp; + char line[130]; + outDlg->OutputEdit->append( tr("Running wget") ); + outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); + sleep(1); + fp = popen( (const char *) cmd, "r"); + if ( !fp ) { + } else { + odebug << "Issuing the command\n"+cmd << oendl; + // system(cmd); + while ( fgets( line, sizeof line, fp)) { + outDlg->OutputEdit->append(line); + outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); + } + pclose(fp); + outDlg->OutputEdit->append("Finished downloading\n"); + outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); + qApp->processEvents(); + + // if( QFile(gutenindex1).exists() ) { + // QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; + // if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0) + // odebug << "renaming error" << oendl; + // } + + } + // outDlg->close(); + FindLibrary(); + if(outDlg) delete outDlg; + } + buttonNewList->setDown(FALSE); + } else { + QMessageBox::message("Note","Could not change directories"); + } + // if(outDlg) + // delete outDlg; + } } |