3 files changed, 64 insertions, 21 deletions

diff --git a/noncore/settings/packagemanager/filterdlg.cpp b/noncore/settings/packagemanager/filterdlg.cpp
index eeed398..70875bd 100644
--- a/noncore/settings/packagemanager/filterdlg.cpp
+++ b/noncore/settings/packagemanager/filterdlg.cpp
@@ -29,10 +29,12 @@
 
 #include "filterdlg.h"
 
+#include <qwhatsthis.h>
+
 FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
                const QString &server, const QString &destination,
                OPackageManager::Status status, const QString &category )
-    : QDialog( parent, QString::null, true )
+    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
 {
     setCaption( tr( "Filter packages" ) );
 
@@ -47,8 +49,10 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
 
     // Category
     m_categoryCB = new QCheckBox( tr( "Category:" ), container );
+    QWhatsThis::add( m_categoryCB, tr( "Tap here to filter package list by application category." ) );
     connect( m_categoryCB, SIGNAL(toggled(bool)), this, SLOT(slotCategorySelected(bool)) );
     m_category = new QComboBox( container );
+    QWhatsThis::add( m_category, tr( "Select the application category to filter by here." ) );
     m_category->insertStringList( pm->categories() );
     initItem( m_category, m_categoryCB, category );
     layout->addWidget( m_categoryCB );
@@ -56,8 +60,10 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
 
     // Package name
     m_nameCB = new QCheckBox( tr( "Names containing:" ), container );
+    QWhatsThis::add( m_nameCB, tr( "Tap here to filter package list by package name." ) );
     connect( m_nameCB, SIGNAL(toggled(bool)), this, SLOT(slotNameSelected(bool)) );
     m_name = new QLineEdit( name, container );
+    QWhatsThis::add( m_name, tr( "Enter the package name to filter by here." ) );
     if ( !name.isNull() )
         m_nameCB->setChecked( true );
     m_name->setEnabled( !name.isNull() );
@@ -66,8 +72,10 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
 
     // Status
     m_statusCB = new QCheckBox( tr( "With the status:" ), container );
+    QWhatsThis::add( m_statusCB, tr( "Tap here to filter package list by the package status." ) );
     connect( m_statusCB, SIGNAL(toggled(bool)), this, SLOT(slotStatusSelected(bool)) );
     m_status = new QComboBox( container );
+    QWhatsThis::add( m_status, tr( "Select the package status to filter by here." ) );
     connect( m_status, SIGNAL(activated(const QString&)), this, SLOT(slotStatusChanged(const QString&)) );
     QString currStatus;
     switch ( status )
@@ -92,8 +100,10 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
 
     // Server
     m_serverCB = new QCheckBox( tr( "Available from the following server:" ), container );
+    QWhatsThis::add( m_serverCB, tr( "Tap here to filter package list by source server." ) );
     connect( m_serverCB, SIGNAL(toggled(bool)), this, SLOT(slotServerSelected(bool)) );
     m_server = new QComboBox( container );
+    QWhatsThis::add( m_server, tr( "Select the source server to filter by here." ) );
     m_server->insertStringList( *(pm->servers()) );
     initItem( m_server, m_serverCB, server );
     layout->addWidget( m_serverCB );
@@ -101,14 +111,14 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
 
     // Destination
     m_destCB = new QCheckBox( tr( "Installed on device at:" ), container );
+    QWhatsThis::add( m_destCB, tr( "Tap here to filter package list by destination where the package is installed to on this device." ) );
     connect( m_destCB, SIGNAL(toggled(bool)), this, SLOT(slotDestSelected(bool)) );
     m_destination = new QComboBox( container );
+    QWhatsThis::add( m_destination, tr( "Select the destination location to filter by here." ) );
     m_destination->insertStringList( *(pm->destinations()) );
     initItem( m_destination, m_destCB, destination );
     layout->addWidget( m_destCB );
     layout->addWidget( m_destination );
-
-    //showMaximized();
 }
 
 void FilterDlg::initItem( QComboBox *comboBox, QCheckBox *checkBox, const QString &selection )
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index b334bca..810046f 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -116,7 +116,7 @@ void MainWindow::closeEvent( QCloseEvent *event )
 void MainWindow::initPackageList()
 {
     m_packageList.addColumn( tr( "Packages" ) );
-    QWhatsThis::add( &m_packageList, tr( "This is a listing of all packages.\n\nA blue dot next to the package name indicates that the package is currently installed.\n\nA blue dot with a star indicates that a newer version of the package is available from the server feed.\n\nClick inside the box at the left to select a package." ) );
+    QWhatsThis::add( &m_packageList, tr( "This is a listing of all packages.\n\nA blue dot next to the package name indicates that the package is currently installed.\n\nA blue dot with a star indicates that a newer version of the package is available from the server feed.\n\nTap inside the box at the left to select a package.  Tap and hold to view package details." ) );
     QPEApplication::setStylusOperation( m_packageList.viewport(), QPEApplication::RightOnHold );
     connect( &m_packageList, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),
              this, SLOT(slotDisplayPackageInfo(QListViewItem*)) );
