summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-06-15 09:51:02 (UTC)
committer llornkcor <llornkcor>2004-06-15 09:51:02 (UTC)
commit83b4b2d2670b63a2a540006cea2ea8808100d308 (patch) (side-by-side diff)
tree577fc60d3b2f63374c7bceeea311f2dc28f99e8e
parent631bd9765ed1d4e53ee8b021da644e0cfdcd623c (diff)
downloadopie-83b4b2d2670b63a2a540006cea2ea8808100d308.zip
opie-83b4b2d2670b63a2a540006cea2ea8808100d308.tar.gz
opie-83b4b2d2670b63a2a540006cea2ea8808100d308.tar.bz2
load guten library, and fix some dialogs
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
@@ -88,2 +88,4 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, W
new QPEDialogListener(this);
+ QTimer::singleShot( 1000, this, SLOT( FindLibrary()) );
+
}
@@ -257,3 +259,3 @@ void LibraryDialog::Library()
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);
@@ -513,3 +515,3 @@ 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>");
}
@@ -941,3 +943,3 @@ 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);
@@ -1039,3 +1041,3 @@ bool LibraryDialog::moreInfo()
} 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
@@ -238,2 +238,3 @@ void LibraryDialog::initDialog(){
buttonSearch->setDisabled(TRUE);
+ buttonSearch->setDefault(TRUE);
@@ -243,3 +244,3 @@ void LibraryDialog::initDialog(){
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
@@ -107,3 +107,3 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
initSlots();
-
+ qDebug("init finished");
QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold);
@@ -138,3 +138,3 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
if( index != -1) {
- // odebug << tempTitle << oendl;
+ odebug << tempTitle << oendl;
bookmarksMenu->insertItem( tempTitle);
@@ -144,4 +144,4 @@ 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() ) {
@@ -153,4 +153,5 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
}
+ qDebug("attempting new library");
LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */);
- loadCheck=false;
+ loadCheck = false;
chdir(local_library);
@@ -161,3 +162,3 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
for (int i=1;i< qApp->argc();i++) {
- odebug << "Suppose we open somethin" << oendl;
+ qDebug("Suppose we open somethin");
load(qApp->argv()[i]);
@@ -230,3 +231,3 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
fp = popen( (const char *) cmd, "r");
- // odebug << "Issuing the command\n"+cmd << oendl;
+ odebug << "Issuing the command\n"+cmd << oendl;
// system(cmd);
@@ -234,3 +235,3 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
outDlg->OutputEdit->append(line);
- outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
}
@@ -411,3 +412,3 @@ void Gutenbrowser::ForwardBtn() {
Lview->insertLine( s, -1);
- // odebug << s << oendl;
+ odebug << s << oendl;
currentLine++;
@@ -423,7 +424,7 @@ 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);
// }
@@ -431,3 +432,3 @@ void Gutenbrowser::ForwardBtn() {
} else {
- // odebug << "bal" << oendl;
+ odebug << "bal" << oendl;
// if( i_pageNum != pages) {
@@ -446,3 +447,3 @@ void Gutenbrowser::ForwardBtn() {
- // odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
+ odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
}
@@ -458,5 +459,5 @@ void Gutenbrowser::BackBtn() {
- // 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;
@@ -503,3 +504,3 @@ void Gutenbrowser::BackBtn() {
setStatus();
- Lview->setCursorPosition( Lview->Top(), 0, FALSE);
+// Lview->setCursorPosition( Lview->Top(), 0, FALSE);
@@ -537,3 +538,3 @@ void Gutenbrowser::TopBtn() {
}
- Lview->setCursorPosition( 0,0, FALSE);
+// Lview->setCursorPosition( 0,0, FALSE);
i_pageNum=1;
@@ -580,3 +581,3 @@ void Gutenbrowser::BeginBtn() {
pageStopArray[i_pageNum ] = currentFilePos;
- // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
+ odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
}
@@ -606,5 +607,5 @@ 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 );
}
@@ -663,3 +664,3 @@ void Gutenbrowser::Bookmark( int itemId) {
- // odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
+ odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
@@ -709,3 +710,3 @@ void Gutenbrowser::Bookmark( int itemId) {
pageStopArray[i_pageNum ] = currentFilePos;
- // odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
+ odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
}
@@ -746,3 +747,3 @@ 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;
@@ -812,3 +813,3 @@ bool Gutenbrowser::load( const char *fileName) {
- Lview->setCursorPosition(0,0,FALSE);
+// Lview->setCursorPosition(0,0,FALSE);
@@ -903,3 +904,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
if( i > Lview->lastRow() ) {
- Lview->setCursorPosition(i,pos,FALSE);
+// Lview->setCursorPosition(i,pos,FALSE);
for(int l = 0 ; l < length; l++) {
@@ -907,3 +908,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
}
- Lview->setCursorPosition( i , pos + length, TRUE );
+// Lview->setCursorPosition( i , pos + length, TRUE );
int newTop = Lview->Top();
@@ -913,3 +914,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
} else {
- Lview->setCursorPosition(i,pos,FALSE);
+// Lview->setCursorPosition(i,pos,FALSE);
for(int l = 0 ; l < length; l++) {
@@ -917,3 +918,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
}
- Lview->setCursorPosition( i , pos + length, TRUE );
+// Lview->setCursorPosition( i , pos + length, TRUE );
// AdjustStatus();
@@ -938,3 +939,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
if( ! (line == i && pos > col ) ) {
- Lview->setCursorPosition( i ,pos ,FALSE );
+// Lview->setCursorPosition( i ,pos ,FALSE );
for(int l = 0 ; l < length; l++) {
@@ -942,3 +943,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
}
- Lview->setCursorPosition(i ,pos + length ,TRUE );
+// Lview->setCursorPosition(i ,pos + length ,TRUE );
// int newTop = Lview->Top();
@@ -948,3 +949,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
if( ! (line == i && pos > col ) ) {
- Lview->setCursorPosition( i, pos, FALSE );
+// Lview->setCursorPosition( i, pos, FALSE );
for( int l = 0 ; l < length; l++) {
@@ -952,3 +953,3 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive, boo
}
- Lview->setCursorPosition( i, pos + length, TRUE );
+// Lview->setCursorPosition( i, pos + length, TRUE );
}
@@ -982,8 +983,3 @@ void Gutenbrowser::LibraryBtn() {
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)
@@ -1792,3 +1788,3 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
if( Bmrkrow > Lview->topRow() ) {
- Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE );
+// Lview->setCursorPosition( Bmrkrow /* - Lview->topRow() */,0, FALSE );
Lview->ScrollUp( Bmrkrow - Lview->topRow() );
@@ -1797,3 +1793,3 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
else if( Bmrkrow < Lview->topRow() ) {
- Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
+// Lview->setCursorPosition( Lview->topRow() - Bmrkrow ,0, FALSE );
Lview->ScrollDown( Lview->topRow() - Bmrkrow );