| -rw-r--r-- | noncore/settings/packagemanager/filterdlg.cpp | 16 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/mainwindow.cpp | 28 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 41 |
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 @@ -31,2 +31,4 @@ +#include <qwhatsthis.h> + FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, @@ -34,3 +36,3 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, OPackageManager::Status status, const QString &category ) - : QDialog( parent, QString::null, true ) + : QDialog( parent, QString::null, true, WStyle_ContextHelp ) { @@ -49,4 +51,6 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, 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() ); @@ -58,4 +62,6 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &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() ) @@ -68,4 +74,6 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, 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&)) ); @@ -94,4 +102,6 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, 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()) ); @@ -103,4 +113,6 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, 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()) ); @@ -109,4 +121,2 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, layout->addWidget( m_destination ); - - //showMaximized(); } 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 @@ -118,3 +118,3 @@ 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 ); @@ -159,3 +159,3 @@ void MainWindow::initUI() 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()) ); @@ -165,3 +165,3 @@ void MainWindow::initUI() 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()) ); @@ -173,3 +173,3 @@ void MainWindow::initUI() 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()) ); @@ -179,3 +179,3 @@ void MainWindow::initUI() 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()) ); @@ -187,3 +187,3 @@ void MainWindow::initUI() 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()) ); @@ -197,3 +197,3 @@ void MainWindow::initUI() 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()) ); @@ -203,3 +203,3 @@ void MainWindow::initUI() 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()) ); @@ -209,3 +209,3 @@ void MainWindow::initUI() 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()) ); @@ -218,3 +218,3 @@ void MainWindow::initUI() 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)) ); @@ -223,3 +223,3 @@ void MainWindow::initUI() 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()) ); @@ -230,3 +230,3 @@ void MainWindow::initUI() 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()) ); @@ -236,3 +236,3 @@ void MainWindow::initUI() 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()) ); @@ -245,3 +245,3 @@ void MainWindow::initUI() 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()) ); 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 @@ -41,2 +41,3 @@ #include <qscrollview.h> +#include <qwhatsthis.h> @@ -46,3 +47,3 @@ 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 ) @@ -169,2 +170,3 @@ void OIpkgConfigDlg::initServerWidget() 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 ) ); @@ -174,2 +176,3 @@ void OIpkgConfigDlg::initServerWidget() 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()) ); @@ -178,2 +181,3 @@ void OIpkgConfigDlg::initServerWidget() 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()) ); @@ -189,4 +193,6 @@ void OIpkgConfigDlg::initServerWidget() 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 ); @@ -194,7 +200,10 @@ void OIpkgConfigDlg::initServerWidget() 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 ); @@ -202,2 +211,3 @@ void OIpkgConfigDlg::initServerWidget() 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()) ); @@ -221,2 +231,3 @@ void OIpkgConfigDlg::initDestinationWidget() 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 ) ); @@ -226,2 +237,3 @@ void OIpkgConfigDlg::initDestinationWidget() 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()) ); @@ -230,2 +242,3 @@ void OIpkgConfigDlg::initDestinationWidget() 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()) ); @@ -241,12 +254,17 @@ void OIpkgConfigDlg::initDestinationWidget() 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 ); @@ -254,2 +272,3 @@ void OIpkgConfigDlg::initDestinationWidget() 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()) ); @@ -279,4 +298,6 @@ void OIpkgConfigDlg::initProxyWidget() 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 ); @@ -290,4 +311,6 @@ void OIpkgConfigDlg::initProxyWidget() 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 ); @@ -296,4 +319,6 @@ void OIpkgConfigDlg::initProxyWidget() 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 ); @@ -301,4 +326,6 @@ void OIpkgConfigDlg::initProxyWidget() 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 ); @@ -321,2 +348,3 @@ void OIpkgConfigDlg::initOptionsWidget() 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 ); @@ -324,2 +352,3 @@ void OIpkgConfigDlg::initOptionsWidget() 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 ); @@ -327,2 +356,3 @@ void OIpkgConfigDlg::initOptionsWidget() 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 ); @@ -330,2 +360,3 @@ void OIpkgConfigDlg::initOptionsWidget() 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 ); @@ -333,2 +364,3 @@ void OIpkgConfigDlg::initOptionsWidget() QLabel *l = new QLabel( tr( "Information Level" ), container ); + QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); layout->addWidget( l ); @@ -336,2 +368,3 @@ void OIpkgConfigDlg::initOptionsWidget() m_optVerboseIpkg = new QComboBox( container ); + QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); |