author | llornkcor <llornkcor> | 2004-06-15 09:51:02 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-06-15 09:51:02 (UTC) |
commit | 83b4b2d2670b63a2a540006cea2ea8808100d308 (patch) (unidiff) | |
tree | 577fc60d3b2f63374c7bceeea311f2dc28f99e8e /noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | |
parent | 631bd9765ed1d4e53ee8b021da644e0cfdcd623c (diff) | |
download | opie-83b4b2d2670b63a2a540006cea2ea8808100d308.zip opie-83b4b2d2670b63a2a540006cea2ea8808100d308.tar.gz opie-83b4b2d2670b63a2a540006cea2ea8808100d308.tar.bz2 |
load guten library, and fix some dialogs
Diffstat (limited to 'noncore/apps/opie-gutenbrowser/gutenbrowser.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | 82 |
1 files changed, 39 insertions, 43 deletions
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 | |||
@@ -102,13 +102,13 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) | |||
102 | initConfig(); | 102 | initConfig(); |
103 | initMenuBar(); | 103 | initMenuBar(); |
104 | initButtonBar(); | 104 | initButtonBar(); |
105 | initStatusBar(); | 105 | initStatusBar(); |
106 | initView(); | 106 | initView(); |
107 | initSlots(); | 107 | initSlots(); |
108 | 108 | qDebug("init finished"); | |
109 | QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold); | 109 | QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold); |
110 | 110 | ||
111 | connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)), | 111 | connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)), |
112 | this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) ); | 112 | this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) ); |
113 | if( useIcons) | 113 | if( useIcons) |
114 | toggleButtonIcons( TRUE); | 114 | toggleButtonIcons( TRUE); |
@@ -133,36 +133,37 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) | |||
133 | 133 | ||
134 | config.setGroup( "Titles" ); | 134 | config.setGroup( "Titles" ); |
135 | QString tempTitle = config.readEntry( ramble, ""); | 135 | QString tempTitle = config.readEntry( ramble, ""); |
136 | config.setGroup( tempTitle); | 136 | config.setGroup( tempTitle); |
137 | int index=config.readNumEntry( "LineNumber", -1 ); | 137 | int index=config.readNumEntry( "LineNumber", -1 ); |
138 | if( index != -1) { | 138 | if( index != -1) { |
139 | // odebug << tempTitle << oendl; | 139 | odebug << tempTitle << oendl; |
140 | bookmarksMenu->insertItem( tempTitle); | 140 | bookmarksMenu->insertItem( tempTitle); |
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | // QString gutenIndex= local_library + "GUTINDEX.ALL"; | 144 | // QString gutenIndex= local_library + "GUTINDEX.ALL"; |
145 | QString gutenIndex= QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL"; | 145 | QString gutenIndex = QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL"; |
146 | 146 | qDebug("gutenindex "+gutenIndex ); | |
147 | if( QFile( gutenIndex).exists() ) { | 147 | if( QFile( gutenIndex).exists() ) { |
148 | indexLib.setName( gutenIndex); | 148 | indexLib.setName( gutenIndex); |
149 | } else { | 149 | } else { |
150 | QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT"; | 150 | QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT"; |
151 | // QString localLibIndexFile= local_library + "PGWHOLE.TXT"; | 151 | // QString localLibIndexFile= local_library + "PGWHOLE.TXT"; |
152 | newindexLib.setName( localLibIndexFile); | 152 | newindexLib.setName( localLibIndexFile); |
153 | } | 153 | } |
154 | qDebug("attempting new library"); | ||
154 | LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */); | 155 | LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */); |
155 | loadCheck=false; | 156 | loadCheck = false; |
156 | chdir(local_library); | 157 | chdir(local_library); |
157 | if(!showMainList) { | 158 | if(!showMainList) { |
158 | Lview->setFocus(); | 159 | Lview->setFocus(); |
159 | // if(firstTime) | 160 | // if(firstTime) |
160 | // Bookmark(); | 161 | // Bookmark(); |
161 | for (int i=1;i< qApp->argc();i++) { | 162 | for (int i=1;i< qApp->argc();i++) { |
162 | odebug << "Suppose we open somethin" << oendl; | 163 | qDebug("Suppose we open somethin"); |
163 | load(qApp->argv()[i]); | 164 | load(qApp->argv()[i]); |
164 | } | 165 | } |
165 | } else { | 166 | } else { |
166 | fillWithTitles(); | 167 | fillWithTitles(); |
167 | mainList->setFocus(); | 168 | mainList->setFocus(); |
168 | // mainList->setCurrentItem(0); | 169 | // mainList->setCurrentItem(0); |
@@ -225,17 +226,17 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) { | |||
225 | qApp->processEvents(); | 226 | qApp->processEvents(); |
226 | FILE *fp; | 227 | FILE *fp; |
227 | char line[130]; | 228 | char line[130]; |
228 | outDlg->OutputEdit->append( tr("Running wget") ); | 229 | outDlg->OutputEdit->append( tr("Running wget") ); |
229 | sleep(1); | 230 | sleep(1); |
230 | fp = popen( (const char *) cmd, "r"); | 231 | fp = popen( (const char *) cmd, "r"); |
231 | // odebug << "Issuing the command\n"+cmd << oendl; | 232 | odebug << "Issuing the command\n"+cmd << oendl; |
232 | // system(cmd); | 233 | // system(cmd); |
233 | while ( fgets( line, sizeof line, fp)) { | 234 | while ( fgets( line, sizeof line, fp)) { |
234 | outDlg->OutputEdit->append(line); | 235 | outDlg->OutputEdit->append(line); |
235 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); | 236 | // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); |
236 | } | 237 | } |
237 | pclose(fp); | 238 | pclose(fp); |
238 | outDlg->close(); | 239 | outDlg->close(); |
239 | if(outDlg) | 240 | if(outDlg) |
240 | delete outDlg; | 241 | delete outDlg; |
241 | } else { | 242 | } else { |
@@ -406,33 +407,33 @@ void Gutenbrowser::ForwardBtn() { | |||
406 | for(int fd=0; fd < pageSize - 1;fd++) { | 407 | for(int fd=0; fd < pageSize - 1;fd++) { |
407 | f.readLine(s, 256); | 408 | f.readLine(s, 256); |
408 | if(useWrap) | 409 | if(useWrap) |
409 | s.replace(QRegExp("\n"),""); | 410 | s.replace(QRegExp("\n"),""); |
410 | insertString+=s; | 411 | insertString+=s; |
411 | Lview->insertLine( s, -1); | 412 | Lview->insertLine( s, -1); |
412 | // odebug << s << oendl; | 413 | odebug << s << oendl; |
413 | currentLine++; | 414 | currentLine++; |
414 | } | 415 | } |
415 | // Lview->insertAt( insertString,0,0, FALSE); | 416 | // Lview->insertAt( insertString,0,0, FALSE); |
416 | currentFilePos = f.at(); | 417 | currentFilePos = f.at(); |
417 | // if( i_pageNum != pages) { | 418 | // if( i_pageNum != pages) { |
418 | // Lview->MultiLine_Ex::pageDown( FALSE); | 419 | // Lview->MultiLine_Ex::pageDown( FALSE); |
419 | i_pageNum++; | 420 | i_pageNum++; |
420 | pageStopArray.resize(i_pageNum + 1); | 421 | pageStopArray.resize(i_pageNum + 1); |
421 | // int length = Lview->length(); | 422 | // int length = Lview->length(); |
422 | 423 | ||
423 | pageStopArray[i_pageNum ] = currentFilePos; | 424 | pageStopArray[i_pageNum ] = currentFilePos; |
424 | // odebug << currentFilePos << " current page is number " << i_pageNum | 425 | odebug << currentFilePos << " current page is number " << i_pageNum |
425 | // << ", pagesize " << pageSize << ", length " << Lview->length() | 426 | << ", pagesize " << pageSize << ", length " << Lview->length() |
426 | // << ", current " << pageStopArray[i_pageNum] << oendl; | 427 | << ", current " << pageStopArray[i_pageNum] << oendl; |
427 | setStatus(); | 428 | setStatus(); |
428 | Lview->setCursorPosition( 0, 0, FALSE); | 429 | // Lview->setCursorPosition( 0, 0, FALSE); |
429 | // } | 430 | // } |
430 | 431 | ||
431 | } else { | 432 | } else { |
432 | // odebug << "bal" << oendl; | 433 | odebug << "bal" << oendl; |
433 | // if( i_pageNum != pages) { | 434 | // if( i_pageNum != pages) { |
434 | 435 | ||
435 | // // int newTop = Lview->Top(); | 436 | // // int newTop = Lview->Top(); |
436 | // // if(Lview->lastRow() > i) | 437 | // // if(Lview->lastRow() > i) |
437 | // Lview->ScrollUp(1); | 438 | // Lview->ScrollUp(1); |
438 | // // i_pageNum++; | 439 | // // i_pageNum++; |
@@ -441,27 +442,27 @@ void Gutenbrowser::ForwardBtn() { | |||
441 | 442 | ||
442 | // } | 443 | // } |
443 | 444 | ||
444 | } | 445 | } |
445 | Lview->setFocus(); | 446 | Lview->setFocus(); |
446 | 447 | ||
447 | // odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl; | 448 | odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl; |
448 | } | 449 | } |
449 | 450 | ||
450 | 451 | ||
451 | void Gutenbrowser::BackBtn() { | 452 | void Gutenbrowser::BackBtn() { |
452 | if( i_pageNum > 0) { | 453 | if( i_pageNum > 0) { |
453 | int pageSize= Lview->PageSize(); | 454 | int pageSize= Lview->PageSize(); |
454 | // int length=Lview->length(); | 455 | // int length=Lview->length(); |
455 | 456 | ||
456 | i_pageNum--; | 457 | i_pageNum--; |
457 | currentFilePos = f.at(); | 458 | currentFilePos = f.at(); |
458 | 459 | ||
459 | // odebug << currentFilePos << " move back to " << pageStopArray[i_pageNum - 1 ] | 460 | odebug << currentFilePos << " move back to " << pageStopArray[i_pageNum - 1 ] |
460 | // << ", current page number " << i_pageNum | 461 | << ", current page number " << i_pageNum |
461 | // << ", " << pageSize << ", length " << Lview->length() << oendl; | 462 | << ", " << pageSize << ", length " << Lview->length() << oendl; |
462 | 463 | ||
463 | if( i_pageNum < 2) { | 464 | if( i_pageNum < 2) { |
464 | f.at( 0); | 465 | f.at( 0); |
465 | } else { | 466 | } else { |
466 | if(!f.at( pageStopArray[i_pageNum - 1] )) | 467 | if(!f.at( pageStopArray[i_pageNum - 1] )) |
467 | odebug << "File positioned backward did not work" << oendl; | 468 | odebug << "File positioned backward did not work" << oendl; |
@@ -498,13 +499,13 @@ void Gutenbrowser::BackBtn() { | |||
498 | Lview->MultiLine_Ex::pageUp( FALSE); | 499 | Lview->MultiLine_Ex::pageUp( FALSE); |
499 | // Lview->ScrollDown(1); | 500 | // Lview->ScrollDown(1); |
500 | // i_pageNum--; | 501 | // i_pageNum--; |
501 | if( i_pageNum < 1) | 502 | if( i_pageNum < 1) |
502 | i_pageNum = 1; | 503 | i_pageNum = 1; |
503 | setStatus(); | 504 | setStatus(); |
504 | Lview->setCursorPosition( Lview->Top(), 0, FALSE); | 505 | // Lview->setCursorPosition( Lview->Top(), 0, FALSE); |
505 | 506 | ||
506 | } | 507 | } |
507 | } | 508 | } |
508 | Lview->setFocus(); | 509 | Lview->setFocus(); |
509 | } | 510 | } |
510 | 511 | ||
@@ -532,13 +533,13 @@ void Gutenbrowser::TopBtn() { | |||
532 | f.readLine(s, 256); | 533 | f.readLine(s, 256); |
533 | if(useWrap) | 534 | if(useWrap) |
534 | s.replace(QRegExp("\n"),""); | 535 | s.replace(QRegExp("\n"),""); |
535 | Lview->insertLine(s ,-1); | 536 | Lview->insertLine(s ,-1); |
536 | currentLine++; | 537 | currentLine++; |
537 | } | 538 | } |
538 | Lview->setCursorPosition( 0,0, FALSE); | 539 | // Lview->setCursorPosition( 0,0, FALSE); |
539 | i_pageNum=1; | 540 | i_pageNum=1; |
540 | setStatus(); | 541 | setStatus(); |
541 | } | 542 | } |
542 | Lview->setFocus(); | 543 | Lview->setFocus(); |
543 | } | 544 | } |
544 | } | 545 | } |
@@ -575,13 +576,13 @@ void Gutenbrowser::BeginBtn() { | |||
575 | currentFilePos = f.at(); | 576 | currentFilePos = f.at(); |
576 | 577 | ||
577 | i_pageNum = lineNo/pageSize; | 578 | i_pageNum = lineNo/pageSize; |
578 | if(lastPage < i_pageNum) { | 579 | if(lastPage < i_pageNum) { |
579 | pageStopArray.resize(i_pageNum + 1); | 580 | pageStopArray.resize(i_pageNum + 1); |
580 | pageStopArray[i_pageNum ] = currentFilePos; | 581 | pageStopArray[i_pageNum ] = currentFilePos; |
581 | // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; | 582 | odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; |
582 | } | 583 | } |
583 | // lastPage = i_pageNum; | 584 | // lastPage = i_pageNum; |
584 | if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) { | 585 | if( LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) { |
585 | odebug << "<<<<<< FOUND IT!! new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; | 586 | odebug << "<<<<<< FOUND IT!! new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; |
586 | break; | 587 | break; |
587 | } | 588 | } |
@@ -601,15 +602,15 @@ void Gutenbrowser::BeginBtn() { | |||
601 | pageStopArray.resize(i_pageNum + 1); | 602 | pageStopArray.resize(i_pageNum + 1); |
602 | // int length = Lview->length(); | 603 | // int length = Lview->length(); |
603 | 604 | ||
604 | qApp->processEvents(); | 605 | qApp->processEvents(); |
605 | 606 | ||
606 | if( pos > i_topRow ) { | 607 | if( pos > i_topRow ) { |
607 | Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE); | 608 | // Lview->setCursorPosition( pos+linesPerPage+2/* - i_topRow+3 */,0, FALSE); |
608 | } else { | 609 | } else { |
609 | Lview->setCursorPosition( pos+2 , 0, FALSE ); | 610 | // Lview->setCursorPosition( pos+2 , 0, FALSE ); |
610 | } | 611 | } |
611 | 612 | ||
612 | Lview->deselect(); | 613 | Lview->deselect(); |
613 | // AdjustStatus(); | 614 | // AdjustStatus(); |
614 | Lview->setFocus(); | 615 | Lview->setFocus(); |
615 | } | 616 | } |
@@ -658,13 +659,13 @@ void Gutenbrowser::setBookmark() { | |||
658 | void Gutenbrowser::Bookmark( int itemId) { | 659 | void Gutenbrowser::Bookmark( int itemId) { |
659 | 660 | ||
660 | // qApp->processEvents(); | 661 | // qApp->processEvents(); |
661 | Config config("Gutenbrowser"); | 662 | Config config("Gutenbrowser"); |
662 | config.setGroup( "Bookmarks" ); | 663 | config.setGroup( "Bookmarks" ); |
663 | 664 | ||
664 | // odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl; | 665 | odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl; |
665 | 666 | ||
666 | QString itemString; | 667 | QString itemString; |
667 | 668 | ||
668 | odebug << "menu item " << itemId << "" << oendl; | 669 | odebug << "menu item " << itemId << "" << oendl; |
669 | QString tempTitle; | 670 | QString tempTitle; |
670 | QString s_Bmrkrow; | 671 | QString s_Bmrkrow; |
@@ -704,13 +705,13 @@ void Gutenbrowser::Bookmark( int itemId) { | |||
704 | currentFilePos = f.at(); | 705 | currentFilePos = f.at(); |
705 | 706 | ||
706 | i_pageNum = lineNo/pageSize; | 707 | i_pageNum = lineNo/pageSize; |
707 | if(lastPage < i_pageNum) { | 708 | if(lastPage < i_pageNum) { |
708 | pageStopArray.resize(i_pageNum + 1); | 709 | pageStopArray.resize(i_pageNum + 1); |
709 | pageStopArray[i_pageNum ] = currentFilePos; | 710 | pageStopArray[i_pageNum ] = currentFilePos; |
710 | // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; | 711 | odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl; |
711 | } | 712 | } |
712 | if(currentFilePos == bookmarkPosition) | 713 | if(currentFilePos == bookmarkPosition) |
713 | break; | 714 | break; |
714 | } | 715 | } |
715 | if(f.atEnd()) | 716 | if(f.atEnd()) |
716 | f.at(0); | 717 | f.at(0); |
@@ -741,13 +742,13 @@ void Gutenbrowser::Bookmark( int itemId) { | |||
741 | } | 742 | } |
742 | 743 | ||
743 | 744 | ||
744 | bool Gutenbrowser::load( const char *fileName) { | 745 | bool Gutenbrowser::load( const char *fileName) { |
745 | 746 | ||
746 | // QCopEnvelope ( "QPE/System", "busy()" ); | 747 | // QCopEnvelope ( "QPE/System", "busy()" ); |
747 | // odebug << "Title is already set as "+title << oendl; | 748 | odebug << "Title is already set as "+title << oendl; |
748 | odebug << "sizeHint " << sizeHint().height() << " pageSize " << Lview->PageSize() << "" << oendl; | 749 | odebug << "sizeHint " << sizeHint().height() << " pageSize " << Lview->PageSize() << "" << oendl; |
749 | if( Lview->PageSize() < 4) { | 750 | if( Lview->PageSize() < 4) { |
750 | 751 | ||
751 | Lview->setMaximumHeight( sizeHint().height() ); | 752 | Lview->setMaximumHeight( sizeHint().height() ); |
752 | Lview->setMinimumHeight( sizeHint().height() ); | 753 | Lview->setMinimumHeight( sizeHint().height() ); |
753 | pointSize = Lview->fontInfo().pointSize(); | 754 | pointSize = Lview->fontInfo().pointSize(); |
@@ -807,13 +808,13 @@ bool Gutenbrowser::load( const char *fileName) { | |||
807 | 808 | ||
808 | Lview->setMaxLines(Lview->PageSize()*2); | 809 | Lview->setMaxLines(Lview->PageSize()*2); |
809 | odebug << "Gulped " << currentLine << "" << oendl; | 810 | odebug << "Gulped " << currentLine << "" << oendl; |
810 | setCaption(title); | 811 | setCaption(title); |
811 | Lview->setAutoUpdate( TRUE); | 812 | Lview->setAutoUpdate( TRUE); |
812 | 813 | ||
813 | Lview->setCursorPosition(0,0,FALSE); | 814 | // Lview->setCursorPosition(0,0,FALSE); |
814 | 815 | ||
815 | // pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1; | 816 | // pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1; |
816 | //odebug << "number of pages " << pages << "" << oendl; | 817 | //odebug << "number of pages " << pages << "" << oendl; |
817 | 818 | ||
818 | loadCheck = true; | 819 | loadCheck = true; |
819 | enableButtons(true); | 820 | enableButtons(true); |
@@ -898,27 +899,27 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo | |||
898 | string = Lview->textLine(i); | 899 | string = Lview->textLine(i); |
899 | pos = string.find(s_pattern, i == line ? col : 0, case_sensitive); | 900 | pos = string.find(s_pattern, i == line ? col : 0, case_sensitive); |
900 | if( pos != -1) { | 901 | if( pos != -1) { |
901 | int top = Lview->Top(); | 902 | int top = Lview->Top(); |
902 | length = s_pattern.length(); | 903 | length = s_pattern.length(); |
903 | if( i > Lview->lastRow() ) { | 904 | if( i > Lview->lastRow() ) { |
904 | Lview->setCursorPosition(i,pos,FALSE); | 905 | // Lview->setCursorPosition(i,pos,FALSE); |
905 | for(int l = 0 ; l < length; l++) { | 906 | for(int l = 0 ; l < length; l++) { |
906 | Lview->cursorRight(TRUE); | 907 | Lview->cursorRight(TRUE); |
907 | } | 908 | } |
908 | Lview->setCursorPosition( i , pos + length, TRUE ); | 909 | // Lview->setCursorPosition( i , pos + length, TRUE ); |
909 | int newTop = Lview->Top(); | 910 | int newTop = Lview->Top(); |
910 | if(Lview->lastRow() > i) | 911 | if(Lview->lastRow() > i) |
911 | Lview->ScrollUp( newTop - top); | 912 | Lview->ScrollUp( newTop - top); |
912 | // AdjustStatus(); | 913 | // AdjustStatus(); |
913 | } else { | 914 | } else { |
914 | Lview->setCursorPosition(i,pos,FALSE); | 915 | // Lview->setCursorPosition(i,pos,FALSE); |
915 | for(int l = 0 ; l < length; l++) { | 916 | for(int l = 0 ; l < length; l++) { |
916 | Lview->cursorRight(TRUE); | 917 | Lview->cursorRight(TRUE); |
917 | } | 918 | } |
918 | Lview->setCursorPosition( i , pos + length, TRUE ); | 919 | // Lview->setCursorPosition( i , pos + length, TRUE ); |
919 | // AdjustStatus(); | 920 | // AdjustStatus(); |
920 | } | 921 | } |
921 | pattern = s_pattern; | 922 | pattern = s_pattern; |
922 | last_search = 1; //FORWARD; | 923 | last_search = 1; //FORWARD; |
923 | return 1; | 924 | return 1; |
924 | } | 925 | } |
@@ -933,27 +934,27 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo | |||
933 | // int top = Lview->Top(); | 934 | // int top = Lview->Top(); |
934 | length = s_pattern.length(); | 935 | length = s_pattern.length(); |
935 | if( i < Lview->Top() ) { | 936 | if( i < Lview->Top() ) { |
936 | Lview->ScrollDown( Lview->PageSize() ); | 937 | Lview->ScrollDown( Lview->PageSize() ); |
937 | Lview->MultiLine_Ex::pageUp( FALSE ); | 938 | Lview->MultiLine_Ex::pageUp( FALSE ); |
938 | if( ! (line == i && pos > col ) ) { | 939 | if( ! (line == i && pos > col ) ) { |
939 | Lview->setCursorPosition( i ,pos ,FALSE ); | 940 | // Lview->setCursorPosition( i ,pos ,FALSE ); |
940 | for(int l = 0 ; l < length; l++) { | 941 | for(int l = 0 ; l < length; l++) { |
941 | Lview->cursorRight(TRUE); | 942 | Lview->cursorRight(TRUE); |
942 | } | 943 | } |
943 | Lview->setCursorPosition(i ,pos + length ,TRUE ); | 944 | // Lview->setCursorPosition(i ,pos + length ,TRUE ); |
944 | // int newTop = Lview->Top(); | 945 | // int newTop = Lview->Top(); |
945 | /* if(useSplitter) Rview->ScrollUp( newTop - top); | 946 | /* if(useSplitter) Rview->ScrollUp( newTop - top); |
946 | */ } | 947 | */ } |
947 | } else { | 948 | } else { |
948 | if( ! (line == i && pos > col ) ) { | 949 | if( ! (line == i && pos > col ) ) { |
949 | Lview->setCursorPosition( i, pos, FALSE ); | 950 | // Lview->setCursorPosition( i, pos, FALSE ); |
950 | for( int l = 0 ; l < length; l++) { | 951 | for( int l = 0 ; l < length; l++) { |
951 | Lview->cursorRight( TRUE); | 952 | Lview->cursorRight( TRUE); |
952 | } | 953 | } |
953 | Lview->setCursorPosition( i, pos + length, TRUE ); | 954 | // Lview->setCursorPosition( i, pos + length, TRUE ); |
954 | } | 955 | } |
955 | pattern = s_pattern; | 956 | pattern = s_pattern; |
956 | last_search = -1; | 957 | last_search = -1; |
957 | return 1; | 958 | return 1; |
958 | } | 959 | } |
959 | } | 960 | } |
@@ -977,18 +978,13 @@ void Gutenbrowser::LibraryBtn() { | |||
977 | QMessageBox::message( "Note",( tr("Please install unzip")) ); | 978 | QMessageBox::message( "Note",( tr("Please install unzip")) ); |
978 | } | 979 | } |
979 | // LibraryDlg = new LibraryDialog( this, "Library Index"); | 980 | // LibraryDlg = new LibraryDialog( this, "Library Index"); |
980 | LibraryDlg->setCaption( tr( "Gutenberg Library")); | 981 | LibraryDlg->setCaption( tr( "Gutenberg Library")); |
981 | Config config("Gutenbrowser"); | 982 | Config config("Gutenbrowser"); |
982 | config.setGroup("General"); | 983 | config.setGroup("General"); |
983 | QString tmp=config.readEntry("RunBefore","FALSE"); | 984 | |
984 | if(tmp=="FALSE") { | ||
985 | QMessageBox::message( "Note", | ||
986 | "<P>Your first time running gutenbrowser. You'll need to click the \"load library\" button to load the gutenberg index.</P>"); | ||
987 | config.writeEntry("RunBefore","TRUE"); | ||
988 | } | ||
989 | if(useSplitter) | 985 | if(useSplitter) |
990 | LibraryDlg->useSmallInterface=FALSE; | 986 | LibraryDlg->useSmallInterface=FALSE; |
991 | 987 | ||
992 | LibraryDlg->showMaximized(); | 988 | LibraryDlg->showMaximized(); |
993 | 989 | ||
994 | if( LibraryDlg->exec() != 0 ) { | 990 | if( LibraryDlg->exec() != 0 ) { |
@@ -1787,18 +1783,18 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) { | |||
1787 | config.setGroup( title); | 1783 | config.setGroup( title); |
1788 | file_name = config.readEntry("File Name", ""); | 1784 | file_name = config.readEntry("File Name", ""); |
1789 | i_pageNum = config.readNumEntry("Page Number", 1); | 1785 | i_pageNum = config.readNumEntry("Page Number", 1); |
1790 | int Bmrkrow = config.readNumEntry("LineNumber", -1); | 1786 | int Bmrkrow = config.readNumEntry("LineNumber", -1); |
1791 | if(Bmrkrow > -1) { | 1787 | if(Bmrkrow > -1) { |
1792 | if( Bmrkrow > Lview->topRow() ) { | 1788 | if( Bmrkrow > Lview->topRow() ) { |
1793 | Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE ); | 1789 | // Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE ); |
1794 | Lview->ScrollUp( Bmrkrow - Lview->topRow() ); | 1790 | Lview->ScrollUp( Bmrkrow - Lview->topRow() ); |
1795 | // AdjustStatus(); | 1791 | // AdjustStatus(); |
1796 | } | 1792 | } |
1797 | else if( Bmrkrow < Lview->topRow() ) { | 1793 | else if( Bmrkrow < Lview->topRow() ) { |
1798 | Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE ); | 1794 | // Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE ); |
1799 | Lview->ScrollDown( Lview->topRow() - Bmrkrow ); | 1795 | Lview->ScrollDown( Lview->topRow() - Bmrkrow ); |
1800 | // AdjustStatus(); | 1796 | // AdjustStatus(); |
1801 | } | 1797 | } |
1802 | } | 1798 | } |
1803 | } | 1799 | } |
1804 | } | 1800 | } |