@@ -157,13 +157,13 @@ void MainWindow::initUI()
     QPopupMenu *popup = new QPopupMenu( this );
 
     QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "packagemanager/update" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to update package lists from servers." ) );
+    a->setWhatsThis( tr( "Tap here to update package lists from servers." ) );
     connect( a, SIGNAL(activated()), this, SLOT(slotUpdate()) );
     a->addTo( popup );
     a->addTo( &m_toolBar );
 
     QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "packagemanager/upgrade" ), QString::null, 0, this, 0 );
-    actionUpgrade->setWhatsThis( tr( "Click here to upgrade all installed packages if a newer version is available." ) );
+    actionUpgrade->setWhatsThis( tr( "Tap here to upgrade all installed packages if a newer version is available." ) );
     connect( actionUpgrade, SIGNAL(activated()), this, SLOT(slotUpgrade()) );
     actionUpgrade->addTo( popup );
     actionUpgrade->addTo( &m_toolBar );
@@ -171,13 +171,13 @@ void MainWindow::initUI()
     QPixmap iconDownload = Resource::loadPixmap( "packagemanager/download" );
     QPixmap iconRemove = Resource::loadPixmap( "packagemanager/remove" );
     QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 );
-    actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) );
+    actionDownload->setWhatsThis( tr( "Tap here to download the currently selected package(s)." ) );
     connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) );
     actionDownload->addTo( popup );
     actionDownload->addTo( &m_toolBar );
 
     a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "packagemanager/apply" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) );
+    a->setWhatsThis( tr( "Tap here to install, remove or upgrade currently selected package(s)." ) );
     connect( a, SIGNAL(activated()), this, SLOT(slotApply()) );
     a->addTo( popup );
     a->addTo( &m_toolBar );
@@ -185,7 +185,7 @@ void MainWindow::initUI()
     popup->insertSeparator();
 
     a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to configure this application." ) );
+    a->setWhatsThis( tr( "Tap here to configure this application." ) );
     connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) );
     a->addTo( popup );
     mb->insertItem( tr( "Actions" ), popup );
@@ -195,19 +195,19 @@ void MainWindow::initUI()
 
     m_actionShowNotInstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 );
     m_actionShowNotInstalled->setToggleAction( true );
-    m_actionShowNotInstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) );
+    m_actionShowNotInstalled->setWhatsThis( tr( "Tap here to show packages available which have not been installed." ) );
     connect( m_actionShowNotInstalled, SIGNAL(activated()), this, SLOT(slotShowNotInstalled()) );
     m_actionShowNotInstalled->addTo( popup );
 
     m_actionShowInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 );
     m_actionShowInstalled->setToggleAction( true );
-    m_actionShowInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) );
+    m_actionShowInstalled->setWhatsThis( tr( "Tap here to show packages currently installed on this device." ) );
     connect( m_actionShowInstalled, SIGNAL(activated()), this, SLOT(slotShowInstalled()) );
     m_actionShowInstalled->addTo( popup );
 
     m_actionShowUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 );
     m_actionShowUpdated->setToggleAction( true );
-    m_actionShowUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) );
+    m_actionShowUpdated->setWhatsThis( tr( "Tap here to show packages currently installed on this device which have a newer version available." ) );
     connect( m_actionShowUpdated, SIGNAL(activated()), this, SLOT(slotShowUpdated()) );
     m_actionShowUpdated->addTo( popup );
 
@@ -216,25 +216,25 @@ void MainWindow::initUI()
     m_actionFilter = new QAction( tr( "Filter" ), Resource::loadPixmap( "packagemanager/filter" ),
                                          QString::null, 0, this, 0 );
     m_actionFilter->setToggleAction( true );
