author | drw <drw> | 2003-01-05 01:13:45 (UTC) |
---|---|---|
committer | drw <drw> | 2003-01-05 01:13:45 (UTC) |
commit | db5ab38ee45f202f4a627085e7457a2511abceb4 (patch) (unidiff) | |
tree | 5080aed27ffaac6cfb91ca0ad4c20e74b4a3508a /noncore | |
parent | 8b0f280e69a6c5b4c1caf4070085feaf0951380d (diff) | |
download | opie-db5ab38ee45f202f4a627085e7457a2511abceb4.zip opie-db5ab38ee45f202f4a627085e7457a2511abceb4.tar.gz opie-db5ab38ee45f202f4a627085e7457a2511abceb4.tar.bz2 |
Remove unused dialog and menu shortcut key combos. Also added a bunch of tr()'s to existing strings. Note to translators: These strings might be changing in the next couple of weeks as I do some UI updates.
-rw-r--r-- | noncore/settings/aqpkg/aqpkg.pro | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 30 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 90 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.h | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/progressdlg.cpp | 65 | ||||
-rw-r--r-- | noncore/settings/aqpkg/progressdlg.h | 37 |
6 files changed, 60 insertions, 166 deletions
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro index ad0dfc5..a5d49e7 100644 --- a/noncore/settings/aqpkg/aqpkg.pro +++ b/noncore/settings/aqpkg/aqpkg.pro | |||
@@ -4,13 +4,12 @@ HEADERS = global.h \ | |||
4 | mainwin.h \ | 4 | mainwin.h \ |
5 | datamgr.h \ | 5 | datamgr.h \ |
6 | settingsimpl.h \ | 6 | settingsimpl.h \ |
7 | ipkg.h \ | 7 | ipkg.h \ |
8 | networkpkgmgr.h \ | 8 | networkpkgmgr.h \ |
9 | package.h \ | 9 | package.h \ |
10 | progressdlg.h \ | ||
11 | progresswidget.h \ | 10 | progresswidget.h \ |
12 | installdlgimpl.h \ | 11 | installdlgimpl.h \ |
13 | instoptionsimpl.h \ | 12 | instoptionsimpl.h \ |
14 | destination.h \ | 13 | destination.h \ |
15 | utils.h \ | 14 | utils.h \ |
16 | server.h \ | 15 | server.h \ |
@@ -23,13 +22,12 @@ SOURCES = mainwin.cpp \ | |||
23 | mem.cpp \ | 22 | mem.cpp \ |
24 | settingsimpl.cpp \ | 23 | settingsimpl.cpp \ |
25 | ipkg.cpp \ | 24 | ipkg.cpp \ |
26 | networkpkgmgr.cpp \ | 25 | networkpkgmgr.cpp \ |
27 | main.cpp \ | 26 | main.cpp \ |
28 | package.cpp \ | 27 | package.cpp \ |
29 | progressdlg.cpp \ | ||
30 | progresswidget.cpp \ | 28 | progresswidget.cpp \ |
31 | installdlgimpl.cpp \ | 29 | installdlgimpl.cpp \ |
32 | instoptionsimpl.cpp \ | 30 | instoptionsimpl.cpp \ |
33 | destination.cpp \ | 31 | destination.cpp \ |
34 | utils.cpp \ | 32 | utils.cpp \ |
35 | server.cpp \ | 33 | server.cpp \ |
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 5e03f11..e577285 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -40,36 +40,36 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | setCaption( tr( "AQPkg - Package Manager" ) ); | 42 | setCaption( tr( "AQPkg - Package Manager" ) ); |
43 | 43 | ||
44 | // Create our menu | 44 | // Create our menu |
45 | help = new QPopupMenu( this ); | 45 | help = new QPopupMenu( this ); |
46 | help->insertItem( "&General", this, SLOT(displayHelp()), Qt::CTRL+Qt::Key_G ); | 46 | help->insertItem( tr( "General" ), this, SLOT(displayHelp()) ); |
47 | help->insertItem( "&About", this, SLOT(displayAbout()), Qt::CTRL+Qt::Key_A ); | 47 | help->insertItem( tr( "About" ), this, SLOT(displayAbout()) ); |
48 | 48 | ||
49 | settings = new QPopupMenu( this ); | 49 | settings = new QPopupMenu( this ); |
50 | settings->insertItem( "&Settings", this, SLOT(displaySettings()), Qt::CTRL+Qt::Key_S ); | 50 | settings->insertItem( tr( "Settings" ), this, SLOT(displaySettings()) ); |
51 | 51 | ||
52 | edit = new QPopupMenu( this ); | 52 | edit = new QPopupMenu( this ); |
53 | edit->insertItem( "&Find", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_I ); | 53 | edit->insertItem( tr( "Find" ), this, SLOT(searchForPackage()) ); |
54 | edit->insertItem( "Find &Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_N ); | 54 | edit->insertItem( tr( "Find Next" ), this, SLOT(repeatSearchForPackage()) ); |
55 | 55 | ||
56 | filter = new QPopupMenu( this ); | 56 | filter = new QPopupMenu( this ); |
57 | mnuShowUninstalledPkgsId = filter->insertItem( "Show &Non-Installed Packages", this, SLOT(filterUninstalledPackages()), Qt::CTRL+Qt::Key_U ); | 57 | mnuShowUninstalledPkgsId = filter->insertItem( tr( "Show Non-Installed Packages" ), this, SLOT(filterUninstalledPackages()) ); |
58 | mnuShowInstalledPkgsId = filter->insertItem( "Show In&stalled Packages", this, SLOT(filterInstalledPackages()), Qt::CTRL+Qt::Key_S ); | 58 | mnuShowInstalledPkgsId = filter->insertItem( tr( "Show Installed Packages" ), this, SLOT(filterInstalledPackages()) ); |
59 | mnuShowUpgradedPkgsId = filter->insertItem( "Show U&pdated Packages", this, SLOT(filterUpgradedPackages()), Qt::CTRL+Qt::Key_P ); | 59 | mnuShowUpgradedPkgsId = filter->insertItem( tr( "Show Updated Packages" ), this, SLOT(filterUpgradedPackages()) ); |
60 | filter->insertSeparator(); | 60 | filter->insertSeparator(); |
61 | mnuFilterByCategory = filter->insertItem( "Filter By &Category", this, SLOT(filterCategory()), Qt::CTRL+Qt::Key_C ); | 61 | mnuFilterByCategory = filter->insertItem( tr( "Filter By Category" ), this, SLOT(filterCategory()) ); |
62 | mnuSetFilterCategory = filter->insertItem( "Set Filter C&ategory", this, SLOT(setFilterCategory()), Qt::CTRL+Qt::Key_A ); | 62 | mnuSetFilterCategory = filter->insertItem( tr( "Set Filter Category" ), this, SLOT(setFilterCategory()) ); |
63 | 63 | ||
64 | // Create the main menu | 64 | // Create the main menu |
65 | menu = menuBar(); //new QMenuBar( this ); | 65 | menu = menuBar(); //new QMenuBar( this ); |
66 | menu->insertItem( tr( "&Settings" ), settings ); | 66 | menu->insertItem( tr( "Settings" ), settings ); |
67 | menu->insertItem( tr( "&Edit" ), edit ); | 67 | menu->insertItem( tr( "Edit" ), edit ); |
68 | menu->insertItem( tr( "&Filter" ), filter ); | 68 | menu->insertItem( tr( "Filter" ), filter ); |
69 | menu->insertItem( tr( "&Help" ), help ); | 69 | menu->insertItem( tr( "Help" ), help ); |
70 | 70 | ||
71 | // Create UI widgets | 71 | // Create UI widgets |
72 | stack = new QWidgetStack( this ); | 72 | stack = new QWidgetStack( this ); |
73 | 73 | ||
74 | progressWindow = new ProgressWidget( stack ); | 74 | progressWindow = new ProgressWidget( stack ); |
75 | stack->addWidget( progressWindow, 2 ); | 75 | stack->addWidget( progressWindow, 2 ); |
@@ -142,13 +142,13 @@ void MainWindow :: repeatSearchForPackage() | |||
142 | { | 142 | { |
143 | networkPkgWindow->searchForPackage( true ); | 143 | networkPkgWindow->searchForPackage( true ); |
144 | } | 144 | } |
145 | 145 | ||
146 | void MainWindow :: displayAbout() | 146 | void MainWindow :: displayAbout() |
147 | { | 147 | { |
148 | QMessageBox::about( this, "About AQPkg", VERSION_TEXT ); | 148 | QMessageBox::about( this, tr( "About AQPkg" ), tr( VERSION_TEXT ) ); |
149 | } | 149 | } |
150 | 150 | ||
151 | 151 | ||
152 | void MainWindow :: filterUninstalledPackages() | 152 | void MainWindow :: filterUninstalledPackages() |
153 | { | 153 | { |
154 | bool val; | 154 | bool val; |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index cae0d8f..ee37157 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -142,27 +142,27 @@ void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) | |||
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | 145 | ||
146 | void NetworkPackageManager :: initGui() | 146 | void NetworkPackageManager :: initGui() |
147 | { | 147 | { |
148 | QLabel *l = new QLabel( "Servers", this ); | 148 | QLabel *l = new QLabel( tr( "Servers" ), this ); |
149 | serversList = new QComboBox( this ); | 149 | serversList = new QComboBox( this ); |
150 | packagesList = new QListView( this ); | 150 | packagesList = new QListView( this ); |
151 | update = new QPushButton( "Refresh Lists", this ); | 151 | update = new QPushButton( tr( "Refresh Lists" ), this ); |
152 | download = new QPushButton( "Download", this ); | 152 | download = new QPushButton( tr( "Download" ), this ); |
153 | upgrade = new QPushButton( "Upgrade", this ); | 153 | upgrade = new QPushButton( tr( "Upgrade" ), this ); |
154 | apply = new QPushButton( "Apply", this ); | 154 | apply = new QPushButton( tr( "Apply" ), this ); |
155 | 155 | ||
156 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" ); | 156 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 ); |
157 | QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1, "HBox1" ); | 157 | QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 ); |
158 | hbox1->addWidget( l ); | 158 | hbox1->addWidget( l ); |
159 | hbox1->addWidget( serversList ); | 159 | hbox1->addWidget( serversList ); |
160 | 160 | ||
161 | QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1, "HBox1" ); | 161 | QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 ); |
162 | QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1, "HBox1" ); | 162 | QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 ); |
163 | 163 | ||
164 | 164 | ||
165 | if ( showJumpTo ) | 165 | if ( showJumpTo ) |
166 | { | 166 | { |
167 | char text[2]; | 167 | char text[2]; |
168 | text[1] = '\0'; | 168 | text[1] = '\0'; |
@@ -176,15 +176,15 @@ void NetworkPackageManager :: initGui() | |||
176 | else | 176 | else |
177 | hbox4->addWidget( b ); | 177 | hbox4->addWidget( b ); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | vbox->addWidget( packagesList ); | 181 | vbox->addWidget( packagesList ); |
182 | packagesList->addColumn( "Packages" ); | 182 | packagesList->addColumn( tr( "Packages" ) ); |
183 | 183 | ||
184 | QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1, "HBox2" ); | 184 | QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1 ); |
185 | hbox2->addWidget( update ); | 185 | hbox2->addWidget( update ); |
186 | hbox2->addWidget( download ); | 186 | hbox2->addWidget( download ); |
187 | hbox2->addWidget( upgrade ); | 187 | hbox2->addWidget( upgrade ); |
188 | hbox2->addWidget( apply ); | 188 | hbox2->addWidget( apply ); |
189 | } | 189 | } |
190 | 190 | ||
@@ -305,59 +305,59 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) | |||
305 | else | 305 | else |
306 | { | 306 | { |
307 | if ( it->getInstalledTo() ) | 307 | if ( it->getInstalledTo() ) |
308 | destName = it->getInstalledTo()->getDestinationName(); | 308 | destName = it->getInstalledTo()->getDestinationName(); |
309 | } | 309 | } |
310 | if ( destName != "" ) | 310 | if ( destName != "" ) |
311 | new QCheckListItem( item, QString( "Installed To - " ) + destName ); | 311 | new QCheckListItem( item, QString( tr( "Installed To - " ) ) + destName ); |
312 | } | 312 | } |
313 | 313 | ||
314 | if ( !it->isPackageStoredLocally() ) | 314 | if ( !it->isPackageStoredLocally() ) |
315 | { | 315 | { |
316 | new QCheckListItem( item, QString( "Description - " ) + it->getDescription() ); | 316 | new QCheckListItem( item, QString( tr( "Description - " ) ) + it->getDescription() ); |
317 | new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() ); | 317 | new QCheckListItem( item, QString( tr( "Size - " ) ) + it->getPackageSize() ); |
318 | new QCheckListItem( item, QString( "Section - " ) + it->getSection() ); | 318 | new QCheckListItem( item, QString( tr( "Section - " ) ) + it->getSection() ); |
319 | } | 319 | } |
320 | else | 320 | else |
321 | new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() ); | 321 | new QCheckListItem( item, QString( tr( "Filename - " ) ) + it->getFilename() ); |
322 | 322 | ||
323 | if ( serverName == LOCAL_SERVER ) | 323 | if ( serverName == LOCAL_SERVER ) |
324 | { | 324 | { |
325 | new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() ); | 325 | new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() ); |
326 | } | 326 | } |
327 | else | 327 | else |
328 | { | 328 | { |
329 | new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() ); | 329 | new QCheckListItem( item, QString( tr( "V. Available - " ) ) + it->getVersion() ); |
330 | if ( it->getLocalPackage() ) | 330 | if ( it->getLocalPackage() ) |
331 | { | 331 | { |
332 | if ( it->isInstalled() ) | 332 | if ( it->isInstalled() ) |
333 | new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() ); | 333 | new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getInstalledVersion() ); |
334 | } | 334 | } |
335 | } | 335 | } |
336 | 336 | ||
337 | packagesList->insertItem( item ); | 337 | packagesList->insertItem( item ); |
338 | } | 338 | } |
339 | 339 | ||
340 | // If the local server or the local ipkgs server disable the download button | 340 | // If the local server or the local ipkgs server disable the download button |
341 | if ( serverName == LOCAL_SERVER ) | 341 | if ( serverName == LOCAL_SERVER ) |
342 | { | 342 | { |
343 | upgrade->setEnabled( false ); | 343 | upgrade->setEnabled( false ); |
344 | download->setText( "Download" ); | 344 | download->setText( tr( "Download" ) ); |
345 | download->setEnabled( true ); | 345 | download->setEnabled( true ); |
346 | } | 346 | } |
347 | else if ( serverName == LOCAL_IPKGS ) | 347 | else if ( serverName == LOCAL_IPKGS ) |
348 | { | 348 | { |
349 | upgrade->setEnabled( false ); | 349 | upgrade->setEnabled( false ); |
350 | download->setEnabled( true ); | 350 | download->setEnabled( true ); |
351 | download->setText( "Remove" ); | 351 | download->setText( tr( "Remove" ) ); |
352 | } | 352 | } |
353 | else | 353 | else |
354 | { | 354 | { |
355 | upgrade->setEnabled( true ); | 355 | upgrade->setEnabled( true ); |
356 | download->setEnabled( true ); | 356 | download->setEnabled( true ); |
357 | download->setText( "Download" ); | 357 | download->setText( tr( "Download" ) ); |
358 | } | 358 | } |
359 | 359 | ||
360 | // Display this widget once everything is done | 360 | // Display this widget once everything is done |
361 | if ( doProgress && raiseProgress ) | 361 | if ( doProgress && raiseProgress ) |
362 | { | 362 | { |
363 | emit appRaiseMainWidget(); | 363 | emit appRaiseMainWidget(); |
@@ -376,27 +376,27 @@ void NetworkPackageManager :: updateServer() | |||
376 | // First, write out ipkg_conf file so that ipkg can use it | 376 | // First, write out ipkg_conf file so that ipkg can use it |
377 | dataMgr->writeOutIpkgConf(); | 377 | dataMgr->writeOutIpkgConf(); |
378 | 378 | ||
379 | Ipkg ipkg; | 379 | Ipkg ipkg; |
380 | ipkg.setOption( "update" ); | 380 | ipkg.setOption( "update" ); |
381 | 381 | ||
382 | InstallDlgImpl dlg( &ipkg, "Refreshing server package lists", this, "Upgrade", true ); | 382 | InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true ); |
383 | dlg.showDlg(); | 383 | dlg.showDlg(); |
384 | 384 | ||
385 | // Reload data | 385 | // Reload data |
386 | dataMgr->reloadServerData(); | 386 | dataMgr->reloadServerData(); |
387 | serverSelected(-1); | 387 | serverSelected(-1); |
388 | // delete progDlg; | 388 | // delete progDlg; |
389 | } | 389 | } |
390 | 390 | ||
391 | void NetworkPackageManager :: upgradePackages() | 391 | void NetworkPackageManager :: upgradePackages() |
392 | { | 392 | { |
393 | // We're gonna do an upgrade of all packages | 393 | // We're gonna do an upgrade of all packages |
394 | // First warn user that this isn't recommended | 394 | // First warn user that this isn't recommended |
395 | QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n"; | 395 | QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" ); |
396 | QMessageBox warn("Warning", text, QMessageBox::Warning, | 396 | QMessageBox warn( tr( "Warning" ), text, QMessageBox::Warning, |
397 | QMessageBox::Yes, | 397 | QMessageBox::Yes, |
398 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default , | 398 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default , |
399 | 0, this ); | 399 | 0, this ); |
400 | warn.adjustSize(); | 400 | warn.adjustSize(); |
401 | 401 | ||
402 | if ( warn.exec() == QMessageBox::Yes ) | 402 | if ( warn.exec() == QMessageBox::Yes ) |
@@ -405,26 +405,26 @@ void NetworkPackageManager :: upgradePackages() | |||
405 | dataMgr->writeOutIpkgConf(); | 405 | dataMgr->writeOutIpkgConf(); |
406 | 406 | ||
407 | // Now run upgrade | 407 | // Now run upgrade |
408 | Ipkg ipkg; | 408 | Ipkg ipkg; |
409 | ipkg.setOption( "upgrade" ); | 409 | ipkg.setOption( "upgrade" ); |
410 | 410 | ||
411 | InstallDlgImpl dlg( &ipkg, "Upgrading installed packages", this, "Upgrade", true ); | 411 | InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true ); |
412 | dlg.showDlg(); | 412 | dlg.showDlg(); |
413 | 413 | ||
414 | // Reload data | 414 | // Reload data |
415 | dataMgr->reloadServerData(); | 415 | dataMgr->reloadServerData(); |
416 | serverSelected(-1); | 416 | serverSelected(-1); |
417 | } | 417 | } |
418 | } | 418 | } |
419 | 419 | ||
420 | 420 | ||
421 | void NetworkPackageManager :: downloadPackage() | 421 | void NetworkPackageManager :: downloadPackage() |
422 | { | 422 | { |
423 | bool doUpdate = true; | 423 | bool doUpdate = true; |
424 | if ( download->text() == "Download" ) | 424 | if ( download->text() == tr( "Download" ) ) |
425 | { | 425 | { |
426 | // See if any packages are selected | 426 | // See if any packages are selected |
427 | bool found = false; | 427 | bool found = false; |
428 | if ( serversList->currentText() != LOCAL_SERVER ) | 428 | if ( serversList->currentText() != LOCAL_SERVER ) |
429 | { | 429 | { |
430 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); | 430 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); |
@@ -442,13 +442,13 @@ void NetworkPackageManager :: downloadPackage() | |||
442 | if ( found ) | 442 | if ( found ) |
443 | downloadSelectedPackages(); | 443 | downloadSelectedPackages(); |
444 | else | 444 | else |
445 | downloadRemotePackage(); | 445 | downloadRemotePackage(); |
446 | 446 | ||
447 | } | 447 | } |
448 | else if ( download->text() == "Remove" ) | 448 | else if ( download->text() == tr( "Remove" ) ) |
449 | { | 449 | { |
450 | doUpdate = false; | 450 | doUpdate = false; |
451 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); | 451 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); |
452 | item != 0 ; | 452 | item != 0 ; |
453 | item = (QCheckListItem *)item->nextSibling() ) | 453 | item = (QCheckListItem *)item->nextSibling() ) |
454 | { | 454 | { |
@@ -463,15 +463,15 @@ void NetworkPackageManager :: downloadPackage() | |||
463 | if ( pos > 0 ) | 463 | if ( pos > 0 ) |
464 | name.truncate( pos - 1 ); | 464 | name.truncate( pos - 1 ); |
465 | 465 | ||
466 | Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name ); | 466 | Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name ); |
467 | 467 | ||
468 | QString msgtext; | 468 | QString msgtext; |
469 | msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() ); | 469 | msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() ); |
470 | if ( QMessageBox::information( this, "Are you sure?", | 470 | if ( QMessageBox::information( this, tr( "Are you sure?" ), |
471 | msgtext, "No", "Yes" ) == 1 ) | 471 | msgtext, tr( "No" ), tr( "Yes" ) ) == 1 ) |
472 | { | 472 | { |
473 | doUpdate = true; | 473 | doUpdate = true; |
474 | QFile f( p->getFilename() ); | 474 | QFile f( p->getFilename() ); |
475 | f.remove(); | 475 | f.remove(); |
476 | } | 476 | } |
477 | } | 477 | } |
@@ -543,13 +543,13 @@ void NetworkPackageManager :: downloadSelectedPackages() | |||
543 | } | 543 | } |
544 | 544 | ||
545 | void NetworkPackageManager :: downloadRemotePackage() | 545 | void NetworkPackageManager :: downloadRemotePackage() |
546 | { | 546 | { |
547 | // Display dialog | 547 | // Display dialog |
548 | bool ok; | 548 | bool ok; |
549 | QString package = InputDialog::getText( "Install Remote Package", tr( "Enter package location" ), "http://", &ok, this ); | 549 | QString package = InputDialog::getText( tr( "Install Remote Package" ), tr( "Enter package location" ), "http://", &ok, this ); |
550 | if ( !ok || package.isEmpty() ) | 550 | if ( !ok || package.isEmpty() ) |
551 | return; | 551 | return; |
552 | // DownloadRemoteDlgImpl dlg( this, "Install", true ); | 552 | // DownloadRemoteDlgImpl dlg( this, "Install", true ); |
553 | // if ( dlg.exec() == QDialog::Rejected ) | 553 | // if ( dlg.exec() == QDialog::Rejected ) |
554 | // return; | 554 | // return; |
555 | 555 | ||
@@ -600,14 +600,14 @@ void NetworkPackageManager :: applyChanges() | |||
600 | } | 600 | } |
601 | } | 601 | } |
602 | 602 | ||
603 | if ( workingPackages.size() == 0 ) | 603 | if ( workingPackages.size() == 0 ) |
604 | { | 604 | { |
605 | // Nothing to do | 605 | // Nothing to do |
606 | QMessageBox::information( this, "Nothing to do", | 606 | QMessageBox::information( this, tr( "Nothing to do" ), |
607 | "No packages selected", "OK" ); | 607 | tr( "No packages selected" ), tr( "OK" ) ); |
608 | 608 | ||
609 | return; | 609 | return; |
610 | } | 610 | } |
611 | 611 | ||
612 | // do the stuff | 612 | // do the stuff |
613 | InstallDlgImpl dlg( workingPackages, dataMgr, this, "Install", true ); | 613 | InstallDlgImpl dlg( workingPackages, dataMgr, this, "Install", true ); |
@@ -700,34 +700,34 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) | |||
700 | QString text; | 700 | QString text; |
701 | QString secondButton; | 701 | QString secondButton; |
702 | QString secondOption; | 702 | QString secondOption; |
703 | if ( val == 0 ) | 703 | if ( val == 0 ) |
704 | { | 704 | { |
705 | // Version available is the same - option to remove or reinstall | 705 | // Version available is the same - option to remove or reinstall |
706 | caption = "Do you wish to remove or reinstall\n%s?"; | 706 | caption = tr( "Do you wish to remove or reinstall\n%1?" ); |
707 | text = "Remove or ReInstall"; | 707 | text = tr( "Remove or ReInstall" ); |
708 | secondButton = "ReInstall"; | 708 | secondButton = tr( "ReInstall" ); |
709 | secondOption = "R"; | 709 | secondOption = tr( "R" ); |
710 | } | 710 | } |
711 | else if ( val == 1 ) | 711 | else if ( val == 1 ) |
712 | { | 712 | { |
713 | // Version available is newer - option to remove or upgrade | 713 | // Version available is newer - option to remove or upgrade |
714 | caption = "Do you wish to remove or upgrade\n%s?"; | 714 | caption = tr( "Do you wish to remove or upgrade\n%1?" ); |
715 | text = "Remove or Upgrade"; | 715 | text = tr( "Remove or Upgrade" ); |
716 | secondButton = "Upgrade"; | 716 | secondButton = tr( "Upgrade" ); |
717 | secondOption = "U"; | 717 | secondOption = tr( "U" ); |
718 | } | 718 | } |
719 | 719 | ||
720 | // Sticky option not implemented yet, but will eventually allow | 720 | // Sticky option not implemented yet, but will eventually allow |
721 | // the user to say something like 'remove all' | 721 | // the user to say something like 'remove all' |
722 | if ( stickyOption == "" ) | 722 | if ( stickyOption == "" ) |
723 | { | 723 | { |
724 | QString msgtext; | 724 | QString msgtext; |
725 | msgtext.sprintf( caption, (const char *)name ); | 725 | msgtext = caption.arg( ( const char * )name ); |
726 | switch( QMessageBox::information( this, text, | 726 | switch( QMessageBox::information( this, text, |
727 | msgtext, "Remove", secondButton ) ) | 727 | msgtext, tr( "Remove" ), secondButton ) ) |
728 | { | 728 | { |
729 | case 0: // Try again or Enter | 729 | case 0: // Try again or Enter |
730 | // option 0 = Remove | 730 | // option 0 = Remove |
731 | item.option = "D"; | 731 | item.option = "D"; |
732 | break; | 732 | break; |
733 | case 1: // Quit or Escape | 733 | case 1: // Quit or Escape |
@@ -794,13 +794,13 @@ void NetworkPackageManager :: letterPushed( QString t ) | |||
794 | 794 | ||
795 | 795 | ||
796 | void NetworkPackageManager :: searchForPackage( bool findNext ) | 796 | void NetworkPackageManager :: searchForPackage( bool findNext ) |
797 | { | 797 | { |
798 | bool ok = false; | 798 | bool ok = false; |
799 | if ( !findNext || lastSearchText.isEmpty() ) | 799 | if ( !findNext || lastSearchText.isEmpty() ) |
800 | lastSearchText = InputDialog::getText( "Search for package", "Enter package to search for", lastSearchText, &ok, this ).lower(); | 800 | lastSearchText = InputDialog::getText( tr( "Search for package" ), tr( "Enter package to search for" ), lastSearchText, &ok, this ).lower(); |
801 | else | 801 | else |
802 | ok = true; | 802 | ok = true; |
803 | 803 | ||
804 | if ( ok && !lastSearchText.isEmpty() ) | 804 | if ( ok && !lastSearchText.isEmpty() ) |
805 | { | 805 | { |
806 | cout << "searching for " << lastSearchText << endl; | 806 | cout << "searching for " << lastSearchText << endl; |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h index 2206c81..6b552ee 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.h +++ b/noncore/settings/aqpkg/networkpkgmgr.h | |||
@@ -22,13 +22,12 @@ | |||
22 | #include <qpushbutton.h> | 22 | #include <qpushbutton.h> |
23 | #include <qwidget.h> | 23 | #include <qwidget.h> |
24 | #include <qcombobox.h> | 24 | #include <qcombobox.h> |
25 | #include <qlistview.h> | 25 | #include <qlistview.h> |
26 | 26 | ||
27 | #include "datamgr.h" | 27 | #include "datamgr.h" |
28 | #include "progressdlg.h" | ||
29 | 28 | ||
30 | class InstallData; | 29 | class InstallData; |
31 | 30 | ||
32 | /** NetworkPackageManager is the base class of the project */ | 31 | /** NetworkPackageManager is the base class of the project */ |
33 | class NetworkPackageManager : public QWidget | 32 | class NetworkPackageManager : public QWidget |
34 | { | 33 | { |
@@ -56,13 +55,12 @@ private: | |||
56 | QListView *packagesList; | 55 | QListView *packagesList; |
57 | QPushButton *update; | 56 | QPushButton *update; |
58 | QPushButton *upgrade; | 57 | QPushButton *upgrade; |
59 | QPushButton *download; | 58 | QPushButton *download; |
60 | QPushButton *apply; | 59 | QPushButton *apply; |
61 | 60 | ||
62 | ProgressDlg *progressDlg; | ||
63 | QString currentlySelectedServer; | 61 | QString currentlySelectedServer; |
64 | QString lastSearchText; | 62 | QString lastSearchText; |
65 | QString categoryFilter; | 63 | QString categoryFilter; |
66 | 64 | ||
67 | bool categoryFilterEnabled; | 65 | bool categoryFilterEnabled; |
68 | bool showJumpTo; | 66 | bool showJumpTo; |
diff --git a/noncore/settings/aqpkg/progressdlg.cpp b/noncore/settings/aqpkg/progressdlg.cpp deleted file mode 100644 index 3fa4367..0000000 --- a/noncore/settings/aqpkg/progressdlg.cpp +++ b/dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | progressdlg.h - description | ||
3 | ------------------- | ||
4 | begin : Mon Aug 26 2002 | ||
5 | copyright : (C) 2002 by Andy Qua | ||
6 | email : andy.qua@blueyonder.co.uk | ||
7 | ***************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
10 | * * | ||
11 | * This program is free software; you can redistribute it and/or modify * | ||
12 | * it under the terms of the GNU General Public License as published by * | ||
13 | * the Free Software Foundation; either version 2 of the License, or * | ||
14 | * (at your option) any later version. * | ||
15 | * * | ||
16 | ***************************************************************************/ | ||
17 | |||
18 | #include "progressdlg.h" | ||
19 | |||
20 | #include <qlabel.h> | ||
21 | #include <qlayout.h> | ||
22 | #include <qvariant.h> | ||
23 | #include <qtooltip.h> | ||
24 | #include <qwhatsthis.h> | ||
25 | |||
26 | #include "global.h" | ||
27 | /* | ||
28 | * Constructs a ProgressDlg which is a child of 'parent', with the | ||
29 | * name 'name' and widget flags set to 'f' | ||
30 | * | ||
31 | * The dialog will by default be modeless, unless you set 'modal' to | ||
32 | * TRUE to construct a modal dialog. | ||
33 | */ | ||
34 | ProgressDlg::ProgressDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) | ||
35 | : QDialog( parent, name, modal, fl ) | ||
36 | { | ||
37 | if ( !name ) | ||
38 | setName( "ProgressDlg" ); | ||
39 | resize( 240, 73 ); | ||
40 | setCaption( tr( "Progress" ) ); | ||
41 | |||
42 | TextLabel2 = new QLabel( this, "TextLabel2" ); | ||
43 | TextLabel2->setGeometry( QRect( 10, 10, 240, 50 ) ); | ||
44 | TextLabel2->setFrameShape( QLabel::Box ); | ||
45 | TextLabel2->setText( tr( "Text" ) ); | ||
46 | TextLabel2->setAlignment( QLabel::WordBreak | QLabel::AlignHCenter | QLabel::AlignVCenter ); | ||
47 | } | ||
48 | |||
49 | /* | ||
50 | * Destroys the object and frees any allocated resources | ||
51 | */ | ||
52 | ProgressDlg::~ProgressDlg() | ||
53 | { | ||
54 | // no need to delete child widgets, Qt does it all for us | ||
55 | } | ||
56 | |||
57 | void ProgressDlg :: setText( QString &text ) | ||
58 | { | ||
59 | TextLabel2->setText( text ); | ||
60 | } | ||
61 | |||
62 | void ProgressDlg :: setText( const char *text ) | ||
63 | { | ||
64 | TextLabel2->setText( text ); | ||
65 | } | ||
diff --git a/noncore/settings/aqpkg/progressdlg.h b/noncore/settings/aqpkg/progressdlg.h deleted file mode 100644 index 3e83455..0000000 --- a/noncore/settings/aqpkg/progressdlg.h +++ b/dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | progressdlg.h - description | ||
3 | ------------------- | ||
4 | begin : Mon Aug 26 2002 | ||
5 | copyright : (C) 2002 by Andy Qua | ||
6 | email : andy.qua@blueyonder.co.uk | ||
7 | ***************************************************************************/ | ||
8 | |||
9 | /*************************************************************************** | ||
10 | * * | ||
11 | * This program is free software; you can redistribute it and/or modify * | ||
12 | * it under the terms of the GNU General Public License as published by * | ||
13 | * the Free Software Foundation; either version 2 of the License, or * | ||
14 | * (at your option) any later version. * | ||
15 | * * | ||
16 | ***************************************************************************/#ifndef PROGRESSDLG_H | ||
17 | #define PROGRESSDLG_H | ||
18 | |||
19 | #include <qdialog.h> | ||
20 | |||
21 | class QLabel; | ||
22 | |||
23 | class ProgressDlg : public QDialog | ||
24 | { | ||
25 | Q_OBJECT | ||
26 | |||
27 | public: | ||
28 | ProgressDlg( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | ||
29 | ~ProgressDlg(); | ||
30 | |||
31 | QLabel* TextLabel2; | ||
32 | |||
33 | void setText( QString &text ); | ||
34 | void setText( const char *text ); | ||
35 | }; | ||
36 | |||
37 | #endif // PROGRESSDLG_H | ||