summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -87,4 +87,6 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W
new QPEDialogListener(this);
+ QTimer::singleShot( 1000, this, SLOT( FindLibrary()) );
+
}
@@ -256,5 +258,5 @@ void LibraryDialog::Library()
} 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);
}
@@ -512,5 +514,5 @@ bool LibraryDialog::download_Etext()
}
} else
- QMessageBox::message("Note","There was an error\nwith the file");
+ QMessageBox::message("Note","<p>There was an error with the file</p>");
}
}
@@ -940,5 +942,5 @@ void LibraryDialog::newList()
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();
@@ -1038,5 +1040,5 @@ bool LibraryDialog::moreInfo()
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
@@ -237,4 +237,5 @@ void LibraryDialog::initDialog(){
moreInfoButton->setDisabled(TRUE);
buttonSearch->setDisabled(TRUE);
+ buttonSearch->setDefault(TRUE);
buttonSearch->setText(tr("Search"));
@@ -242,5 +243,5 @@ void LibraryDialog::initDialog(){
buttonCancel->setText(tr("Close"));
buttonLibrary->setText("Load");
- buttonLibrary->setDefault(TRUE);
+// buttonLibrary->setDefault(TRUE);
buttonNewList->setText("New List");
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 )
initView();
initSlots();
-
+ qDebug("init finished");
QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold);
@@ -137,5 +137,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
int index=config.readNumEntry( "LineNumber", -1 );
if( index != -1) {
- // odebug << tempTitle << oendl;
+ odebug << tempTitle << oendl;
bookmarksMenu->insertItem( tempTitle);
}
@@ -143,6 +143,6 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
// 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);
@@ -152,6 +152,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
newindexLib.setName( localLibIndexFile);
}
+ qDebug("attempting new library");
LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */);
- loadCheck=false;
+ loadCheck = false;
chdir(local_library);
if(!showMainList) {
@@ -160,5 +161,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
// Bookmark();
for (int i=1;i< qApp->argc();i++) {
- odebug << "Suppose we open somethin" << oendl;
+ qDebug("Suppose we open somethin");
load(qApp->argv()[i]);
}
@@ -229,9 +230,9 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
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);
@@ -410,5 +411,5 @@ void Gutenbrowser::ForwardBtn() {
insertString+=s;
Lview->insertLine( s, -1);
- // odebug << s << oendl;
+ odebug << s << oendl;
currentLine++;
}
@@ -422,13 +423,13 @@ void Gutenbrowser::ForwardBtn() {
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) {
@@ -445,5 +446,5 @@ void Gutenbrowser::ForwardBtn() {
Lview->setFocus();
- // odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
+ odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
}
@@ -457,7 +458,7 @@ void Gutenbrowser::BackBtn() {
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) {
@@ -502,5 +503,5 @@ void Gutenbrowser::BackBtn() {
i_pageNum = 1;
setStatus();
- Lview->setCursorPosition( Lview->Top(), 0, FALSE);
+// Lview->setCursorPosition( Lview->Top(), 0, FALSE);
}
@@ -536,5 +537,5 @@ void Gutenbrowser::TopBtn() {
currentLine++;
}
- Lview->setCursorPosition( 0,0, FALSE);
+// Lview->setCursorPosition( 0,0, FALSE);
i_pageNum=1;
setStatus();
@@ -579,5 +580,5 @@ void Gutenbrowser::BeginBtn() {
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;
@@ -605,7 +606,7 @@ void Gutenbrowser::BeginBtn() {
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 );
}
@@ -662,5 +663,5 @@ void Gutenbrowser::Bookmark( int itemId) {
config.setGroup( "Bookmarks" );
- // odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
+ odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
QString itemString;
@@ -708,5 +709,5 @@ void Gutenbrowser::Bookmark( int itemId) {
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)
@@ -745,5 +746,5 @@ 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) {
@@ -811,5 +812,5 @@ bool Gutenbrowser::load( const char *fileName) {
Lview->setAutoUpdate( TRUE);
- Lview->setCursorPosition(0,0,FALSE);
+// Lview->setCursorPosition(0,0,FALSE);
// pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1;
@@ -902,9 +903,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
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)
@@ -912,9 +913,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
// 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();
}
@@ -937,9 +938,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
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);
@@ -947,9 +948,9 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
} 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;
@@ -981,10 +982,5 @@ void Gutenbrowser::LibraryBtn() {
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;
@@ -1791,10 +1787,10 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
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();