author | llornkcor <llornkcor> | 2004-06-15 09:51:02 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-06-15 09:51:02 (UTC) |
commit | 83b4b2d2670b63a2a540006cea2ea8808100d308 (patch) (side-by-side diff) | |
tree | 577fc60d3b2f63374c7bceeea311f2dc28f99e8e /noncore | |
parent | 631bd9765ed1d4e53ee8b021da644e0cfdcd623c (diff) | |
download | opie-83b4b2d2670b63a2a540006cea2ea8808100d308.zip opie-83b4b2d2670b63a2a540006cea2ea8808100d308.tar.gz opie-83b4b2d2670b63a2a540006cea2ea8808100d308.tar.bz2 |
load guten library, and fix some dialogs
-rw-r--r-- | noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | 82 |
3 files changed, 47 insertions, 48 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp index 270a4cf..124b6f3 100644 --- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp @@ -85,8 +85,10 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W newindexLib.setName( old_index); indexLib.setName( old_index); new QPEDialogListener(this); + QTimer::singleShot( 1000, this, SLOT( FindLibrary()) ); + } LibraryDialog::~LibraryDialog() { @@ -254,9 +256,9 @@ void LibraryDialog::Library() } indexLib.close(); } else { QString sMsg; - sMsg = ( tr("Error opening local library index:\n "))+local_index; + sMsg = ( tr("<p>Error opening local library index:</P> "))+local_index; QMessageBox::message( "Error",sMsg); } } //end Library() @@ -510,9 +512,9 @@ bool LibraryDialog::download_Etext() odebug << "Writing doclink did not work" << oendl; } else { } } else - QMessageBox::message("Note","There was an error\nwith the file"); + QMessageBox::message("Note","<p>There was an error with the file</p>"); } } return true; } @@ -938,9 +940,9 @@ void LibraryDialog::newList() 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" - ,"Ok to use /'wget/' to download\na new library list?\n" + ,"<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); @@ -1036,9 +1038,9 @@ bool LibraryDialog::moreInfo() QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search"; cmd="opera "+cmd; system(cmd); } else - QMessageBox::message( "Note","If you select a title, this will\nsearch google.com for that title."); + QMessageBox::message( "Note","<p>If you select a title, this will search google.com for that title.</p>"); return true; } diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp index 72d605e..60c1c75 100644 --- a/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp +++ b/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp @@ -235,14 +235,15 @@ void LibraryDialog::initDialog(){ moreInfoButton->setText("Info"); moreInfoButton->setDisabled(TRUE); buttonSearch->setDisabled(TRUE); + buttonSearch->setDefault(TRUE); buttonSearch->setText(tr("Search")); buttonCancel->setText(tr("Close")); buttonLibrary->setText("Load"); - buttonLibrary->setDefault(TRUE); +// buttonLibrary->setDefault(TRUE); buttonNewList->setText("New List"); QStrList sortingList; sortingList.append( "Sort by Number"); diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp index f14080f..be920dd 100644 --- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp +++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp @@ -104,9 +104,9 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) initButtonBar(); initStatusBar(); initView(); initSlots(); - + qDebug("init finished"); QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold); connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)), this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) ); @@ -135,32 +135,33 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) QString tempTitle = config.readEntry( ramble, ""); config.setGroup( tempTitle); int index=config.readNumEntry( "LineNumber", -1 ); if( index != -1) { - // odebug << tempTitle << oendl; + odebug << tempTitle << oendl; bookmarksMenu->insertItem( tempTitle); } } // QString gutenIndex= local_library + "GUTINDEX.ALL"; - QString gutenIndex= QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL"; - + QString gutenIndex = QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL"; + qDebug("gutenindex "+gutenIndex ); if( QFile( gutenIndex).exists() ) { indexLib.setName( gutenIndex); } else { QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT"; // QString localLibIndexFile= local_library + "PGWHOLE.TXT"; newindexLib.setName( localLibIndexFile); } + qDebug("attempting new library"); LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */); - loadCheck=false; + loadCheck = false; chdir(local_library); if(!showMainList) { Lview->setFocus(); // if(firstTime) // Bookmark(); for (int i=1;i< qApp->argc();i++) { - odebug << "Suppose we open somethin" << oendl; + qDebug("Suppose we open somethin"); load(qApp->argv()[i]); } } else { fillWithTitles(); @@ -227,13 +228,13 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) { char line[130]; outDlg->OutputEdit->append( tr("Running wget") ); sleep(1); fp = popen( (const char *) cmd, "r"); - // odebug << "Issuing the command\n"+cmd << oendl; + 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->close(); if(outDlg) @@ -408,9 +409,9 @@ void Gutenbrowser::ForwardBtn() { if(useWrap) s.replace(QRegExp("\n"),""); insertString+=s; Lview->insertLine( s, -1); - // odebug << s << oendl; + odebug << s << oendl; currentLine++; } // Lview->insertAt( insertString,0,0, FALSE); currentFilePos = f.at(); @@ -420,17 +421,17 @@ void Gutenbrowser::ForwardBtn() { pageStopArray.resize(i_pageNum + 1); // int length = Lview->length(); pageStopArray[i_pageNum ] = currentFilePos; - // odebug << currentFilePos << " current page is number " << i_pageNum - // << ", pagesize " << pageSize << ", length " << Lview->length() - // << ", current " << pageStopArray[i_pageNum] << oendl; + odebug << currentFilePos << " current page is number " << i_pageNum + << ", pagesize " << pageSize << ", length " << Lview->length() + << ", current " << pageStopArray[i_pageNum] << oendl; setStatus(); - Lview->setCursorPosition( 0, 0, FALSE); +// Lview->setCursorPosition( 0, 0, FALSE); // } } else { - // odebug << "bal" << oendl; + odebug << "bal" << oendl; // if( i_pageNum != pages) { // // int newTop = Lview->Top(); // // if(Lview->lastRow() > i) @@ -443,9 +444,9 @@ void Gutenbrowser::ForwardBtn() { } Lview->setFocus(); - // odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl; + odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl; } void Gutenbrowser::BackBtn() { @@ -455,11 +456,11 @@ void Gutenbrowser::BackBtn() { i_pageNum--; currentFilePos = f.at(); - // odebug << currentFilePos << " move back to " << pageStopArray[i_pageNum - 1 ] - // << ", current page number " << i_pageNum - // << ", " << pageSize << ", length " << Lview->length() << oendl; + odebug << currentFilePos << " move back to " << pageStopArray[i_pageNum - 1 ] + << ", current page number " << i_pageNum + << ", " << pageSize << ", length " << Lview->length() << oendl; if( i_pageNum < 2) { f.at( 0); } else { @@ -500,9 +501,9 @@ void Gutenbrowser::BackBtn() { // i_pageNum--; if( i_pageNum < 1) i_pageNum = 1; setStatus(); - Lview->setCursorPosition( Lview->Top(), 0, FALSE); +// Lview->setCursorPosition( Lview->Top(), 0, FALSE); } } Lview->setFocus(); @@ -534,9 +535,9 @@ void Gutenbrowser::TopBtn() { s.replace(QRegExp("\n"),""); Lview->insertLine(s ,-1); currentLine++; } - Lview->setCursorPosition( 0,0, FALSE); +// Lview->setCursorPosition( 0,0, FALSE); i_pageNum=1; setStatus(); } Lview->setFocus(); @@ -577,9 +578,9 @@ void Gutenbrowser::BeginBtn() { i_pageNum = lineNo/pageSize; if(lastPage < i_pageNum) { pageStopArray.resize(i_pageNum + 1); pageStopArray[i_pageNum ] = currentFilePos; - // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; + odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; } // lastPage = i_pageNum; if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) { odebug << "<<<<<< FOUND IT!! new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; @@ -603,11 +604,11 @@ void Gutenbrowser::BeginBtn() { qApp->processEvents(); if( pos > i_topRow ) { - Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE); +// Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE); } else { - Lview->setCursorPosition( pos+2 , 0, FALSE ); +// Lview->setCursorPosition( pos+2 , 0, FALSE ); } Lview->deselect(); // AdjustStatus(); @@ -660,9 +661,9 @@ void Gutenbrowser::Bookmark( int itemId) { // qApp->processEvents(); Config config("Gutenbrowser"); config.setGroup( "Bookmarks" ); - // odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl; + odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl; QString itemString; odebug << "menu item " << itemId << "" << oendl; @@ -706,9 +707,9 @@ void Gutenbrowser::Bookmark( int itemId) { i_pageNum = lineNo/pageSize; if(lastPage < i_pageNum) { pageStopArray.resize(i_pageNum + 1); pageStopArray[i_pageNum ] = currentFilePos; - // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; + odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; } if(currentFilePos == bookmarkPosition) break; } @@ -743,9 +744,9 @@ void Gutenbrowser::Bookmark( int itemId) { bool Gutenbrowser::load( const char *fileName) { // QCopEnvelope ( "QPE/System", "busy()" ); - // odebug << "Title is already set as "+title << oendl; + odebug << "Title is already set as "+title << oendl; odebug << "sizeHint " << sizeHint().height() << " pageSize " << Lview->PageSize() << "" << oendl; if( Lview->PageSize() < 4) { Lview->setMaximumHeight( sizeHint().height() ); @@ -809,9 +810,9 @@ bool Gutenbrowser::load( const char *fileName) { odebug << "Gulped " << currentLine << "" << oendl; setCaption(title); Lview->setAutoUpdate( TRUE); - Lview->setCursorPosition(0,0,FALSE); +// Lview->setCursorPosition(0,0,FALSE); // pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1; //odebug << "number of pages " << pages << "" << oendl; @@ -900,23 +901,23 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo if( pos != -1) { int top = Lview->Top(); length = s_pattern.length(); if( i > Lview->lastRow() ) { - Lview->setCursorPosition(i,pos,FALSE); +// Lview->setCursorPosition(i,pos,FALSE); for(int l = 0 ; l < length; l++) { Lview->cursorRight(TRUE); } - Lview->setCursorPosition( i , pos + length, TRUE ); +// Lview->setCursorPosition( i , pos + length, TRUE ); int newTop = Lview->Top(); if(Lview->lastRow() > i) Lview->ScrollUp( newTop - top); // AdjustStatus(); } else { - Lview->setCursorPosition(i,pos,FALSE); +// Lview->setCursorPosition(i,pos,FALSE); for(int l = 0 ; l < length; l++) { Lview->cursorRight(TRUE); } - Lview->setCursorPosition( i , pos + length, TRUE ); +// Lview->setCursorPosition( i , pos + length, TRUE ); // AdjustStatus(); } pattern = s_pattern; last_search = 1; //FORWARD; @@ -935,23 +936,23 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo if( i < Lview->Top() ) { Lview->ScrollDown( Lview->PageSize() ); Lview->MultiLine_Ex::pageUp( FALSE ); if( ! (line == i && pos > col ) ) { - Lview->setCursorPosition( i ,pos ,FALSE ); +// Lview->setCursorPosition( i ,pos ,FALSE ); for(int l = 0 ; l < length; l++) { Lview->cursorRight(TRUE); } - Lview->setCursorPosition(i ,pos + length ,TRUE ); +// Lview->setCursorPosition(i ,pos + length ,TRUE ); // int newTop = Lview->Top(); /* if(useSplitter) Rview->ScrollUp( newTop - top); */ } } else { if( ! (line == i && pos > col ) ) { - Lview->setCursorPosition( i, pos, FALSE ); +// Lview->setCursorPosition( i, pos, FALSE ); for( int l = 0 ; l < length; l++) { Lview->cursorRight( TRUE); } - Lview->setCursorPosition( i, pos + length, TRUE ); +// Lview->setCursorPosition( i, pos + length, TRUE ); } pattern = s_pattern; last_search = -1; return 1; @@ -979,14 +980,9 @@ void Gutenbrowser::LibraryBtn() { // LibraryDlg = new LibraryDialog( this, "Library Index"); LibraryDlg->setCaption( tr( "Gutenberg Library")); Config config("Gutenbrowser"); config.setGroup("General"); - QString tmp=config.readEntry("RunBefore","FALSE"); - if(tmp=="FALSE") { - QMessageBox::message( "Note", - "<P>Your first time running gutenbrowser. You'll need to click the \"load library\" button to load the gutenberg index.</P>"); - config.writeEntry("RunBefore","TRUE"); - } + if(useSplitter) LibraryDlg->useSmallInterface=FALSE; LibraryDlg->showMaximized(); @@ -1789,14 +1785,14 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) { i_pageNum = config.readNumEntry("Page Number", 1); int Bmrkrow = config.readNumEntry("LineNumber", -1); if(Bmrkrow > -1) { if( Bmrkrow > Lview->topRow() ) { - Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE ); +// Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE ); Lview->ScrollUp( Bmrkrow - Lview->topRow() ); // AdjustStatus(); } else if( Bmrkrow < Lview->topRow() ) { - Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE ); +// Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE ); Lview->ScrollDown( Lview->topRow() - Bmrkrow ); // AdjustStatus(); } } |