Diffstat (limited to 'noncore/unsupported/oipkg/packagelistitem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/packagelistitem.cpp | 33 |
1 files changed, 8 insertions, 25 deletions
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() ); |