-    m_actionFilter->setWhatsThis( tr( "Click here to apply current filter." ) );
+    m_actionFilter->setWhatsThis( tr( "Tap here to apply current filter." ) );
     connect( m_actionFilter, SIGNAL(toggled(bool)), this, SLOT(slotFilter(bool)) );
     m_actionFilter->addTo( popup );
 
     a = new QAction( tr( "Filter settings" ),  QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to change the package filter criteria." ) );
+    a->setWhatsThis( tr( "Tap here to change the package filter criteria." ) );
     connect( a, SIGNAL(activated()), this, SLOT(slotFilterChange()) );
     a->addTo( popup );
 
     popup->insertSeparator();
 
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to search for text in package names." ) );
+    a->setWhatsThis( tr( "Tap here to search for text in package names." ) );
     connect( a, SIGNAL(activated()), this, SLOT(slotFindShowToolbar()) );
     a->addTo( popup );
 
     m_actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
     m_actionFindNext->setEnabled( false );
-    m_actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) );
+    m_actionFindNext->setWhatsThis( tr( "Tap here to find the next package name containing the text you are searching for." ) );
     connect( m_actionFindNext, SIGNAL(activated()), this, SLOT(slotFindNext()) );
     m_actionFindNext->addTo( popup );
     m_actionFindNext->addTo( &m_findBar );
@@ -243,7 +243,7 @@ void MainWindow::initUI()
 
     // Finish find toolbar creation
     a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
+    a->setWhatsThis( tr( "Tap here to hide the find toolbar." ) );
     connect( a, SIGNAL(activated()), this, SLOT(slotFindHideToolbar()) );
     a->addTo( &m_findBar );
     m_findBar.hide();
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 74e7137..d134651 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -39,12 +39,13 @@
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
+#include <qwhatsthis.h>
 
 #include <qpe/resource.h>
 
 using namespace Opie::Ui;
 OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
-    : QDialog( parent, QString::null, true )
+    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
     , m_ipkg( ipkg )
     , m_configs( 0x0 )
     , m_installOptions( installOptions )
@@ -167,15 +168,18 @@ void OIpkgConfigDlg::initServerWidget()
     QGridLayout *layout = new QGridLayout( container, 3, 2, 2, 4 );
 
     m_serverList = new QListBox( container );
+    QWhatsThis::add( m_serverList, tr( "This is a list of all servers configured.  Select one here to edit or delete, or add a new one below." ) );
     m_serverList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerEdit(int)) );
     layout->addMultiCellWidget( m_serverList, 0, 0, 0, 1 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) );
     layout->addWidget( btn, 1, 0 );
 
     btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    QWhatsThis::add( btn, tr( "Tap here to delete the entry selected above." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) );
     layout->addWidget( btn, 1, 1 );
 
@@ -187,19 +191,25 @@ void OIpkgConfigDlg::initServerWidget()
     QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
 
     QLabel *label = new QLabel( tr( "Name:" ), grpbox );
+    QWhatsThis::add( label, tr( "Enter the name of this entry here." ) );
     grplayout->addWidget( label, 0, 0 );
     m_serverName = new QLineEdit( grpbox );
+    QWhatsThis::add( m_serverName, tr( "Enter the name of this entry here." ) );
     grplayout->addWidget( m_serverName, 0, 1 );
 
     label = new QLabel( tr( "Address:" ), grpbox );
+    QWhatsThis::add( label, tr( "Enter the URL address of this entry here." ) );
     grplayout->addWidget( label, 1, 0 );
     m_serverLocation = new QLineEdit( grpbox );
+    QWhatsThis::add( m_serverLocation, tr( "Enter the URL address of this entry here." ) );
     grplayout->addWidget( m_serverLocation, 1, 1 );
 
-    m_serverActive = new QCheckBox( tr( "Active Server" ), grpbox );
+    m_serverActive = new QCheckBox( tr( "Active" ), grpbox );
+    QWhatsThis::add( m_serverActive, tr( "Tap here to indicate whether this entry is active or not." ) );
     grplayout->addMultiCellWidget( m_serverActive, 2, 2, 0, 1 );
 
     btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
+    QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotServerUpdate()) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 }
@@ -219,15 +229,18 @@ void OIpkgConfigDlg::initDestinationWidget()
     QGridLayout *layout = new QGridLayout( container, 3, 2, 2, 4 );
 
     m_destList = new QListBox( container );
+    QWhatsThis::add( m_destList, tr( "This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below." ) );
     m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestEdit(int)) );
     layout->addMultiCellWidget( m_destList, 0, 0, 0, 1 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) );
     layout->addWidget( btn, 1, 0 );
 
     btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    QWhatsThis::add( btn, tr( "Tap here to delete the entry selected above." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) );
     layout->addWidget( btn, 1, 1 );
 
@@ -239,19 +252,25 @@ void OIpkgConfigDlg::initDestinationWidget()
     QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
 
     QLabel *label = new QLabel( tr( "Name:" ), grpbox );
+    QWhatsThis::add( label, tr( "Enter the name of this entry here." ) );
     grplayout->addWidget( label, 0, 0 );
     m_destName = new QLineEdit( grpbox );
+    QWhatsThis::add( m_destName, tr( "Enter the name of this entry here." ) );
     grplayout->addWidget( m_destName, 0, 1 );
 
