-rw-r--r-- | noncore/apps/opie-reader/Bkmks.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/BuffDoc.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 46 |
3 files changed, 25 insertions, 25 deletions
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp index 92ed69f..0cb9ea9 100644 --- a/noncore/apps/opie-reader/Bkmks.cpp +++ b/noncore/apps/opie-reader/Bkmks.cpp | |||
@@ -170,7 +170,7 @@ CList<Bkmk>* BkmkFile::readall() | |||
170 | fread(&newmagic, sizeof(newmagic), 1, f); | 170 | fread(&newmagic, sizeof(newmagic), 1, f); |
171 | if (newmagic != magic) | 171 | if (newmagic != magic) |
172 | { | 172 | { |
173 | if (QMessageBox::warning(NULL, "Old bookmark file!", "Which version of QTReader\ndid you upgrade from?", "0_4*", "Any other version") == 0) | 173 | if (QMessageBox::warning(NULL, "Old bookmark file!", "Which version of OpieReader\ndid you upgrade from?", "0_4*", "Any other version") == 0) |
174 | { | 174 | { |
175 | fseek(f,0,SEEK_SET); | 175 | fseek(f,0,SEEK_SET); |
176 | bl = readall04(); | 176 | bl = readall04(); |
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp index e37b136..d4541ea 100644 --- a/noncore/apps/opie-reader/BuffDoc.cpp +++ b/noncore/apps/opie-reader/BuffDoc.cpp | |||
@@ -209,7 +209,7 @@ int BuffDoc::openfile(QWidget* _parent, const char *src) | |||
209 | if (ret != 0) | 209 | if (ret != 0) |
210 | { | 210 | { |
211 | delete exp; | 211 | delete exp; |
212 | QMessageBox::information(_parent, "QTReader", "Unknown file compression type","Try another file"); | 212 | QMessageBox::information(_parent, "OpieReader", "Unknown file compression type","Try another file"); |
213 | return ret; | 213 | return ret; |
214 | } | 214 | } |
215 | // qDebug("Doing final open:%x:%x",exp,filt); | 215 | // qDebug("Doing final open:%x:%x",exp,filt); |
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index 0608b66..ef1f4f1 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -99,7 +99,7 @@ void QTReaderApp::listBkmkFiles() | |||
99 | editorStack->raiseWidget( bkmkselector ); | 99 | editorStack->raiseWidget( bkmkselector ); |
100 | } | 100 | } |
101 | else | 101 | else |
102 | QMessageBox::information(this, "QTReader", "No bookmark files"); | 102 | QMessageBox::information(this, "OpieReader", "No bookmark files"); |
103 | } | 103 | } |
104 | 104 | ||
105 | QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) | 105 | QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) |
@@ -118,7 +118,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) | |||
118 | m_autogenstr = "^ *[A-Z].*[a-z] *$"; | 118 | m_autogenstr = "^ *[A-Z].*[a-z] *$"; |
119 | setToolBarsMovable( FALSE ); | 119 | setToolBarsMovable( FALSE ); |
120 | 120 | ||
121 | setIcon( Resource::loadPixmap( "uqtreader" ) ); | 121 | setIcon( Resource::loadPixmap( "opie-reader/uqtreader" ) ); |
122 | 122 | ||
123 | QPEToolBar *bar = new QPEToolBar( this ); | 123 | QPEToolBar *bar = new QPEToolBar( this ); |
124 | bar->setHorizontalStretchable( TRUE ); | 124 | bar->setHorizontalStretchable( TRUE ); |
@@ -255,7 +255,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) | |||
255 | connect(ag, SIGNAL( selected(QAction*) ), this, SLOT( buttonActionSelected(QAction*) ) ); | 255 | connect(ag, SIGNAL( selected(QAction*) ), this, SLOT( buttonActionSelected(QAction*) ) ); |
256 | 256 | ||
257 | 257 | ||
258 | a = m_scrollButton = new QAction( tr( "Scroll" ), Resource::loadPixmap( "panel-arrow-down" ), QString::null, 0, this, 0, true ); | 258 | a = m_scrollButton = new QAction( tr( "Scroll" ), Resource::loadPixmap( "opie-reader/panel-arrow-down" ), QString::null, 0, this, 0, true ); |
259 | // connect( a, SIGNAL( activated() ), this, SLOT( autoScroll() ) ); | 259 | // connect( a, SIGNAL( activated() ), this, SLOT( autoScroll() ) ); |
260 | a->setOn(false); | 260 | a->setOn(false); |
261 | connect( a, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) ); | 261 | connect( a, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) ); |
@@ -630,13 +630,13 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) | |||
630 | { | 630 | { |
631 | QString info; | 631 | QString info; |
632 | stream >> info; | 632 | stream >> info; |
633 | QMessageBox::information(this, "QTReader", info); | 633 | QMessageBox::information(this, "OpieReader", info); |
634 | } | 634 | } |
635 | else if ( msg == "warn(QString)" ) | 635 | else if ( msg == "warn(QString)" ) |
636 | { | 636 | { |
637 | QString info; | 637 | QString info; |
638 | stream >> info; | 638 | stream >> info; |
639 | QMessageBox::warning(this, "QTReader", info); | 639 | QMessageBox::warning(this, "OpieReader", info); |
640 | } | 640 | } |
641 | 641 | ||
642 | 642 | ||
@@ -751,7 +751,7 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data) | |||
751 | pos = reader->locate(); | 751 | pos = reader->locate(); |
752 | if (!reader->buffdoc.getline(&test,reader->width())) | 752 | if (!reader->buffdoc.getline(&test,reader->width())) |
753 | { | 753 | { |
754 | QMessageBox::information(this, "QTReader", QString("Can't find\n")+info); | 754 | QMessageBox::information(this, "OpieReader", QString("Can't find\n")+info); |
755 | pos = start; | 755 | pos = start; |
756 | break; | 756 | break; |
757 | } | 757 | } |
@@ -914,12 +914,12 @@ void QTReaderApp::autoScroll(bool _b) | |||
914 | 914 | ||
915 | void QTReaderApp::TBD() | 915 | void QTReaderApp::TBD() |
916 | { | 916 | { |
917 | QMessageBox::information(this, "QTReader", "Not yet implemented", 1); | 917 | QMessageBox::information(this, "OpieReader", "Not yet implemented", 1); |
918 | } | 918 | } |
919 | 919 | ||
920 | void QTReaderApp::TBDzoom() | 920 | void QTReaderApp::TBDzoom() |
921 | { | 921 | { |
922 | QMessageBox::information(this, "QTReader", "Zooming is done interactively\nTry left/right cursor keys", 1); | 922 | QMessageBox::information(this, "OpieReader", "Zooming is done interactively\nTry left/right cursor keys", 1); |
923 | } | 923 | } |
924 | 924 | ||
925 | void QTReaderApp::clearBkmkList() | 925 | void QTReaderApp::clearBkmkList() |
@@ -941,7 +941,7 @@ void QTReaderApp::fileOpen() | |||
941 | { | 941 | { |
942 | if (m_fBkmksChanged) | 942 | if (m_fBkmksChanged) |
943 | { | 943 | { |
944 | if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0) | 944 | if (QMessageBox::warning(this, "OpieReader", "Save bookmarks?", "Save", "Don't bother") == 0) |
945 | savebkmks(); | 945 | savebkmks(); |
946 | } | 946 | } |
947 | delete pBkmklist; | 947 | delete pBkmklist; |
@@ -953,7 +953,7 @@ void QTReaderApp::fileOpen() | |||
953 | editorStack->raiseWidget( fileSelector ); | 953 | editorStack->raiseWidget( fileSelector ); |
954 | fileSelector->reread(); | 954 | fileSelector->reread(); |
955 | */ | 955 | */ |
956 | fileBrowser* fb = new fileBrowser(this,"QTReader",TRUE, | 956 | fileBrowser* fb = new fileBrowser(this,"OpieReader",TRUE, |
957 | 0, | 957 | 0, |
958 | // WStyle_Customize | WStyle_NoBorderEx, | 958 | // WStyle_Customize | WStyle_NoBorderEx, |
959 | "*", QFileInfo(reader->m_lastfile).dirPath(true)); | 959 | "*", QFileInfo(reader->m_lastfile).dirPath(true)); |
@@ -973,7 +973,7 @@ void QTReaderApp::showinfo() | |||
973 | unsigned long fs, ts, pl; | 973 | unsigned long fs, ts, pl; |
974 | if (reader->empty()) | 974 | if (reader->empty()) |
975 | { | 975 | { |
976 | QMessageBox::information(this, "QTReader", "No file loaded", 1); | 976 | QMessageBox::information(this, "OpieReader", "No file loaded", 1); |
977 | } | 977 | } |
978 | else | 978 | else |
979 | { | 979 | { |
@@ -1020,7 +1020,7 @@ void QTReaderApp::addAnno(const QString& name, const QString& text) | |||
1020 | { | 1020 | { |
1021 | if (name.isEmpty()) | 1021 | if (name.isEmpty()) |
1022 | { | 1022 | { |
1023 | QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nPlease try again", 1); | 1023 | QMessageBox::information(this, "OpieReader", "Need a name for the bookmark\nPlease try again", 1); |
1024 | } | 1024 | } |
1025 | else | 1025 | else |
1026 | { | 1026 | { |
@@ -1077,7 +1077,7 @@ void QTReaderApp::addanno() | |||
1077 | { | 1077 | { |
1078 | if (reader->empty()) | 1078 | if (reader->empty()) |
1079 | { | 1079 | { |
1080 | QMessageBox::information(this, "QTReader", "No file loaded", 1); | 1080 | QMessageBox::information(this, "OpieReader", "No file loaded", 1); |
1081 | } | 1081 | } |
1082 | else | 1082 | else |
1083 | { | 1083 | { |
@@ -1231,7 +1231,7 @@ void QTReaderApp::do_overlap(const QString& lcn) | |||
1231 | reader->m_overlap = ulcn; | 1231 | reader->m_overlap = ulcn; |
1232 | } | 1232 | } |
1233 | else | 1233 | else |
1234 | QMessageBox::information(this, "QTReader", "Must be a number"); | 1234 | QMessageBox::information(this, "OpieReader", "Must be a number"); |
1235 | } | 1235 | } |
1236 | 1236 | ||
1237 | void QTReaderApp::do_mono(const QString& lcn) | 1237 | void QTReaderApp::do_mono(const QString& lcn) |
@@ -1246,7 +1246,7 @@ void QTReaderApp::do_mono(const QString& lcn) | |||
1246 | //reader->setmono(true); | 1246 | //reader->setmono(true); |
1247 | } | 1247 | } |
1248 | else | 1248 | else |
1249 | QMessageBox::information(this, "QTReader", "Must be a number"); | 1249 | QMessageBox::information(this, "OpieReader", "Must be a number"); |
1250 | } | 1250 | } |
1251 | 1251 | ||
1252 | /* | 1252 | /* |
@@ -1418,7 +1418,7 @@ void QTReaderApp::openFile( const DocLnk &f ) | |||
1418 | } | 1418 | } |
1419 | else | 1419 | else |
1420 | { | 1420 | { |
1421 | QMessageBox::information(this, "QTReader", "File does not exist"); | 1421 | QMessageBox::information(this, "OpieReader", "File does not exist"); |
1422 | } | 1422 | } |
1423 | 1423 | ||
1424 | } | 1424 | } |
@@ -1486,12 +1486,12 @@ void QTReaderApp::clear() | |||
1486 | void QTReaderApp::updateCaption() | 1486 | void QTReaderApp::updateCaption() |
1487 | { | 1487 | { |
1488 | if ( !doc ) | 1488 | if ( !doc ) |
1489 | setCaption( tr("QTReader") ); | 1489 | setCaption( tr("OpieReader") ); |
1490 | else { | 1490 | else { |
1491 | QString s = doc->name(); | 1491 | QString s = doc->name(); |
1492 | if ( s.isEmpty() ) | 1492 | if ( s.isEmpty() ) |
1493 | s = tr( "Unnamed" ); | 1493 | s = tr( "Unnamed" ); |
1494 | setCaption( s + " - " + tr("QTReader") ); | 1494 | setCaption( s + " - " + tr("OpieReader") ); |
1495 | } | 1495 | } |
1496 | } | 1496 | } |
1497 | 1497 | ||
@@ -1532,7 +1532,7 @@ void QTReaderApp::closeEvent( QCloseEvent *e ) | |||
1532 | } | 1532 | } |
1533 | if (m_fBkmksChanged && pBkmklist != NULL) | 1533 | if (m_fBkmksChanged && pBkmklist != NULL) |
1534 | { | 1534 | { |
1535 | if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0) | 1535 | if (QMessageBox::warning(this, "OpieReader", "Save bookmarks?", "Save", "Don't bother") == 0) |
1536 | savebkmks(); | 1536 | savebkmks(); |
1537 | delete pBkmklist; | 1537 | delete pBkmklist; |
1538 | pBkmklist = NULL; | 1538 | pBkmklist = NULL; |
@@ -1587,7 +1587,7 @@ void QTReaderApp::listbkmk() | |||
1587 | editorStack->raiseWidget( bkmkselector ); | 1587 | editorStack->raiseWidget( bkmkselector ); |
1588 | } | 1588 | } |
1589 | else | 1589 | else |
1590 | QMessageBox::information(this, "QTReader", "No bookmarks in memory"); | 1590 | QMessageBox::information(this, "OpieReader", "No bookmarks in memory"); |
1591 | } | 1591 | } |
1592 | 1592 | ||
1593 | void QTReaderApp::do_autogen() | 1593 | void QTReaderApp::do_autogen() |
@@ -1646,7 +1646,7 @@ void QTReaderApp::do_jump(const QString& lcn) | |||
1646 | if (ok) | 1646 | if (ok) |
1647 | reader->locate(ulcn); | 1647 | reader->locate(ulcn); |
1648 | else | 1648 | else |
1649 | QMessageBox::information(this, "QTReader", "Must be a number"); | 1649 | QMessageBox::information(this, "OpieReader", "Must be a number"); |
1650 | } | 1650 | } |
1651 | 1651 | ||
1652 | void QTReaderApp::do_regaction() | 1652 | void QTReaderApp::do_regaction() |
@@ -1686,7 +1686,7 @@ void QTReaderApp::do_settarget(const QString& _txt) | |||
1686 | { | 1686 | { |
1687 | m_targetapp = ""; | 1687 | m_targetapp = ""; |
1688 | m_targetmsg = ""; | 1688 | m_targetmsg = ""; |
1689 | QMessageBox::information(this, "QTReader", "Format is\nappname/messagename"); | 1689 | QMessageBox::information(this, "OpieReader", "Format is\nappname/messagename"); |
1690 | } | 1690 | } |
1691 | else | 1691 | else |
1692 | { | 1692 | { |
@@ -1921,7 +1921,7 @@ void QTReaderApp::do_addbkmk(const QString& text) | |||
1921 | { | 1921 | { |
1922 | if (text.isEmpty()) | 1922 | if (text.isEmpty()) |
1923 | { | 1923 | { |
1924 | QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nSelect add again", 1); | 1924 | QMessageBox::information(this, "OpieReader", "Need a name for the bookmark\nSelect add again", 1); |
1925 | } | 1925 | } |
1926 | else | 1926 | else |
1927 | { | 1927 | { |