| -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 @@ -14,19 +14,20 @@ You should have received a copy of the GNU General Public License along with thi file; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "configuredlg.h" -#include <qvbuttongroup.h> #include <qlabel.h> #include <qlayout.h> +#include <qvbuttongroup.h> +#include <qwhatsthis.h> ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwaysOpenNew, int numVerses, bool disableBlanking, int copyFormat, const QFont *font ) - : QDialog( parent, QString::null, true ) + : QDialog( parent, QString::null, true, WStyle_ContextHelp ) , m_tabs( this ) { setCaption( tr( "Configure Dagger" ) ); QVBoxLayout *layout = new QVBoxLayout( this ); layout->setMargin( 4 ); @@ -35,46 +36,54 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa // General tab QWidget *widget = new QWidget( this ); QGridLayout *grid = new QGridLayout( widget, 1, 2, 4, 2 ); grid->setRowStretch( 9, 5 ); grid->setColStretch( 0, 2 ); - QLabel *label = new QLabel( tr( "Path where Sword modules are located:" ), widget ); + QLabel *label = new QLabel( tr( "Path where Sword texts are located:" ), widget ); label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); + 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." ) ); grid->addMultiCellWidget( label, 0, 0, 0, 1 ); m_swordPath = new QLineEdit( swordPath, widget ); + 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." ) ); grid->addMultiCellWidget( m_swordPath, 1, 1, 0, 1 ); label = new QLabel( tr( "(Note: Dagger must be restarted for this option to take affect.)" ), widget ); label->setAlignment( Qt::AlignHCenter | Qt::AlignTop | Qt::WordBreak ); + 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." ) ); grid->addMultiCellWidget( label, 2, 2, 0, 1 ); grid->addRowSpacing( 3, 15 ); m_alwaysOpenNew = new QCheckBox( tr( "Always open texts in new window?" ), widget ); m_alwaysOpenNew->setChecked( alwaysOpenNew ); + 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." ) ); grid->addMultiCellWidget( m_alwaysOpenNew, 4, 4, 0, 1 ); grid->addRowSpacing( 5, 15 ); label = new QLabel( tr( "Number of verses to display at a time:" ), widget ); label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); + 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." ) ); grid->addWidget( label, 6, 0 ); m_numVerses = new QSpinBox( 1, 20, 1, widget ); m_numVerses->setValue( numVerses ); + 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." ) ); grid->addWidget( m_numVerses, 6, 1 ); grid->addRowSpacing( 7, 15 ); m_disableScreenBlank = new QCheckBox( tr( "Disable automatic screen power-down?" ), widget ); m_disableScreenBlank->setChecked( disableBlanking ); + 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." ) ); grid->addMultiCellWidget( m_disableScreenBlank, 8, 8, 0, 1 ); m_tabs.addTab( widget, "SettingsIcon", tr( "General" ) ); // Copy tab widget = new QWidget( this ); + QWhatsThis::add( widget, tr( "Select the format used when copying the current verse to the clipboard." ) ); layout = new QVBoxLayout( widget ); layout->setMargin( 4 ); QVButtonGroup *bg = new QVButtonGroup( tr( "Select copy format" ), widget ); m_copyTextFull = new QRadioButton( tr( "\"Verse (Book cc:vv, text)\"" ), bg ); connect( m_copyTextFull, SIGNAL(clicked()), this, SLOT(slotCopyFormatSelected()) ); @@ -112,12 +121,14 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa m_tabs.addTab( widget, "copy", tr( "Copy" ) ); // Font tab m_font = new Opie::Ui::OFontSelector( true, this ); if ( font ) m_font->setSelectedFont( *font ); + QWhatsThis::add( m_font, tr( "Select the font, style and size used for displaying texts." ) ); + m_tabs.addTab( m_font, "font", tr( "Font" ) ); m_tabs.setCurrentTab( tr( "General" ) ); } void ConfigureDlg::slotCopyFormatSelected() 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 @@ -19,50 +19,58 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include <qpe/config.h> #include <qpe/resource.h> #include <qaction.h> #include <qlineedit.h> +#include <qwhatsthis.h> NavBar::NavBar( QMainWindow *parent ) : QToolBar( QString::null, parent, QMainWindow::Top, true ) { // Initialize UI m_actionPrevPage = new QAction( tr( "Previous page" ), Resource::loadPixmap( "fastback" ), QString::null, 0, this, 0 ); + m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) ); m_actionPrevPage->addTo( this ); connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); m_actionPrevVerse = new QAction( tr( "Previous verse" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); + m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) ); m_actionPrevVerse->addTo( this ); connect( m_actionPrevVerse, SIGNAL(activated()), this, SIGNAL(prevVerse()) ); m_key = new QLineEdit( this ); setStretchableWidget( m_key ); + QWhatsThis::add( m_key, tr( "Enter location to display here." ) ); connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) ); m_actionNextVerse = new QAction( tr( "Next verse" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); + m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) ); m_actionNextVerse->addTo( this ); connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); m_actionNextPage = new QAction( tr( "Next page" ), Resource::loadPixmap( "fastforward" ), QString::null, 0, this, 0 ); + m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) ); m_actionNextPage->addTo( this ); connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) ); addSeparator(); m_scrollRate = new QSpinBox( 1, 100, 1, this ); m_scrollRate->setMinimumWidth( 35 ); + QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) ); connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); m_actionScroll = new QAction( tr( "Auto-scroll" ), Resource::loadPixmap( "dagger/autoscroll" ), QString::null, 0, this, 0 ); m_actionScroll->setToggleAction( true ); + m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) ); connect( m_actionScroll, SIGNAL(toggled(bool)), this, SIGNAL(autoScroll(bool)) ); m_actionScroll->addTo( this ); if ( parent ) { installEventFilter( parent ); 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 @@ -23,12 +23,13 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qaction.h> #include <qcombobox.h> #include <qlineedit.h> +#include <qwhatsthis.h> #include <listkey.h> #include <regex.h> #include <versekey.h> void searchCallback( char /*percent*/, void */*userData*/ ) @@ -40,37 +41,42 @@ SearchBar::SearchBar( QMainWindow *parent ) : QToolBar( QString::null, parent, QMainWindow::Top, true ) , m_currText( 0x0 ) { // Initialize UI m_searchText = new QLineEdit( this ); setStretchableWidget( m_searchText ); + QWhatsThis::add( m_searchText, tr( "Enter text to search for here." ) ); connect(m_searchText, SIGNAL(textChanged(const QString &)), this, SLOT(slotTextChanged(const QString &)) ); m_actionFind = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); m_actionFind->setEnabled( false ); m_actionFind->addTo( this ); + m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) ); connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) ); addSeparator(); m_actionPrev = new QAction( tr( "Previous result" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); m_actionPrev->setEnabled( false ); m_actionPrev->addTo( this ); + m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) ); connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) ); m_resultList = new QComboBox( this ); m_resultList->setEnabled( false ); + QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) ); connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) ); m_actionNext = new QAction( tr( "Next result" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); m_actionNext->setEnabled( false ); m_actionNext->addTo( this ); + m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) ); connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) ); if ( parent ) { installEventFilter( parent ); // TODO - install for all controls |