author | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
commit | 1c58d1407f9584fedcdae390a04e2b37e5853361 (patch) (unidiff) | |
tree | 3c6e741c4d382d1a53c182930052b684d6e35b91 /noncore/apps/opie-reader | |
parent | e3f4607edd0c1ca1434adb446df1d4a1d27c6a86 (diff) | |
download | opie-1c58d1407f9584fedcdae390a04e2b37e5853361.zip opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.gz opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.bz2 |
Merge from BRANCH_1_0
-rw-r--r-- | noncore/apps/opie-reader/Prefs.cpp | 60 | ||||
-rw-r--r-- | noncore/apps/opie-reader/Prefs.h | 9 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/ToolbarPrefs.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/opie-reader.control | 2 |
5 files changed, 38 insertions, 37 deletions
diff --git a/noncore/apps/opie-reader/Prefs.cpp b/noncore/apps/opie-reader/Prefs.cpp index 825608e..e5320d9 100644 --- a/noncore/apps/opie-reader/Prefs.cpp +++ b/noncore/apps/opie-reader/Prefs.cpp | |||
@@ -31,7 +31,7 @@ CLayoutPrefs::CLayoutPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
31 | : QWidget( parent, name, fl ) | 31 | : QWidget( parent, name, fl ) |
32 | { | 32 | { |
33 | QHBoxLayout* hb = new QHBoxLayout(this); | 33 | QHBoxLayout* hb = new QHBoxLayout(this); |
34 | QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, "Text", this); | 34 | QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, tr("Text"), this); |
35 | hb->addWidget(bg); | 35 | hb->addWidget(bg); |
36 | 36 | ||
37 | StripCR = new QCheckBox( bg ); | 37 | StripCR = new QCheckBox( bg ); |
@@ -365,7 +365,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
365 | 365 | ||
366 | hl->setMargin( 0 ); | 366 | hl->setMargin( 0 ); |
367 | 367 | ||
368 | QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, "Select Action", this); | 368 | QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, tr("Select Action"), this); |
369 | hl->addWidget( gb, 0, 0 ); | 369 | hl->addWidget( gb, 0, 0 ); |
370 | 370 | ||
371 | annotation = new QCheckBox( gb ); | 371 | annotation = new QCheckBox( gb ); |
@@ -377,7 +377,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
377 | clipboard = new QCheckBox( gb ); | 377 | clipboard = new QCheckBox( gb ); |
378 | clipboard->setText( tr( "Clipboard" ) ); | 378 | clipboard->setText( tr( "Clipboard" ) ); |
379 | 379 | ||
380 | QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, "Plucker", this); | 380 | QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, tr("Plucker"), this); |
381 | hl->addWidget( bg, 0 , 1 ); | 381 | hl->addWidget( bg, 0 , 1 ); |
382 | 382 | ||
383 | Depluck = new QCheckBox( bg ); | 383 | Depluck = new QCheckBox( bg ); |
@@ -484,7 +484,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
484 | 484 | ||
485 | QVBoxLayout* vb = new QVBoxLayout; | 485 | QVBoxLayout* vb = new QVBoxLayout; |
486 | 486 | ||
487 | gb = new QGroupBox(1, Qt::Horizontal, "Dictionary", this); | 487 | gb = new QGroupBox(1, Qt::Horizontal, tr("Dictionary"), this); |
488 | 488 | ||
489 | TextLabel = new QLabel( gb ); | 489 | TextLabel = new QLabel( gb ); |
490 | TextLabel->setText( tr( "Application" ) ); | 490 | TextLabel->setText( tr( "Application" ) ); |
@@ -500,7 +500,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
500 | twotouch->setText( tr( "Two/One\nTouch" ) ); | 500 | twotouch->setText( tr( "Two/One\nTouch" ) ); |
501 | 501 | ||
502 | SwapMouse = new QCheckBox( gb ); | 502 | SwapMouse = new QCheckBox( gb ); |
503 | SwapMouse->setText("Swap Tap\nActions"); | 503 | SwapMouse->setText(tr("Swap Tap\nActions") ); |
504 | 504 | ||
505 | 505 | ||
506 | vb->addWidget(gb); | 506 | vb->addWidget(gb); |
@@ -523,24 +523,24 @@ void CButtonPrefs::populate(MenuButton *mb) | |||
523 | #endif | 523 | #endif |
524 | { | 524 | { |
525 | mb->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); | 525 | mb->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); |
526 | mb->insertItem("<Nothing>"); | 526 | mb->insertItem(tr("<Nothing>") ); |
527 | mb->insertItem("Open file"); | 527 | mb->insertItem(tr("Open file") ); |
528 | mb->insertItem("Autoscroll"); | 528 | mb->insertItem(tr("Autoscroll") ); |
529 | mb->insertItem("Bookmark"); | 529 | mb->insertItem(tr("Bookmark") ); |
530 | mb->insertItem("Annotate"); | 530 | mb->insertItem(tr("Annotate") ); |
531 | mb->insertItem("Fullscreen"); | 531 | mb->insertItem(tr("Fullscreen") ); |
532 | 532 | ||
533 | mb->insertItem("Zoom in"); | 533 | mb->insertItem(tr("Zoom in") ); |
534 | mb->insertItem("Zoom out"); | 534 | mb->insertItem(tr("Zoom out") ); |
535 | mb->insertItem("Back"); | 535 | mb->insertItem(tr("Back") ); |
536 | mb->insertItem("Forward"); | 536 | mb->insertItem(tr("Forward") ); |
537 | mb->insertItem("Home"); | 537 | mb->insertItem(tr("Home") ); |
538 | mb->insertItem("Page up"); | 538 | mb->insertItem(tr("Page up") ); |
539 | mb->insertItem("Page down"); | 539 | mb->insertItem(tr("Page down") ); |
540 | mb->insertItem("Line up"); | 540 | mb->insertItem(tr("Line up") ); |
541 | mb->insertItem("Line down"); | 541 | mb->insertItem(tr("Line down") ); |
542 | mb->insertItem("Beginning"); | 542 | mb->insertItem(tr("Beginning") ); |
543 | mb->insertItem("End"); | 543 | mb->insertItem(tr("End") ); |
544 | } | 544 | } |
545 | 545 | ||
546 | CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | 546 | CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) |
@@ -551,7 +551,7 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
551 | 551 | ||
552 | hl->setMargin( 0 ); | 552 | hl->setMargin( 0 ); |
553 | 553 | ||
554 | QLabel* ql = new QLabel("Escape Button", this); | 554 | QLabel* ql = new QLabel(tr("Escape Button"), this); |
555 | hl->addWidget(ql, 0, 0, Qt::AlignBottom); | 555 | hl->addWidget(ql, 0, 0, Qt::AlignBottom); |
556 | #ifdef USECOMBO | 556 | #ifdef USECOMBO |
557 | escapeAction = new QComboBox( this ); | 557 | escapeAction = new QComboBox( this ); |
@@ -561,7 +561,7 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
561 | populate(escapeAction); | 561 | populate(escapeAction); |
562 | hl->addWidget(escapeAction, 1, 0, Qt::AlignTop | Qt::AlignLeft); | 562 | hl->addWidget(escapeAction, 1, 0, Qt::AlignTop | Qt::AlignLeft); |
563 | 563 | ||
564 | ql = new QLabel("Space Button", this); | 564 | ql = new QLabel(tr("Space Button"), this); |
565 | hl->addWidget(ql, 2, 0, Qt::AlignBottom); | 565 | hl->addWidget(ql, 2, 0, Qt::AlignBottom); |
566 | #ifdef USECOMBO | 566 | #ifdef USECOMBO |
567 | spaceAction = new QComboBox( this ); | 567 | spaceAction = new QComboBox( this ); |
@@ -571,7 +571,7 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
571 | populate(spaceAction); | 571 | populate(spaceAction); |
572 | hl->addWidget(spaceAction, 3, 0, Qt::AlignTop | Qt::AlignLeft); | 572 | hl->addWidget(spaceAction, 3, 0, Qt::AlignTop | Qt::AlignLeft); |
573 | 573 | ||
574 | ql = new QLabel("Return Button", this); | 574 | ql = new QLabel(tr("Return Button"), this); |
575 | hl->addWidget(ql, 2, 1, Qt::AlignBottom); | 575 | hl->addWidget(ql, 2, 1, Qt::AlignBottom); |
576 | #ifdef USECOMBO | 576 | #ifdef USECOMBO |
577 | returnAction = new QComboBox( this ); | 577 | returnAction = new QComboBox( this ); |
@@ -581,7 +581,7 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
581 | populate(returnAction); | 581 | populate(returnAction); |
582 | hl->addWidget(returnAction, 3, 1, Qt::AlignTop | Qt::AlignLeft); | 582 | hl->addWidget(returnAction, 3, 1, Qt::AlignTop | Qt::AlignLeft); |
583 | 583 | ||
584 | ql = new QLabel("Left Arrow", this); | 584 | ql = new QLabel(tr("Left Arrow"), this); |
585 | hl->addWidget(ql, 4, 0, Qt::AlignBottom); | 585 | hl->addWidget(ql, 4, 0, Qt::AlignBottom); |
586 | #ifdef USECOMBO | 586 | #ifdef USECOMBO |
587 | leftAction = new QComboBox( this ); | 587 | leftAction = new QComboBox( this ); |
@@ -593,7 +593,7 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
593 | leftScroll = new QCheckBox( tr("Scroll Speed"), this ); | 593 | leftScroll = new QCheckBox( tr("Scroll Speed"), this ); |
594 | hl->addWidget(leftScroll, 6, 0, Qt::AlignTop | Qt::AlignLeft); | 594 | hl->addWidget(leftScroll, 6, 0, Qt::AlignTop | Qt::AlignLeft); |
595 | 595 | ||
596 | ql = new QLabel("Right Arrow", this); | 596 | ql = new QLabel(tr("Right Arrow"), this); |
597 | hl->addWidget(ql, 4, 1, Qt::AlignBottom); | 597 | hl->addWidget(ql, 4, 1, Qt::AlignBottom); |
598 | #ifdef USECOMBO | 598 | #ifdef USECOMBO |
599 | rightAction = new QComboBox( this ); | 599 | rightAction = new QComboBox( this ); |
@@ -605,7 +605,7 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
605 | rightScroll = new QCheckBox( tr("Scroll Speed"), this ); | 605 | rightScroll = new QCheckBox( tr("Scroll Speed"), this ); |
606 | hl->addWidget(rightScroll, 6, 1, Qt::AlignTop | Qt::AlignLeft); | 606 | hl->addWidget(rightScroll, 6, 1, Qt::AlignTop | Qt::AlignLeft); |
607 | 607 | ||
608 | ql = new QLabel("Down Arrow", this); | 608 | ql = new QLabel(tr("Down Arrow"), this); |
609 | hl->addWidget(ql, 7, 0, Qt::AlignBottom); | 609 | hl->addWidget(ql, 7, 0, Qt::AlignBottom); |
610 | #ifdef USECOMBO | 610 | #ifdef USECOMBO |
611 | downAction = new QComboBox( this ); | 611 | downAction = new QComboBox( this ); |
@@ -617,7 +617,7 @@ CButtonPrefs::CButtonPrefs( QWidget* parent, const char* name, WFlags fl ) | |||
617 | downScroll = new QCheckBox( tr("Scroll Speed"), this ); | 617 | downScroll = new QCheckBox( tr("Scroll Speed"), this ); |
618 | hl->addWidget(downScroll, 9, 0, Qt::AlignTop | Qt::AlignLeft); | 618 | hl->addWidget(downScroll, 9, 0, Qt::AlignTop | Qt::AlignLeft); |
619 | 619 | ||
620 | ql = new QLabel("Up Arrow", this); | 620 | ql = new QLabel(tr("Up Arrow"), this); |
621 | hl->addWidget(ql, 7, 1, Qt::AlignBottom); | 621 | hl->addWidget(ql, 7, 1, Qt::AlignBottom); |
622 | #ifdef USECOMBO | 622 | #ifdef USECOMBO |
623 | upAction = new QComboBox( this ); | 623 | upAction = new QComboBox( this ); |
diff --git a/noncore/apps/opie-reader/Prefs.h b/noncore/apps/opie-reader/Prefs.h index 37d8c9e..8fef2f5 100644 --- a/noncore/apps/opie-reader/Prefs.h +++ b/noncore/apps/opie-reader/Prefs.h | |||
@@ -35,7 +35,7 @@ class QLabel; | |||
35 | 35 | ||
36 | class CLayoutPrefs : public QWidget | 36 | class CLayoutPrefs : public QWidget |
37 | { | 37 | { |
38 | 38 | Q_OBJECT | |
39 | public: | 39 | public: |
40 | 40 | ||
41 | friend class CPrefs; | 41 | friend class CPrefs; |
@@ -56,7 +56,7 @@ public: | |||
56 | 56 | ||
57 | class CLayoutPrefs2 : public QWidget | 57 | class CLayoutPrefs2 : public QWidget |
58 | { | 58 | { |
59 | 59 | Q_OBJECT | |
60 | public: | 60 | public: |
61 | 61 | ||
62 | friend class CPrefs; | 62 | friend class CPrefs; |
@@ -99,7 +99,7 @@ protected: | |||
99 | */ | 99 | */ |
100 | class CMiscPrefs : public QWidget | 100 | class CMiscPrefs : public QWidget |
101 | { | 101 | { |
102 | 102 | Q_OBJECT | |
103 | public: | 103 | public: |
104 | 104 | ||
105 | friend class CPrefs; | 105 | friend class CPrefs; |
@@ -113,6 +113,7 @@ public: | |||
113 | 113 | ||
114 | class CButtonPrefs : public QWidget | 114 | class CButtonPrefs : public QWidget |
115 | { | 115 | { |
116 | Q_OBJECT | ||
116 | #ifdef USECOMBO | 117 | #ifdef USECOMBO |
117 | void populate(QComboBox*); | 118 | void populate(QComboBox*); |
118 | #else | 119 | #else |
@@ -135,7 +136,7 @@ public: | |||
135 | 136 | ||
136 | class CInterPrefs : public QWidget | 137 | class CInterPrefs : public QWidget |
137 | { | 138 | { |
138 | 139 | Q_OBJECT | |
139 | public: | 140 | public: |
140 | 141 | ||
141 | friend class CPrefs; | 142 | friend class CPrefs; |
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index af1da27..087ce00 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -2601,7 +2601,7 @@ void QTReaderApp::updateCaption() | |||
2601 | //QString s = doc->name(); | 2601 | //QString s = doc->name(); |
2602 | //if ( s.isEmpty() ) | 2602 | //if ( s.isEmpty() ) |
2603 | // s = tr( "Unnamed" ); | 2603 | // s = tr( "Unnamed" ); |
2604 | setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) ); | 2604 | setCaption( reader->m_string + " - " + tr("Reader") ); |
2605 | // } | 2605 | // } |
2606 | } | 2606 | } |
2607 | 2607 | ||
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.h b/noncore/apps/opie-reader/ToolbarPrefs.h index 297d63a..9571c28 100644 --- a/noncore/apps/opie-reader/ToolbarPrefs.h +++ b/noncore/apps/opie-reader/ToolbarPrefs.h | |||
@@ -171,7 +171,7 @@ class CIndBarPrefs : public QWidget | |||
171 | 171 | ||
172 | class CMiscBarPrefs : public QWidget | 172 | class CMiscBarPrefs : public QWidget |
173 | { | 173 | { |
174 | 174 | Q_OBJECT | |
175 | public: | 175 | public: |
176 | 176 | ||
177 | CMiscBarPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 177 | CMiscBarPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control index 9996297..b7b0e8f 100644 --- a/noncore/apps/opie-reader/opie-reader.control +++ b/noncore/apps/opie-reader/opie-reader.control | |||
@@ -4,7 +4,7 @@ Priority: optional | |||
4 | Section: applications | 4 | Section: applications |
5 | Maintainer: Tim Wentford <timwentford@hotmail.com> | 5 | Maintainer: Tim Wentford <timwentford@hotmail.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | License: GPL | 8 | License: GPL |
10 | Description: E-Book reader | 9 | Description: E-Book reader |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||