summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.cpp10
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp3
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowser.cpp82
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
85 newindexLib.setName( old_index); 85 newindexLib.setName( old_index);
86 indexLib.setName( old_index); 86 indexLib.setName( old_index);
87 87
88 new QPEDialogListener(this); 88 new QPEDialogListener(this);
89 QTimer::singleShot( 1000, this, SLOT( FindLibrary()) );
90
89} 91}
90 92
91LibraryDialog::~LibraryDialog() 93LibraryDialog::~LibraryDialog()
92{ 94{
@@ -254,9 +256,9 @@ void LibraryDialog::Library()
254 } 256 }
255 indexLib.close(); 257 indexLib.close();
256 } else { 258 } else {
257 QString sMsg; 259 QString sMsg;
258 sMsg = ( tr("Error opening local library index:\n "))+local_index; 260 sMsg = ( tr("<p>Error opening local library index:</P> "))+local_index;
259 QMessageBox::message( "Error",sMsg); 261 QMessageBox::message( "Error",sMsg);
260 } 262 }
261 263
262} //end Library() 264} //end Library()
@@ -510,9 +512,9 @@ bool LibraryDialog::download_Etext()
510 odebug << "Writing doclink did not work" << oendl; 512 odebug << "Writing doclink did not work" << oendl;
511 } else { 513 } else {
512 } 514 }
513 } else 515 } else
514 QMessageBox::message("Note","There was an error\nwith the file"); 516 QMessageBox::message("Note","<p>There was an error with the file</p>");
515 } 517 }
516 } 518 }
517 return true; 519 return true;
518} 520}
@@ -938,9 +940,9 @@ void LibraryDialog::newList()
938 QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL"; 940 QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
939 QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1"; 941 QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1";
940 942
941 int result = QMessageBox::warning( this,"Download" 943 int result = QMessageBox::warning( this,"Download"
942 ,"Ok to use /'wget/' to download\na new library list?\n" 944 ,"<p>Ok to use /'wget/' to download a new library list?</P>"
943 ,"Yes","No",0,0,1); 945 ,"Yes","No",0,0,1);
944 qApp->processEvents(); 946 qApp->processEvents();
945 if(result == 0) { 947 if(result == 0) {
946 outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE); 948 outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
@@ -1036,9 +1038,9 @@ bool LibraryDialog::moreInfo()
1036 QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search"; 1038 QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search";
1037 cmd="opera "+cmd; 1039 cmd="opera "+cmd;
1038 system(cmd); 1040 system(cmd);
1039 } else 1041 } else
1040 QMessageBox::message( "Note","If you select a title, this will\nsearch google.com for that title."); 1042 QMessageBox::message( "Note","<p>If you select a title, this will search google.com for that title.</p>");
1041 return true; 1043 return true;
1042 1044
1043} 1045}
1044 1046
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(){
235 235
236 moreInfoButton->setText("Info"); 236 moreInfoButton->setText("Info");
237 moreInfoButton->setDisabled(TRUE); 237 moreInfoButton->setDisabled(TRUE);
238 buttonSearch->setDisabled(TRUE); 238 buttonSearch->setDisabled(TRUE);
239 buttonSearch->setDefault(TRUE);
239 240
240 buttonSearch->setText(tr("Search")); 241 buttonSearch->setText(tr("Search"));
241 242
242 buttonCancel->setText(tr("Close")); 243 buttonCancel->setText(tr("Close"));
243 buttonLibrary->setText("Load"); 244 buttonLibrary->setText("Load");
244 buttonLibrary->setDefault(TRUE); 245// buttonLibrary->setDefault(TRUE);
245 buttonNewList->setText("New List"); 246 buttonNewList->setText("New List");
246 247
247 QStrList sortingList; 248 QStrList sortingList;
248 sortingList.append( "Sort by Number"); 249 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 )
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 &)) );
@@ -135,32 +135,33 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
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();
@@ -227,13 +228,13 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
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)
@@ -408,9 +409,9 @@ void Gutenbrowser::ForwardBtn() {
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();
@@ -420,17 +421,17 @@ void Gutenbrowser::ForwardBtn() {
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)
@@ -443,9 +444,9 @@ void Gutenbrowser::ForwardBtn() {
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
451void Gutenbrowser::BackBtn() { 452void Gutenbrowser::BackBtn() {
@@ -455,11 +456,11 @@ void Gutenbrowser::BackBtn() {
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 {
@@ -500,9 +501,9 @@ void Gutenbrowser::BackBtn() {
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();
@@ -534,9 +535,9 @@ void Gutenbrowser::TopBtn() {
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();
@@ -577,9 +578,9 @@ void Gutenbrowser::BeginBtn() {
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;
@@ -603,11 +604,11 @@ void Gutenbrowser::BeginBtn() {
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();
@@ -660,9 +661,9 @@ void Gutenbrowser::Bookmark( int itemId) {
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;
@@ -706,9 +707,9 @@ void Gutenbrowser::Bookmark( int itemId) {
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 }
@@ -743,9 +744,9 @@ void Gutenbrowser::Bookmark( int itemId) {
743 744
744bool Gutenbrowser::load( const char *fileName) { 745bool 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() );
@@ -809,9 +810,9 @@ bool Gutenbrowser::load( const char *fileName) {
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
@@ -900,23 +901,23 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
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;
@@ -935,23 +936,23 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
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;
@@ -979,14 +980,9 @@ void Gutenbrowser::LibraryBtn() {
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();
@@ -1789,14 +1785,14 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
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 }