| -rw-r--r-- | noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | 27 | ||||
| -rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | 17 |
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 @@ -138,9 +138,12 @@ void LibraryDialog::Newlibrary() if( lastName.find( firstName, 0, true) == -1) // this avoids dup names author=lastName+", "+firstName; } - if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) && (file.find( "]",0, TRUE) == -1) ) { + if( !number.isEmpty() + && (title.find( "reserved",0, FALSE) == -1) + && (file.find( "]",0, TRUE) == -1) + && (title.find( "Audio",0, FALSE) == -1)) { // fill string list or something to be able to resort the whole library if( author.isEmpty() ) QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file ); @@ -205,10 +208,17 @@ void LibraryDialog::Library() if(file.left(1).find("[",0,TRUE) != -1) file.remove(1,1); if( file.find("]",0,TRUE) != -1) file = file.left( file.find("]",0,TRUE)); - //odebug << "file is "+file << oendl; - /// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 ); + + + if(file.find("?", 0, false) != -1 ) { + QString tmpfile = file.replace(QRegExp("[?]"), "8"); +// qDebug( "file is now " + tmpfile ); + file = tmpfile; + } + +// number = indexLine.mid( indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 ); number = indexLine.mid(55,5); number = number.stripWhiteSpace(); // title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() ); title = indexLine.mid( 9, 50 ); @@ -228,9 +238,11 @@ void LibraryDialog::Library() if( lastName.find( firstName, 0, true) == -1) // this avoids dup names author=lastName+", "+firstName; } - if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) /*&& (file.find( "]",0, TRUE))*/ ) { + if( !number.isEmpty() + && (title.find( "reserved",0, FALSE) == -1) + &&(title.find( "Audio",0, FALSE) == -1)) { // fill string list or something to be able to sort by Author if( author.isEmpty() ) QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file ); else { @@ -595,19 +607,16 @@ bool LibraryDialog::setTitle() 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; } @@ -749,10 +758,8 @@ void LibraryDialog::onButtonSearch() texter = SearchResultsDialog->selText; // odebug << texter << oendl; resultLs = SearchResultsDialog->resultsList; i_berger = 1; - } else { - resultLs.clear(); } Searchlist.clear(); // if(SearchResultsDialog) 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 @@ -220,25 +220,36 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) { 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") { |