summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -2,17 +2,16 @@ TEMPLATE = app
CONFIG = qt warn_on debug
HEADERS = global.h \
mainwin.h \
datamgr.h \
settingsimpl.h \
ipkg.h \
networkpkgmgr.h \
package.h \
- progressdlg.h \
progresswidget.h \
installdlgimpl.h \
instoptionsimpl.h \
destination.h \
utils.h \
server.h \
helpwindow.h \
letterpushbutton.h \
@@ -21,17 +20,16 @@ HEADERS = global.h \
SOURCES = mainwin.cpp \
datamgr.cpp \
mem.cpp \
settingsimpl.cpp \
ipkg.cpp \
networkpkgmgr.cpp \
main.cpp \
package.cpp \
- progressdlg.cpp \
progresswidget.cpp \
installdlgimpl.cpp \
instoptionsimpl.cpp \
destination.cpp \
utils.cpp \
server.cpp \
helpwindow.cpp \
letterpushbutton.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
@@ -38,40 +38,40 @@ MainWindow :: MainWindow( QWidget *p, char *name )
#ifdef QWS
showMaximized();
#endif
setCaption( tr( "AQPkg - Package Manager" ) );
// Create our menu
help = new QPopupMenu( this );
- help->insertItem( "&General", this, SLOT(displayHelp()), Qt::CTRL+Qt::Key_G );
- help->insertItem( "&About", this, SLOT(displayAbout()), Qt::CTRL+Qt::Key_A );
+ help->insertItem( tr( "General" ), this, SLOT(displayHelp()) );
+ help->insertItem( tr( "About" ), this, SLOT(displayAbout()) );
settings = new QPopupMenu( this );
- settings->insertItem( "&Settings", this, SLOT(displaySettings()), Qt::CTRL+Qt::Key_S );
+ settings->insertItem( tr( "Settings" ), this, SLOT(displaySettings()) );
edit = new QPopupMenu( this );
- edit->insertItem( "&Find", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_I );
- edit->insertItem( "Find &Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_N );
+ edit->insertItem( tr( "Find" ), this, SLOT(searchForPackage()) );
+ edit->insertItem( tr( "Find Next" ), this, SLOT(repeatSearchForPackage()) );
filter = new QPopupMenu( this );
- mnuShowUninstalledPkgsId = filter->insertItem( "Show &Non-Installed Packages", this, SLOT(filterUninstalledPackages()), Qt::CTRL+Qt::Key_U );
- mnuShowInstalledPkgsId = filter->insertItem( "Show In&stalled Packages", this, SLOT(filterInstalledPackages()), Qt::CTRL+Qt::Key_S );
- mnuShowUpgradedPkgsId = filter->insertItem( "Show U&pdated Packages", this, SLOT(filterUpgradedPackages()), Qt::CTRL+Qt::Key_P );
+ mnuShowUninstalledPkgsId = filter->insertItem( tr( "Show Non-Installed Packages" ), this, SLOT(filterUninstalledPackages()) );
+ mnuShowInstalledPkgsId = filter->insertItem( tr( "Show Installed Packages" ), this, SLOT(filterInstalledPackages()) );
+ mnuShowUpgradedPkgsId = filter->insertItem( tr( "Show Updated Packages" ), this, SLOT(filterUpgradedPackages()) );
filter->insertSeparator();
- mnuFilterByCategory = filter->insertItem( "Filter By &Category", this, SLOT(filterCategory()), Qt::CTRL+Qt::Key_C );
- mnuSetFilterCategory = filter->insertItem( "Set Filter C&ategory", this, SLOT(setFilterCategory()), Qt::CTRL+Qt::Key_A );
+ mnuFilterByCategory = filter->insertItem( tr( "Filter By Category" ), this, SLOT(filterCategory()) );
+ mnuSetFilterCategory = filter->insertItem( tr( "Set Filter Category" ), this, SLOT(setFilterCategory()) );
// Create the main menu
menu = menuBar(); //new QMenuBar( this );
- menu->insertItem( tr( "&Settings" ), settings );
- menu->insertItem( tr( "&Edit" ), edit );
- menu->insertItem( tr( "&Filter" ), filter );
- menu->insertItem( tr( "&Help" ), help );
+ menu->insertItem( tr( "Settings" ), settings );
+ menu->insertItem( tr( "Edit" ), edit );
+ menu->insertItem( tr( "Filter" ), filter );
+ menu->insertItem( tr( "Help" ), help );
// Create UI widgets
stack = new QWidgetStack( this );
progressWindow = new ProgressWidget( stack );
stack->addWidget( progressWindow, 2 );
networkPkgWindow = new NetworkPackageManager( stack );
@@ -140,17 +140,17 @@ void MainWindow :: searchForPackage()
void MainWindow :: repeatSearchForPackage()
{
networkPkgWindow->searchForPackage( true );
}
void MainWindow :: displayAbout()
{
- QMessageBox::about( this, "About AQPkg", VERSION_TEXT );
+ QMessageBox::about( this, tr( "About AQPkg" ), tr( VERSION_TEXT ) );
}
void MainWindow :: filterUninstalledPackages()
{
bool val;
if ( filter->isItemChecked( mnuShowUninstalledPkgsId ) )
{
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
@@ -140,31 +140,31 @@ void NetworkPackageManager :: selectLocalPackage( const QString &pkg )
break;
}
}
}
void NetworkPackageManager :: initGui()
{
- QLabel *l = new QLabel( "Servers", this );
+ QLabel *l = new QLabel( tr( "Servers" ), this );
serversList = new QComboBox( this );
packagesList = new QListView( this );
- update = new QPushButton( "Refresh Lists", this );
- download = new QPushButton( "Download", this );
- upgrade = new QPushButton( "Upgrade", this );
- apply = new QPushButton( "Apply", this );
+ update = new QPushButton( tr( "Refresh Lists" ), this );
+ download = new QPushButton( tr( "Download" ), this );
+ upgrade = new QPushButton( tr( "Upgrade" ), this );
+ apply = new QPushButton( tr( "Apply" ), this );
- QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" );
- QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1, "HBox1" );
+ QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 );
+ QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
hbox1->addWidget( l );
hbox1->addWidget( serversList );
- QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1, "HBox1" );
- QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1, "HBox1" );
+ QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
+ QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
if ( showJumpTo )
{
char text[2];
text[1] = '\0';
for ( int i = 0 ; i < 26 ; ++i )
{
@@ -174,19 +174,19 @@ void NetworkPackageManager :: initGui()
if ( i < 13 )
hbox3->addWidget( b );
else
hbox4->addWidget( b );
}
}
vbox->addWidget( packagesList );
- packagesList->addColumn( "Packages" );
+ packagesList->addColumn( tr( "Packages" ) );
- QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1, "HBox2" );
+ QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1 );
hbox2->addWidget( update );
hbox2->addWidget( download );
hbox2->addWidget( upgrade );
hbox2->addWidget( apply );
}
void NetworkPackageManager :: setupConnections()
{
@@ -303,63 +303,63 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
destName = it->getLocalPackage()->getInstalledTo()->getDestinationName();
}
else
{
if ( it->getInstalledTo() )
destName = it->getInstalledTo()->getDestinationName();
}
if ( destName != "" )
- new QCheckListItem( item, QString( "Installed To - " ) + destName );
+ new QCheckListItem( item, QString( tr( "Installed To - " ) ) + destName );
}
if ( !it->isPackageStoredLocally() )
{
- new QCheckListItem( item, QString( "Description - " ) + it->getDescription() );
- new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() );
- new QCheckListItem( item, QString( "Section - " ) + it->getSection() );
+ new QCheckListItem( item, QString( tr( "Description - " ) ) + it->getDescription() );
+ new QCheckListItem( item, QString( tr( "Size - " ) ) + it->getPackageSize() );
+ new QCheckListItem( item, QString( tr( "Section - " ) ) + it->getSection() );
}
else
- new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() );
+ new QCheckListItem( item, QString( tr( "Filename - " ) ) + it->getFilename() );
if ( serverName == LOCAL_SERVER )
{
- new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() );
+ new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() );
}
else
{
- new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );
+ new QCheckListItem( item, QString( tr( "V. Available - " ) ) + it->getVersion() );
if ( it->getLocalPackage() )
{
if ( it->isInstalled() )
- new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );
+ new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getInstalledVersion() );
}
}
packagesList->insertItem( item );
}
// If the local server or the local ipkgs server disable the download button
if ( serverName == LOCAL_SERVER )
{
upgrade->setEnabled( false );
- download->setText( "Download" );
+ download->setText( tr( "Download" ) );
download->setEnabled( true );
}
else if ( serverName == LOCAL_IPKGS )
{
upgrade->setEnabled( false );
download->setEnabled( true );
- download->setText( "Remove" );
+ download->setText( tr( "Remove" ) );
}
else
{
upgrade->setEnabled( true );
download->setEnabled( true );
- download->setText( "Download" );
+ download->setText( tr( "Download" ) );
}
// Display this widget once everything is done
if ( doProgress && raiseProgress )
{
emit appRaiseMainWidget();
}
}
@@ -374,59 +374,59 @@ void NetworkPackageManager :: updateServer()
// Disable buttons to stop silly people clicking lots on them :)
// First, write out ipkg_conf file so that ipkg can use it
dataMgr->writeOutIpkgConf();
Ipkg ipkg;
ipkg.setOption( "update" );
- InstallDlgImpl dlg( &ipkg, "Refreshing server package lists", this, "Upgrade", true );
+ InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true );
dlg.showDlg();
// Reload data
dataMgr->reloadServerData();
serverSelected(-1);
// delete progDlg;
}
void NetworkPackageManager :: upgradePackages()
{
// We're gonna do an upgrade of all packages
// First warn user that this isn't recommended
- QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n";
- QMessageBox warn("Warning", text, QMessageBox::Warning,
+ QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" );
+ QMessageBox warn( tr( "Warning" ), text, QMessageBox::Warning,
QMessageBox::Yes,
QMessageBox::No | QMessageBox::Escape | QMessageBox::Default ,
0, this );
warn.adjustSize();
if ( warn.exec() == QMessageBox::Yes )
{
// First, write out ipkg_conf file so that ipkg can use it
dataMgr->writeOutIpkgConf();
// Now run upgrade
Ipkg ipkg;
ipkg.setOption( "upgrade" );
- InstallDlgImpl dlg( &ipkg, "Upgrading installed packages", this, "Upgrade", true );
+ InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true );
dlg.showDlg();
// Reload data
dataMgr->reloadServerData();
serverSelected(-1);
}
}
void NetworkPackageManager :: downloadPackage()
{
bool doUpdate = true;
- if ( download->text() == "Download" )
+ if ( download->text() == tr( "Download" ) )
{
// See if any packages are selected
bool found = false;
if ( serversList->currentText() != LOCAL_SERVER )
{
for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
item != 0 && !found;
item = (QCheckListItem *)item->nextSibling() )
@@ -440,17 +440,17 @@ void NetworkPackageManager :: downloadPackage()
// otherwise, display dialog asking user what package to download from an http server
// and whether to install it
if ( found )
downloadSelectedPackages();
else
downloadRemotePackage();
}
- else if ( download->text() == "Remove" )
+ else if ( download->text() == tr( "Remove" ) )
{
doUpdate = false;
for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
item != 0 ;
item = (QCheckListItem *)item->nextSibling() )
{
if ( item->isOn() )
{
@@ -461,19 +461,19 @@ void NetworkPackageManager :: downloadPackage()
// if (there is a (installed), remove it
pos = name.find( "(installed)" );
if ( pos > 0 )
name.truncate( pos - 1 );
Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name );
QString msgtext;
- msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() );
- if ( QMessageBox::information( this, "Are you sure?",
- msgtext, "No", "Yes" ) == 1 )
+ msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() );
+ if ( QMessageBox::information( this, tr( "Are you sure?" ),
+ msgtext, tr( "No" ), tr( "Yes" ) ) == 1 )
{
doUpdate = true;
QFile f( p->getFilename() );
f.remove();
}
}
}
}
@@ -541,17 +541,17 @@ void NetworkPackageManager :: downloadSelectedPackages()
}
}
}
void NetworkPackageManager :: downloadRemotePackage()
{
// Display dialog
bool ok;
- QString package = InputDialog::getText( "Install Remote Package", tr( "Enter package location" ), "http://", &ok, this );
+ QString package = InputDialog::getText( tr( "Install Remote Package" ), tr( "Enter package location" ), "http://", &ok, this );
if ( !ok || package.isEmpty() )
return;
// DownloadRemoteDlgImpl dlg( this, "Install", true );
// if ( dlg.exec() == QDialog::Rejected )
// return;
// grab details from dialog
// QString package = dlg.getPackageLocation();
@@ -598,18 +598,18 @@ void NetworkPackageManager :: applyChanges()
InstallData data = dealWithItem( item );
workingPackages.push_back( data );
}
}
if ( workingPackages.size() == 0 )
{
// Nothing to do
- QMessageBox::information( this, "Nothing to do",
- "No packages selected", "OK" );
+ QMessageBox::information( this, tr( "Nothing to do" ),
+ tr( "No packages selected" ), tr( "OK" ) );
return;
}
// do the stuff
InstallDlgImpl dlg( workingPackages, dataMgr, this, "Install", true );
dlg.showDlg();
@@ -698,38 +698,38 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
{
QString caption;
QString text;
QString secondButton;
QString secondOption;
if ( val == 0 )
{
// Version available is the same - option to remove or reinstall
- caption = "Do you wish to remove or reinstall\n%s?";
- text = "Remove or ReInstall";
- secondButton = "ReInstall";
- secondOption = "R";
+ caption = tr( "Do you wish to remove or reinstall\n%1?" );
+ text = tr( "Remove or ReInstall" );
+ secondButton = tr( "ReInstall" );
+ secondOption = tr( "R" );
}
else if ( val == 1 )
{
// Version available is newer - option to remove or upgrade
- caption = "Do you wish to remove or upgrade\n%s?";
- text = "Remove or Upgrade";
- secondButton = "Upgrade";
- secondOption = "U";
+ caption = tr( "Do you wish to remove or upgrade\n%1?" );
+ text = tr( "Remove or Upgrade" );
+ secondButton = tr( "Upgrade" );
+ secondOption = tr( "U" );
}
// Sticky option not implemented yet, but will eventually allow
// the user to say something like 'remove all'
if ( stickyOption == "" )
{
QString msgtext;
- msgtext.sprintf( caption, (const char *)name );
+ msgtext = caption.arg( ( const char * )name );
switch( QMessageBox::information( this, text,
- msgtext, "Remove", secondButton ) )
+ msgtext, tr( "Remove" ), secondButton ) )
{
case 0: // Try again or Enter
// option 0 = Remove
item.option = "D";
break;
case 1: // Quit or Escape
item.option = secondOption;
break;
@@ -792,17 +792,17 @@ void NetworkPackageManager :: letterPushed( QString t )
} while ( item != start);
}
void NetworkPackageManager :: searchForPackage( bool findNext )
{
bool ok = false;
if ( !findNext || lastSearchText.isEmpty() )
- lastSearchText = InputDialog::getText( "Search for package", "Enter package to search for", lastSearchText, &ok, this ).lower();
+ lastSearchText = InputDialog::getText( tr( "Search for package" ), tr( "Enter package to search for" ), lastSearchText, &ok, this ).lower();
else
ok = true;
if ( ok && !lastSearchText.isEmpty() )
{
cout << "searching for " << lastSearchText << endl;
// look through package list for text startng at current position
vector<InstallData> workingPackages;
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
@@ -20,17 +20,16 @@
#include <qlayout.h>
#include <qpushbutton.h>
#include <qwidget.h>
#include <qcombobox.h>
#include <qlistview.h>
#include "datamgr.h"
-#include "progressdlg.h"
class InstallData;
/** NetworkPackageManager is the base class of the project */
class NetworkPackageManager : public QWidget
{
Q_OBJECT
public:
@@ -54,17 +53,16 @@ private:
QComboBox *serversList;
QListView *packagesList;
QPushButton *update;
QPushButton *upgrade;
QPushButton *download;
QPushButton *apply;
- ProgressDlg *progressDlg;
QString currentlySelectedServer;
QString lastSearchText;
QString categoryFilter;
bool categoryFilterEnabled;
bool showJumpTo;
bool showUninstalledPkgs;
bool showInstalledPkgs;
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 @@
-/***************************************************************************
- progressdlg.h - description
- -------------------
- begin : Mon Aug 26 2002
- copyright : (C) 2002 by Andy Qua
- email : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#include "progressdlg.h"
-
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-#include "global.h"
-/*
- * Constructs a ProgressDlg which is a child of 'parent', with the
- * name 'name' and widget flags set to 'f'
- *
- * The dialog will by default be modeless, unless you set 'modal' to
- * TRUE to construct a modal dialog.
- */
-ProgressDlg::ProgressDlg( QWidget* parent, const char* name, bool modal, WFlags fl )
- : QDialog( parent, name, modal, fl )
-{
- if ( !name )
- setName( "ProgressDlg" );
- resize( 240, 73 );
- setCaption( tr( "Progress" ) );
-
- TextLabel2 = new QLabel( this, "TextLabel2" );
- TextLabel2->setGeometry( QRect( 10, 10, 240, 50 ) );
- TextLabel2->setFrameShape( QLabel::Box );
- TextLabel2->setText( tr( "Text" ) );
- TextLabel2->setAlignment( QLabel::WordBreak | QLabel::AlignHCenter | QLabel::AlignVCenter );
-}
-
-/*
- * Destroys the object and frees any allocated resources
- */
-ProgressDlg::~ProgressDlg()
-{
- // no need to delete child widgets, Qt does it all for us
-}
-
-void ProgressDlg :: setText( QString &text )
-{
- TextLabel2->setText( text );
-}
-
-void ProgressDlg :: setText( const char *text )
-{
- TextLabel2->setText( text );
-}
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 @@
-/***************************************************************************
- progressdlg.h - description
- -------------------
- begin : Mon Aug 26 2002
- copyright : (C) 2002 by Andy Qua
- email : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/#ifndef PROGRESSDLG_H
-#define PROGRESSDLG_H
-
-#include <qdialog.h>
-
-class QLabel;
-
-class ProgressDlg : public QDialog
-{
- Q_OBJECT
-
-public:
- ProgressDlg( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
- ~ProgressDlg();
-
- QLabel* TextLabel2;
-
- void setText( QString &text );
- void setText( const char *text );
-};
-
-#endif // PROGRESSDLG_H