summaryrefslogtreecommitdiff
authortille <tille>2002-05-12 14:06:06 (UTC)
committer tille <tille>2002-05-12 14:06:06 (UTC)
commitf388350086510b261c496c232da7302f4ec81cc3 (patch) (side-by-side diff)
tree472aad42f650028bfd7fae66be6a19f37e2a26e0
parentc1f023c19bbee54a3a0575bd6035b133592edcfc (diff)
downloadopie-f388350086510b261c496c232da7302f4ec81cc3.zip
opie-f388350086510b261c496c232da7302f4ec81cc3.tar.gz
opie-f388350086510b261c496c232da7302f4ec81cc3.tar.bz2
fixed filename for remote files
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp24
-rw-r--r--noncore/unsupported/oipkg/mainwindow.h3
-rw-r--r--noncore/unsupported/oipkg/package.cpp4
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp2
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp5
-rw-r--r--noncore/unsupported/oipkg/packagelistremote.cpp2
6 files changed, 8 insertions, 32 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 1c56aae..9c4c752 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -42,9 +42,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
listViewPackages->addList( tr("documents"), &packageListDocLnk );
-// wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton);
-// wait = new QMessageBox(this);
-// wait->setText(tr("Please wait"));
ipkg = new PmIpkg( settings, this );
-// settings->setIpkg( ipkg );
packageListServers.setSettings( settings );
packageListSearch.setSettings( settings );
@@ -270,8 +266,4 @@ void MainWindow::runIpkg()
void MainWindow::updateList()
{
-// wait->show();
- QTimer *t = new QTimer( this );
- connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
- t->start( 0, false );
packageListServers.clear();
packageListSearch.clear();
@@ -281,20 +273,15 @@ void MainWindow::updateList()
packageListSearch.update();
packageListDocLnk.update();
- t->stop();
-// wait->hide();
}
void MainWindow::filterList()
{
-// wait->show();
QString f = "";
if ( findAction->isOn() ) f = findEdit->text();
packageListServers.filterPackages( f );
-// wait->hide();
}
void MainWindow::displayList()
{
-// wait->hide();
filterList();
listViewPackages->display();
@@ -409,15 +396,4 @@ void MainWindow::destClose()
}
-void MainWindow::rotateUpdateIcon()
-{
- pvDebug(2, "MainWindow::rotateUpdateIcon");
- if ( updateIcon )
- updateAction->setIconSet( Resource::loadIconSet( "oipkg/update" ) );
- else
- updateAction->setIconSet( Resource::loadIconSet( "oipkg/update2" ) );
- updateIcon = !updateIcon;
-}
-
-
void MainWindow::setDocument(const QString &fileName)
{
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index ce3e761..4a5e8bf 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -90,7 +90,4 @@ private:
QComboBox *destination;
QCheckBox* CheckBoxLink;
-// QMessageBox *wait;
-private slots:
- void rotateUpdateIcon();
};
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 4542e42..8c5f0ea 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -51,4 +51,5 @@ Package::Package( QString n, PackageManagerSettings *s )
_name = QString( n );
}else{
+ pvDebug(2,"remote file: "+n);
parseIpkgFile( n );
_useFileName = true;
@@ -343,5 +344,6 @@ QString Package::dest()
void Package::setDest( QString d )
{
- _dest = d;
+ if ( d == "remote") _useFileName = true;
+ else _dest = d;
}
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 8f835b7..1b572e0 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -176,7 +176,7 @@ void PackageList::readFileEntries( QString filename, QString dest )
{
Package *p = new Package( packEntry, settings );
- p->setDest( dest );
if ( p )
{
+ p->setDest( dest );
insertPackage( p );
packEntry.clear();
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index c743a49..55047d5 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -34,10 +34,11 @@ void PackageListItem::init( Package *pi, PackageManagerSettings *s)
QCheckListItem *item;
nameItem = new QCheckListItem( this, "" );
- item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() );
+ item = new QCheckListItem( this, QObject::tr("Description: ")+pi->desc() );
+ item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() );
destItem = new QCheckListItem( this, "" );
linkItem = new QCheckListItem( this, "" );
statusItem = new QCheckListItem( this, "" );
QCheckListItem *otherItem = new QCheckListItem( this, QObject::tr("other") );
- item = new QCheckListItem( otherItem, QObject::tr("Description: ")+pi->desc() );
+ item = new QCheckListItem( otherItem, QObject::tr("Install Name: ")+pi->installName() );
QDict<QString> *fields = pi->getFields();
QDictIterator<QString> it( *fields );
diff --git a/noncore/unsupported/oipkg/packagelistremote.cpp b/noncore/unsupported/oipkg/packagelistremote.cpp
index e37f256..bb29e80 100644
--- a/noncore/unsupported/oipkg/packagelistremote.cpp
+++ b/noncore/unsupported/oipkg/packagelistremote.cpp
@@ -46,4 +46,4 @@ void PackageListRemote::update()
pvDebug(4,"search :"+cmd);
r = system(cmd.latin1());
- readFileEntries( redirect );
+ readFileEntries( redirect, "remote" );
}