author | tille <tille> | 2002-04-29 22:45:35 (UTC) |
---|---|---|
committer | tille <tille> | 2002-04-29 22:45:35 (UTC) |
commit | b794af4c50efffe239c94e5a015e90565ff991c3 (patch) (side-by-side diff) | |
tree | dd4e20851eba8052a07396b57388f9216f85ae7f /noncore/unsupported/oipkg | |
parent | e4d0908ec054b71a9b97e9c35efbd5a697d0b58d (diff) | |
download | opie-b794af4c50efffe239c94e5a015e90565ff991c3.zip opie-b794af4c50efffe239c94e5a015e90565ff991c3.tar.gz opie-b794af4c50efffe239c94e5a015e90565ff991c3.tar.bz2 |
removes links again
21 files changed, 545 insertions, 387 deletions
diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO index 3fc84e5..790766c 100644 --- a/noncore/unsupported/oipkg/TODO +++ b/noncore/unsupported/oipkg/TODO @@ -1,11 +1,9 @@ -* setDocument function * Settings Class * tr() ;) * Dialog to display ipkg output live * parse "to install" and "to remove" from status -* install local file +* install local file dialog * qcop * error handling * manage links * dependency checking -* ipkg options in runwindow
\ No newline at end of file diff --git a/noncore/unsupported/oipkg/debug.h b/noncore/unsupported/oipkg/debug.h index 973d96c..206dea5 100644 --- a/noncore/unsupported/oipkg/debug.h +++ b/noncore/unsupported/oipkg/debug.h @@ -16,5 +16,5 @@ if ( debugLevel < 3 ) \ }else{\ if ( I <= debugLevel ) \ - qDebug("# %s \t\t(Level: %i)\n",QString(S).latin1(),I);\ + qDebug("#%s:%i: %s \t\t(Level: %i)",__FILE__,__LINE__,QString(S).latin1(),I);\ } diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index c95f482..ca1e5e8 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp @@ -7,4 +7,5 @@ #include <qpe/qpemessagebox.h> #include <qpe/resource.h> +#include <qpe/config.h> #include <qpe/qpetoolbar.h> #include <qpe/qcopenvelope_qws.h> @@ -18,4 +19,5 @@ #include <qlistview.h> #include <qtextview.h> +#include <qcheckbox.h> #include <qlineedit.h> #include <qtabwidget.h> @@ -25,4 +27,5 @@ #include "pksettingsbase.h" +#include "utils.h" #include "packagelistitem.h" @@ -31,31 +34,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : QMainWindow( parent, name, f ) { + setCaption( tr("Package Manager") ); settings = new PackageManagerSettings(this,0,TRUE); listViewPackages = new PackageListView( this,"listViewPackages",settings ); - ipkg = new PmIpkg( settings, this ); - setCentralWidget( listViewPackages ); - setCaption( tr("Package Manager") ); // 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")); - - channel = new QCopChannel( "QPE/Application/oipkg", this ); - connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(receive(const QCString&, const QByteArray&)) ); - - makeMenu(); - - connect( section, SIGNAL( activated(int) ), - this, SLOT( sectionChanged() ) ); - connect( subsection, SIGNAL(activated(int) ), - this, SLOT( subSectionChanged() ) ); - +// wait = new QMessageBox(this); +// wait->setText(tr("Please wait")); ipkg = new PmIpkg( settings, this ); packageList.setSettings( settings ); - getList(); - setSections(); - setSubSections(); + packageList.update(); + makeMenu(); + makeChannel(); + //opie is hardcoded default ;) + 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()) ); displayList(); } @@ -101,17 +98,15 @@ void MainWindow::makeMenu() updateAction->addTo( srvMenu ); -// would we use for find -// detailsAction = new QAction( tr( "Details" ), +// could we use for find +// detailsAction = new QAction( tr( "Find" ), // Resource::loadIconSet( "find" ), // QString::null, 0, this, 0 ); // connect( detailsAction, SIGNAL( activated() ), -// this , SLOT( showDetails() ) ); +// this , SLOT( showFind() ) ); // detailsAction->addTo( toolBar ); -// detailsAction->addTo( srvMenu ); QAction *cfgact; cfgact = new QAction( tr( "Setups" ), - // Resource::loadIconSet( "" ), QString::null, 0, this, 0 ); connect( cfgact, SIGNAL( activated() ), @@ -120,5 +115,4 @@ void MainWindow::makeMenu() cfgact = new QAction( tr( "Servers" ), - // Resource::loadIconSet( "" ), QString::null, 0, this, 0 ); connect( cfgact, SIGNAL( activated() ), @@ -126,5 +120,4 @@ void MainWindow::makeMenu() cfgact->addTo( cfgMenu ); cfgact = new QAction( tr( "Destinations" ), - // Resource::loadIconSet( "" ), QString::null, 0, this, 0 ); connect( cfgact, SIGNAL( activated() ), @@ -132,5 +125,5 @@ void MainWindow::makeMenu() cfgact->addTo( cfgMenu ); - QAction *a; + QAction *a; sectionBar = new QPEToolBar( this ); @@ -141,17 +134,17 @@ void MainWindow::makeMenu() sectionBar->setStretchableWidget( label ); section = new QComboBox( false, sectionBar ); -// section->setBackgroundMode( PaletteBackground ); label = new QLabel( " / ", sectionBar ); label->setBackgroundColor( sectionBar->backgroundColor() ); subsection = new QComboBox( false, sectionBar ); - a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), this, SLOT( sectionClose() ) ); a->addTo( sectionBar ); + setSections(); + setSubSections(); + sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 ); connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) ); sectionAction->setToggleAction( true ); - sectionAction->setOn( true ); sectionAction->addTo( viewMenu ); @@ -166,4 +159,7 @@ void MainWindow::makeMenu() this, SLOT( displayList() ) ); + a = new QAction( tr( "Clear Find" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); + connect( a, SIGNAL( activated() ), findEdit, SLOT( clear() ) ); + a->addTo( findBar ); a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); @@ -172,22 +168,54 @@ void MainWindow::makeMenu() connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) ); findAction->setToggleAction( true ); - findAction->setOn( true ); findAction->addTo( viewMenu ); - #ifdef NEW + destBar = new QPEToolBar(this); + addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); + label = new QLabel( tr("Destination: "), destBar ); + label->setBackgroundColor( destBar->backgroundColor() ); + destBar->setHorizontalStretchable( TRUE ); + destination = new QComboBox( false, destBar ); + destination->insertStringList( settings->getDestinationNames() ); + setComboName(destination,settings->getDestinationName()); +// connect( destination, SIGNAL(activated(int)), +// SLOT(activeDestinationChange(int)) ); + spacer = new QLabel( " ", destBar ); + spacer->setBackgroundColor( destBar->backgroundColor() ); + CheckBoxLink = new QCheckBox( tr("Link"), destBar); + CheckBoxLink->setBackgroundColor( destBar->backgroundColor() ); + CheckBoxLink->setChecked( settings->createLinks() ); +// connect( CheckBoxLink, SIGNAL(toggled(bool)), +// settings, SLOT(linkEnabled(bool)) ); + destAction = new QAction( tr( "Destinations" ), QString::null, 0, this, 0 ); + connect( destAction, SIGNAL( toggled(bool) ), SLOT( destShow(bool) ) ); + a = new QAction( tr( "Close Destinations" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); + connect( a, SIGNAL( activated() ), SLOT( destClose() ) ); + a->addTo( destBar ); + destBar->setStretchableWidget( CheckBoxLink ); + destAction->setToggleAction( true ); + // destAction->addTo( viewMenu ); + + // configure the menus Config cfg( "oipkg", Config::User ); - cfg.setGroup( "Setting_" + QString::number( setting ) ); - CheckBoxLink->setChecked( cfg.readBoolEntry( "link", false ) ); - findShow(bool b) - sectionShow(bool b) - #endif + cfg.setGroup( "gui" ); + + findShow( cfg.readBoolEntry( "findBar", true ) ); + sectionShow( cfg.readBoolEntry( "sectionBar", true ) ); + destShow( cfg.readBoolEntry( "destBar", false ) ); } MainWindow::~MainWindow() { + Config cfg( "oipkg", Config::User ); + cfg.setGroup( "gui" ); + cfg.writeEntry( "findBar", !findBar->isHidden() ); + cfg.writeEntry( "sectionBar", !sectionBar->isHidden() ); + cfg.writeEntry( "destBar", !destBar->isHidden() ); + } void MainWindow::runIpkg() { + packageList.allPackages(); ipkg->commit( packageList ); // ##### If we looked in the list of files, we could send out accurate @@ -201,5 +229,5 @@ void MainWindow::runIpkg() void MainWindow::updateList() { - wait->show(); +// wait->show(); QTimer *t = new QTimer( this ); connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) ); @@ -207,30 +235,21 @@ void MainWindow::updateList() packageList.clear(); ipkg->update(); - getList(); - t->stop(); - wait->hide(); - -} - -void MainWindow::getList() -{ - wait->show(); packageList.update(); - displayList(); - wait->hide(); + t->stop(); +// wait->hide(); } void MainWindow::filterList() { - wait->show(); +// wait->show(); QString f = ""; if ( findAction->isOn() ) f = findEdit->text(); packageList.filterPackages( f ); - wait->hide(); +// wait->hide(); } void MainWindow::displayList() { - wait->hide(); +// wait->hide(); filterList(); listViewPackages->clear(); @@ -327,4 +346,16 @@ void MainWindow::findClose() } +void MainWindow::destShow(bool b) +{ + if (b) destBar->show(); + else destBar->hide(); + destAction->setOn( b ); +} + +void MainWindow::destClose() +{ + destAction->setOn( false ); +} + void MainWindow::rotateUpdateIcon() { @@ -362,10 +393,30 @@ void MainWindow::installFile(const QString &fileName) } +void MainWindow::makeChannel() +{ + channel = new QCopChannel( "QPE/Application/oipkg", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) ); +} + + + void MainWindow::receive(const QCString &msg, const QByteArray &arg) { - pvDebug(3, "QCop "+msg); + pvDebug(3, "QCop "+msg+" "+QCString(arg)); if ( msg == "installFile(QString)" ) { - installFile( QString(arg) ); - } -}
\ No newline at end of file + ipkg->installFile( QString(arg) ); + }else if( msg == "removeFile(QString)" ) + { + ipkg->removeFile( QString(arg) ); + }else if( msg == "createLinks(QString)" ) + { + ipkg->createLinks( QString(arg) ); + }else if( msg == "removeLinks(QString)" ) + { + ipkg->removeLinks( QString(arg) ); + }else{ + pvDebug(2,"Huh what do ya want") + } +} diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index a713d00..7615b09 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h @@ -18,4 +18,5 @@ class PackageListItem; class QCopChannel; class QMessageBox; +class QCheckBox; class MainWindow : public QMainWindow @@ -27,4 +28,5 @@ public: MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~MainWindow(); + void makeChannel(); QCopChannel *channel; @@ -32,5 +34,4 @@ public: protected slots: void runIpkg(); - void getList(); void updateList(); void displayList(); @@ -46,4 +47,6 @@ public slots: void findClose(); void findShow(bool); + void destClose(); + void destShow(bool); void filterList(); void receive (const QCString &, const QByteArray &); @@ -61,8 +64,8 @@ private: PackageList packageList; QAction *runAction; - QAction *detailsAction; QAction *updateAction; QAction *findAction; QAction *sectionAction; + QAction *destAction; PackageListView *listViewPackages; QPEToolBar *findBar; @@ -71,5 +74,8 @@ private: QComboBox *section; QComboBox *subsection; - QMessageBox *wait; + QPEToolBar *destBar; + QComboBox *destination; + QCheckBox* CheckBoxLink; +// QMessageBox *wait; private slots: void rotateUpdateIcon(); diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro index 1f7a70d..c5d3b3d 100644 --- a/noncore/unsupported/oipkg/oipkg.pro +++ b/noncore/unsupported/oipkg/oipkg.pro @@ -6,4 +6,5 @@ HEADERS = mainwindow.h \ pksettings.h \ pmipkg.h \ + utils.h \ packagelistitem.h \ packagelist.h \ @@ -12,4 +13,5 @@ HEADERS = mainwindow.h \ SOURCES = main.cpp \ mainwindow.cpp \ + utils.cpp \ packagelistview.cpp \ pksettings.cpp \ diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index 5f0e5fa..0499e19 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp @@ -10,7 +10,7 @@ #include "debug.h" -Package::~Package() -{ -} +//Package::~Package() +//{ +//} Package::Package( PackageManagerSettings *s ) @@ -62,63 +62,54 @@ Package::Package( Package *pi ) void Package::setValue( QString n, QString t ) { - if ( n == "Status" && installed() ) return; if ( n == "Package" ) - { + { _name = QString( t ); - } - if ( n == "Installed-Size" ) - { + }else if ( n == "Installed-Size" ) + { _size = t; - } - if ( n == "Priority") - { + }else if ( n == "Priority") + { - } - if ( n == "Section") - { + }else if ( n == "Section") + { setSection( t ); - } - if ( n == "Maintainer") - { + }else if ( n == "Maintainer") + { - } - if ( n == "Architecture") - { + }else if ( n == "Architecture") + { - } - if ( n == "Version") - { + }else if ( n == "Version") + { - } - if ( n == "Pre-Depends") - { + }else if ( n == "Pre-Depends") + { - } - if ( n == "Depends") - { + }else if ( n == "Depends") + { - }else if ( n == "Filename") - { + }else if ( n == "Filename") + { - }else if ( n == "Size") + }else if ( n == "Size") { - + }else if ( n == "MD5Sum") - { + { - } + } if ( n == "Description") - { + { setDesc( t ); - } + } if ( n == "Status") - { + { if ( installed() ) return; _status = t; - } + } if ( t == "Essential") - { + { - } + } }; @@ -154,4 +145,20 @@ QString Package::size() } +QString Package::sizeUnits() +{ + int i = _size.toInt(); + int c = 0; + QString ret; + QStringList unit; + unit << "B" << "KB" << "MB" << "GB" << "TB"; //prepair for the future ;) + while (i > 1) + { + ret=QString::number(i)+" "+unit[c]; + c++; + i /= 1024; + } + return ret; +} + bool Package::toProcess() { diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h index 31b0010..49bb3bf 100644 --- a/noncore/unsupported/oipkg/package.h +++ b/noncore/unsupported/oipkg/package.h @@ -13,8 +13,8 @@ class Package //: public QObject { - // Q_OBJECT +// Q_OBJECT public: Package(PackageManagerSettings *); - ~Package(); + // ~Package(); Package( QStringList, PackageManagerSettings * ); Package( QString, PackageManagerSettings * ); @@ -31,4 +31,5 @@ class Package //: public QObject QString desc(); QString size(); + QString sizeUnits(); void setSection( QString ); QString section(); @@ -46,5 +47,4 @@ class Package //: public QObject void parseIpkgFile( QString );; public slots: - /** No descriptions */ QString getPackageName(); void toggleProcess(); diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp index 149ba35..0c7c928 100644 --- a/noncore/unsupported/oipkg/packagelistitem.cpp +++ b/noncore/unsupported/oipkg/packagelistitem.cpp @@ -18,16 +18,5 @@ PackageListItem::PackageListItem(QListView* lv, Package *pi, PackageManagerSetti setExpandable( true ); QCheckListItem *item; -#ifndef NEWLAYOUT - item = new QCheckListItem( this, QObject::tr("Name") ); - item->setText(1,pi->name()); - item = new QCheckListItem( this, QObject::tr("Description") ); - item->setText(1,pi->desc()+"\ntest multi\nline"); - item = new QCheckListItem( this, QObject::tr("Size") ); - item->setText(1,pi->size()); - item = new QCheckListItem( this, QObject::tr("Destination") ); - item->setText(1,pi->getDest()); -#endif -#ifdef NEWLAYOUT - item = new QCheckListItem( this, QObject::tr("Name: ")+pi->name() ); + nameItem = new QCheckListItem( this, "" ); item = new QCheckListItem( this, QObject::tr("Description: ")+pi->desc() ); item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() ); @@ -35,7 +24,7 @@ PackageListItem::PackageListItem(QListView* lv, Package *pi, PackageManagerSetti linkItem = new QCheckListItem( this, "" ); displayDetails(); -#endif - if (!pm_uninstalled) { + if (!pm_uninstalled) + { pm_uninstalled = new QPixmap(Resource::loadPixmap("oipkg/uninstalled")); pm_installed = new QPixmap(Resource::loadPixmap("oipkg/installed")); @@ -43,8 +32,4 @@ PackageListItem::PackageListItem(QListView* lv, Package *pi, PackageManagerSetti pm_uninstall = new QPixmap(Resource::loadPixmap("oipkg/uninstall")); } -#ifndef NEWLAYOUT - setText(1, package->shortDesc() ); - setText(2, package->size() ); -#endif } @@ -121,11 +106,4 @@ void PackageListItem::setOn( bool b ) QCheckListItem::setOn( b ); package->toggleProcess(); -// if ( b ) -// { -// if ((package->dest()).isEmpty) -// package->setDest( settings->getDestinationName() ); -// }else{ -// package->setDest( QObject::tr("not installed")); -// } package->setLink( settings->createLinks() ); displayDetails(); @@ -134,4 +112,9 @@ void PackageListItem::setOn( bool b ) void PackageListItem::displayDetails() { + QString sod = " ("+package->sizeUnits(); + sod += package->dest().isEmpty()?QString(""):QString(QObject::tr(" on ")+package->dest()); + sod += ")"; + setText(0, package->name()+sod ); + nameItem->setText( 0, QObject::tr("Name: ")+package->name()); linkItem->setText( 0, QObject::tr("Link: ")+QString(package->link()?QObject::tr("Yes"):QObject::tr("No")) ); destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); diff --git a/noncore/unsupported/oipkg/packagelistitem.h b/noncore/unsupported/oipkg/packagelistitem.h index f695432..54d9f9e 100644 --- a/noncore/unsupported/oipkg/packagelistitem.h +++ b/noncore/unsupported/oipkg/packagelistitem.h @@ -28,4 +28,5 @@ public: private: + QCheckListItem *nameItem; QCheckListItem *destItem; QCheckListItem *linkItem; diff --git a/noncore/unsupported/oipkg/packagelistview.cpp b/noncore/unsupported/oipkg/packagelistview.cpp index 693ea6a..2915ac6 100644 --- a/noncore/unsupported/oipkg/packagelistview.cpp +++ b/noncore/unsupported/oipkg/packagelistview.cpp @@ -53,5 +53,5 @@ void PackageListView::setCurrent( QListViewItem* p ) activePackageListItem = (PackageListItem*)p; activePackage = activePackageListItem->getPackage(); - pvDebug(5, "start timer"); + if (!activePackage) return; popupTimer->start( 750, true ); } @@ -64,13 +64,24 @@ void PackageListView::showPopup() QAction *popupAction; - popupMenu->insertItem( QObject::tr("Install to"), destsMenu ); - QStringList dests = settings->getDestinationNames(); - for (uint i = 0; i < dests.count(); i++ ) - { - popupAction = new QAction( dests[i], QString::null, 0, this, 0 ); - popupAction->addTo( destsMenu ); - } - connect( destsMenu, SIGNAL( activated( int ) ), - this, SLOT( changePackageDest( int ) ) ); + if ( !activePackage->installed() ) + { + popupMenu->insertItem( QObject::tr("Install to"), destsMenu ); + QStringList dests = settings->getDestinationNames(); + QString ad = settings->getDestinationName(); + for (uint i = 0; i < dests.count(); i++ ) + { + popupAction = new QAction( dests[i], QString::null, 0, this, 0 ); + popupAction->addTo( destsMenu ); + if ( dests[i] == ad && activePackage->toInstall() ) + { + popupAction->setToggleAction( true ); + popupAction->setOn(true); + }; + } + connect( destsMenu, SIGNAL( activated( int ) ), + this, SLOT( changePackageDest( int ) ) ); + }else{ +// popupActcat setOn( activePackage->toProcess() ); + } popupMenu->popup( QCursor::pos() ); } @@ -78,5 +89,4 @@ void PackageListView::showPopup() void PackageListView::stopTimer( QListViewItem* ) { - pvDebug( 5, "stop timer" ); popupTimer->stop(); } @@ -90,2 +100,8 @@ void PackageListView::changePackageDest( int i ) activePackageListItem->displayDetails(); } + +void PackageListView::toggleProcess() +{ + activePackage->toggleProcess() ; + activePackageListItem->displayDetails(); +} diff --git a/noncore/unsupported/oipkg/packagelistview.h b/noncore/unsupported/oipkg/packagelistview.h index 15e200b..a3db0d0 100644 --- a/noncore/unsupported/oipkg/packagelistview.h +++ b/noncore/unsupported/oipkg/packagelistview.h @@ -49,4 +49,6 @@ public slots: void setCurrent( QListViewItem* ); void stopTimer( QListViewItem* ); + /** No descriptions */ + void toggleProcess(); }; diff --git a/noncore/unsupported/oipkg/pkdesc.ui b/noncore/unsupported/oipkg/pkdesc.ui deleted file mode 100644 index 494d3d6..0000000 --- a/noncore/unsupported/oipkg/pkdesc.ui +++ b/dev/null @@ -1,96 +0,0 @@ -<!DOCTYPE UI><UI> -<class>PackageDetails</class> -<widget> - <class>QDialog</class> - <property stdset="1"> - <name>name</name> - <cstring>Form7</cstring> - </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>0</x> - <y>0</y> - <width>221</width> - <height>291</height> - </rect> - </property> - <property stdset="1"> - <name>caption</name> - <string>(pkgname)</string> - </property> - <property> - <name>layoutMargin</name> - </property> - <property> - <name>layoutSpacing</name> - </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>6</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>3</number> - </property> - <widget> - <class>QTextView</class> - <property stdset="1"> - <name>name</name> - <cstring>description</cstring> - </property> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout4</cstring> - </property> - <hbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QToolButton</class> - <property stdset="1"> - <name>name</name> - <cstring>install</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Install</string> - </property> - </widget> - <widget> - <class>QToolButton</class> - <property stdset="1"> - <name>name</name> - <cstring>remove</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Remove</string> - </property> - </widget> - <widget> - <class>QToolButton</class> - <property stdset="1"> - <name>name</name> - <cstring>ignore</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Ignore</string> - </property> - </widget> - </hbox> - </widget> - </vbox> -</widget> -</UI> diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp index be01837..6c8dc2a 100644 --- a/noncore/unsupported/oipkg/pksettings.cpp +++ b/noncore/unsupported/oipkg/pksettings.cpp @@ -32,4 +32,5 @@ #include <unistd.h> #include "debug.h" +//#include "utils.h" PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* name, WFlags fl ) @@ -57,4 +58,5 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na destinationurlDic.setAutoDelete(TRUE); readSettings(); + activeLinkDestination->hide(); } @@ -77,6 +79,8 @@ void PackageManagerSettings::newServer() activeServers->insertItem(servername->text()); } + changed = true; servers->setSelected(i,TRUE); editServer(i); + changed = true; } @@ -98,4 +102,5 @@ void PackageManagerSettings::newDestination() destinations->setSelected(i,TRUE); editDestination(i); + changed = true; } @@ -118,4 +123,5 @@ void PackageManagerSettings::editServer(int i) connect( servername, SIGNAL(textChanged(const QString&)), this, SLOT(serverNameChanged(const QString&)) ); connect( serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(serverUrlChanged(const QString&)) ); + changed = true; } @@ -138,4 +144,5 @@ void PackageManagerSettings::editDestination(int i) connect( destinationname, SIGNAL(textChanged(const QString&)), this, SLOT(destNameChanged(const QString&)) ); connect( destinationurl, SIGNAL(textChanged(const QString&)), this, SLOT(destUrlChanged(const QString&)) ); + changed = true; } @@ -152,4 +159,5 @@ void PackageManagerSettings::removeServer() servername->setEnabled(FALSE); serverurl->setEnabled(FALSE); + changed = true; } @@ -167,4 +175,5 @@ void PackageManagerSettings::removeDestination() destinationname->setEnabled(FALSE); destinationurl->setEnabled(FALSE); + changed = true; } @@ -174,5 +183,7 @@ void PackageManagerSettings::serverNameChanged(const QString& t) servers->changeItem( t, editedserver ); activeServers->changeItem( t, editedserver ); + changed = true; connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) ); + changed = true; } @@ -184,4 +195,5 @@ void PackageManagerSettings::destNameChanged(const QString& t) activeLinkDestination->changeItem( t, editeddestination ); connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); + changed = true; } @@ -189,4 +201,5 @@ void PackageManagerSettings::serverUrlChanged(const QString& t) { serverurlDic.replace(editedserver, new QString(t)); + changed = true; } @@ -194,4 +207,5 @@ void PackageManagerSettings::destUrlChanged(const QString& t) { destinationurlDic.replace(editeddestination, new QString(t)); + changed = true; } @@ -266,9 +280,9 @@ void PackageManagerSettings::installationSettingChange(int cs) currentSetting = cs; readInstallationSetting( cs ); + changed = true; } void PackageManagerSettings::writeInstallationSettings() { - if ( ! changed ) return ; { Config cfg( "oipkg", Config::User ); @@ -286,17 +300,16 @@ void PackageManagerSettings::readInstallationSetting(int setting) Config cfg( "oipkg", Config::User ); cfg.setGroup( "Setting_" + QString::number( setting ) ); - CheckBoxLink->setChecked( cfg.readBoolEntry( "link", false ) ); + CheckBoxLink->setChecked( cfg.readBoolEntry( "link", true ) ); QString dest = cfg.readEntry( "dest" ); QString linkdest = cfg.readEntry( "linkdest" ); pvDebug(3, "dest="+dest); pvDebug(3, "linkdest="+linkdest); - for ( int i = 0; i < activeDestination->count(); i++) - { - if ( activeDestination->text( i ) == dest ) - activeDestination->setCurrentItem( i ); - if ( activeLinkDestination->text( i ) == linkdest ) - activeLinkDestination->setCurrentItem( i ); - } + { + if ( activeDestination->text( i ) == dest ) + activeDestination->setCurrentItem( i ); + if ( activeLinkDestination->text( i ) == linkdest ) + activeLinkDestination->setCurrentItem( i ); + } } @@ -304,5 +317,4 @@ void PackageManagerSettings::writeCurrentInstallationSetting() { Config cfg( "oipkg", Config::User ); - changed = false; cfg.setGroup( "Setting_" + QString::number(currentSetting) ); cfg.writeEntry( "link", CheckBoxLink->isChecked() ); @@ -333,4 +345,5 @@ bool PackageManagerSettings::readIpkgConfig(const QString& conffile) { QFile conf(conffile); + changed = false; if ( conf.open(IO_ReadOnly) ) { QTextStream s(&conf); @@ -425,5 +438,5 @@ void PackageManagerSettings::readSettings() void PackageManagerSettings::writeSettings() { - writeIpkgConfig("/etc/ipkg.conf"); + if ( changed ) writeIpkgConfig("/etc/ipkg.conf"); writeInstallationSettings(); } @@ -436,5 +449,5 @@ bool PackageManagerSettings::showDialog( int i ) if ( ret ) writeSettings(); else readSettings(); - return ret; + return (changed && ret); } /** Returns the installation destination */ @@ -470,4 +483,13 @@ QStringList PackageManagerSettings::getActiveServers() return sl; } + QStringList PackageManagerSettings::getServers() +{ + QStringList sl; + for (int i=0; i<(int)activeServers->count(); i++) + { + sl += activeServers->text(i); + } + return sl; +} /** returns the destination listed in ipkg.conf */ @@ -507,5 +529,14 @@ QStringList PackageManagerSettings::getDestinationNames() void PackageManagerSettings::linkEnabled( bool b ) { - changed = true; activeLinkDestination->setEnabled( b ); } + +void PackageManagerSettings::activeServerChanged() +{ + changed = true; +} + +QComboBox* PackageManagerSettings::getDestCombo() +{ + return new QComboBox(activeDestination); +} diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h index 11ba55c..fbb3b99 100644 --- a/noncore/unsupported/oipkg/pksettings.h +++ b/noncore/unsupported/oipkg/pksettings.h @@ -18,8 +18,11 @@ public: QString getLinkDestinationName(); bool createLinks(); + QStringList getServers(); QStringList getActiveServers(); QStringList getDestinationUrls(); QStringList getDestinationNames(); QString getDestinationUrlByName(QString); + /** No descriptions */ + QComboBox* getDestCombo(); private: @@ -60,4 +63,5 @@ public slots: void removeInstallationSetting(); void renameInstallationSetting(); + void activeServerChanged(); }; diff --git a/noncore/unsupported/oipkg/pksettingsbase.ui b/noncore/unsupported/oipkg/pksettingsbase.ui index 196a89f..fd6d208 100644 --- a/noncore/unsupported/oipkg/pksettingsbase.ui +++ b/noncore/unsupported/oipkg/pksettingsbase.ui @@ -12,5 +12,5 @@ <x>0</x> <y>0</y> - <width>349</width> + <width>345</width> <height>454</height> </rect> @@ -177,5 +177,5 @@ <property stdset="1"> <name>text</name> - <string>Link Destination: root</string> + <string>Link to root destination</string> </property> </widget> @@ -719,4 +719,22 @@ </widget> <connections> + <connection> + <sender>activeServers</sender> + <signal>pressed(QListBoxItem*)</signal> + <receiver>Form4</receiver> + <slot>activeServerChanged()</slot> + </connection> + <connection> + <sender>activeServers</sender> + <signal>selectionChanged(QListBoxItem*)</signal> + <receiver>Form4</receiver> + <slot>activeServerChanged()</slot> + </connection> + <connection> + <sender>activeServers</sender> + <signal>pressed(QListBoxItem*)</signal> + <receiver>Form4</receiver> + <slot>activeServerChanged()</slot> + </connection> <slot access="public">destNameChanged(const QString&)</slot> <slot access="public">destUrlChanged(const QString&)</slot> @@ -729,4 +747,5 @@ <slot access="public">newInstallationSetting()</slot> <slot access="public">newServer()</slot> + <slot access="public">activeServerChanged()</slot> <slot access="public">removeDestination()</slot> <slot access="public">removeInstallationSetting()</slot> diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index ecc97b2..9f6429a 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -10,4 +10,5 @@ #include <qdir.h> #include <qfile.h> +#include <qgroupbox.h> #include <qmultilineedit.h> #include <qstring.h> @@ -58,6 +59,13 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest ) cmd += " -force-defaults "; -// if (runwindow->forcedepends->isChecked()) -// cmd += " -force-depends "; + if (_force_depends) + { + if (_force_depends->isChecked()) + cmd += " -force-depends "; + if (_force_reinstall->isChecked()) + cmd += " -force-reinstall "; + if (_force_remove->isChecked()) + cmd += " -force-removal-of-essential-packages "; + } out( "<hr><br>Starting to "+ args+"<br>\n"); @@ -77,12 +85,10 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest ) cmd += " 2>&1 | tee "+redirect+" 2>&1"; pvDebug(2, "running >"+cmd+"<"); - r = system(cmd.latin1()); + r = system(cmd.latin1()); QFile f( redirect ); QString line; QString oldLine; while ( ! f.open(IO_ReadOnly) ) {}; - // { QTextStream t( &f ); - // QString fp; while ( !t.eof() ) { @@ -94,5 +100,4 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest ) } } -// } f.close(); out( "Finished!<br>"); @@ -105,6 +110,12 @@ void PmIpkg::makeLinks(Package *pack) { pvDebug( 2, "PmIpkg::makeLinks "+ pack->name()); - QString dest = settings->getDestinationUrlByName( pack->dest() ); - if (dest == "/" ) return; + linkPackage( pack->name(), pack->dest() ); +} + +QStringList* PmIpkg::getList( QString packFileName, QString d ) +{ + QString dest = settings->getDestinationUrlByName( d ); + dest = dest==""?d:dest; + if (dest == "/" ) return 0; { Config cfg( "oipkg", Config::User ); @@ -112,32 +123,46 @@ void PmIpkg::makeLinks(Package *pack) QString statusDir = cfg.readEntry( "statusDir", "" ); } - QString fn = dest+"/"+statusDir+"/info/"+pack->name()+".list"; - linkPackage( fn, dest ); -} - -void PmIpkg::linkPackage( QString packFileName, QString dest ) -{ - QFile f( packFileName ); - if ( ! f.open(IO_ReadOnly) ) + packFileName = dest+"/"+statusDir+"/info/"+packFileName+".list"; + QFile f( packFileName ); + if ( ! f.open(IO_ReadOnly) ) { + pvDebug(1," Panik! Could not open"); out( "<b>Panik!</b> Could not open:<br>"+packFileName ); - return; - }; - out( "<br>creating links<br>" ); - out("for package "+packFileName+" in "+dest+"<br>"); + return (QStringList*)0; + } + QStringList *fileList = new QStringList(); QTextStream t( &f ); - QString fp; while ( !t.eof() ) { - fp = t.readLine(); - processLinkDir( fp, dest ); + *fileList += t.readLine(); } - f.close(); + return fileList; } +void PmIpkg::linkPackage( QString packFileName, QString dest ) +{ + QStringList *fileList = getList( packFileName, dest ); + processFileList( fileList, dest ); + delete fileList; +} + +void PmIpkg::processFileList( QStringList *fileList, QString d ) +{ + if (!fileList) return; + for (uint i=0; i < fileList->count(); i++) + { + QString dest = settings->getDestinationUrlByName( d ); + dest = dest==""?d:dest; + processLinkDir( (*fileList)[i], dest ); + } +} + + void PmIpkg::processLinkDir( QString file, QString dest ) { pvDebug( 7,"PmIpkg::processLinkDir "+file+" to "+ dest); - if ( dest == "???" ) return; + if (linkOpp==createLink) pvDebug( 2,"opp: createLink"); + if (linkOpp==removeLink) pvDebug( 2,"opp:removeLink"); + if ( dest == "???" || dest == "" ) return; QString destFile = file; file = dest+"/"+file; @@ -147,5 +172,5 @@ void PmIpkg::processLinkDir( QString file, QString dest ) { QDir destDir( destFile ); - destDir.mkdir( destFile, true ); + if (linkOpp==createLink) destDir.mkdir( destFile, true ); QDir d( file ); d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); @@ -155,8 +180,13 @@ void PmIpkg::processLinkDir( QString file, QString dest ) while ( (fi=it.current()) ) { - // out( "<b>"+fi->absFilePath()+"</b>" ); + pvDebug(4, "process dir "+fi->absFilePath()); processLinkDir( fi->absFilePath(), dest ); ++it; } +// if (linkOpp==removeLink) +// { +// pvDebug(2,"remove destDir "+ destFile ); +// destDir.remove( destFile, true ); +// } } else if ( fileInfo.isFile() ) @@ -164,7 +194,18 @@ void PmIpkg::processLinkDir( QString file, QString dest ) const char *instFile = strdup( (file).ascii() ); const char *linkFile = strdup( (destFile).ascii()); -// out( "linking: "+file+" -> "+destFile ); - qDebug( "linking: %s -> %s", instFile, linkFile ); - symlink( instFile, linkFile ); + if( linkOpp==createLink ) + { + pvDebug(4, "linking: "+file+" -> "+destFile ); + symlink( instFile, linkFile ); + } + } else { + const char *linkFile = strdup( (destFile).ascii()); + if( linkOpp==removeLink ) + { + pvDebug(4,"removing "+destFile+" no "+file); + QFileInfo toRemoveLink( destFile ); + if ( !QFile::exists( file ) && toRemoveLink.isSymLink() ) + unlink( linkFile ); + } } } @@ -177,5 +218,4 @@ void PmIpkg::commit( PackageList pl ) QString rem="<b>"+tr("To remove:")+"</b><br>\n"; QString inst="<b>"+tr("To install:")+"</b><br>\n"; - pl.allPackages(); for( Package *pack = pl.first();pack ; (pack = pl.next()) ) { @@ -208,68 +248,64 @@ void PmIpkg::startDialog() RunWindowLayout->setMargin( 2 ); - QHBoxLayout *buttons = new QHBoxLayout; - buttons->setSpacing( 6 ); - buttons->setMargin( 0 ); - PackageListView *plv = new PackageListView(installDialog, "install",settings); + plv->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, plv->sizePolicy().mayShrinkVertically()) ); RunWindowLayout->addWidget( plv, 1, 0 ); + QCheckListItem *toRemoveItem; + toRemoveItem= new QCheckListItem( plv, QObject::tr("To remove") ); + toRemoveItem->setOpen( true ); for (Package *it=to_remove.first(); it != 0; it=to_remove.next() ) { - plv->insertItem( new PackageListItem(plv, it,settings) ); + toRemoveItem->insertItem( new PackageListItem(plv, it,settings) ); } + QCheckListItem *toInstallItem; + toInstallItem = new QCheckListItem( plv, QObject::tr("To install") ); + toInstallItem->setOpen( true ); for (Package *it=to_install.first(); it != 0; it=to_install.next() ) { - plv->insertItem( new PackageListItem(plv, it,settings) ); + toInstallItem->insertItem( new PackageListItem(plv, it,settings) ); } - QPushButton *doItButton = new QPushButton( installDialog, "doItButton" ); - doItButton->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, doItButton->sizePolicy().hasHeightForWidth() ) ); - QFont doItButton_font( doItButton->font() ); - doItButton_font.setPointSize( 8 ); - doItButton->setFont( doItButton_font ); - doItButton->setText( tr( "Do all " ) ); - doItButton->setAutoResize( FALSE ); - buttons->addWidget( doItButton ); - - QPushButton *installButton = new QPushButton( installDialog, "installButton" ); - QFont installButton_font( installButton->font() ); - installButton_font.setPointSize( 8 ); - installButton->setFont( installButton_font ); - installButton->setText( tr( "Install" ) ); - installButton->setAutoResize( TRUE ); - buttons->addWidget( installButton ); - - QPushButton *removeButton = new QPushButton( installDialog, "removeButton" ); - QFont removeButton_font( removeButton->font() ); - removeButton_font.setPointSize( 7 ); - removeButton->setFont( removeButton_font ); - removeButton->setText( tr( "Remove" ) ); - removeButton->setAutoResize( TRUE ); - buttons->addWidget( removeButton ); - - QPushButton *cancelButton = new QPushButton( installDialog, "cancelButton" ); - QFont cancelButton_font( cancelButton->font() ); - cancelButton_font.setPointSize( 8 ); - cancelButton->setFont( cancelButton_font ); - cancelButton->setText( tr( "Cancel" ) ); - cancelButton->setAutoResize( TRUE ); - buttons->addWidget( cancelButton ); - - RunWindowLayout->addLayout( buttons, 3, 0 ); - - connect( doItButton, SIGNAL( clicked() ), - this, SLOT( doIt() ) ); - connect( installButton, SIGNAL( clicked() ), - this, SLOT( install() ) ); - connect( removeButton, SIGNAL( clicked() ), - this, SLOT( remove() ) ); - connect( cancelButton, SIGNAL( clicked() ), - installDialog, SLOT( close() ) ); + + QGroupBox *GroupBox1 = new QGroupBox( installDialog, "Ipkg" ); + GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, GroupBox1->sizePolicy().hasHeightForWidth() ) ); + GroupBox1->setTitle( tr( "Ipkg options" ) ); + GroupBox1->setColumnLayout(0, Qt::Vertical ); + GroupBox1->layout()->setSpacing( 0 ); + GroupBox1->layout()->setMargin( 0 ); + QGridLayout *GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); + GroupBox1Layout->setAlignment( Qt::AlignTop ); + GroupBox1Layout->setSpacing( 3 ); + GroupBox1Layout->setMargin( 3 ); + + _force_depends = new QCheckBox( GroupBox1, "_force_depends" ); + _force_depends->setText( tr( "-force-depends" ) ); + _force_depends->setAutoResize( TRUE ); + GroupBox1Layout->addWidget( _force_depends, 0, 0 ); + _force_reinstall = new QCheckBox( GroupBox1, "_force_reinstall" ); + _force_reinstall->setText( tr( "-force-reinstall" ) ); + _force_reinstall->setAutoResize( TRUE ); + GroupBox1Layout->addWidget( _force_reinstall, 1, 0 ); + _force_remove = new QCheckBox( GroupBox1, "_force_remove" ); + _force_remove->setText( tr( "-force-removal-of-essential-packages" ) ); + _force_remove->setAutoResize( TRUE ); + GroupBox1Layout->addWidget( _force_remove, 1, 0 ); + RunWindowLayout->addWidget( GroupBox1 , 3, 0 ); + +// connect( doItButton, SIGNAL( clicked() ), +// this, SLOT( doIt() ) ); +// connect( installButton, SIGNAL( clicked() ), +// this, SLOT( install() ) ); +// connect( removeButton, SIGNAL( clicked() ), +// this, SLOT( remove() ) ); +// connect( cancelButton, SIGNAL( clicked() ), +// installDialog, SLOT( close() ) ); installDialog->showMaximized(); if ( installDialog->exec() ) doIt(); installDialog->close(); + out(tr("<b>All done.</b>")); } void PmIpkg::doIt() { + show( true ); remove(); install(); @@ -280,20 +316,30 @@ void PmIpkg::remove() { if ( to_remove.count() == 0 ) return; - installDialog->close(); - show( true ); - out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>"); + out("<b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br><hr>"); + QStringList *fileList; for (Package *it=to_remove.first(); it != 0; it=to_remove.next() ) { + if ( it->link() )fileList = getList( it->name(), it->dest() ); if ( runIpkg("remove " + it->name()) == 0) { - runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress()); - it->processed(); - runwindow->progress->setProgress( 1 ); + runwindow->progress->setProgress( 1 + runwindow->progress->progress() ); + linkOpp = removeLink; + if ( it->link() ) + { + out( "<br>removing links<br>" ); + out( "for package "+it->name()+" in "+it->dest()+"<br>" ); + processFileList( fileList, it->dest() ); + } + it->processed(); + out("<br><hr>"); }else{ - out("<b>"+tr("Error while removing")+"</b>"+it->name()); + out("<b>"+tr("Error while removing")+"</b><hr>"+it->name()); } + pvDebug(2,"delete File List"); + if ( it->link() )delete fileList; } + out("<br>"); } @@ -302,7 +348,5 @@ void PmIpkg::install() { if ( to_install.count() == 0 ) return; - installDialog->close(); - show( true ); - out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); + out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); for (Package *it=to_install.first(); it != 0; it=to_install.next() ) { @@ -311,26 +355,36 @@ void PmIpkg::install() { runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress()); + linkOpp = createLink; if ( it->link() ) + { + out( "<br>creating links<br>" ); + out( "for package "+it->name()+" in "+it->dest()+"<br>" ); makeLinks( it ); + } it->processed(); + out("<br><hr>"); }else{ - out("<b>"+tr("Error while installing")+"</b>"+it->name()); + out("<b>"+tr("Error while installing")+"</b><hr>"+it->name()); } } + out("<br>"); } -void PmIpkg::linkDestination( const QString msg, const QByteArray dest ) +void PmIpkg::createLinks( const QString &dest ) { - qDebug("msg="+msg+" -- "+QString(dest) ); -// QDir d( src ); -// d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); -//// if (! d.exists() ) return; -// const QFileInfoList *list = d.entryInfoList(); -// QFileInfoListIterator it( *list ); -// QFileInfo *fi; -// while ( (fi=it.current()) ) { -// processLinkDir( fi->absFilePath(), dest ); -// ++it; -// } + pvDebug(2,"PmIpkg::createLinks "+dest); + linkOpp=createLink; + QString url = settings->getDestinationUrlByName( dest ); + url = url==""?dest:url; + processLinkDir( "/", url ); +} + +void PmIpkg::removeLinks( const QString &dest ) +{ + pvDebug(2,"PmIpkg::removeLinks "+dest); + linkOpp=removeLink; + QString url = settings->getDestinationUrlByName( dest ); + url = url==""?dest:url; + processLinkDir( "/", url ); } @@ -344,5 +398,7 @@ void PmIpkg::update() void PmIpkg::out( QString o ) { - runwindow->outPut->setText( runwindow->outPut->text()+o ); + runwindow->outPut->append(o); + //runwindow->outPut->setCursorPosition(0, runwindow->outPut->contentsHeight()); +// runwindow->outPut->setText( runwindow->outPut->text()+o ); runwindow->outPut->setContentsPos(0, runwindow->outPut->contentsHeight()); } @@ -377,5 +433,5 @@ void PmIpkg::show(bool b) } -void PmIpkg::installFile(const QString &fileName) +void PmIpkg::installFile(const QString &fileName, const QString &dest) { @@ -383,6 +439,22 @@ void PmIpkg::installFile(const QString &fileName) to_remove.clear(); pvDebug( 2,"PmIpkg::installFile "+ fileName); - to_install.append( new Package(fileName,settings) ); + Package *p = new Package(fileName,settings); + if ( dest!="") p->setDest( dest ); + to_install.append( p ); + startDialog(); + delete p; +} + +void PmIpkg::removeFile(const QString &fileName, const QString &dest) +{ + + to_install.clear(); + to_remove.clear(); + pvDebug( 2,"PmIpkg::removeFile "+ fileName); + Package *p = new Package(fileName,settings); + if ( dest!="") p->setDest( dest ); + to_remove.append( p ); startDialog(); + delete p; } diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h index c5e6255..0625032 100644 --- a/noncore/unsupported/oipkg/pmipkg.h +++ b/noncore/unsupported/oipkg/pmipkg.h @@ -12,4 +12,7 @@ #include "debug.h" +#define createLink 0 +#define removeLink 1 + class Package; class PmIpkg : public QObject @@ -20,10 +23,20 @@ public: ~PmIpkg(); + int linkOpp; void commit( PackageList ); void update(); - PackageList* getPackageList(); + // PackageList* getPackageList(); void showButtons(bool b=true); void show( bool buttons=true ); +public slots: + void doIt(); + void install(); + void remove(); + void installFile(const QString &fileName, const QString &dest=""); + void removeFile(const QString &fileName, const QString &dest=""); + void createLinks( const QString &dest ); + void removeLinks( const QString &dest ); + private: PackageManagerSettings* settings; @@ -34,18 +47,17 @@ private: bool runwindowopen; QString fileNameToInstall; - + QCheckBox *_force_reinstall; + QCheckBox *_force_remove; + QCheckBox *_force_depends; void startDialog(); void makeLinks(Package*); void linkPackage( QString, QString ); - void processLinkDir( QString, QString ); + void processLinkDir( QString , QString ); int runIpkg(const QString& args, const QString& dest="" ); void out( QString ); + QStringList* getList( QString, QString ); + void processFileList( QStringList*, QString ); + -public slots: - void doIt(); - void install(); - void remove(); - void installFile(const QString &fileName); - void linkDestination( const QString, const QByteArray ); }; diff --git a/noncore/unsupported/oipkg/settings.cpp b/noncore/unsupported/oipkg/settings.cpp index 2b324be..8f91995 100644 --- a/noncore/unsupported/oipkg/settings.cpp +++ b/noncore/unsupported/oipkg/settings.cpp @@ -435,2 +435,7 @@ void PackageManagerSettings::linkEnabled( bool b ) activeLinkDestination->setEnabled( b ); } + +void PackageManagerSettings::activeDestinationChange(int i) +{ + activeLinkDestination->setCurrentItem( i ); +}
\ No newline at end of file diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h index cf6e614..e2072f1 100644 --- a/noncore/unsupported/oipkg/settings.h +++ b/noncore/unsupported/oipkg/settings.h @@ -22,26 +22,11 @@ public: QStringList getDestinationUrls(); -private: - QIntDict<QString> serverurlDic; - QIntDict<QString> destinationurlDic; - int ipkg_old; - int editedserver; - int editeddestination; - int currentSetting; - int installationSettingsCount; - bool changed; - - bool readIpkgConfig(const QString&); - void writeIpkgConfig(const QString&); - void writeSettings(); - void readSettings(); - public slots: - void writeInstallationSettings(); + void writeInstallationSettings(); void readInstallationSettings(); void writeCurrentInstallationSetting(); void readInstallationSetting(int); void installationSettingSetName(const QString &); - + void activeDestinationChange(int) void newServer(); void editServer(int); @@ -59,4 +44,19 @@ public slots: void removeInstallationSetting(); void renameInstallationSetting(); + +private: + QIntDict<QString> serverurlDic; + QIntDict<QString> destinationurlDic; + int ipkg_old; + int editedserver; + int editeddestination; + int currentSetting; + int installationSettingsCount; + bool changed; + + bool readIpkgConfig(const QString&); + void writeIpkgConfig(const QString&); + void writeSettings(); + void readSettings(); }; diff --git a/noncore/unsupported/oipkg/utils.cpp b/noncore/unsupported/oipkg/utils.cpp new file mode 100644 index 0000000..13b17fb --- a/dev/null +++ b/noncore/unsupported/oipkg/utils.cpp @@ -0,0 +1,27 @@ +/*************************************************************************** + utils.cpp - description + ------------------- + begin : Sun Apr 28 2002 + copyright : (C) 2002 by tille + email : tille@handhelds.org + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#include <qcombobox.h> +#include <qstring.h> +#include "utils.h" + +void setComboName( QComboBox* combo, QString s) +{ + for ( int i = 0; i < combo->count(); i++) + if ( combo->text( i ) == s ) + combo->setCurrentItem( i ); +}
\ No newline at end of file diff --git a/noncore/unsupported/oipkg/utils.h b/noncore/unsupported/oipkg/utils.h new file mode 100644 index 0000000..bb033c5 --- a/dev/null +++ b/noncore/unsupported/oipkg/utils.h @@ -0,0 +1,18 @@ +/*************************************************************************** + utils.h - description + ------------------- + begin : Sun Apr 28 2002 + copyright : (C) 2002 by tille + email : tille@handhelds.org + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +void setComboName( QComboBox*, QString );
\ No newline at end of file |