2 files changed, 5 insertions, 2 deletions

diff --git a/noncore/apps/opie-reader/.cvsignore b/noncore/apps/opie-reader/.cvsignore
new file mode 100644
index 0000000..5344d1b
--- a/dev/null
+++ b/noncore/apps/opie-reader/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+moc*
\ No newline at end of file
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 620e93e..06a35f6 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -910,198 +910,198 @@ void QTReaderApp::openFile( const QString &f )
 
 void QTReaderApp::openFile( const DocLnk &f )
 {
   clear();
   FileManager fm;
   if ( fm.exists( f ) )
     {
 //      QMessageBox::information(0, "Progress", "Calling fileNew()");
 
       clear();
 
       //      editorStack->raiseWidget( reader );
 
       //      reader->setFocus();
 
       //      QMessageBox::information(0, "DocLnk", "Begin");
       doc = new DocLnk(f);
       //      QMessageBox::information(0, "DocLnk done", doc->file());
       //      QMessageBox::information(0, "Progress", "Calling setText()");
       //      QMessageBox::information(0, "Progress", "Textset");
 
       //      updateCaption();
       showEditTools();
       reader->setText(doc->name(), doc->file());
       readbkmks();
     }
   else
     {
       QMessageBox::information(this, "QTReader", "File does not exist");
     }
 	
 }
 
 void QTReaderApp::showEditTools()
 {
     if ( !doc )
 	close();
 //    fileSelector->hide();
     menu->show();
     editBar->show();
     if ( searchVisible )
 	searchBar->show();
     if ( regVisible )
 	regBar->show();
     if (m_fontVisible) m_fontBar->show();
 
     updateCaption();
     editorStack->raiseWidget( reader );
     reader->setFocus();
 }
 /*
 void QTReaderApp::save()
 {
     if ( !doc )
 	return;
     if ( !editor->edited() )
 	return;
 
     QString rt = editor->text();
     QString pt = rt;
 
     if ( doc->name().isEmpty() ) {
 	unsigned ispace = pt.find( ' ' );
 	unsigned ienter = pt.find( '\n' );
 	int i = (ispace < ienter) ? ispace : ienter;
 	QString docname;
 	if ( i == -1 ) {
 	    if ( pt.isEmpty() )
 		docname = "Empty Text";
 	    else
 		docname = pt;
 	} else {
 	    docname = pt.left( i );
 	}
 	doc->setName(docname);
     }
     FileManager fm;
     fm.saveFile( *doc, rt );
 }
 */
 
 void QTReaderApp::clear()
 {
     if (doc != 0)
       {
 //  QMessageBox::information(this, "QTReader", "Deleting doc", 1);
 	delete doc;
 //  QMessageBox::information(this, "QTReader", "Deleted doc", 1);
 	doc = 0;
       }
     reader->clear();
 }
 
 void QTReaderApp::updateCaption()
 {
     if ( !doc )
-	setCaption( tr("QTReader") );
+  setCaption( tr("Opie Reader") );
     else {
 	QString s = doc->name();
 	if ( s.isEmpty() )
 	    s = tr( "Unnamed" );
-	setCaption( s + " - " + tr("QTReader") );
+  setCaption( s + " - " + tr("Opie Reader") );
     }
 }
 
 void QTReaderApp::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
 //QMessageBox::information(0, "setDocument", fileref);
     openFile(DocLnk(fileref));
 //    showEditTools();
 }
 
 void QTReaderApp::closeEvent( QCloseEvent *e )
 {
     if (editorStack->visibleWidget() == reader)
     {
         if (m_fontVisible)
 	{
 	    m_fontBar->hide();
 	    m_fontVisible = false;
 	}
 	if (regVisible)
 	{
 	    regBar->hide();
 	    regVisible = false;
 	    return;
 	}
 	if (searchVisible)
 	{
 	    searchBar->hide();
 	    searchVisible = false;
 	    return;
 	}
 	if (m_fBkmksChanged && pBkmklist != NULL)
 	{
 	    if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
 		savebkmks();
 	    delete pBkmklist;
 	    pBkmklist = NULL;
 	    m_fBkmksChanged = false;
 	}
 	bFromDocView = FALSE;
 	saveprefs();
 	e->accept();
     }
     else
     {
 	showEditTools();
     }
 }
 
 void QTReaderApp::do_gotomark()
 {
     m_nRegAction = cGotoBkmk;
     listbkmk();
 }
 
 void QTReaderApp::do_delmark()
 {
     m_nRegAction = cDelBkmk;
     listbkmk();
 }
 
 void QTReaderApp::listbkmk()
 {
     bkmkselector->clear();
     int cnt = 0;
     if (pBkmklist != NULL)
       {
       	if (m_fBkmksChanged) pBkmklist->sort();
 	for (CList<Bkmk>::iterator i = pBkmklist->begin(); i != pBkmklist->end(); i++)
 	  {
 #ifdef _UNICODE
 	    bkmkselector->insertItem(toQString(i->name()));
 #else
 	    bkmkselector->insertItem(i->name());
 #endif
 	    cnt++;
 	  }
       }
     if (cnt > 0)
       {
         menu->hide();
         editBar->hide();
         if (m_fontVisible) m_fontBar->hide();
         if (regVisible) regBar->hide();
         if (searchVisible) searchBar->hide();
         editorStack->raiseWidget( bkmkselector );
       }
     else
       QMessageBox::information(this, "QTReader", "No bookmarks in memory");
 }
 
 void QTReaderApp::do_autogen()
 {
   m_nRegAction = cAutoGen;
   regEdit->setText(m_autogenstr);