summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp166
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.h2
2 files changed, 115 insertions, 53 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index a058285..76c7a9c 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -136,17 +136,17 @@ void NetworkPackageManager :: selectLocalPackage( const QString &pkg )
}
void NetworkPackageManager :: initGui()
{
QLabel *l = new QLabel( "Servers", this );
serversList = new QComboBox( this );
packagesList = new QListView( this );
- update = new QPushButton( "Refresh List", this );
+ update = new QPushButton( "Refresh Lists", this );
download = new QPushButton( "Download", this );
upgrade = new QPushButton( "Upgrade", this );
apply = new QPushButton( "Apply", this );
QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" );
QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1, "HBox1" );
hbox1->addWidget( l );
hbox1->addWidget( serversList );
@@ -280,18 +280,18 @@ void NetworkPackageManager :: serverSelected( int )
}
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->setEnabled( false );
+ download->setText( "Install Remote" );
+ download->setEnabled( true );
}
else if ( serverName == LOCAL_IPKGS )
{
upgrade->setEnabled( false );
download->setEnabled( true );
download->setText( "Remove" );
}
else
@@ -360,69 +360,37 @@ void NetworkPackageManager :: upgradePackages()
}
void NetworkPackageManager :: downloadPackage()
{
bool doUpdate = true;
if ( download->text() == "Download" )
{
- // First, write out ipkg_conf file so that ipkg can use it
- dataMgr->writeOutIpkgConf();
-
- // Display dialog to user asking where to download the files to
- bool ok = FALSE;
- QString dir = "";
-#ifdef QWS
- // read download directory from config file
- Config cfg( "aqpkg" );
- cfg.setGroup( "settings" );
- dir = cfg.readEntry( "downloadDir", "/home/root/Documents/application/ipkg" );
-#endif
-
- QString text = InputDialog::getText( tr( "Download to where" ), tr( "Enter path to download to" ), dir, &ok, this );
- if ( ok && !text.isEmpty() )
- dir = text; // user entered something and pressed ok
- else
- return; // user entered nothing or pressed cancel
-
-#ifdef QWS
- // Store download directory in config file
- cfg.writeEntry( "downloadDir", dir );
-#endif
-
- // Get starting directory
- char initDir[PATH_MAX];
- getcwd( initDir, PATH_MAX );
-
- // Download each package
- Ipkg ipkg;
- connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
-
- ipkg.setOption( "download" );
- ipkg.setRuntimeDirectory( dir );
- for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
- item != 0 ;
- item = (QCheckListItem *)item->nextSibling() )
+ // See if any packages are selected
+ bool found = false;
+ if ( serversList->currentText() != LOCAL_SERVER )
{
- if ( item->isOn() )
+ for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
+ item != 0 && !found;
+ item = (QCheckListItem *)item->nextSibling() )
{
- QString name = item->text();
- int pos = name.find( "*" );
- name.truncate( pos );
-
- // if (there is a (installed), remove it
- pos = name.find( "(installed)" );
- if ( pos > 0 )
- name.truncate( pos - 1 );
-
- ipkg.setPackage( name );
- ipkg.runIpkg( );
+ if ( item->isOn() )
+ found = true;
}
}
+
+ // If user selected some packages then download the and store the locally
+ // 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" )
{
doUpdate = false;
for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
item != 0 ;
item = (QCheckListItem *)item->nextSibling() )
{
@@ -454,16 +422,108 @@ void NetworkPackageManager :: downloadPackage()
if ( doUpdate )
{
dataMgr->reloadServerData();
serverSelected( -1 );
}
}
+void NetworkPackageManager :: downloadSelectedPackages()
+{
+ // First, write out ipkg_conf file so that ipkg can use it
+ dataMgr->writeOutIpkgConf();
+
+ // Display dialog to user asking where to download the files to
+ bool ok = FALSE;
+ QString dir = "";
+#ifdef QWS
+ // read download directory from config file
+ Config cfg( "aqpkg" );
+ cfg.setGroup( "settings" );
+ dir = cfg.readEntry( "downloadDir", "/home/root/Documents/application/ipkg" );
+#endif
+
+ QString text = InputDialog::getText( tr( "Download to where" ), tr( "Enter path to download to" ), dir, &ok, this );
+ if ( ok && !text.isEmpty() )
+ dir = text; // user entered something and pressed ok
+ else
+ return; // user entered nothing or pressed cancel
+
+#ifdef QWS
+ // Store download directory in config file
+ cfg.writeEntry( "downloadDir", dir );
+#endif
+
+ // Get starting directory
+ char initDir[PATH_MAX];
+ getcwd( initDir, PATH_MAX );
+
+ // Download each package
+ Ipkg ipkg;
+ connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
+
+ ipkg.setOption( "download" );
+ ipkg.setRuntimeDirectory( dir );
+ for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
+ item != 0 ;
+ item = (QCheckListItem *)item->nextSibling() )
+ {
+ if ( item->isOn() )
+ {
+ QString name = item->text();
+ int pos = name.find( "*" );
+ name.truncate( pos );
+
+ // if (there is a (installed), remove it
+ pos = name.find( "(installed)" );
+ if ( pos > 0 )
+ name.truncate( pos - 1 );
+
+ ipkg.setPackage( name );
+ ipkg.runIpkg( );
+ }
+ }
+}
+
+void NetworkPackageManager :: downloadRemotePackage()
+{
+ // Display dialog
+ bool ok;
+ QString package = InputDialog::getText( "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();
+
+ InstallData item;
+ item.option = "I";
+ item.packageName = package;
+ vector<InstallData> workingPackages;
+ workingPackages.push_back( item );
+
+ InstallDlgImpl dlg2( workingPackages, dataMgr, this, "Install", true );
+ dlg2.showDlg();
+
+ // Reload data
+ dataMgr->reloadServerData();
+ serverSelected(-1);
+
+#ifdef QWS
+ // Finally let the main system update itself
+ QCopEnvelope e("QPE/System", "linkChanged(QString)");
+ QString lf = QString::null;
+ e << lf;
+#endif
+}
+
void NetworkPackageManager :: applyChanges()
{
stickyOption = "";
// First, write out ipkg_conf file so that ipkg can use it
dataMgr->writeOutIpkgConf();
@@ -703,9 +763,9 @@ void NetworkPackageManager :: searchForPackage( bool findNext )
{
cout << "matched " << item->text() << endl;
packagesList->ensureItemVisible( item );
packagesList->setCurrentItem( item );
break;
}
}
}
-} \ No newline at end of file
+}
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index 20f6e2d..66a8903 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -58,16 +58,18 @@ private:
bool showJumpTo;
int timerId;
void timerEvent ( QTimerEvent * );
void initGui();
void setupConnections();
void showProgressDialog( char *initialText );
+ void downloadSelectedPackages();
+ void downloadRemotePackage();
InstallData dealWithItem( QCheckListItem *item );
QString stickyOption;
public slots:
void serverSelected( int index );
void applyChanges();
void upgradePackages();
void downloadPackage();