summaryrefslogtreecommitdiff
authordrw <drw>2003-01-05 01:13:45 (UTC)
committer drw <drw>2003-01-05 01:13:45 (UTC)
commitdb5ab38ee45f202f4a627085e7457a2511abceb4 (patch) (unidiff)
tree5080aed27ffaac6cfb91ca0ad4c20e74b4a3508a
parent8b0f280e69a6c5b4c1caf4070085feaf0951380d (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/aqpkg.pro2
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp30
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp90
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.h2
-rw-r--r--noncore/settings/aqpkg/progressdlg.cpp65
-rw-r--r--noncore/settings/aqpkg/progressdlg.h37
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
@@ -9,3 +9,2 @@ HEADERS = global.h \
9 package.h \ 9 package.h \
10 progressdlg.h \
11 progresswidget.h \ 10 progresswidget.h \
@@ -28,3 +27,2 @@ SOURCES = mainwin.cpp \
28 package.cpp \ 27 package.cpp \
29 progressdlg.cpp \
30 progresswidget.cpp \ 28 progresswidget.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
@@ -45,19 +45,19 @@ MainWindow :: MainWindow( QWidget *p, char *name )
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
@@ -65,6 +65,6 @@ MainWindow :: MainWindow( QWidget *p, char *name )
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
@@ -147,3 +147,3 @@ 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}
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
@@ -147,12 +147,12 @@ 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 );
@@ -160,4 +160,4 @@ void NetworkPackageManager :: initGui()
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
@@ -181,5 +181,5 @@ void NetworkPackageManager :: initGui()
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 );
@@ -310,3 +310,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
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 }
@@ -315,8 +315,8 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
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
@@ -324,3 +324,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
324 { 324 {
325 new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() ); 325 new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() );
326 } 326 }
@@ -328,3 +328,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
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() )
@@ -332,3 +332,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
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 }
@@ -343,3 +343,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
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 );
@@ -350,3 +350,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
350 download->setEnabled( true ); 350 download->setEnabled( true );
351 download->setText( "Remove" ); 351 download->setText( tr( "Remove" ) );
352 } 352 }
@@ -356,3 +356,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
356 download->setEnabled( true ); 356 download->setEnabled( true );
357 download->setText( "Download" ); 357 download->setText( tr( "Download" ) );
358 } 358 }
@@ -381,3 +381,3 @@ void NetworkPackageManager :: updateServer()
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();
@@ -394,4 +394,4 @@ void NetworkPackageManager :: upgradePackages()
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,
@@ -410,3 +410,3 @@ void NetworkPackageManager :: upgradePackages()
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();
@@ -423,3 +423,3 @@ void NetworkPackageManager :: downloadPackage()
423 bool doUpdate = true; 423 bool doUpdate = true;
424 if ( download->text() == "Download" ) 424 if ( download->text() == tr( "Download" ) )
425 { 425 {
@@ -447,3 +447,3 @@ void NetworkPackageManager :: downloadPackage()
447 } 447 }
448 else if ( download->text() == "Remove" ) 448 else if ( download->text() == tr( "Remove" ) )
449 { 449 {
@@ -468,5 +468,5 @@ void NetworkPackageManager :: downloadPackage()
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 {
@@ -548,3 +548,3 @@ void NetworkPackageManager :: downloadRemotePackage()
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() )
@@ -605,4 +605,4 @@ void NetworkPackageManager :: applyChanges()
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
@@ -705,6 +705,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
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 }
@@ -713,6 +713,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
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 }
@@ -724,5 +724,5 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
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 {
@@ -799,3 +799,3 @@ void NetworkPackageManager :: searchForPackage( bool findNext )
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
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
@@ -27,3 +27,2 @@
27#include "datamgr.h" 27#include "datamgr.h"
28#include "progressdlg.h"
29 28
@@ -61,3 +60,2 @@ private:
61 60
62 ProgressDlg *progressDlg;
63 QString currentlySelectedServer; 61 QString currentlySelectedServer;
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 */
34ProgressDlg::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 */
52ProgressDlg::~ProgressDlg()
53{
54 // no need to delete child widgets, Qt does it all for us
55}
56
57void ProgressDlg :: setText( QString &text )
58{
59 TextLabel2->setText( text );
60}
61
62void 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
21class QLabel;
22
23class ProgressDlg : public QDialog
24{
25 Q_OBJECT
26
27public:
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