| -rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 19 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/datamgr.h | 8 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/global.h | 4 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 4 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 139 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/main.cpp | 9 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 6 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/mem.cpp | 2 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/package.cpp | 35 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/version.cpp | 39 |
10 files changed, 107 insertions, 158 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index cd0c78f..67f90a3 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp @@ -1,6 +1,6 @@ /* This file is part of the OPIE Project - + =. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk> .=l. Dan Williams <drw@handhelds.org> .>+-= @@ -40,6 +40,9 @@ #include "datamgr.h" #include "global.h" +QString LOCAL_SERVER; +QString LOCAL_IPKGS; + QString DataManager::availableCategories = ""; DataManager::DataManager() @@ -47,7 +50,7 @@ DataManager::DataManager() { activeServer = ""; availableCategories = "#"; - + serverList.setAutoDelete( TRUE ); destList.setAutoDelete( TRUE ); } @@ -137,7 +140,7 @@ void DataManager :: loadServers() linkToRoot = cfg.readBoolEntry( key, true ); #endif d->linkToRoot( linkToRoot ); - + destList.append( d ); } else if ( lineStr.startsWith( "option" ) || lineStr.startsWith( "#option" ) ) @@ -180,7 +183,7 @@ void DataManager :: reloadServerData( ) QString serverName; int i = 0; - + Server *server; QListIterator<Server> it( serverList ); for ( ; it.current(); ++it ) @@ -190,7 +193,7 @@ void DataManager :: reloadServerData( ) i++; emit progressUpdate( i ); qApp->processEvents(); - + // Now we've read the config file in we need to read the servers // The local server is a special case. This holds the contents of the // status files the number of which depends on how many destinations @@ -201,7 +204,7 @@ void DataManager :: reloadServerData( ) else if ( serverName == LOCAL_IPKGS ) server->readLocalIpks( getServer( LOCAL_SERVER ) ); else - server->readPackageFile( getServer( LOCAL_SERVER ) ); + server->readPackageFile( getServer( LOCAL_SERVER ) ); } } @@ -212,7 +215,7 @@ void DataManager :: writeOutIpkgConf() { return; } - + QTextStream t( &f ); /* QString ipkg_conf = IPKG_CONF; @@ -294,7 +297,7 @@ void DataManager :: writeOutIpkgConf() t << "# Offline mode (for use in constructing flash images offline)\n"; t << "#option offline_root target\n"; - + f.close(); } diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h index 32a1e57..9f8920d 100644 --- a/noncore/settings/aqpkg/datamgr.h +++ b/noncore/settings/aqpkg/datamgr.h @@ -1,6 +1,6 @@ /* This file is part of the OPIE Project - + =. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk> .=l. Dan Williams <drw@handhelds.org> .>+-= @@ -40,8 +40,10 @@ using namespace std; #include "server.h" #include "destination.h" -#define LOCAL_SERVER "Installed Pkgs" -#define LOCAL_IPKGS "local IPKG" +//#define LOCAL_SERVER "Installed Pkgs" +//#define LOCAL_IPKGS "local IPKG" +extern QString LOCAL_SERVER; +extern QString LOCAL_IPKGS; /** *@author Andy Qua diff --git a/noncore/settings/aqpkg/global.h b/noncore/settings/aqpkg/global.h index 4fdd51d..0325a59 100644 --- a/noncore/settings/aqpkg/global.h +++ b/noncore/settings/aqpkg/global.h @@ -1,6 +1,6 @@ /* This file is part of the OPIE Project - + =. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk> .=l. Dan Williams <drw@handhelds.org> .>+-= @@ -30,7 +30,7 @@ #ifndef __GLOBAL_H #define __GLOBAL_H -#define VERSION_TEXT "AQPkg Version 1.11" +//extern QString VERSION_TEXT; // Uncomment the below line to run on a Linux box rather than a Zaurus // box this allows you to change where root is, and where to load config files from diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index 17f7b08..ea2c47f 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp @@ -394,11 +394,9 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text ) if ( !mult ) mult = 1; if ( !div ) div = 1; -// long total = totalBlocks * mult / div; long avail = availBlocks * mult / div; -// long used = total - avail; - space.sprintf( "%ld Kb", avail ); + space = tr( "%1 Kb" ).arg( avail ); } else space = tr( "Unknown" ); diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 3df569b..43eaaae 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -1,6 +1,6 @@ /* This file is part of the OPIE Project - + =. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk> .=l. Dan Williams <drw@handhelds.org> .>+-= @@ -111,7 +111,7 @@ void Ipkg :: runIpkg() flags ^= MAKE_LINKS; } } - + #ifdef X86 commands << "-f"; commands << IPKG_CONF; @@ -127,7 +127,7 @@ void Ipkg :: runIpkg() if ( package != "" ) - emit outputText( QString( "Dealing with package " ) + package ); + emit outputText( tr( "Dealing with package %1" ).arg( package) ); qApp->processEvents(); @@ -138,12 +138,12 @@ void Ipkg :: runIpkg() createLinks = false; if ( flags & MAKE_LINKS ) { - emit outputText( QString( "Removing symbolic links...\n" ) ); + emit outputText( tr( "Removing symbolic links...\n" ) ); linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); emit outputText( QString( " " ) ); } } - + // Execute command dependantPackages = new QList<QString>; dependantPackages->setAutoDelete( true ); @@ -162,7 +162,7 @@ void Ipkg :: createSymLinks() if ( flags & MAKE_LINKS ) { emit outputText( " " ); - emit outputText( QString( "Creating symbolic links for " )+ package ); + emit outputText( tr( "Creating symbolic links for %1." ).arg( package) ); linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); @@ -173,7 +173,7 @@ void Ipkg :: createSymLinks() if ( *pkg == package ) continue; emit outputText( " " ); - emit outputText( QString( "Creating symbolic links for " )+ (*pkg) ); + emit outputText( tr( "Creating symbolic links for %1" ).arg( *pkg ) ); linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir ); } } @@ -181,7 +181,7 @@ void Ipkg :: createSymLinks() delete dependantPackages; - emit outputText( "Finished" ); + emit outputText( tr("Finished") ); emit outputText( "" ); } @@ -195,19 +195,19 @@ void Ipkg :: removeStatusEntry() outStatusFile.append( ".tmp" ); emit outputText( "" ); - emit outputText( "Removing status entry..." ); - QString tempstr = "status file - "; + emit outputText( tr("Removing status entry...") ); + QString tempstr = tr("status file - "); tempstr.append( statusFile ); emit outputText( tempstr ); - tempstr = "package - "; + tempstr = tr("package - "); tempstr.append( package ); emit outputText( tempstr ); - + ifstream in( statusFile ); ofstream out( outStatusFile ); if ( !in.is_open() ) { - tempstr = "Couldn't open status file - "; + tempstr = tr("Couldn't open status file - "); tempstr.append( statusFile ); emit outputText( tempstr ); return; @@ -215,7 +215,7 @@ void Ipkg :: removeStatusEntry() if ( !out.is_open() ) { - tempstr = "Couldn't create tempory status file - "; + tempstr = tr("Couldn't create tempory status file - "); tempstr.append( outStatusFile ); emit outputText( tempstr ); return; @@ -256,7 +256,7 @@ void Ipkg :: removeStatusEntry() lines.push_back( QString( line ) ); out << line << endl; - // Improve UI responsiveness + // Improve UI responsiveness i++; if ( ( i % 50 ) == 0 ) qApp->processEvents(); @@ -267,13 +267,13 @@ void Ipkg :: removeStatusEntry() for ( it = lines.begin() ; it != lines.end() ; ++it ) { out << (const char *)(*it) << endl; - - // Improve UI responsiveness + + // Improve UI responsiveness i++; if ( ( i % 50 ) == 0 ) qApp->processEvents(); } - + in.close(); out.close(); @@ -290,7 +290,7 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) delete proc; proc = 0; } - + // OK we're gonna use OProcess to run this thing proc = new OProcess(); aborted = false; @@ -305,7 +305,7 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)), this, SLOT(commandStderr(OProcess *, char *, int))); - + for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) { *proc << (*it).latin1(); @@ -315,7 +315,7 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) finished = false; if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) { - emit outputText( QString( "Couldn't start ipkg process" ) ); + emit outputText( tr("Couldn't start ipkg process" ) ); } } @@ -346,7 +346,7 @@ void Ipkg::commandStdout(OProcess*, char *buffer, int buflen) // Ipkg should send this to STDERR, but doesn't - so trap here error = true; } - + buffer[0] = '\0'; } @@ -368,7 +368,7 @@ void Ipkg::processFinished() if ( !error && option == "remove" ) removeStatusEntry(); - + delete proc; proc = 0; finished = true; @@ -386,77 +386,11 @@ void Ipkg :: abort() } } -/* -int Ipkg :: executeIpkgCommand( QString &cmd, const QString option ) -{ - FILE *fp = NULL; - char line[130]; - QString lineStr, lineStrOld; - int ret = false; - - fp = popen( (const char *) cmd, "r"); - if ( fp == NULL ) - { - QString text; - text.sprintf( "Couldn't execute %s! See stdout for error code", (const char *)cmd ); - emit outputText( text ); - } - else - { - while ( fgets( line, sizeof line, fp) != NULL ) - { - lineStr = line; - lineStr=lineStr.left( lineStr.length()-1 ); - - if ( lineStr != lineStrOld ) - { - //See if we're finished - if ( option == "install" || option == "reinstall" ) - { - // Need to keep track of any dependant packages that get installed - // so that we can create links to them as necessary - if ( lineStr.startsWith( "Installing " ) ) - { - int start = lineStr.find( " " ) + 1; - int end = lineStr.find( " ", start ); - QString *package = new QString( lineStr.mid( start, end-start ) ); - dependantPackages->append( package ); - } - } - - if ( option == "update" ) - { - if (lineStr.contains("Updated list")) - ret = true; - } - else if ( option == "download" ) - { - if (lineStr.contains("Downloaded")) - ret = true; - } - else - { - if (lineStr.contains("Done")) - ret = true; - } - - emit outputText( lineStr ); - } - lineStrOld = lineStr; - qApp->processEvents(); - } - pclose(fp); - } - - return ret; -} -*/ - void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir ) { if ( dest == "root" || dest == "/" ) return; - + qApp->processEvents(); QStringList *fileList = getList( packFileName, destDir ); qApp->processEvents(); @@ -476,14 +410,14 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des { // Couldn't open from dest, try from / f.close(); - + packageFileDir = "/usr/lib/ipkg/info/"; packageFileDir.append( packageFilename ); packageFileDir.append( ".list" ); f.setName( packageFileDir ); if ( ! f.open(IO_ReadOnly) ) { - QString tempstr = "Could not open :"; + QString tempstr = tr("Could not open :"); tempstr.append( packageFileDir ); emit outputText( tempstr ); return (QStringList*)0; @@ -528,12 +462,12 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QString sourceFile = baseDir; sourceFile.append( file ); - + QString linkFile = destDir; if ( file.startsWith( "/" ) && destDir.right( 1 ) == "/" ) { linkFile.append( file.mid( 1 ) ); - } + } else { linkFile.append( file ); @@ -548,7 +482,7 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QFileInfo f( linkFile ); if ( !f.exists() ) { - QString tempstr = "Creating directory "; + QString tempstr = tr("Creating directory "); tempstr.append( linkFile ); emit outputText( tempstr ); QDir d; @@ -556,15 +490,14 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const } // else // emit outputText( QString( "Directory " ) + linkFile + " already exists" ); - + } else { int rc = symlink( sourceFile, linkFile ); - text = (rc == 0 ? "Linked " : "Failed to link "); - text.append( sourceFile ); - text.append( " to " ); - text.append( linkFile ); + text = ( rc == 0 ? tr( "Linked %1 to %2" ) : tr( "Failed to link %1 to %2" ) ). + arg( sourceFile ). + arg( linkFile ); emit outputText( text ); } } @@ -578,8 +511,7 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QFile f( linkFile ); bool rc = f.remove(); - text = (rc ? "Removed " : "Failed to remove "); - text.append( linkFile ); + text = ( rc ? tr( "Removed %1" ) : tr( "Failed to remove %1" ) ).arg( linkFile ); emit outputText( text ); } else if ( f.isDir() ) @@ -588,8 +520,7 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const bool rc = d.rmdir( linkFile, true ); if ( rc ) { - text = (rc ? "Removed " : "Failed to remove "); - text.append( linkFile ); + text = ( rc ? tr( "Removed " ) : tr( "Failed to remove " ) ).arg( linkFile ); emit outputText( text ); } } diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp index 066d79f..b7f8b7b 100644 --- a/noncore/settings/aqpkg/main.cpp +++ b/noncore/settings/aqpkg/main.cpp @@ -1,6 +1,6 @@ /* This file is part of the OPIE Project - + =. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk> .=l. Dan Williams <drw@handhelds.org> .>+-= @@ -42,6 +42,10 @@ #include "global.h" +/* be less intrusive for translation -zecke */ +extern QString LOCAL_SERVER; +extern QString LOCAL_IPKGS; + int main(int argc, char *argv[]) { #ifdef QWS @@ -55,6 +59,9 @@ int main(int argc, char *argv[]) QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend; #endif + LOCAL_SERVER = QObject::tr( "Installed packages" ); + LOCAL_IPKGS = QObject::tr( "Local packages" ); + MainWindow *win = new MainWindow(); a.setMainWidget(win); win->showMaximized(); diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 0efa1e0..45a6663 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp @@ -1054,7 +1054,7 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) caption = tr( "Do you wish to remove or reinstall\n%1?" ); text = tr( "Remove or ReInstall" ); secondButton = tr( "ReInstall" ); - secondOption = tr( "R" ); + secondOption = "R"; // Internal action code, do not translate } else if ( val == 1 ) { @@ -1062,7 +1062,7 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) caption = tr( "Do you wish to remove or upgrade\n%1?" ); text = tr( "Remove or Upgrade" ); secondButton = tr( "Upgrade" ); - secondOption = tr( "U" ); + secondOption = "U"; // Internal action code, do not translate } // Sticky option not implemented yet, but will eventually allow @@ -1071,8 +1071,6 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) { QString msgtext; msgtext = caption.arg( ( const char * )name ); -// switch( QMessageBox::information( this, text, -// msgtext, tr( "Remove" ), secondButton ) ) QuestionDlg dlg( text, msgtext, secondButton ); switch( dlg.exec() ) { diff --git a/noncore/settings/aqpkg/mem.cpp b/noncore/settings/aqpkg/mem.cpp index 5f32a26..4c6117b 100644 --- a/noncore/settings/aqpkg/mem.cpp +++ b/noncore/settings/aqpkg/mem.cpp @@ -99,7 +99,7 @@ void DumpUnfreed() AllocList::iterator i; long totalSize = 0; char buf[1024]; - + // Debug output, okay to leave untranslated for(i = allocList.begin(); i != allocList.end(); i++) { sprintf(buf, "%-15s: LINE %ld, ADDRESS %ld %ld unfreed", (*i)->file, (*i)->line, (*i)->address, (*i)->size); diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp index 4c27c65..adda832 100644 --- a/noncore/settings/aqpkg/package.cpp +++ b/noncore/settings/aqpkg/package.cpp @@ -1,6 +1,6 @@ /* This file is part of the OPIE Project - + =. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk> .=l. Dan Williams <drw@handhelds.org> .>+-= @@ -30,15 +30,18 @@ #include "package.h" #include "global.h" +#include <qobject.h> + Package::Package( QString &name ) { packageName = name; - version = "N/A"; - description = "N/A"; - packageSize = "N/A"; - section = "N/A"; - + QString tempstr = QObject::tr( "N/A" ); + version = tempstr; + description = tempstr; + packageSize = tempstr; + section = tempstr; + localPackage = 0; installed = false; packageStoredLocally = false; @@ -51,11 +54,12 @@ Package::Package( char *name ) { packageName = name; - version = "N/A"; - description = "N/A"; - packageSize = "N/A"; - section = "N/A"; - + QString tempstr = QObject::tr( "N/A" ); + version = tempstr; + description = tempstr; + packageSize = tempstr; + section = tempstr; + localPackage = 0; installed = false; packageStoredLocally = false; @@ -71,11 +75,12 @@ Package::~Package() QString Package :: toString() { - QString ret = "Package - " + getPackageName() + - "\n version - " + getVersion(); + QString ret = QObject::tr( "Package - %1\n version - %2" ). + arg( getPackageName() ). + arg( getVersion() ); if ( localPackage ) - ret += "\n inst version - " + localPackage->getVersion(); + ret.append( QObject::tr( "\n inst version - %1" ).arg( localPackage->getVersion() ) ); return ret; @@ -87,7 +92,7 @@ void Package :: setStatus( const QString &s ) int two, three; status = s.simplifyWhiteSpace( ); - + two = status.find( " " ); // find second column three = status.find( " ", two + 1 ); // find third column diff --git a/noncore/settings/aqpkg/version.cpp b/noncore/settings/aqpkg/version.cpp index e836da1..59e6f3f 100644 --- a/noncore/settings/aqpkg/version.cpp +++ b/noncore/settings/aqpkg/version.cpp @@ -23,7 +23,9 @@ #include <ctype.h> #include <string.h> -# define _(Text) Text +#include <qobject.h> + +//# define _(Text) Text class versionrevision { @@ -44,14 +46,14 @@ public: version = new char[(strlen(str)+1)]; strcpy( version, str ); } - + unsigned long epoch; char *version; const char *revision; const char *familiar_revision; -}; +}; -static int verrevcmp(const char *val, const char *ref) +static int verrevcmp(const char *val, const char *ref) { int vc, rc; long vl, rl; @@ -82,7 +84,7 @@ static int verrevcmp(const char *val, const char *ref) } int versioncompare(const struct versionrevision *version, - const struct versionrevision *refversion) + const struct versionrevision *refversion) { int r; @@ -95,7 +97,7 @@ int versioncompare(const struct versionrevision *version, int versionsatisfied3(const struct versionrevision *it, const struct versionrevision *ref, - const char *op) + const char *op) { int r; r= versioncompare(it,ref); @@ -109,23 +111,26 @@ int versionsatisfied3(const struct versionrevision *it, return r > 0; if (strcmp(op, "=") == 0) return r == 0; - fprintf(stderr, "unknown operator: %s", op); +// fprintf(stderr, "unknown operator: %s", op); exit(1); } -const char *parseversion(struct versionrevision *rversion, const char *string) +const char *parseversion(struct versionrevision *rversion, const char *string) { char *hyphen, *colon, *eepochcolon; unsigned long epoch; - if (!*string) return _("version string is empty"); - + if ( !*string ) + return QObject::tr( "Version string is empty." ); + colon= strchr(string,':'); if (colon) { epoch= strtoul(string,&eepochcolon,10); - if (colon != eepochcolon) return _("epoch in version is not number"); - if (!*++colon) return _("nothing after colon in version number"); + if ( colon != eepochcolon ) + return QObject::tr( "Epoch in version is not number." ); + if ( !*++colon ) + return QObject::tr( "Nothing after colon in version number." ); string= colon; rversion->epoch= epoch; } else { @@ -156,7 +161,7 @@ const char *parseversion(struct versionrevision *rversion, const char *string) rversion->version, rversion->revision, rversion->familiar_revision); -*/ +*/ return 0; } @@ -167,13 +172,13 @@ int compareVersions( const char *v1, const char *v2 ) err = parseversion(&ref, v1); if (err) { - fprintf(stderr, "Invalid version `%s': %s\n", v2, err); +// fprintf(stderr, "Invalid version `%s': %s\n", v2, err); return -2; } err = parseversion(&ver, v2); if (err) { - fprintf(stderr, "Invalid version `%s': %s\n", v1, err); +// fprintf(stderr, "Invalid version `%s': %s\n", v1, err); return -2; } @@ -186,7 +191,7 @@ int compareVersions( const char *v1, const char *v2 ) } /* -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) { const char *err; versionrevision ver, ref; @@ -201,7 +206,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Invalid version `%s': %s\n", argv[1], err); return 2; } - + err = parseversion(&ref, argv[3]); if (err) { fprintf(stderr, "Invalid version `%s': %s\n", argv[3], err); |