author | drw <drw> | 2004-04-21 17:43:18 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-21 17:43:18 (UTC) |
commit | d10e9746089964b7a1be59903c43b4f3364a9ee2 (patch) (unidiff) | |
tree | d146e4509d23a399fab47759f42fd891812f9d07 | |
parent | 8d6f6d769e945eac05c7089964d1e2c764f0ee7a (diff) | |
download | opie-d10e9746089964b7a1be59903c43b4f3364a9ee2.zip opie-d10e9746089964b7a1be59903c43b4f3364a9ee2.tar.gz opie-d10e9746089964b7a1be59903c43b4f3364a9ee2.tar.bz2 |
Added/fixed QWhatsThis and fixed a few labels in the config dialog
-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 | |||
@@ -30,8 +30,10 @@ | |||
30 | #include "filterdlg.h" | 30 | #include "filterdlg.h" |
31 | 31 | ||
32 | #include <qwhatsthis.h> | ||
33 | |||
32 | FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, | 34 | FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, |
33 | const QString &server, const QString &destination, | 35 | const QString &server, const QString &destination, |
34 | OPackageManager::Status status, const QString &category ) | 36 | OPackageManager::Status status, const QString &category ) |
35 | : QDialog( parent, QString::null, true ) | 37 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) |
36 | { | 38 | { |
37 | setCaption( tr( "Filter packages" ) ); | 39 | setCaption( tr( "Filter packages" ) ); |
@@ -48,6 +50,8 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, | |||
48 | // Category | 50 | // Category |
49 | m_categoryCB = new QCheckBox( tr( "Category:" ), container ); | 51 | m_categoryCB = new QCheckBox( tr( "Category:" ), container ); |
52 | QWhatsThis::add( m_categoryCB, tr( "Tap here to filter package list by application category." ) ); | ||
50 | connect( m_categoryCB, SIGNAL(toggled(bool)), this, SLOT(slotCategorySelected(bool)) ); | 53 | connect( m_categoryCB, SIGNAL(toggled(bool)), this, SLOT(slotCategorySelected(bool)) ); |
51 | m_category = new QComboBox( container ); | 54 | m_category = new QComboBox( container ); |
55 | QWhatsThis::add( m_category, tr( "Select the application category to filter by here." ) ); | ||
52 | m_category->insertStringList( pm->categories() ); | 56 | m_category->insertStringList( pm->categories() ); |
53 | initItem( m_category, m_categoryCB, category ); | 57 | initItem( m_category, m_categoryCB, category ); |
@@ -57,6 +61,8 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, | |||
57 | // Package name | 61 | // Package name |
58 | m_nameCB = new QCheckBox( tr( "Names containing:" ), container ); | 62 | m_nameCB = new QCheckBox( tr( "Names containing:" ), container ); |
63 | QWhatsThis::add( m_nameCB, tr( "Tap here to filter package list by package name." ) ); | ||
59 | connect( m_nameCB, SIGNAL(toggled(bool)), this, SLOT(slotNameSelected(bool)) ); | 64 | connect( m_nameCB, SIGNAL(toggled(bool)), this, SLOT(slotNameSelected(bool)) ); |
60 | m_name = new QLineEdit( name, container ); | 65 | m_name = new QLineEdit( name, container ); |
66 | QWhatsThis::add( m_name, tr( "Enter the package name to filter by here." ) ); | ||
61 | if ( !name.isNull() ) | 67 | if ( !name.isNull() ) |
62 | m_nameCB->setChecked( true ); | 68 | m_nameCB->setChecked( true ); |
@@ -67,6 +73,8 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, | |||
67 | // Status | 73 | // Status |
68 | m_statusCB = new QCheckBox( tr( "With the status:" ), container ); | 74 | m_statusCB = new QCheckBox( tr( "With the status:" ), container ); |
75 | QWhatsThis::add( m_statusCB, tr( "Tap here to filter package list by the package status." ) ); | ||
69 | connect( m_statusCB, SIGNAL(toggled(bool)), this, SLOT(slotStatusSelected(bool)) ); | 76 | connect( m_statusCB, SIGNAL(toggled(bool)), this, SLOT(slotStatusSelected(bool)) ); |
70 | m_status = new QComboBox( container ); | 77 | m_status = new QComboBox( container ); |
78 | QWhatsThis::add( m_status, tr( "Select the package status to filter by here." ) ); | ||
71 | connect( m_status, SIGNAL(activated(const QString&)), this, SLOT(slotStatusChanged(const QString&)) ); | 79 | connect( m_status, SIGNAL(activated(const QString&)), this, SLOT(slotStatusChanged(const QString&)) ); |
72 | QString currStatus; | 80 | QString currStatus; |
@@ -93,6 +101,8 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, | |||
93 | // Server | 101 | // Server |
94 | m_serverCB = new QCheckBox( tr( "Available from the following server:" ), container ); | 102 | m_serverCB = new QCheckBox( tr( "Available from the following server:" ), container ); |
103 | QWhatsThis::add( m_serverCB, tr( "Tap here to filter package list by source server." ) ); | ||
95 | connect( m_serverCB, SIGNAL(toggled(bool)), this, SLOT(slotServerSelected(bool)) ); | 104 | connect( m_serverCB, SIGNAL(toggled(bool)), this, SLOT(slotServerSelected(bool)) ); |
96 | m_server = new QComboBox( container ); | 105 | m_server = new QComboBox( container ); |
106 | QWhatsThis::add( m_server, tr( "Select the source server to filter by here." ) ); | ||
97 | m_server->insertStringList( *(pm->servers()) ); | 107 | m_server->insertStringList( *(pm->servers()) ); |
98 | initItem( m_server, m_serverCB, server ); | 108 | initItem( m_server, m_serverCB, server ); |
@@ -102,12 +112,12 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name, | |||
102 | // Destination | 112 | // Destination |
103 | m_destCB = new QCheckBox( tr( "Installed on device at:" ), container ); | 113 | m_destCB = new QCheckBox( tr( "Installed on device at:" ), container ); |
114 | QWhatsThis::add( m_destCB, tr( "Tap here to filter package list by destination where the package is installed to on this device." ) ); | ||
104 | connect( m_destCB, SIGNAL(toggled(bool)), this, SLOT(slotDestSelected(bool)) ); | 115 | connect( m_destCB, SIGNAL(toggled(bool)), this, SLOT(slotDestSelected(bool)) ); |
105 | m_destination = new QComboBox( container ); | 116 | m_destination = new QComboBox( container ); |
117 | QWhatsThis::add( m_destination, tr( "Select the destination location to filter by here." ) ); | ||
106 | m_destination->insertStringList( *(pm->destinations()) ); | 118 | m_destination->insertStringList( *(pm->destinations()) ); |
107 | initItem( m_destination, m_destCB, destination ); | 119 | initItem( m_destination, m_destCB, destination ); |
108 | layout->addWidget( m_destCB ); | 120 | layout->addWidget( m_destCB ); |
109 | layout->addWidget( m_destination ); | 121 | layout->addWidget( m_destination ); |
110 | |||
111 | //showMaximized(); | ||
112 | } | 122 | } |
113 | 123 | ||
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 | |||
@@ -117,5 +117,5 @@ void MainWindow::initPackageList() | |||
117 | { | 117 | { |
118 | m_packageList.addColumn( tr( "Packages" ) ); | 118 | m_packageList.addColumn( tr( "Packages" ) ); |
119 | 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." ) ); | 119 | 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." ) ); |
120 | QPEApplication::setStylusOperation( m_packageList.viewport(), QPEApplication::RightOnHold ); | 120 | QPEApplication::setStylusOperation( m_packageList.viewport(), QPEApplication::RightOnHold ); |
121 | connect( &m_packageList, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)), | 121 | connect( &m_packageList, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)), |
@@ -158,5 +158,5 @@ void MainWindow::initUI() | |||
158 | 158 | ||
159 | QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "packagemanager/update" ), QString::null, 0, this, 0 ); | 159 | QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "packagemanager/update" ), QString::null, 0, this, 0 ); |
160 | a->setWhatsThis( tr( "Click here to update package lists from servers." ) ); | 160 | a->setWhatsThis( tr( "Tap here to update package lists from servers." ) ); |
161 | connect( a, SIGNAL(activated()), this, SLOT(slotUpdate()) ); | 161 | connect( a, SIGNAL(activated()), this, SLOT(slotUpdate()) ); |
162 | a->addTo( popup ); | 162 | a->addTo( popup ); |
@@ -164,5 +164,5 @@ void MainWindow::initUI() | |||
164 | 164 | ||
165 | QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "packagemanager/upgrade" ), QString::null, 0, this, 0 ); | 165 | QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "packagemanager/upgrade" ), QString::null, 0, this, 0 ); |
166 | actionUpgrade->setWhatsThis( tr( "Click here to upgrade all installed packages if a newer version is available." ) ); | 166 | actionUpgrade->setWhatsThis( tr( "Tap here to upgrade all installed packages if a newer version is available." ) ); |
167 | connect( actionUpgrade, SIGNAL(activated()), this, SLOT(slotUpgrade()) ); | 167 | connect( actionUpgrade, SIGNAL(activated()), this, SLOT(slotUpgrade()) ); |
168 | actionUpgrade->addTo( popup ); | 168 | actionUpgrade->addTo( popup ); |
@@ -172,5 +172,5 @@ void MainWindow::initUI() | |||
172 | QPixmap iconRemove = Resource::loadPixmap( "packagemanager/remove" ); | 172 | QPixmap iconRemove = Resource::loadPixmap( "packagemanager/remove" ); |
173 | QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 ); | 173 | QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 ); |
174 | actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) ); | 174 | actionDownload->setWhatsThis( tr( "Tap here to download the currently selected package(s)." ) ); |
175 | connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) ); | 175 | connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) ); |
176 | actionDownload->addTo( popup ); | 176 | actionDownload->addTo( popup ); |
@@ -178,5 +178,5 @@ void MainWindow::initUI() | |||
178 | 178 | ||
179 | a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "packagemanager/apply" ), QString::null, 0, this, 0 ); | 179 | a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "packagemanager/apply" ), QString::null, 0, this, 0 ); |
180 | a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) ); | 180 | a->setWhatsThis( tr( "Tap here to install, remove or upgrade currently selected package(s)." ) ); |
181 | connect( a, SIGNAL(activated()), this, SLOT(slotApply()) ); | 181 | connect( a, SIGNAL(activated()), this, SLOT(slotApply()) ); |
182 | a->addTo( popup ); | 182 | a->addTo( popup ); |
@@ -186,5 +186,5 @@ void MainWindow::initUI() | |||
186 | 186 | ||
187 | a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 ); | 187 | a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 ); |
188 | a->setWhatsThis( tr( "Click here to configure this application." ) ); | 188 | a->setWhatsThis( tr( "Tap here to configure this application." ) ); |
189 | connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) ); | 189 | connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) ); |
190 | a->addTo( popup ); | 190 | a->addTo( popup ); |
@@ -196,5 +196,5 @@ void MainWindow::initUI() | |||
196 | m_actionShowNotInstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 ); | 196 | m_actionShowNotInstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 ); |
197 | m_actionShowNotInstalled->setToggleAction( true ); | 197 | m_actionShowNotInstalled->setToggleAction( true ); |
198 | m_actionShowNotInstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) ); | 198 | m_actionShowNotInstalled->setWhatsThis( tr( "Tap here to show packages available which have not been installed." ) ); |
199 | connect( m_actionShowNotInstalled, SIGNAL(activated()), this, SLOT(slotShowNotInstalled()) ); | 199 | connect( m_actionShowNotInstalled, SIGNAL(activated()), this, SLOT(slotShowNotInstalled()) ); |
200 | m_actionShowNotInstalled->addTo( popup ); | 200 | m_actionShowNotInstalled->addTo( popup ); |
@@ -202,5 +202,5 @@ void MainWindow::initUI() | |||
202 | m_actionShowInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 ); | 202 | m_actionShowInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 ); |
203 | m_actionShowInstalled->setToggleAction( true ); | 203 | m_actionShowInstalled->setToggleAction( true ); |
204 | m_actionShowInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) ); | 204 | m_actionShowInstalled->setWhatsThis( tr( "Tap here to show packages currently installed on this device." ) ); |
205 | connect( m_actionShowInstalled, SIGNAL(activated()), this, SLOT(slotShowInstalled()) ); | 205 | connect( m_actionShowInstalled, SIGNAL(activated()), this, SLOT(slotShowInstalled()) ); |
206 | m_actionShowInstalled->addTo( popup ); | 206 | m_actionShowInstalled->addTo( popup ); |
@@ -208,5 +208,5 @@ void MainWindow::initUI() | |||
208 | m_actionShowUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 ); | 208 | m_actionShowUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 ); |
209 | m_actionShowUpdated->setToggleAction( true ); | 209 | m_actionShowUpdated->setToggleAction( true ); |
210 | m_actionShowUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) ); | 210 | m_actionShowUpdated->setWhatsThis( tr( "Tap here to show packages currently installed on this device which have a newer version available." ) ); |
211 | connect( m_actionShowUpdated, SIGNAL(activated()), this, SLOT(slotShowUpdated()) ); | 211 | connect( m_actionShowUpdated, SIGNAL(activated()), this, SLOT(slotShowUpdated()) ); |
212 | m_actionShowUpdated->addTo( popup ); | 212 | m_actionShowUpdated->addTo( popup ); |
@@ -217,10 +217,10 @@ void MainWindow::initUI() | |||
217 | QString::null, 0, this, 0 ); | 217 | QString::null, 0, this, 0 ); |
218 | m_actionFilter->setToggleAction( true ); | 218 | m_actionFilter->setToggleAction( true ); |
219 | m_actionFilter->setWhatsThis( tr( "Click here to apply current filter." ) ); | 219 | m_actionFilter->setWhatsThis( tr( "Tap here to apply current filter." ) ); |
220 | connect( m_actionFilter, SIGNAL(toggled(bool)), this, SLOT(slotFilter(bool)) ); | 220 | connect( m_actionFilter, SIGNAL(toggled(bool)), this, SLOT(slotFilter(bool)) ); |
221 | m_actionFilter->addTo( popup ); | 221 | m_actionFilter->addTo( popup ); |
222 | 222 | ||
223 | a = new QAction( tr( "Filter settings" ), QString::null, 0, this, 0 ); | 223 | a = new QAction( tr( "Filter settings" ), QString::null, 0, this, 0 ); |
224 | a->setWhatsThis( tr( "Click here to change the package filter criteria." ) ); | 224 | a->setWhatsThis( tr( "Tap here to change the package filter criteria." ) ); |
225 | connect( a, SIGNAL(activated()), this, SLOT(slotFilterChange()) ); | 225 | connect( a, SIGNAL(activated()), this, SLOT(slotFilterChange()) ); |
226 | a->addTo( popup ); | 226 | a->addTo( popup ); |
@@ -229,5 +229,5 @@ void MainWindow::initUI() | |||
229 | 229 | ||
230 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); | 230 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); |
231 | a->setWhatsThis( tr( "Click here to search for text in package names." ) ); | 231 | a->setWhatsThis( tr( "Tap here to search for text in package names." ) ); |
232 | connect( a, SIGNAL(activated()), this, SLOT(slotFindShowToolbar()) ); | 232 | connect( a, SIGNAL(activated()), this, SLOT(slotFindShowToolbar()) ); |
233 | a->addTo( popup ); | 233 | a->addTo( popup ); |
@@ -235,5 +235,5 @@ void MainWindow::initUI() | |||
235 | m_actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 ); | 235 | m_actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 ); |
236 | m_actionFindNext->setEnabled( false ); | 236 | m_actionFindNext->setEnabled( false ); |
237 | m_actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) ); | 237 | m_actionFindNext->setWhatsThis( tr( "Tap here to find the next package name containing the text you are searching for." ) ); |
238 | connect( m_actionFindNext, SIGNAL(activated()), this, SLOT(slotFindNext()) ); | 238 | connect( m_actionFindNext, SIGNAL(activated()), this, SLOT(slotFindNext()) ); |
239 | m_actionFindNext->addTo( popup ); | 239 | m_actionFindNext->addTo( popup ); |
@@ -244,5 +244,5 @@ void MainWindow::initUI() | |||
244 | // Finish find toolbar creation | 244 | // Finish find toolbar creation |
245 | a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 245 | a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |
246 | a->setWhatsThis( tr( "Click here to hide the find toolbar." ) ); | 246 | a->setWhatsThis( tr( "Tap here to hide the find toolbar." ) ); |
247 | connect( a, SIGNAL(activated()), this, SLOT(slotFindHideToolbar()) ); | 247 | connect( a, SIGNAL(activated()), this, SLOT(slotFindHideToolbar()) ); |
248 | a->addTo( &m_findBar ); | 248 | a->addTo( &m_findBar ); |
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 | |||
@@ -40,4 +40,5 @@ | |||
40 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
41 | #include <qscrollview.h> | 41 | #include <qscrollview.h> |
42 | #include <qwhatsthis.h> | ||
42 | 43 | ||
43 | #include <qpe/resource.h> | 44 | #include <qpe/resource.h> |
@@ -45,5 +46,5 @@ | |||
45 | using namespace Opie::Ui; | 46 | using namespace Opie::Ui; |
46 | OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) | 47 | OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) |
47 | : QDialog( parent, QString::null, true ) | 48 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) |
48 | , m_ipkg( ipkg ) | 49 | , m_ipkg( ipkg ) |
49 | , m_configs( 0x0 ) | 50 | , m_configs( 0x0 ) |
@@ -168,4 +169,5 @@ void OIpkgConfigDlg::initServerWidget() | |||
168 | 169 | ||
169 | m_serverList = new QListBox( container ); | 170 | m_serverList = new QListBox( container ); |
171 | 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." ) ); | ||
170 | m_serverList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); | 172 | m_serverList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); |
171 | connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerEdit(int)) ); | 173 | connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerEdit(int)) ); |
@@ -173,8 +175,10 @@ void OIpkgConfigDlg::initServerWidget() | |||
173 | 175 | ||
174 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container ); | 176 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container ); |
177 | QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); | ||
175 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) ); | 178 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) ); |
176 | layout->addWidget( btn, 1, 0 ); | 179 | layout->addWidget( btn, 1, 0 ); |
177 | 180 | ||
178 | btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container ); | 181 | btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container ); |
182 | QWhatsThis::add( btn, tr( "Tap here to delete the entry selected above." ) ); | ||
179 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) ); | 183 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) ); |
180 | layout->addWidget( btn, 1, 1 ); | 184 | layout->addWidget( btn, 1, 1 ); |
@@ -188,17 +192,23 @@ void OIpkgConfigDlg::initServerWidget() | |||
188 | 192 | ||
189 | QLabel *label = new QLabel( tr( "Name:" ), grpbox ); | 193 | QLabel *label = new QLabel( tr( "Name:" ), grpbox ); |
194 | QWhatsThis::add( label, tr( "Enter the name of this entry here." ) ); | ||
190 | grplayout->addWidget( label, 0, 0 ); | 195 | grplayout->addWidget( label, 0, 0 ); |
191 | m_serverName = new QLineEdit( grpbox ); | 196 | m_serverName = new QLineEdit( grpbox ); |
197 | QWhatsThis::add( m_serverName, tr( "Enter the name of this entry here." ) ); | ||
192 | grplayout->addWidget( m_serverName, 0, 1 ); | 198 | grplayout->addWidget( m_serverName, 0, 1 ); |
193 | 199 | ||
194 | label = new QLabel( tr( "Address:" ), grpbox ); | 200 | label = new QLabel( tr( "Address:" ), grpbox ); |
201 | QWhatsThis::add( label, tr( "Enter the URL address of this entry here." ) ); | ||
195 | grplayout->addWidget( label, 1, 0 ); | 202 | grplayout->addWidget( label, 1, 0 ); |
196 | m_serverLocation = new QLineEdit( grpbox ); | 203 | m_serverLocation = new QLineEdit( grpbox ); |
204 | QWhatsThis::add( m_serverLocation, tr( "Enter the URL address of this entry here." ) ); | ||
197 | grplayout->addWidget( m_serverLocation, 1, 1 ); | 205 | grplayout->addWidget( m_serverLocation, 1, 1 ); |
198 | 206 | ||
199 | m_serverActive = new QCheckBox( tr( "Active Server" ), grpbox ); | 207 | m_serverActive = new QCheckBox( tr( "Active" ), grpbox ); |
208 | QWhatsThis::add( m_serverActive, tr( "Tap here to indicate whether this entry is active or not." ) ); | ||
200 | grplayout->addMultiCellWidget( m_serverActive, 2, 2, 0, 1 ); | 209 | grplayout->addMultiCellWidget( m_serverActive, 2, 2, 0, 1 ); |
201 | 210 | ||
202 | btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox ); | 211 | btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox ); |
212 | QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) ); | ||
203 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerUpdate()) ); | 213 | connect( btn, SIGNAL(clicked()), this, SLOT(slotServerUpdate()) ); |
204 | grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 ); | 214 | grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 ); |
@@ -220,4 +230,5 @@ void OIpkgConfigDlg::initDestinationWidget() | |||
220 | 230 | ||
221 | m_destList = new QListBox( container ); | 231 | m_destList = new QListBox( container ); |
232 | 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." ) ); | ||
222 | m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); | 233 | m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); |
223 | connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestEdit(int)) ); | 234 | connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestEdit(int)) ); |
@@ -225,8 +236,10 @@ void OIpkgConfigDlg::initDestinationWidget() | |||
225 | 236 | ||
226 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container ); | 237 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container ); |
238 | QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); | ||
227 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) ); | 239 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) ); |
228 | layout->addWidget( btn, 1, 0 ); | 240 | layout->addWidget( btn, 1, 0 ); |
229 | 241 | ||
230 | btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container ); | 242 | btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container ); |
243 | QWhatsThis::add( btn, tr( "Tap here to delete the entry selected above." ) ); | ||
231 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) ); | 244 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) ); |
232 | layout->addWidget( btn, 1, 1 ); | 245 | layout->addWidget( btn, 1, 1 ); |
@@ -240,17 +253,23 @@ void OIpkgConfigDlg::initDestinationWidget() | |||
240 | 253 | ||
241 | QLabel *label = new QLabel( tr( "Name:" ), grpbox ); | 254 | QLabel *label = new QLabel( tr( "Name:" ), grpbox ); |
255 | QWhatsThis::add( label, tr( "Enter the name of this entry here." ) ); | ||
242 | grplayout->addWidget( label, 0, 0 ); | 256 | grplayout->addWidget( label, 0, 0 ); |
243 | m_destName = new QLineEdit( grpbox ); | 257 | m_destName = new QLineEdit( grpbox ); |
258 | QWhatsThis::add( m_destName, tr( "Enter the name of this entry here." ) ); | ||
244 | grplayout->addWidget( m_destName, 0, 1 ); | 259 | grplayout->addWidget( m_destName, 0, 1 ); |
245 | 260 | ||
246 | label = new QLabel( tr( "Address:" ), grpbox ); | 261 | label = new QLabel( tr( "Location:" ), grpbox ); |
262 | QWhatsThis::add( label, tr( "Enter the absolute directory path of this entry here." ) ); | ||
247 | grplayout->addWidget( label, 1, 0 ); | 263 | grplayout->addWidget( label, 1, 0 ); |
248 | m_destLocation = new QLineEdit( grpbox ); | 264 | m_destLocation = new QLineEdit( grpbox ); |
265 | QWhatsThis::add( m_destLocation, tr( "Enter the absolute directory path of this entry here." ) ); | ||
249 | grplayout->addWidget( m_destLocation, 1, 1 ); | 266 | grplayout->addWidget( m_destLocation, 1, 1 ); |
250 | 267 | ||
251 | m_destActive = new QCheckBox( tr( "Active Server" ), grpbox ); | 268 | m_destActive = new QCheckBox( tr( "Active" ), grpbox ); |
269 | QWhatsThis::add( m_destActive, tr( "Tap here to indicate whether this entry is active or not." ) ); | ||
252 | grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 1 ); | 270 | grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 1 ); |
253 | 271 | ||
254 | btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox ); | 272 | btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox ); |
273 | QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) ); | ||
255 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestUpdate()) ); | 274 | connect( btn, SIGNAL(clicked()), this, SLOT(slotDestUpdate()) ); |
256 | grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 ); | 275 | grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 ); |
@@ -278,6 +297,8 @@ void OIpkgConfigDlg::initProxyWidget() | |||
278 | QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() ); | 297 | QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() ); |
279 | m_proxyHttpServer = new QLineEdit( grpbox ); | 298 | m_proxyHttpServer = new QLineEdit( grpbox ); |
299 | QWhatsThis::add( m_proxyHttpServer, tr( "Enter the URL address of the HTTP proxy server here." ) ); | ||
280 | grplayout->addWidget( m_proxyHttpServer ); | 300 | grplayout->addWidget( m_proxyHttpServer ); |
281 | m_proxyHttpActive = new QCheckBox( tr( "Enabled" ), grpbox ); | 301 | m_proxyHttpActive = new QCheckBox( tr( "Enabled" ), grpbox ); |
302 | QWhatsThis::add( m_proxyHttpActive, tr( "Tap here to enable or disable the HTTP proxy server." ) ); | ||
282 | grplayout->addWidget( m_proxyHttpActive ); | 303 | grplayout->addWidget( m_proxyHttpActive ); |
283 | 304 | ||
@@ -289,17 +310,23 @@ void OIpkgConfigDlg::initProxyWidget() | |||
289 | grplayout = new QVBoxLayout( grpbox->layout() ); | 310 | grplayout = new QVBoxLayout( grpbox->layout() ); |
290 | m_proxyFtpServer = new QLineEdit( grpbox ); | 311 | m_proxyFtpServer = new QLineEdit( grpbox ); |
312 | QWhatsThis::add( m_proxyFtpServer, tr( "Enter the URL address of the FTP proxy server here." ) ); | ||
291 | grplayout->addWidget( m_proxyFtpServer ); | 313 | grplayout->addWidget( m_proxyFtpServer ); |
292 | m_proxyFtpActive = new QCheckBox( tr( "Enabled" ), grpbox ); | 314 | m_proxyFtpActive = new QCheckBox( tr( "Enabled" ), grpbox ); |
315 | QWhatsThis::add( m_proxyFtpActive, tr( "Tap here to enable or disable the FTP proxy server." ) ); | ||
293 | grplayout->addWidget( m_proxyFtpActive ); | 316 | grplayout->addWidget( m_proxyFtpActive ); |
294 | 317 | ||
295 | // Proxy server username and password configuration | 318 | // Proxy server username and password configuration |
296 | QLabel *label = new QLabel( tr( "Username:" ), container ); | 319 | QLabel *label = new QLabel( tr( "Username:" ), container ); |
320 | QWhatsThis::add( label, tr( "Enter the username for the proxy servers here." ) ); | ||
297 | layout->addWidget( label, 2, 0 ); | 321 | layout->addWidget( label, 2, 0 ); |
298 | m_proxyUsername = new QLineEdit( container ); | 322 | m_proxyUsername = new QLineEdit( container ); |
323 | QWhatsThis::add( m_proxyUsername, tr( "Enter the username for the proxy servers here." ) ); | ||
299 | layout->addWidget( m_proxyUsername, 2, 1 ); | 324 | layout->addWidget( m_proxyUsername, 2, 1 ); |
300 | 325 | ||
301 | label = new QLabel( tr( "Password:" ), container ); | 326 | label = new QLabel( tr( "Password:" ), container ); |
327 | QWhatsThis::add( label, tr( "Enter the password for the proxy servers here." ) ); | ||
302 | layout->addWidget( label, 3, 0 ); | 328 | layout->addWidget( label, 3, 0 ); |
303 | m_proxyPassword = new QLineEdit( container ); | 329 | m_proxyPassword = new QLineEdit( container ); |
330 | QWhatsThis::add( m_proxyPassword, tr( "Enter the password for the proxy servers here." ) ); | ||
304 | layout->addWidget( m_proxyPassword, 3, 1 ); | 331 | layout->addWidget( m_proxyPassword, 3, 1 ); |
305 | } | 332 | } |
@@ -320,19 +347,25 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
320 | 347 | ||
321 | m_optForceDepends = new QCheckBox( tr( "Force Depends" ), container ); | 348 | m_optForceDepends = new QCheckBox( tr( "Force Depends" ), container ); |
349 | QWhatsThis::add( m_optForceDepends, tr( "Tap here to enable or disable the '-force-depends' option for Ipkg." ) ); | ||
322 | layout->addWidget( m_optForceDepends ); | 350 | layout->addWidget( m_optForceDepends ); |
323 | 351 | ||
324 | m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container ); | 352 | m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container ); |
353 | QWhatsThis::add( m_optForceReinstall, tr( "Tap here to enable or disable the '-force-reinstall' option for Ipkg." ) ); | ||
325 | layout->addWidget( m_optForceReinstall ); | 354 | layout->addWidget( m_optForceReinstall ); |
326 | 355 | ||
327 | m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container ); | 356 | m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container ); |
357 | QWhatsThis::add( m_optForceRemove, tr( "Tap here to enable or disable the '-force-removal-of-dependent-packages' option for Ipkg." ) ); | ||
328 | layout->addWidget( m_optForceRemove ); | 358 | layout->addWidget( m_optForceRemove ); |
329 | 359 | ||
330 | m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container ); | 360 | m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container ); |
361 | QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); | ||
331 | layout->addWidget( m_optForceOverwrite ); | 362 | layout->addWidget( m_optForceOverwrite ); |
332 | 363 | ||
333 | QLabel *l = new QLabel( tr( "Information Level" ), container ); | 364 | QLabel *l = new QLabel( tr( "Information Level" ), container ); |
365 | QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); | ||
334 | layout->addWidget( l ); | 366 | layout->addWidget( l ); |
335 | 367 | ||
336 | m_optVerboseIpkg = new QComboBox( container ); | 368 | m_optVerboseIpkg = new QComboBox( container ); |
369 | QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); | ||
337 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); | 370 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); |
338 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); | 371 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); |