Merge from BRANCH_1_0

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
@@ -28,13 +28,13 @@
 #endif
 
 CLayoutPrefs::CLayoutPrefs( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     QHBoxLayout* hb = new QHBoxLayout(this);
-    QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, "Text", this);
+    QButtonGroup* bg = new QButtonGroup(2, Qt::Horizontal, tr("Text"), this);
     hb->addWidget(bg);
 
     StripCR = new QCheckBox( bg );
     StripCR->setText( tr( "Strip CR" ) );
 
     Dehyphen = new QCheckBox( bg );
@@ -362,25 +362,25 @@ CMiscPrefs::CMiscPrefs( QWidget* parent,  const char* name, WFlags fl )
 {
 
     QGridLayout* hl = new QGridLayout(this,1,2);
 
     hl->setMargin( 0 );
 
-    QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, "Select Action", this);
+    QGroupBox* gb = new QGroupBox(1, Qt::Horizontal, tr("Select Action"), this);
     hl->addWidget( gb, 0, 0 );
 
     annotation = new QCheckBox( gb );
     annotation->setText( tr( "Annotation" ) );
 
     dictionary = new QCheckBox( gb );
     dictionary->setText( tr( "Dictionary" ) );
 
     clipboard = new QCheckBox( gb );
     clipboard->setText( tr( "Clipboard" ) );
 
-    QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, "Plucker", this);
+    QButtonGroup* bg = new QButtonGroup(1, Qt::Horizontal, tr("Plucker"), this);
     hl->addWidget( bg, 0 , 1 );
 
     Depluck = new QCheckBox( bg );
     Depluck->setText( tr( "Depluck" ) );
 
     Dejpluck = new QCheckBox( bg );
@@ -481,13 +481,13 @@ CInterPrefs::CInterPrefs( QWidget* parent,  const char* name, WFlags fl )
     {
 	encoding->insertItem(iter->mime);
     }
 
     QVBoxLayout* vb = new QVBoxLayout;
 
-    gb = new QGroupBox(1, Qt::Horizontal, "Dictionary", this);
+    gb = new QGroupBox(1, Qt::Horizontal, tr("Dictionary"), this);
 
     TextLabel = new QLabel( gb );
     TextLabel->setText( tr( "Application" ) );
     application = new QLineEdit(gb);
     application->setFixedWidth(80);
 
@@ -497,13 +497,13 @@ CInterPrefs::CInterPrefs( QWidget* parent,  const char* name, WFlags fl )
     message->setFixedWidth(80);
 //    message->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     twotouch = new QCheckBox( gb );
     twotouch->setText( tr( "Two/One\nTouch" ) );
 
     SwapMouse = new QCheckBox( gb );
-    SwapMouse->setText("Swap Tap\nActions");
+    SwapMouse->setText(tr("Swap Tap\nActions") );
 
 
     vb->addWidget(gb);
 
 //    vb->addStretch();
     hb->addLayout(vb);
