author | drw <drw> | 2004-02-05 16:34:04 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-05 16:34:04 (UTC) |
commit | ef8ece225a663f0ff1262989085fc214500beebe (patch) (side-by-side diff) | |
tree | 2d6902575eb29de18a0ed7f3a33acadabd37021b /noncore/settings/packagemanager/oipkg.cpp | |
parent | 823399a552c04821fb0b49d816d733fa21a12a21 (diff) | |
download | opie-ef8ece225a663f0ff1262989085fc214500beebe.zip opie-ef8ece225a663f0ff1262989085fc214500beebe.tar.gz opie-ef8ece225a663f0ff1262989085fc214500beebe.tar.bz2 |
Completed package information dialog and a couple of other minor tweaks
Diffstat (limited to 'noncore/settings/packagemanager/oipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 69 |
1 files changed, 58 insertions, 11 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index ed9ea10..eb07a61 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp @@ -33,2 +33,3 @@ +#include <stdio.h> #include <stdlib.h> @@ -48,5 +49,7 @@ OIpkg *oipkg; -int fIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg ) +// Ipkg callback functions + +int fsignalIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg ) { - oipkg->ipkgOutput( msg ); + oipkg->ipkgMessage( msg ); return 0; @@ -54,3 +57,3 @@ int fIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg ) -char* fIpkgResponse( char */*question*/ ) +char *fIpkgResponse( char */*question*/ ) { @@ -59,2 +62,16 @@ char* fIpkgResponse( char */*question*/ ) +int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ ) +{ + oipkg->ipkgStatus( desc ); + return 0; +} + +int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, + void */*userdata*/ ) +{ +printf( "*****List*****\n%s\n", desc ); + oipkg->ipkgList( desc ); + return 0; +} + OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) @@ -69,3 +86,3 @@ OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) // Initialize libipkg - if ( ipkg_init( &fIpkgMessage, &fIpkgResponse, &m_ipkgArgs ) ) + if ( ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ) ) QMessageBox::critical( 0, tr( "OIpkg" ), tr( "Error initialing libipkg" ) ); @@ -299,6 +316,7 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters, // Connect output signal to widget + if ( rawOutput ) { - if ( slotOutput ) - connect( this, SIGNAL(execOutput(char *)), receiver, slotOutput ); +// if ( slotOutput ) +// connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput ); } @@ -306,3 +324,3 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters, { - // TODO - connect to local slot and parse output before emitting execOutput + // TODO - connect to local slot and parse output before emitting signalIpkgMessage } @@ -311,7 +329,14 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters, { - case OPackage::Update : ipkg_lists_update( &m_ipkgArgs ); + case OPackage::Update : { + connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput ); + ipkg_lists_update( &m_ipkgArgs ); + }; break; - case OPackage::Upgrade : ipkg_packages_upgrade( &m_ipkgArgs ); + case OPackage::Upgrade : { + connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput ); + ipkg_packages_upgrade( &m_ipkgArgs ); + }; break; case OPackage::Install : { + connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput ); for ( QStringList::Iterator it = parameters->begin(); it != parameters->end(); ++it ) @@ -323,2 +348,3 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters, case OPackage::Remove : { + connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput ); for ( QStringList::Iterator it = parameters->begin(); it != parameters->end(); ++it ) @@ -330,2 +356,3 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters, case OPackage::Download : { + connect( this, SIGNAL(signalIpkgMessage(char *)), receiver, slotOutput ); for ( QStringList::Iterator it = parameters->begin(); it != parameters->end(); ++it ) @@ -336,2 +363,12 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters, break; + case OPackage::Info : { + connect( this, SIGNAL(signalIpkgStatus(char *)), receiver, slotOutput ); + ipkg_packages_info( &m_ipkgArgs, (*parameters->begin()), &fIpkgStatus, 0x0 ); + }; + break; + case OPackage::Files : { + connect( this, SIGNAL(signalIpkgList(char *)), receiver, slotOutput ); + ipkg_package_files( &m_ipkgArgs, (*parameters->begin()), &fIpkgFiles, 0x0 ); + }; + break; default : break; @@ -342,5 +379,15 @@ bool OIpkg::executeCommand( OPackage::Command command, QStringList *parameters, -void OIpkg::ipkgOutput( char *msg ) +void OIpkg::ipkgMessage( char *msg ) +{ + emit signalIpkgMessage( msg ); +} + +void OIpkg::ipkgStatus( char *status ) +{ + emit signalIpkgStatus( status ); +} + +void OIpkg::ipkgList( char *filelist ) { - emit execOutput( msg ); + emit signalIpkgList( filelist ); } |