-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/settings.cpp | 2 |
5 files changed, 18 insertions, 8 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 19a1420..a23c900 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp @@ -57,11 +57,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : makeMenu(); makeChannel(); //opie is hardcoded default ;) - pvDebug(9,"section->setCurrentItem"); - for (int i=0;i<section->count();i++) - if (section->text(i)=="opie") - section->setCurrentItem(i); - sectionChanged(); +// pvDebug(9,"section->setCurrentItem"); +// for (int i=0;i<section->count();i++) +// if (section->text(i)=="opie") +// section->setCurrentItem(i); +// sectionChanged(); connect( section, SIGNAL(activated(int)), SLOT(sectionChanged()) ); connect( subsection, SIGNAL(activated(int)), SLOT(subSectionChanged()) ); diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index c947c64..4542e42 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp @@ -34,6 +34,7 @@ void Package::init( PackageManagerSettings *s ) _dest = settings->getDestinationName(); _link = settings->createLinks(); _versions=0; + _version=""; } Package::Package( QStringList pack, PackageManagerSettings *s ) @@ -235,6 +236,11 @@ void Package::copyValues( Package* pack ) if (_shortDesc.isEmpty() && !pack->_shortDesc.isEmpty()) _shortDesc = QString( pack->_shortDesc ); if (_desc.isEmpty() && !pack->_desc.isEmpty()) _desc = QString( pack->_desc ); if (_name.isEmpty() && !pack->_name.isEmpty()) _name = QString( pack->_name ); + if (_dest.isEmpty() && !pack->_dest.isEmpty()) _dest= QString( pack->_dest ); + if (_displayName.isEmpty()&& !pack->_displayName.isEmpty()) _displayName = QString( pack->_displayName ); + if (_fileName.isEmpty() && !pack->_fileName.isEmpty()) _fileName = QString( pack->_fileName ); + if (_version.isEmpty() && !pack->_version.isEmpty()) _version = QString( pack->_version ); + if (_values.isEmpty() && !pack->_values.isEmpty())_values = QDict<QString>( pack->_values ); if (!installed() && _status.isEmpty() && !pack->_status.isEmpty()) _status = QString( pack->_status ); } diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp index 24c7beb..09975b0 100644 --- a/noncore/unsupported/oipkg/pksettings.cpp +++ b/noncore/unsupported/oipkg/pksettings.cpp @@ -169,12 +169,13 @@ void PackageManagerSettings::removeDestination() { disconnect( destinationname, SIGNAL(textChanged(const QString&)), this, SLOT(destNameChanged(const QString&)) ); disconnect( destinationurl, SIGNAL(textChanged(const QString&)), this, SLOT(destUrlChanged(const QString&)) ); - destinationname->setText(destinations->text(editedserver)); - destinationurl->setText(*destinationurlDic[editedserver]); + destinationname->setText(""); + destinationurl->setText(""); disconnect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); destinations->removeItem(editeddestination); activeDestination->removeItem(editeddestination); activeLinkDestination->removeItem(editeddestination); + editeddestination=0; connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); destinationname->setEnabled(FALSE); destinationurl->setEnabled(FALSE); @@ -354,6 +355,7 @@ bool PackageManagerSettings::readIpkgConfig(const QString& conffile) QTextStream s(&conf); servers->clear(); activeServers->clear(); + destinations->clear(); activeDestination->clear(); activeLinkDestination->clear(); serverurlDic.clear(); diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 6ef6d19..0401a5b 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -268,8 +268,10 @@ void PmIpkg::remove() runwindow->progress->setProgress( 1 ); linkOpp = removeLink; to_remove.at(i)->processed(); + pvDebug(4,"link "+QString::number(i)); if ( to_remove.at(i)->link() ) processFileList( fileList, to_remove.at(i)->dest() ); + pvDebug(4,"take "+QString::number(i)); to_remove.take( i ); out("\n"); diff --git a/noncore/unsupported/oipkg/settings.cpp b/noncore/unsupported/oipkg/settings.cpp index 8f91995..85daa98 100644 --- a/noncore/unsupported/oipkg/settings.cpp +++ b/noncore/unsupported/oipkg/settings.cpp @@ -181,7 +181,7 @@ void PackageManagerSettings::writeIpkgConfig(const QString& conffile) QFile conf(conffile); if ( ! conf.open(IO_WriteOnly) ) return; QTextStream s(&conf); - s << "# Written by qpie Package Manager\n"; + s << "# "+tr("Written by Opie Package Manager")+"\n"; for (int i=0; i<(int)activeServers->count(); i++) { QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???"); |