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 | |
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 | |||
@@ -87,4 +87,6 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W | |||
87 | 87 | ||
88 | new QPEDialogListener(this); | 88 | new QPEDialogListener(this); |
89 | QTimer::singleShot( 1000, this, SLOT( FindLibrary()) ); | ||
90 | |||
89 | } | 91 | } |
90 | 92 | ||
@@ -256,5 +258,5 @@ void LibraryDialog::Library() | |||
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 | } |
@@ -512,5 +514,5 @@ bool LibraryDialog::download_Etext() | |||
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 | } |
@@ -940,5 +942,5 @@ void LibraryDialog::newList() | |||
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(); |
@@ -1038,5 +1040,5 @@ bool LibraryDialog::moreInfo() | |||
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 | ||
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 | |||
@@ -237,4 +237,5 @@ void LibraryDialog::initDialog(){ | |||
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")); |
@@ -242,5 +243,5 @@ void LibraryDialog::initDialog(){ | |||
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 | ||
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 | |||
@@ -106,5 +106,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) | |||
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 | ||
@@ -137,5 +137,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) | |||
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 | } |
@@ -143,6 +143,6 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) | |||
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); |
@@ -152,6 +152,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) | |||
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) { |
@@ -160,5 +161,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags ) | |||
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 | } |
@@ -229,9 +230,9 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) { | |||
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); |
@@ -410,5 +411,5 @@ void Gutenbrowser::ForwardBtn() { | |||
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 | } |
@@ -422,13 +423,13 @@ void Gutenbrowser::ForwardBtn() { | |||
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 | ||
@@ -445,5 +446,5 @@ void Gutenbrowser::ForwardBtn() { | |||
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 | ||
@@ -457,7 +458,7 @@ void Gutenbrowser::BackBtn() { | |||
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) { |
@@ -502,5 +503,5 @@ void Gutenbrowser::BackBtn() { | |||
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 | } |
@@ -536,5 +537,5 @@ void Gutenbrowser::TopBtn() { | |||
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(); |
@@ -579,5 +580,5 @@ void Gutenbrowser::BeginBtn() { | |||
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; |
@@ -605,7 +606,7 @@ void Gutenbrowser::BeginBtn() { | |||
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 | ||
@@ -662,5 +663,5 @@ void Gutenbrowser::Bookmark( int itemId) { | |||
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; |
@@ -708,5 +709,5 @@ void Gutenbrowser::Bookmark( int itemId) { | |||
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) |
@@ -745,5 +746,5 @@ 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) { |
@@ -811,5 +812,5 @@ bool Gutenbrowser::load( const char *fileName) { | |||
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; |
@@ -902,9 +903,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo | |||
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) |
@@ -912,9 +913,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo | |||
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 | } |
@@ -937,9 +938,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo | |||
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); |
@@ -947,9 +948,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo | |||
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; |
@@ -981,10 +982,5 @@ void Gutenbrowser::LibraryBtn() { | |||
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; |
@@ -1791,10 +1787,10 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) { | |||
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(); |