author | drw <drw> | 2004-05-27 14:35:16 (UTC) |
---|---|---|
committer | drw <drw> | 2004-05-27 14:35:16 (UTC) |
commit | 26d09a968a56e0d779e12e0f281c1a0f2b8b541f (patch) (unidiff) | |
tree | 1452bf6217d85da369e1e7bdfb0d0aeedd47129c | |
parent | d643ab62b5d08afba2e5d0c1440cf21666e75286 (diff) | |
download | opie-26d09a968a56e0d779e12e0f281c1a0f2b8b541f.zip opie-26d09a968a56e0d779e12e0f281c1a0f2b8b541f.tar.gz opie-26d09a968a56e0d779e12e0f281c1a0f2b8b541f.tar.bz2 |
Added QWhatsThis help text
-rw-r--r-- | noncore/apps/dagger/configuredlg.cpp | 17 | ||||
-rw-r--r-- | noncore/apps/dagger/navbar.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/dagger/searchbar.cpp | 6 |
3 files changed, 28 insertions, 3 deletions
diff --git a/noncore/apps/dagger/configuredlg.cpp b/noncore/apps/dagger/configuredlg.cpp index e4dd60f..0a9317c 100644 --- a/noncore/apps/dagger/configuredlg.cpp +++ b/noncore/apps/dagger/configuredlg.cpp | |||
@@ -17,13 +17,14 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
17 | 17 | ||
18 | #include "configuredlg.h" | 18 | #include "configuredlg.h" |
19 | 19 | ||
20 | #include <qvbuttongroup.h> | ||
21 | #include <qlabel.h> | 20 | #include <qlabel.h> |
22 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | #include <qvbuttongroup.h> | ||
23 | #include <qwhatsthis.h> | ||
23 | 24 | ||
24 | ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwaysOpenNew, int numVerses, | 25 | ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwaysOpenNew, int numVerses, |
25 | bool disableBlanking, int copyFormat, const QFont *font ) | 26 | bool disableBlanking, int copyFormat, const QFont *font ) |
26 | : QDialog( parent, QString::null, true ) | 27 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) |
27 | , m_tabs( this ) | 28 | , m_tabs( this ) |
28 | { | 29 | { |
29 | setCaption( tr( "Configure Dagger" ) ); | 30 | setCaption( tr( "Configure Dagger" ) ); |
@@ -38,40 +39,48 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa | |||
38 | grid->setRowStretch( 9, 5 ); | 39 | grid->setRowStretch( 9, 5 ); |
39 | grid->setColStretch( 0, 2 ); | 40 | grid->setColStretch( 0, 2 ); |
40 | 41 | ||
41 | QLabel *label = new QLabel( tr( "Path where Sword modules are located:" ), widget ); | 42 | QLabel *label = new QLabel( tr( "Path where Sword texts are located:" ), widget ); |
42 | label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); | 43 | label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); |
44 | QWhatsThis::add( label, tr( "Enter the path where the Sword modules (Bible texts, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) ); | ||
43 | grid->addMultiCellWidget( label, 0, 0, 0, 1 ); | 45 | grid->addMultiCellWidget( label, 0, 0, 0, 1 ); |
44 | m_swordPath = new QLineEdit( swordPath, widget ); | 46 | m_swordPath = new QLineEdit( swordPath, widget ); |
47 | QWhatsThis::add( m_swordPath, tr( "Enter the path where the Sword texts (Bibles, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) ); | ||
45 | grid->addMultiCellWidget( m_swordPath, 1, 1, 0, 1 ); | 48 | grid->addMultiCellWidget( m_swordPath, 1, 1, 0, 1 ); |
46 | label = new QLabel( tr( "(Note: Dagger must be restarted for this option to take affect.)" ), widget ); | 49 | label = new QLabel( tr( "(Note: Dagger must be restarted for this option to take affect.)" ), widget ); |
47 | label->setAlignment( Qt::AlignHCenter | Qt::AlignTop | Qt::WordBreak ); | 50 | label->setAlignment( Qt::AlignHCenter | Qt::AlignTop | Qt::WordBreak ); |
51 | QWhatsThis::add( label, tr( "Enter the path where the Sword modules (Bible texts, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) ); | ||
48 | grid->addMultiCellWidget( label, 2, 2, 0, 1 ); | 52 | grid->addMultiCellWidget( label, 2, 2, 0, 1 ); |
49 | 53 | ||
50 | grid->addRowSpacing( 3, 15 ); | 54 | grid->addRowSpacing( 3, 15 ); |
51 | 55 | ||
52 | m_alwaysOpenNew = new QCheckBox( tr( "Always open texts in new window?" ), widget ); | 56 | m_alwaysOpenNew = new QCheckBox( tr( "Always open texts in new window?" ), widget ); |
53 | m_alwaysOpenNew->setChecked( alwaysOpenNew ); | 57 | m_alwaysOpenNew->setChecked( alwaysOpenNew ); |
58 | QWhatsThis::add( m_alwaysOpenNew, tr( "Tap here to always open texts in a new window. If this option is not selected, only one copy of a Sword text will be opened." ) ); | ||
54 | grid->addMultiCellWidget( m_alwaysOpenNew, 4, 4, 0, 1 ); | 59 | grid->addMultiCellWidget( m_alwaysOpenNew, 4, 4, 0, 1 ); |
55 | 60 | ||
56 | grid->addRowSpacing( 5, 15 ); | 61 | grid->addRowSpacing( 5, 15 ); |
57 | 62 | ||
58 | label = new QLabel( tr( "Number of verses to display at a time:" ), widget ); | 63 | label = new QLabel( tr( "Number of verses to display at a time:" ), widget ); |
59 | label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); | 64 | label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); |
65 | QWhatsThis::add( label, tr( "Enter the number of verses to display at a time. This also affects how far the scroll to previous/next page buttons on the Navigation bar scroll." ) ); | ||
60 | grid->addWidget( label, 6, 0 ); | 66 | grid->addWidget( label, 6, 0 ); |
61 | m_numVerses = new QSpinBox( 1, 20, 1, widget ); | 67 | m_numVerses = new QSpinBox( 1, 20, 1, widget ); |
62 | m_numVerses->setValue( numVerses ); | 68 | m_numVerses->setValue( numVerses ); |
69 | QWhatsThis::add( m_numVerses, tr( "Enter the number of verses to display at a time. This also affects how far the scroll to previous/next page buttons on the Navigation bar scroll." ) ); | ||
63 | grid->addWidget( m_numVerses, 6, 1 ); | 70 | grid->addWidget( m_numVerses, 6, 1 ); |
64 | 71 | ||
65 | grid->addRowSpacing( 7, 15 ); | 72 | grid->addRowSpacing( 7, 15 ); |
66 | 73 | ||
67 | m_disableScreenBlank = new QCheckBox( tr( "Disable automatic screen power-down?" ), widget ); | 74 | m_disableScreenBlank = new QCheckBox( tr( "Disable automatic screen power-down?" ), widget ); |
68 | m_disableScreenBlank->setChecked( disableBlanking ); | 75 | m_disableScreenBlank->setChecked( disableBlanking ); |
76 | QWhatsThis::add( m_disableScreenBlank, tr( "Tap here to disable Opie's automatic power management feature which will dim and turn off the screen after a specified time. This will only be effective while Dagger is running." ) ); | ||
69 | grid->addMultiCellWidget( m_disableScreenBlank, 8, 8, 0, 1 ); | 77 | grid->addMultiCellWidget( m_disableScreenBlank, 8, 8, 0, 1 ); |
70 | 78 | ||
71 | m_tabs.addTab( widget, "SettingsIcon", tr( "General" ) ); | 79 | m_tabs.addTab( widget, "SettingsIcon", tr( "General" ) ); |
72 | 80 | ||
73 | // Copy tab | 81 | // Copy tab |
74 | widget = new QWidget( this ); | 82 | widget = new QWidget( this ); |
83 | QWhatsThis::add( widget, tr( "Select the format used when copying the current verse to the clipboard." ) ); | ||
75 | layout = new QVBoxLayout( widget ); | 84 | layout = new QVBoxLayout( widget ); |
76 | layout->setMargin( 4 ); | 85 | layout->setMargin( 4 ); |
77 | 86 | ||
@@ -115,6 +124,8 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa | |||
115 | m_font = new Opie::Ui::OFontSelector( true, this ); | 124 | m_font = new Opie::Ui::OFontSelector( true, this ); |
116 | if ( font ) | 125 | if ( font ) |
117 | m_font->setSelectedFont( *font ); | 126 | m_font->setSelectedFont( *font ); |
127 | QWhatsThis::add( m_font, tr( "Select the font, style and size used for displaying texts." ) ); | ||
128 | |||
118 | m_tabs.addTab( m_font, "font", tr( "Font" ) ); | 129 | m_tabs.addTab( m_font, "font", tr( "Font" ) ); |
119 | 130 | ||
120 | m_tabs.setCurrentTab( tr( "General" ) ); | 131 | m_tabs.setCurrentTab( tr( "General" ) ); |
diff --git a/noncore/apps/dagger/navbar.cpp b/noncore/apps/dagger/navbar.cpp index 212dc36..97761f7 100644 --- a/noncore/apps/dagger/navbar.cpp +++ b/noncore/apps/dagger/navbar.cpp | |||
@@ -22,6 +22,7 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
22 | 22 | ||
23 | #include <qaction.h> | 23 | #include <qaction.h> |
24 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
25 | #include <qwhatsthis.h> | ||
25 | 26 | ||
26 | NavBar::NavBar( QMainWindow *parent ) | 27 | NavBar::NavBar( QMainWindow *parent ) |
27 | : QToolBar( QString::null, parent, QMainWindow::Top, true ) | 28 | : QToolBar( QString::null, parent, QMainWindow::Top, true ) |
@@ -29,25 +30,30 @@ NavBar::NavBar( QMainWindow *parent ) | |||
29 | // Initialize UI | 30 | // Initialize UI |
30 | m_actionPrevPage = new QAction( tr( "Previous page" ), Resource::loadPixmap( "fastback" ), | 31 | m_actionPrevPage = new QAction( tr( "Previous page" ), Resource::loadPixmap( "fastback" ), |
31 | QString::null, 0, this, 0 ); | 32 | QString::null, 0, this, 0 ); |
33 | m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) ); | ||
32 | m_actionPrevPage->addTo( this ); | 34 | m_actionPrevPage->addTo( this ); |
33 | connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); | 35 | connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); |
34 | 36 | ||
35 | m_actionPrevVerse = new QAction( tr( "Previous verse" ), Resource::loadPixmap( "back" ), | 37 | m_actionPrevVerse = new QAction( tr( "Previous verse" ), Resource::loadPixmap( "back" ), |
36 | QString::null, 0, this, 0 ); | 38 | QString::null, 0, this, 0 ); |
39 | m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) ); | ||
37 | m_actionPrevVerse->addTo( this ); | 40 | m_actionPrevVerse->addTo( this ); |
38 | connect( m_actionPrevVerse, SIGNAL(activated()), this, SIGNAL(prevVerse()) ); | 41 | connect( m_actionPrevVerse, SIGNAL(activated()), this, SIGNAL(prevVerse()) ); |
39 | 42 | ||
40 | m_key = new QLineEdit( this ); | 43 | m_key = new QLineEdit( this ); |
41 | setStretchableWidget( m_key ); | 44 | setStretchableWidget( m_key ); |
45 | QWhatsThis::add( m_key, tr( "Enter location to display here." ) ); | ||
42 | connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) ); | 46 | connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) ); |
43 | 47 | ||
44 | m_actionNextVerse = new QAction( tr( "Next verse" ), Resource::loadPixmap( "forward" ), | 48 | m_actionNextVerse = new QAction( tr( "Next verse" ), Resource::loadPixmap( "forward" ), |
45 | QString::null, 0, this, 0 ); | 49 | QString::null, 0, this, 0 ); |
50 | m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) ); | ||
46 | m_actionNextVerse->addTo( this ); | 51 | m_actionNextVerse->addTo( this ); |
47 | connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); | 52 | connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); |
48 | 53 | ||
49 | m_actionNextPage = new QAction( tr( "Next page" ), Resource::loadPixmap( "fastforward" ), | 54 | m_actionNextPage = new QAction( tr( "Next page" ), Resource::loadPixmap( "fastforward" ), |
50 | QString::null, 0, this, 0 ); | 55 | QString::null, 0, this, 0 ); |
56 | m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) ); | ||
51 | m_actionNextPage->addTo( this ); | 57 | m_actionNextPage->addTo( this ); |
52 | connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) ); | 58 | connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) ); |
53 | 59 | ||
@@ -55,11 +61,13 @@ NavBar::NavBar( QMainWindow *parent ) | |||
55 | 61 | ||
56 | m_scrollRate = new QSpinBox( 1, 100, 1, this ); | 62 | m_scrollRate = new QSpinBox( 1, 100, 1, this ); |
57 | m_scrollRate->setMinimumWidth( 35 ); | 63 | m_scrollRate->setMinimumWidth( 35 ); |
64 | QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) ); | ||
58 | connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); | 65 | connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); |
59 | 66 | ||
60 | m_actionScroll = new QAction( tr( "Auto-scroll" ), Resource::loadPixmap( "dagger/autoscroll" ), | 67 | m_actionScroll = new QAction( tr( "Auto-scroll" ), Resource::loadPixmap( "dagger/autoscroll" ), |
61 | QString::null, 0, this, 0 ); | 68 | QString::null, 0, this, 0 ); |
62 | m_actionScroll->setToggleAction( true ); | 69 | m_actionScroll->setToggleAction( true ); |
70 | m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) ); | ||
63 | connect( m_actionScroll, SIGNAL(toggled(bool)), this, SIGNAL(autoScroll(bool)) ); | 71 | connect( m_actionScroll, SIGNAL(toggled(bool)), this, SIGNAL(autoScroll(bool)) ); |
64 | m_actionScroll->addTo( this ); | 72 | m_actionScroll->addTo( this ); |
65 | 73 | ||
diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp index ff434dd..9953e8f 100644 --- a/noncore/apps/dagger/searchbar.cpp +++ b/noncore/apps/dagger/searchbar.cpp | |||
@@ -26,6 +26,7 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
26 | #include <qaction.h> | 26 | #include <qaction.h> |
27 | #include <qcombobox.h> | 27 | #include <qcombobox.h> |
28 | #include <qlineedit.h> | 28 | #include <qlineedit.h> |
29 | #include <qwhatsthis.h> | ||
29 | 30 | ||
30 | #include <listkey.h> | 31 | #include <listkey.h> |
31 | #include <regex.h> | 32 | #include <regex.h> |
@@ -43,6 +44,7 @@ SearchBar::SearchBar( QMainWindow *parent ) | |||
43 | // Initialize UI | 44 | // Initialize UI |
44 | m_searchText = new QLineEdit( this ); | 45 | m_searchText = new QLineEdit( this ); |
45 | setStretchableWidget( m_searchText ); | 46 | setStretchableWidget( m_searchText ); |
47 | QWhatsThis::add( m_searchText, tr( "Enter text to search for here." ) ); | ||
46 | connect(m_searchText, SIGNAL(textChanged(const QString &)), | 48 | connect(m_searchText, SIGNAL(textChanged(const QString &)), |
47 | this, SLOT(slotTextChanged(const QString &)) ); | 49 | this, SLOT(slotTextChanged(const QString &)) ); |
48 | 50 | ||
@@ -50,6 +52,7 @@ SearchBar::SearchBar( QMainWindow *parent ) | |||
50 | 0, this, 0 ); | 52 | 0, this, 0 ); |
51 | m_actionFind->setEnabled( false ); | 53 | m_actionFind->setEnabled( false ); |
52 | m_actionFind->addTo( this ); | 54 | m_actionFind->addTo( this ); |
55 | m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) ); | ||
53 | connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) ); | 56 | connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) ); |
54 | 57 | ||
55 | addSeparator(); | 58 | addSeparator(); |
@@ -58,16 +61,19 @@ SearchBar::SearchBar( QMainWindow *parent ) | |||
58 | QString::null, 0, this, 0 ); | 61 | QString::null, 0, this, 0 ); |
59 | m_actionPrev->setEnabled( false ); | 62 | m_actionPrev->setEnabled( false ); |
60 | m_actionPrev->addTo( this ); | 63 | m_actionPrev->addTo( this ); |
64 | m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) ); | ||
61 | connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) ); | 65 | connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) ); |
62 | 66 | ||
63 | m_resultList = new QComboBox( this ); | 67 | m_resultList = new QComboBox( this ); |
64 | m_resultList->setEnabled( false ); | 68 | m_resultList->setEnabled( false ); |
69 | QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) ); | ||
65 | connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) ); | 70 | connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) ); |
66 | 71 | ||
67 | m_actionNext = new QAction( tr( "Next result" ), Resource::loadPixmap( "forward" ), | 72 | m_actionNext = new QAction( tr( "Next result" ), Resource::loadPixmap( "forward" ), |
68 | QString::null, 0, this, 0 ); | 73 | QString::null, 0, this, 0 ); |
69 | m_actionNext->setEnabled( false ); | 74 | m_actionNext->setEnabled( false ); |
70 | m_actionNext->addTo( this ); | 75 | m_actionNext->addTo( this ); |
76 | m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) ); | ||
71 | connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) ); | 77 | connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) ); |
72 | 78 | ||
73 | if ( parent ) | 79 | if ( parent ) |