@@ -520,107 +520,107 @@ CInterPrefs::~CInterPrefs()
 void CButtonPrefs::populate(QComboBox *mb)
 #else
 void CButtonPrefs::populate(MenuButton *mb)
 #endif
 {
     mb->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-    mb->insertItem("<Nothing>");
-    mb->insertItem("Open file");
-    mb->insertItem("Autoscroll");
-    mb->insertItem("Bookmark");
-    mb->insertItem("Annotate");
-    mb->insertItem("Fullscreen");
-
-    mb->insertItem("Zoom in");
-    mb->insertItem("Zoom out");
-    mb->insertItem("Back");
-    mb->insertItem("Forward");
-    mb->insertItem("Home");
-    mb->insertItem("Page up");
-    mb->insertItem("Page down");
-    mb->insertItem("Line up");
-    mb->insertItem("Line down");
-    mb->insertItem("Beginning");
-    mb->insertItem("End");
+    mb->insertItem(tr("<Nothing>") );
+    mb->insertItem(tr("Open file") );
+    mb->insertItem(tr("Autoscroll") );
+    mb->insertItem(tr("Bookmark") );
+    mb->insertItem(tr("Annotate") );
+    mb->insertItem(tr("Fullscreen") );
+
+    mb->insertItem(tr("Zoom in") );
+    mb->insertItem(tr("Zoom out") );
+    mb->insertItem(tr("Back") );
+    mb->insertItem(tr("Forward") );
+    mb->insertItem(tr("Home") );
+    mb->insertItem(tr("Page up") );
+    mb->insertItem(tr("Page down") );
+    mb->insertItem(tr("Line up") );
+    mb->insertItem(tr("Line down") );
+    mb->insertItem(tr("Beginning") );
+    mb->insertItem(tr("End") );
 }
 
 CButtonPrefs::CButtonPrefs( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
 
     QGridLayout* hl = new QGridLayout(this,10,2);
 
     hl->setMargin( 0 );
 
-    QLabel* ql = new QLabel("Escape Button", this);
+    QLabel* ql = new QLabel(tr("Escape Button"), this);
     hl->addWidget(ql, 0, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     escapeAction = new QComboBox( this );
 #else
     escapeAction = new MenuButton( this );
 #endif
     populate(escapeAction);
     hl->addWidget(escapeAction, 1, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Space Button", this);
+    ql = new QLabel(tr("Space Button"), this);
     hl->addWidget(ql, 2, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     spaceAction = new QComboBox( this );
 #else
     spaceAction = new MenuButton( this );
 #endif
     populate(spaceAction);
     hl->addWidget(spaceAction, 3, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Return Button", this);
+    ql = new QLabel(tr("Return Button"), this);
     hl->addWidget(ql, 2, 1, Qt::AlignBottom);
 #ifdef USECOMBO
     returnAction = new QComboBox( this );
 #else
     returnAction = new MenuButton( this );
 #endif
     populate(returnAction);
     hl->addWidget(returnAction, 3, 1, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Left Arrow", this);
+    ql = new QLabel(tr("Left Arrow"), this);
     hl->addWidget(ql, 4, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     leftAction = new QComboBox( this );
 #else
     leftAction = new MenuButton( this );
 #endif
     populate(leftAction);
     hl->addWidget(leftAction, 5, 0, Qt::AlignTop | Qt::AlignLeft);
     leftScroll = new QCheckBox( tr("Scroll Speed"), this );
     hl->addWidget(leftScroll, 6, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Right Arrow", this);
+    ql = new QLabel(tr("Right Arrow"), this);
     hl->addWidget(ql, 4, 1, Qt::AlignBottom);
 #ifdef USECOMBO
     rightAction = new QComboBox( this );
 #else
     rightAction = new MenuButton( this );
 #endif
     populate(rightAction);
     hl->addWidget(rightAction, 5, 1, Qt::AlignTop | Qt::AlignLeft);
     rightScroll = new QCheckBox( tr("Scroll Speed"), this );
     hl->addWidget(rightScroll, 6, 1, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Down Arrow", this);
+    ql = new QLabel(tr("Down Arrow"), this);
     hl->addWidget(ql, 7, 0, Qt::AlignBottom);
 #ifdef USECOMBO
     downAction = new QComboBox( this );
 #else
     downAction = new MenuButton( this );
 #endif
     populate(downAction);
     hl->addWidget(downAction, 8, 0, Qt::AlignTop | Qt::AlignLeft);
     downScroll = new QCheckBox( tr("Scroll Speed"), this );
     hl->addWidget(downScroll, 9, 0, Qt::AlignTop | Qt::AlignLeft);
 
-    ql = new QLabel("Up Arrow", this);
+    ql = new QLabel(tr("Up Arrow"), this);
     hl->addWidget(ql, 7, 1, Qt::AlignBottom);
 #ifdef USECOMBO
     upAction = new QComboBox( this );
 #else
     upAction = new MenuButton( this );
 #endif
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
@@ -32,13 +32,13 @@ class QGridLayout;
 //class QCheckBox;
 class QLabel;
 //class QSpinBox;
 
 class CLayoutPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CLayoutPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CLayoutPrefs();
@@ -53,13 +53,13 @@ public:
     QCheckBox* Embolden;
     QCheckBox* FullJustify;
 };
 
 class CLayoutPrefs2 : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CLayoutPrefs2( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CLayoutPrefs2();
@@ -96,13 +96,13 @@ protected:
     QGridLayout* Layout4;
 
 };
 */
 class CMiscPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CMiscPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CMiscPrefs();
@@ -110,12 +110,13 @@ public:
     QCheckBox *annotation, *dictionary, *clipboard;
     QCheckBox *Depluck, *Dejpluck, *Continuous;
 };
 
 class CButtonPrefs : public QWidget
 { 
+    Q_OBJECT
 #ifdef USECOMBO
     void populate(QComboBox*);
 #else
     void populate(MenuButton*);
 #endif
 public:
@@ -132,13 +133,13 @@ public:
 #endif
     QCheckBox *leftScroll, *rightScroll, *upScroll, *downScroll;
 };
 
 class CInterPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     friend class CPrefs;
 
     CInterPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CInterPrefs();
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
@@ -2598,13 +2598,13 @@ void QTReaderApp::updateCaption()
 //    if ( !doc )
 //	setCaption( tr("QTReader") );
 //    else {
 //	QString s = doc->name();
 //	if ( s.isEmpty() )
 //	    s = tr( "Unnamed" );
-	setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) );
+	setCaption( reader->m_string + " - " + tr("Reader") );
 //    }
 }
 
 void QTReaderApp::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
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
@@ -168,13 +168,13 @@ class CIndBarPrefs : public QWidget
     bool isChanged() { return m_isChanged; }
 
 };
 
 class CMiscBarPrefs : public QWidget
 { 
-
+    Q_OBJECT
 public:
 
     CMiscBarPrefs( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~CMiscBarPrefs();
 
 #ifdef USECOMBO
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
@@ -1,10 +1,10 @@
 Package: opie-reader
 Files: bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
 Section: applications
 Maintainer: Tim Wentford <timwentford@hotmail.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: E-Book reader
+Version: $QPE_VERSION$EXTRAVERSION