-    label = new QLabel( tr( "Address:" ), grpbox );
+    label = new QLabel( tr( "Location:" ), grpbox );
+    QWhatsThis::add( label, tr( "Enter the absolute directory path of this entry here." ) );
     grplayout->addWidget( label, 1, 0 );
     m_destLocation = new QLineEdit( grpbox );
+    QWhatsThis::add( m_destLocation, tr( "Enter the absolute directory path of this entry here." ) );
     grplayout->addWidget( m_destLocation, 1, 1 );
 
-    m_destActive = new QCheckBox( tr( "Active Server" ), grpbox );
+    m_destActive = new QCheckBox( tr( "Active" ), grpbox );
+    QWhatsThis::add( m_destActive, tr( "Tap here to indicate whether this entry is active or not." ) );
     grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 1 );
 
     btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
+    QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestUpdate()) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 }
@@ -277,8 +296,10 @@ void OIpkgConfigDlg::initProxyWidget()
     layout->addMultiCellWidget( grpbox, 0, 0, 0, 1 );
     QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
     m_proxyHttpServer = new QLineEdit( grpbox );
+    QWhatsThis::add( m_proxyHttpServer, tr( "Enter the URL address of the HTTP proxy server here." ) );
     grplayout->addWidget( m_proxyHttpServer );
     m_proxyHttpActive = new QCheckBox( tr( "Enabled" ), grpbox );
+    QWhatsThis::add( m_proxyHttpActive, tr( "Tap here to enable or disable the HTTP proxy server." ) );
     grplayout->addWidget( m_proxyHttpActive );
 
     // FTP proxy server configuration
@@ -288,19 +309,25 @@ void OIpkgConfigDlg::initProxyWidget()
     layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 );
     grplayout = new QVBoxLayout( grpbox->layout() );
     m_proxyFtpServer = new QLineEdit( grpbox );
+    QWhatsThis::add( m_proxyFtpServer, tr( "Enter the URL address of the FTP proxy server here." ) );
     grplayout->addWidget( m_proxyFtpServer );
     m_proxyFtpActive = new QCheckBox( tr( "Enabled" ), grpbox );
+    QWhatsThis::add( m_proxyFtpActive, tr( "Tap here to enable or disable the FTP proxy server." ) );
     grplayout->addWidget( m_proxyFtpActive );
 
     // Proxy server username and password configuration
     QLabel *label = new QLabel( tr( "Username:" ), container );
+    QWhatsThis::add( label, tr( "Enter the username for the proxy servers here." ) );
     layout->addWidget( label, 2, 0 );
     m_proxyUsername = new QLineEdit( container );
+    QWhatsThis::add( m_proxyUsername, tr( "Enter the username for the proxy servers here." ) );
     layout->addWidget( m_proxyUsername, 2, 1 );
 
     label = new QLabel( tr( "Password:" ), container );
+    QWhatsThis::add( label, tr( "Enter the password for the proxy servers here." ) );
     layout->addWidget( label, 3, 0 );
     m_proxyPassword = new QLineEdit( container );
+    QWhatsThis::add( m_proxyPassword, tr( "Enter the password for the proxy servers here." ) );
     layout->addWidget( m_proxyPassword, 3, 1 );
 }
 
@@ -319,21 +346,27 @@ void OIpkgConfigDlg::initOptionsWidget()
     QVBoxLayout *layout = new QVBoxLayout( container, 2, 4 );
 
     m_optForceDepends = new QCheckBox( tr( "Force Depends" ), container );
+    QWhatsThis::add( m_optForceDepends, tr( "Tap here to enable or disable the '-force-depends' option for Ipkg." ) );
     layout->addWidget( m_optForceDepends );
 
     m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container );
+    QWhatsThis::add( m_optForceReinstall, tr( "Tap here to enable or disable the '-force-reinstall' option for Ipkg." ) );
     layout->addWidget( m_optForceReinstall );
 
     m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container );
+    QWhatsThis::add( m_optForceRemove, tr( "Tap here to enable or disable the '-force-removal-of-dependent-packages' option for Ipkg." ) );
     layout->addWidget( m_optForceRemove );
 
     m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container );
+    QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) );
     layout->addWidget( m_optForceOverwrite );
 
     QLabel *l = new QLabel( tr( "Information Level" ), container );
+    QWhatsThis::add( l, tr( "Select information level for Ipkg." ) );
     layout->addWidget( l );
 
     m_optVerboseIpkg = new QComboBox( container );
+    QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) );
     m_optVerboseIpkg->insertItem( tr( "Errors only" ) );
     m_optVerboseIpkg->insertItem( tr( "Normal messages" ) );
     m_optVerboseIpkg->insertItem( tr( "Informative messages" ) );