| -rw-r--r-- | noncore/apps/opie-reader/.cvsignore | 3 | ||||
| -rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 4 |
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 @@ -814,390 +814,390 @@ void QTReaderApp::findClose() delete searchStack; #endif reader->setFocus(); } void QTReaderApp::regClose() { regVisible = FALSE; regEdit->setText(""); regBar->hide(); reader->setFocus(); } #ifdef __ISEARCH bool QTReaderApp::dosearch(size_t start, CBuffer& test, const QString& arg) #else bool QTReaderApp::dosearch(size_t start, CBuffer& test, const QRegExp& arg) #endif { bool ret = true; size_t pos = start; reader->buffdoc.getline(&test,reader->width()); #ifdef __ISEARCH while (strstr(test.data(),(const tchar*)arg) == NULL) #else #ifdef _UNICODE while (arg.match(toQString(test.data())) == -1) #else while (arg.match(test.data()) == -1) #endif #endif { pos = reader->locate(); if (!reader->buffdoc.getline(&test,reader->width())) { if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2) pos = searchStart; else pos = start; ret = false; findClose(); break; } } reader->locate(pos); return ret; } #ifdef __ISEARCH void QTReaderApp::search(const QString & arg) { searchrecord* ss = searchStack->top(); CBuffer test; size_t start = reader->pagelocate(); bool haspopped = false; while (arg.left(ss->s.length()) != ss->s) { haspopped = true; start = ss->pos; // reader->locate(start); searchStack->pop(); delete ss; } if (haspopped) reader->locate(start); /* if (arg.length() < ss->len) { start = ss->pos; reader->locate(start); searchStack->pop(); delete ss; } */ else { start = reader->pagelocate(); reader->jumpto(start); searchStack->push(new searchrecord(arg,start)); } dosearch(start, test, arg); } #else void QTReaderApp::search() { QRegExp arg = searchEdit->text(); CBuffer test; size_t start = reader->pagelocate(); // reader->jumpto(start); dosearch(start, test, arg); } #endif void QTReaderApp::openFile( const QString &f ) { openFile(DocLnk(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); do_regedit(); } void QTReaderApp::do_regedit() { // editBar->hide(); regBar->show(); regVisible = true; regEdit->setFocus(); } void QTReaderApp::gotobkmk(int ind) { switch (m_nRegAction) { case cGotoBkmk: reader->locate((*pBkmklist)[ind]->value()); break; case cDelBkmk: // qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name()); pBkmklist->erase(ind); m_fBkmksChanged = true; break; case cRmBkmkFile: unlink((const char *)Global::applicationFileName("uqtreader",bkmkselector->text(ind))); break; } showEditTools(); } void QTReaderApp::cancelbkmk() { showEditTools(); } void QTReaderApp::jump() { m_nRegAction = cJump; char lcn[20]; sprintf(lcn, "%lu", reader->pagelocate()); regEdit->setText(lcn); do_regedit(); } void QTReaderApp::do_jump(const QString& lcn) { bool ok; unsigned long ulcn = lcn.toULong(&ok); if (ok) reader->locate(ulcn); else QMessageBox::information(this, "QTReader", "Must be a number"); } void QTReaderApp::do_regaction() { regBar->hide(); regVisible = false; switch(m_nRegAction) { case cAutoGen: do_autogen(regEdit->text()); break; case cAddBkmk: do_addbkmk(regEdit->text()); break; case cJump: do_jump(regEdit->text()); break; case cMonoSpace: do_mono(regEdit->text()); break; case cOverlap: do_overlap(regEdit->text()); break; case cSetTarget: do_settarget(regEdit->text()); break; } reader->restore(); // editBar->show(); reader->setFocus(); } void QTReaderApp::do_settarget(const QString& _txt) { int ind = _txt.find('/'); if (ind == -1) { reader->m_targetapp = ""; reader->m_targetmsg = ""; QMessageBox::information(this, "QTReader", "Format is\nappname/messagename"); } else { reader->m_targetapp = _txt.left(ind); |