summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/.cvsignore3
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp470
2 files changed, 238 insertions, 235 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 @@
1Makefile
2Makefile.in
3moc* \ 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
@@ -68,16 +68,16 @@ void QTReaderApp::listBkmkFiles()
68 68
69 while(1) 69 while(1)
70 { 70 {
71 struct dirent* de; 71 struct dirent* de;
72 struct stat buf; 72 struct stat buf;
73 de = readdir(d); 73 de = readdir(d);
74 if (de == NULL) break; 74 if (de == NULL) break;
75 75
76 if (lstat((const char *)Global::applicationFileName("uqtreader",de->d_name),&buf) == 0 && S_ISREG(buf.st_mode)) 76 if (lstat((const char *)Global::applicationFileName("uqtreader",de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
77 { 77 {
78 bkmkselector->insertItem(de->d_name); 78 bkmkselector->insertItem(de->d_name);
79 cnt++; 79 cnt++;
80 } 80 }
81 } 81 }
82 82
83 closedir(d); 83 closedir(d);
@@ -89,7 +89,7 @@ void QTReaderApp::listBkmkFiles()
89 if (m_fontVisible) m_fontBar->hide(); 89 if (m_fontVisible) m_fontBar->hide();
90 if (regVisible) regBar->hide(); 90 if (regVisible) regBar->hide();
91 if (searchVisible) searchBar->hide(); 91 if (searchVisible) searchBar->hide();
92 m_nRegAction = cRmBkmkFile; 92 m_nRegAction = cRmBkmkFile;
93 editorStack->raiseWidget( bkmkselector ); 93 editorStack->raiseWidget( bkmkselector );
94 } 94 }
95 else 95 else
@@ -105,11 +105,11 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
105 pBkmklist = NULL; 105 pBkmklist = NULL;
106 doc = 0; 106 doc = 0;
107 107
108 m_fBkmksChanged = false; 108 m_fBkmksChanged = false;
109 109
110 QString lang = getenv( "LANG" ); 110 QString lang = getenv( "LANG" );
111 111
112 m_autogenstr = "^ *[A-Z].*[a-z] *$"; 112 m_autogenstr = "^ *[A-Z].*[a-z] *$";
113 setToolBarsMovable( FALSE ); 113 setToolBarsMovable( FALSE );
114 114
115 setIcon( Resource::loadPixmap( "uqtreader" ) ); 115 setIcon( Resource::loadPixmap( "uqtreader" ) );
@@ -420,10 +420,10 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
420 searchBar->setStretchableWidget( searchEdit ); 420 searchBar->setStretchableWidget( searchEdit );
421#ifdef __ISEARCH 421#ifdef __ISEARCH
422 connect( searchEdit, SIGNAL( textChanged( const QString & ) ), 422 connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
423 this, SLOT( search( const QString& ) ) ); 423 this, SLOT( search( const QString& ) ) );
424#else 424#else
425 connect( searchEdit, SIGNAL( returnPressed( ) ), 425 connect( searchEdit, SIGNAL( returnPressed( ) ),
426 this, SLOT( search( ) ) ); 426 this, SLOT( search( ) ) );
427#endif 427#endif
428 a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); 428 a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
429 connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); 429 connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
@@ -445,7 +445,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
445 regBar->setStretchableWidget( regEdit ); 445 regBar->setStretchableWidget( regEdit );
446 446
447 connect( regEdit, SIGNAL( returnPressed( ) ), 447 connect( regEdit, SIGNAL( returnPressed( ) ),
448 this, SLOT( do_regaction() ) ); 448 this, SLOT( do_regaction() ) );
449 449
450 a = new QAction( tr( "Do Reg" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 ); 450 a = new QAction( tr( "Do Reg" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
451 connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) ); 451 connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );
@@ -464,23 +464,23 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
464 m_fontSelector = new QComboBox(false, m_fontBar); 464 m_fontSelector = new QComboBox(false, m_fontBar);
465 m_fontBar->setStretchableWidget( m_fontSelector ); 465 m_fontBar->setStretchableWidget( m_fontSelector );
466 { 466 {
467 FontDatabase f; 467 FontDatabase f;
468 m_fontSelector->insertStringList(f.families()); 468 m_fontSelector->insertStringList(f.families());
469 } // delete the FontDatabase!!! 469 } // delete the FontDatabase!!!
470 connect( m_fontSelector, SIGNAL( activated(const QString& ) ), 470 connect( m_fontSelector, SIGNAL( activated(const QString& ) ),
471 this, SLOT( do_setfont(const QString&) ) ); 471 this, SLOT( do_setfont(const QString&) ) );
472 472
473 m_fontBar->hide(); 473 m_fontBar->hide();
474 m_fontVisible = false; 474 m_fontVisible = false;
475 475
476 connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ), 476 connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ),
477 this, SLOT( msgHandler(const QCString&, const QByteArray&) ) ); 477 this, SLOT( msgHandler(const QCString&, const QByteArray&) ) );
478 478
479 479
480 if (!reader->m_lastfile.isEmpty()) 480 if (!reader->m_lastfile.isEmpty())
481 { 481 {
482 openFile( reader->m_lastfile ); 482 openFile( reader->m_lastfile );
483 doc = new DocLnk(reader->m_lastfile); 483 doc = new DocLnk(reader->m_lastfile);
484 } 484 }
485 m_EncodingAction[reader->m_encd]->setOn(true); 485 m_EncodingAction[reader->m_encd]->setOn(true);
486 do_setfont(reader->m_fontname); 486 do_setfont(reader->m_fontname);
@@ -495,14 +495,14 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
495 QDataStream stream( _data, IO_ReadOnly ); 495 QDataStream stream( _data, IO_ReadOnly );
496 if ( msg == "info(QString)" ) 496 if ( msg == "info(QString)" )
497 { 497 {
498 QString info; 498 QString info;
499 stream >> info; 499 stream >> info;
500 QMessageBox::information(this, "QTReader", info); 500 QMessageBox::information(this, "QTReader", info);
501 } else if ( msg == "warn(QString)" ) 501 } else if ( msg == "warn(QString)" )
502 { 502 {
503 QString info; 503 QString info;
504 stream >> info; 504 stream >> info;
505 QMessageBox::warning(this, "QTReader", info); 505 QMessageBox::warning(this, "QTReader", info);
506 } 506 }
507} 507}
508 508
@@ -510,7 +510,7 @@ int QTReaderApp::EncNameToInt(const QString& _enc)
510{ 510{
511 for (int i = 0; i < MAX_ENCODING; i++) 511 for (int i = 0; i < MAX_ENCODING; i++)
512 { 512 {
513 if (m_EncodingAction[i]->text() == _enc) return i; 513 if (m_EncodingAction[i]->text() == _enc) return i;
514 } 514 }
515 return 0; 515 return 0;
516/* 516/*
@@ -548,9 +548,9 @@ void QTReaderApp::TBDzoom()
548 548
549void QTReaderApp::clearBkmkList() 549void QTReaderApp::clearBkmkList()
550{ 550{
551 delete pBkmklist; 551 delete pBkmklist;
552 pBkmklist = NULL; 552 pBkmklist = NULL;
553 m_fBkmksChanged = false; 553 m_fBkmksChanged = false;
554} 554}
555 555
556void QTReaderApp::fileOpen() 556void QTReaderApp::fileOpen()
@@ -563,14 +563,14 @@ void QTReaderApp::fileOpen()
563*/ 563*/
564 if (pBkmklist != NULL) 564 if (pBkmklist != NULL)
565 { 565 {
566 if (m_fBkmksChanged) 566 if (m_fBkmksChanged)
567 { 567 {
568 if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0) 568 if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
569 savebkmks(); 569 savebkmks();
570 } 570 }
571 delete pBkmklist; 571 delete pBkmklist;
572 pBkmklist = NULL; 572 pBkmklist = NULL;
573 m_fBkmksChanged = false; 573 m_fBkmksChanged = false;
574 } 574 }
575 reader->disableAutoscroll(); 575 reader->disableAutoscroll();
576/* 576/*
@@ -578,15 +578,15 @@ void QTReaderApp::fileOpen()
578 fileSelector->reread(); 578 fileSelector->reread();
579*/ 579*/
580 fileBrowser* fb = new fileBrowser(this,"QTReader",TRUE, 580 fileBrowser* fb = new fileBrowser(this,"QTReader",TRUE,
581 0, 581 0,
582 // WStyle_Customize | WStyle_NoBorderEx, 582// WStyle_Customize | WStyle_NoBorderEx,
583 "*", QFileInfo(reader->m_lastfile).dirPath(true)); 583 "*", QFileInfo(reader->m_lastfile).dirPath(true));
584 584
585 if (fb->exec()) 585 if (fb->exec())
586 { 586 {
587 QString fn(fb->fileList[0]); 587 QString fn(fb->fileList[0]);
588// fb->populateList(); 588// fb->populateList();
589 if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn); 589 if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
590 } 590 }
591 delete fb; 591 delete fb;
592} 592}
@@ -596,19 +596,19 @@ void QTReaderApp::showinfo()
596 unsigned long fs, ts, pl; 596 unsigned long fs, ts, pl;
597 if (reader->empty()) 597 if (reader->empty())
598 { 598 {
599 QMessageBox::information(this, "QTReader", "No file loaded", 1); 599 QMessageBox::information(this, "QTReader", "No file loaded", 1);
600 } 600 }
601 else 601 else
602 { 602 {
603 reader->sizes(fs,ts); 603 reader->sizes(fs,ts);
604 pl = reader->pagelocate(); 604 pl = reader->pagelocate();
605 m_infoWin->setFileSize(fs); 605 m_infoWin->setFileSize(fs);
606 m_infoWin->setTextSize(ts); 606 m_infoWin->setTextSize(ts);
607 m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts); 607 m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
608 m_infoWin->setLocation(pl); 608 m_infoWin->setLocation(pl);
609 m_infoWin->setRead((100*pl + (ts >> 1))/ts); 609 m_infoWin->setRead((100*pl + (ts >> 1))/ts);
610 editorStack->raiseWidget( m_infoWin ); 610 editorStack->raiseWidget( m_infoWin );
611 m_infoWin->setFocus(); 611 m_infoWin->setFocus();
612 } 612 }
613} 613}
614 614
@@ -638,21 +638,21 @@ void QTReaderApp::editMark()
638 638
639void QTReaderApp::editCopy() 639void QTReaderApp::editCopy()
640{ 640{
641 QClipboard* cb = QApplication::clipboard(); 641 QClipboard* cb = QApplication::clipboard();
642 QString text; 642 QString text;
643 int ch; 643 int ch;
644 unsigned long currentpos = reader->pagelocate(); 644 unsigned long currentpos = reader->pagelocate();
645 unsigned long endpos = reader->locate(); 645 unsigned long endpos = reader->locate();
646 reader->jumpto(m_savedpos); 646 reader->jumpto(m_savedpos);
647 while (reader->locate() < endpos && (ch = reader->getch()) != UEOF) 647 while (reader->locate() < endpos && (ch = reader->getch()) != UEOF)
648 { 648 {
649 text += ch; 649 text += ch;
650 } 650 }
651 cb->setText(text); 651 cb->setText(text);
652 //text = cb->text(); 652// text = cb->text();
653 //if (text) 653// if (text)
654 // qDebug("The clipboard contains: %s", (const tchar*)text); 654// qDebug("The clipboard contains: %s", (const tchar*)text);
655 reader->locate(currentpos); 655 reader->locate(currentpos);
656#ifndef QT_NO_CLIPBOARD 656#ifndef QT_NO_CLIPBOARD
657// TBD(); 657// TBD();
658 // reader->copy(); 658 // reader->copy();
@@ -731,8 +731,8 @@ void QTReaderApp::settarget()
731{ 731{
732 m_nRegAction = cSetTarget; 732 m_nRegAction = cSetTarget;
733 QString text = ((reader->m_targetapp.isEmpty()) ? QString("") : reader->m_targetapp) 733 QString text = ((reader->m_targetapp.isEmpty()) ? QString("") : reader->m_targetapp)
734 + "/" 734 + "/"
735 + ((reader->m_targetmsg.isEmpty()) ? QString("") : reader->m_targetmsg); 735 + ((reader->m_targetmsg.isEmpty()) ? QString("") : reader->m_targetmsg);
736 regEdit->setText(text); 736 regEdit->setText(text);
737 do_regedit(); 737 do_regedit();
738} 738}
@@ -743,10 +743,10 @@ void QTReaderApp::do_overlap(const QString& lcn)
743 unsigned long ulcn = lcn.toULong(&ok); 743 unsigned long ulcn = lcn.toULong(&ok);
744 if (ok) 744 if (ok)
745 { 745 {
746 reader->m_overlap = ulcn; 746 reader->m_overlap = ulcn;
747 } 747 }
748 else 748 else
749 QMessageBox::information(this, "QTReader", "Must be a number"); 749 QMessageBox::information(this, "QTReader", "Must be a number");
750} 750}
751 751
752void QTReaderApp::do_mono(const QString& lcn) 752void QTReaderApp::do_mono(const QString& lcn)
@@ -755,11 +755,11 @@ void QTReaderApp::do_mono(const QString& lcn)
755 unsigned long ulcn = lcn.toULong(&ok); 755 unsigned long ulcn = lcn.toULong(&ok);
756 if (ok) 756 if (ok)
757 { 757 {
758 reader->m_charpc = ulcn; 758 reader->m_charpc = ulcn;
759 //reader->setmono(true); 759// reader->setmono(true);
760 } 760 }
761 else 761 else
762 QMessageBox::information(this, "QTReader", "Must be a number"); 762 QMessageBox::information(this, "QTReader", "Must be a number");
763} 763}
764 764
765/* 765/*
@@ -845,15 +845,15 @@ bool QTReaderApp::dosearch(size_t start, CBuffer& test, const QRegExp& arg)
845 { 845 {
846 pos = reader->locate(); 846 pos = reader->locate();
847 if (!reader->buffdoc.getline(&test,reader->width())) 847 if (!reader->buffdoc.getline(&test,reader->width()))
848 { 848 {
849 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2) 849 if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
850 pos = searchStart; 850 pos = searchStart;
851 else 851 else
852 pos = start; 852 pos = start;
853 ret = false; 853 ret = false;
854 findClose(); 854 findClose();
855 break; 855 break;
856 } 856 }
857 } 857 }
858 reader->locate(pos); 858 reader->locate(pos);
859 return ret; 859 return ret;
@@ -937,20 +937,20 @@ void QTReaderApp::openFile( const DocLnk &f )
937 { 937 {
938 QMessageBox::information(this, "QTReader", "File does not exist"); 938 QMessageBox::information(this, "QTReader", "File does not exist");
939 } 939 }
940 940
941} 941}
942 942
943void QTReaderApp::showEditTools() 943void QTReaderApp::showEditTools()
944{ 944{
945 if ( !doc ) 945 if ( !doc )
946 close(); 946 close();
947// fileSelector->hide(); 947// fileSelector->hide();
948 menu->show(); 948 menu->show();
949 editBar->show(); 949 editBar->show();
950 if ( searchVisible ) 950 if ( searchVisible )
951 searchBar->show(); 951 searchBar->show();
952 if ( regVisible ) 952 if ( regVisible )
953 regBar->show(); 953 regBar->show();
954 if (m_fontVisible) m_fontBar->show(); 954 if (m_fontVisible) m_fontBar->show();
955 955
956 updateCaption(); 956 updateCaption();
@@ -961,27 +961,27 @@ void QTReaderApp::showEditTools()
961void QTReaderApp::save() 961void QTReaderApp::save()
962{ 962{
963 if ( !doc ) 963 if ( !doc )
964 return; 964 return;
965 if ( !editor->edited() ) 965 if ( !editor->edited() )
966 return; 966 return;
967 967
968 QString rt = editor->text(); 968 QString rt = editor->text();
969 QString pt = rt; 969 QString pt = rt;
970 970
971 if ( doc->name().isEmpty() ) { 971 if ( doc->name().isEmpty() ) {
972 unsigned ispace = pt.find( ' ' ); 972 unsigned ispace = pt.find( ' ' );
973 unsigned ienter = pt.find( '\n' ); 973 unsigned ienter = pt.find( '\n' );
974 int i = (ispace < ienter) ? ispace : ienter; 974 int i = (ispace < ienter) ? ispace : ienter;
975 QString docname; 975 QString docname;
976 if ( i == -1 ) { 976 if ( i == -1 ) {
977 if ( pt.isEmpty() ) 977 if ( pt.isEmpty() )
978 docname = "Empty Text"; 978 docname = "Empty Text";
979 else 979 else
980 docname = pt; 980 docname = pt;
981 } else { 981 } else {
982 docname = pt.left( i ); 982 docname = pt.left( i );
983 } 983 }
984 doc->setName(docname); 984 doc->setName(docname);
985 } 985 }
986 FileManager fm; 986 FileManager fm;
987 fm.saveFile( *doc, rt ); 987 fm.saveFile( *doc, rt );
@@ -993,9 +993,9 @@ void QTReaderApp::clear()
993 if (doc != 0) 993 if (doc != 0)
994 { 994 {
995// QMessageBox::information(this, "QTReader", "Deleting doc", 1); 995// QMessageBox::information(this, "QTReader", "Deleting doc", 1);
996 delete doc; 996 delete doc;
997// QMessageBox::information(this, "QTReader", "Deleted doc", 1); 997// QMessageBox::information(this, "QTReader", "Deleted doc", 1);
998 doc = 0; 998 doc = 0;
999 } 999 }
1000 reader->clear(); 1000 reader->clear();
1001} 1001}
@@ -1003,12 +1003,12 @@ void QTReaderApp::clear()
1003void QTReaderApp::updateCaption() 1003void QTReaderApp::updateCaption()
1004{ 1004{
1005 if ( !doc ) 1005 if ( !doc )
1006 setCaption( tr("QTReader") ); 1006 setCaption( tr("Opie Reader") );
1007 else { 1007 else {
1008 QString s = doc->name(); 1008 QString s = doc->name();
1009 if ( s.isEmpty() ) 1009 if ( s.isEmpty() )
1010 s = tr( "Unnamed" ); 1010 s = tr( "Unnamed" );
1011 setCaption( s + " - " + tr("QTReader") ); 1011 setCaption( s + " - " + tr("Opie Reader") );
1012 } 1012 }
1013} 1013}
1014 1014
@@ -1025,37 +1025,37 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
1025 if (editorStack->visibleWidget() == reader) 1025 if (editorStack->visibleWidget() == reader)
1026 { 1026 {
1027 if (m_fontVisible) 1027 if (m_fontVisible)
1028 { 1028 {
1029 m_fontBar->hide(); 1029 m_fontBar->hide();
1030 m_fontVisible = false; 1030 m_fontVisible = false;
1031 } 1031 }
1032 if (regVisible) 1032 if (regVisible)
1033 { 1033 {
1034 regBar->hide(); 1034 regBar->hide();
1035 regVisible = false; 1035 regVisible = false;
1036 return; 1036 return;
1037 } 1037 }
1038 if (searchVisible) 1038 if (searchVisible)
1039 { 1039 {
1040 searchBar->hide(); 1040 searchBar->hide();
1041 searchVisible = false; 1041 searchVisible = false;
1042 return; 1042 return;
1043 } 1043 }
1044 if (m_fBkmksChanged && pBkmklist != NULL) 1044 if (m_fBkmksChanged && pBkmklist != NULL)
1045 { 1045 {
1046 if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0) 1046 if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
1047 savebkmks(); 1047 savebkmks();
1048 delete pBkmklist; 1048 delete pBkmklist;
1049 pBkmklist = NULL; 1049 pBkmklist = NULL;
1050 m_fBkmksChanged = false; 1050 m_fBkmksChanged = false;
1051 } 1051 }
1052 bFromDocView = FALSE; 1052 bFromDocView = FALSE;
1053 saveprefs(); 1053 saveprefs();
1054 e->accept(); 1054 e->accept();
1055 } 1055 }
1056 else 1056 else
1057 { 1057 {
1058 showEditTools(); 1058 showEditTools();
1059 } 1059 }
1060} 1060}
1061 1061
@@ -1077,16 +1077,16 @@ void QTReaderApp::listbkmk()
1077 int cnt = 0; 1077 int cnt = 0;
1078 if (pBkmklist != NULL) 1078 if (pBkmklist != NULL)
1079 { 1079 {
1080 if (m_fBkmksChanged) pBkmklist->sort(); 1080 if (m_fBkmksChanged) pBkmklist->sort();
1081 for (CList<Bkmk>::iterator i = pBkmklist->begin(); i != pBkmklist->end(); i++) 1081 for (CList<Bkmk>::iterator i = pBkmklist->begin(); i != pBkmklist->end(); i++)
1082 { 1082 {
1083#ifdef _UNICODE 1083#ifdef _UNICODE
1084 bkmkselector->insertItem(toQString(i->name())); 1084 bkmkselector->insertItem(toQString(i->name()));
1085#else 1085#else
1086 bkmkselector->insertItem(i->name()); 1086 bkmkselector->insertItem(i->name());
1087#endif 1087#endif
1088 cnt++; 1088 cnt++;
1089 } 1089 }
1090 } 1090 }
1091 if (cnt > 0) 1091 if (cnt > 0)
1092 { 1092 {
@@ -1120,17 +1120,17 @@ void QTReaderApp::gotobkmk(int ind)
1120{ 1120{
1121 switch (m_nRegAction) 1121 switch (m_nRegAction)
1122 { 1122 {
1123 case cGotoBkmk: 1123 case cGotoBkmk:
1124 reader->locate((*pBkmklist)[ind]->value()); 1124 reader->locate((*pBkmklist)[ind]->value());
1125 break; 1125 break;
1126 case cDelBkmk: 1126 case cDelBkmk:
1127 // qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name()); 1127// qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
1128 pBkmklist->erase(ind); 1128 pBkmklist->erase(ind);
1129 m_fBkmksChanged = true; 1129 m_fBkmksChanged = true;
1130 break; 1130 break;
1131 case cRmBkmkFile: 1131 case cRmBkmkFile:
1132 unlink((const char *)Global::applicationFileName("uqtreader",bkmkselector->text(ind))); 1132 unlink((const char *)Global::applicationFileName("uqtreader",bkmkselector->text(ind)));
1133 break; 1133 break;
1134 } 1134 }
1135 showEditTools(); 1135 showEditTools();
1136} 1136}
@@ -1154,9 +1154,9 @@ void QTReaderApp::do_jump(const QString& lcn)
1154 bool ok; 1154 bool ok;
1155 unsigned long ulcn = lcn.toULong(&ok); 1155 unsigned long ulcn = lcn.toULong(&ok);
1156 if (ok) 1156 if (ok)
1157 reader->locate(ulcn); 1157 reader->locate(ulcn);
1158 else 1158 else
1159 QMessageBox::information(this, "QTReader", "Must be a number"); 1159 QMessageBox::information(this, "QTReader", "Must be a number");
1160} 1160}
1161 1161
1162void QTReaderApp::do_regaction() 1162void QTReaderApp::do_regaction()
@@ -1166,23 +1166,23 @@ void QTReaderApp::do_regaction()
1166 switch(m_nRegAction) 1166 switch(m_nRegAction)
1167 { 1167 {
1168 case cAutoGen: 1168 case cAutoGen:
1169 do_autogen(regEdit->text()); 1169 do_autogen(regEdit->text());
1170 break; 1170 break;
1171 case cAddBkmk: 1171 case cAddBkmk:
1172 do_addbkmk(regEdit->text()); 1172 do_addbkmk(regEdit->text());
1173 break; 1173 break;
1174 case cJump: 1174 case cJump:
1175 do_jump(regEdit->text()); 1175 do_jump(regEdit->text());
1176 break; 1176 break;
1177 case cMonoSpace: 1177 case cMonoSpace:
1178 do_mono(regEdit->text()); 1178 do_mono(regEdit->text());
1179 break; 1179 break;
1180 case cOverlap: 1180 case cOverlap:
1181 do_overlap(regEdit->text()); 1181 do_overlap(regEdit->text());
1182 break; 1182 break;
1183 case cSetTarget: 1183 case cSetTarget:
1184 do_settarget(regEdit->text()); 1184 do_settarget(regEdit->text());
1185 break; 1185 break;
1186 } 1186 }
1187 reader->restore(); 1187 reader->restore();
1188// editBar->show(); 1188// editBar->show();
@@ -1194,14 +1194,14 @@ void QTReaderApp::do_settarget(const QString& _txt)
1194 int ind = _txt.find('/'); 1194 int ind = _txt.find('/');
1195 if (ind == -1) 1195 if (ind == -1)
1196 { 1196 {
1197 reader->m_targetapp = ""; 1197 reader->m_targetapp = "";
1198 reader->m_targetmsg = ""; 1198 reader->m_targetmsg = "";
1199 QMessageBox::information(this, "QTReader", "Format is\nappname/messagename"); 1199 QMessageBox::information(this, "QTReader", "Format is\nappname/messagename");
1200 } 1200 }
1201 else 1201 else
1202 { 1202 {
1203 reader->m_targetapp = _txt.left(ind); 1203 reader->m_targetapp = _txt.left(ind);
1204 reader->m_targetmsg = _txt.right(_txt.length()-ind-1); 1204 reader->m_targetmsg = _txt.right(_txt.length()-ind-1);
1205 } 1205 }
1206} 1206}
1207 1207
@@ -1209,11 +1209,11 @@ void QTReaderApp::setfont()
1209{ 1209{
1210 for (int i = 1; i <= m_fontSelector->count(); i++) 1210 for (int i = 1; i <= m_fontSelector->count(); i++)
1211 { 1211 {
1212 if (m_fontSelector->text(i) == reader->m_fontname) 1212 if (m_fontSelector->text(i) == reader->m_fontname)
1213 { 1213 {
1214 m_fontSelector->setCurrentItem(i); 1214 m_fontSelector->setCurrentItem(i);
1215 break; 1215 break;
1216 } 1216 }
1217 } 1217 }
1218 m_fontBar->show(); 1218 m_fontBar->show();
1219 m_fontVisible = true; 1219 m_fontVisible = true;
@@ -1259,9 +1259,9 @@ pbar->resize(width(), editBar->height());
1259 if (pc != lastpc) 1259 if (pc != lastpc)
1260 { 1260 {
1261 pbar->setProgress(pc); 1261 pbar->setProgress(pc);
1262 qApp->processEvents(); 1262 qApp->processEvents();
1263 if (reader->locate() != lcn) reader->jumpto(lcn); 1263 if (reader->locate() != lcn) reader->jumpto(lcn);
1264 reader->setFocus(); 1264 reader->setFocus();
1265 lastpc = pc; 1265 lastpc = pc;
1266 } 1266 }
1267 i = reader->buffdoc.getpara(buff); 1267 i = reader->buffdoc.getpara(buff);
@@ -1270,7 +1270,7 @@ pbar->resize(width(), editBar->height());
1270#else 1270#else
1271 if (re.match(buff.data()) != -1) 1271 if (re.match(buff.data()) != -1)
1272#endif 1272#endif
1273 pBkmklist->push_back(Bkmk(buff.data(),lcn)); 1273 pBkmklist->push_back(Bkmk(buff.data(),lcn));
1274 } 1274 }
1275 pbar->setProgress(100); 1275 pbar->setProgress(100);
1276 qApp->processEvents(); 1276 qApp->processEvents();
@@ -1334,40 +1334,40 @@ void info_cb(Fl_Widget* o, void* _data)
1334 1334
1335 if (infowin == NULL) 1335 if (infowin == NULL)
1336 { 1336 {
1337 1337
1338 infowin = new Fl_Window(160,240); 1338 infowin = new Fl_Window(160,240);
1339 filename = new Fl_Output(45,5,110,14,"Filename"); 1339 filename = new Fl_Output(45,5,110,14,"Filename");
1340 filesize = new Fl_Output(45,25,110,14,"Filesize"); 1340 filesize = new Fl_Output(45,25,110,14,"Filesize");
1341 textsize = new Fl_Output(45,45,110,14,"Textsize"); 1341 textsize = new Fl_Output(45,45,110,14,"Textsize");
1342 comprat = new CBar(45,65,110,14,"Ratio %"); 1342 comprat = new CBar(45,65,110,14,"Ratio %");
1343 posn = new Fl_Output(45,85,110,14,"Location"); 1343 posn = new Fl_Output(45,85,110,14,"Location");
1344 frcn = new CBar(45,105,110,14,"% Read"); 1344 frcn = new CBar(45,105,110,14,"% Read");
1345 about = new Fl_Multiline_Output(5,125,150,90); 1345 about = new Fl_Multiline_Output(5,125,150,90);
1346 about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files"); 1346 about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");
1347 Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay"); 1347 Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");
1348 infowin->set_modal(); 1348 infowin->set_modal();
1349 } 1349 }
1350 if (((reader_ui *)_data)->g_filename[0] != '\0') 1350 if (((reader_ui *)_data)->g_filename[0] != '\0')
1351 { 1351 {
1352 unsigned long fs,ts; 1352 unsigned long fs,ts;
1353 tchar sz[20]; 1353 tchar sz[20];
1354 ((reader_ui *)_data)->input->sizes(fs,ts); 1354 ((reader_ui *)_data)->input->sizes(fs,ts);
1355 unsigned long pl = ((reader_ui *)_data)->input->locate(); 1355 unsigned long pl = ((reader_ui *)_data)->input->locate();
1356 1356
1357 filename->value(((reader_ui *)_data)->g_filename); 1357 filename->value(((reader_ui *)_data)->g_filename);
1358 1358
1359 sprintf(sz,"%u",fs); 1359 sprintf(sz,"%u",fs);
1360 filesize->value(sz); 1360 filesize->value(sz);
1361 1361
1362 sprintf(sz,"%u",ts); 1362 sprintf(sz,"%u",ts);
1363 textsize->value(sz); 1363 textsize->value(sz);
1364 1364
1365 comprat->value(100-(100*fs + (ts >> 1))/ts); 1365 comprat->value(100-(100*fs + (ts >> 1))/ts);
1366 1366
1367 sprintf(sz,"%u",pl); 1367 sprintf(sz,"%u",pl);
1368 posn->value(sz); 1368 posn->value(sz);
1369 1369
1370 frcn->value((100*pl + (ts >> 1))/ts); 1370 frcn->value((100*pl + (ts >> 1))/ts);
1371 } 1371 }
1372 infowin->show(); 1372 infowin->show();
1373} 1373}
@@ -1377,27 +1377,27 @@ void QTReaderApp::savebkmks()
1377{ 1377{
1378 if (pBkmklist != NULL) 1378 if (pBkmklist != NULL)
1379 { 1379 {
1380 BkmkFile bf((const char *)Global::applicationFileName("uqtreader",reader->m_string), true); 1380 BkmkFile bf((const char *)Global::applicationFileName("uqtreader",reader->m_string), true);
1381 bf.write(*pBkmklist); 1381 bf.write(*pBkmklist);
1382 } 1382 }
1383 m_fBkmksChanged = false; 1383 m_fBkmksChanged = false;
1384} 1384}
1385 1385
1386void QTReaderApp::readbkmks() 1386void QTReaderApp::readbkmks()
1387{ 1387{
1388 if (pBkmklist != NULL) 1388 if (pBkmklist != NULL)
1389 { 1389 {
1390 delete pBkmklist; 1390 delete pBkmklist;
1391 } 1391 }
1392 BkmkFile bf((const char *)Global::applicationFileName("uqtreader",reader->m_string)); 1392 BkmkFile bf((const char *)Global::applicationFileName("uqtreader",reader->m_string));
1393 pBkmklist = bf.readall(); 1393 pBkmklist = bf.readall();
1394 m_fBkmksChanged = false; 1394 m_fBkmksChanged = false;
1395 if (pBkmklist == NULL) 1395 if (pBkmklist == NULL)
1396 { 1396 {
1397 pBkmklist = reader->getbkmklist(); 1397 pBkmklist = reader->getbkmklist();
1398 } 1398 }
1399 if (pBkmklist != NULL) 1399 if (pBkmklist != NULL)
1400 pBkmklist->sort(); 1400 pBkmklist->sort();
1401} 1401}
1402 1402
1403void QTReaderApp::addbkmk() 1403void QTReaderApp::addbkmk()
@@ -1409,25 +1409,25 @@ void QTReaderApp::addbkmk()
1409 1409
1410void QTReaderApp::do_addbkmk(const QString& text) 1410void QTReaderApp::do_addbkmk(const QString& text)
1411{ 1411{
1412 if (text.isEmpty()) 1412 if (text.isEmpty())
1413 { 1413 {
1414 QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nSelect add again", 1); 1414 QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nSelect add again", 1);
1415 } 1415 }
1416 else 1416 else
1417 { 1417 {
1418 if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>; 1418 if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;
1419#ifdef _UNICODE 1419#ifdef _UNICODE
1420 CBuffer buff; 1420 CBuffer buff;
1421 int i = 0; 1421 int i = 0;
1422 for (i = 0; i < text.length(); i++) 1422 for (i = 0; i < text.length(); i++)
1423 { 1423 {
1424 buff[i] = text[i].unicode(); 1424 buff[i] = text[i].unicode();
1425 } 1425 }
1426 buff[i] = 0; 1426 buff[i] = 0;
1427 pBkmklist->push_front(Bkmk(buff.data(), reader->pagelocate())); 1427 pBkmklist->push_front(Bkmk(buff.data(), reader->pagelocate()));
1428#else 1428#else
1429 pBkmklist->push_front(Bkmk((const tchar*)text,reader->pagelocate())); 1429 pBkmklist->push_front(Bkmk((const tchar*)text,reader->pagelocate()));
1430#endif 1430#endif
1431 m_fBkmksChanged = true; 1431 m_fBkmksChanged = true;
1432 } 1432 }
1433} 1433}