release 0.6.6

[fapman] / packageview.cpp

diff --git a/packageview.cpp b/packageview.cpp
index 6ca121f..857cac6 100644 (file)
--- a/packageview.cpp
+++ b/packageview.cpp
@@ -106,7 +106,7 @@ void ListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
                statusicon = iIconPkgRemove;
        }
 
-       QString showVer = "";
+       QString showVer;
        if( upgradeable && (statfilter==Package::PkgStatUpgradeable ||
                                                (statfilter==Package::PkgStatUnknown && marked==Package::PkgOpInstallUpgrade) ||
                                                (catfilter==PackageView::CatFilterAllMarked && marked==Package::PkgOpInstallUpgrade) ))
@@ -126,7 +126,7 @@ void ListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
                        painter->drawText(r, Qt::AlignTop|Qt::AlignRight, showVer, &r);
                        ver_w = r.width();
                } else if( blacklisted==BlacklistSelect::BlacklistThis ) {
-                       if( upgradeable && upg_version!="" ) {
+                       if( upgradeable && !upg_version.isEmpty() ) {
                                showVer = upg_version;
                        } else {
                                showVer = version;
@@ -490,7 +490,7 @@ void PackageView::addListItem(Package* pkg_, QString listname_)
        if( pkg_ != 0 )
        {
                QString name = pkg_->name();
-               if( pkg_->maemoDisplayName()!="" )
+               if( !pkg_->maemoDisplayName().isEmpty() )
                        name = pkg_->maemoDisplayName();
                p->setData(UserRoleName, name);
        } else {
@@ -535,7 +535,6 @@ void PackageView::closeEvent(QCloseEvent *event)
                return;
        }
 
-#ifdef Q_WS_MAEMO_5
        if( iAptInterface->numSelectedPackages() == 0 )
        {               
                resetWindow();
@@ -552,10 +551,6 @@ void PackageView::closeEvent(QCloseEvent *event)
                        event->ignore();
                }
        }
-#else  // for simulator
-       resetWindow();
-       event->accept();
-#endif
 }
 
 void PackageView::changeEvent(QEvent *e)
@@ -664,6 +659,13 @@ void PackageView::on_listWidget_itemClicked(QListWidgetItem* item)
                        op = Package::PkgOpNone;
        }
 
+       if( pkg->isPinned() && op != Package::PkgOpNone ) {
+               ConfirmDialog d(true, this);
+               d.setText("Warning","Package has been pinned in apt preferences. Operation might not go as expected. Mark anyway?");
+               if( !d.exec() )
+                       op = Package::PkgOpNone;
+       }
+
        pkg->setMarkedForOperation( op );
        item->setData( UserRoleMarked, (int)op );
        updateLabel();
@@ -773,7 +775,7 @@ void PackageView::resetWindow()
        iAptInterface->writeBlacklist();
 
        ui->btn_StatusFilter->setEnabled(true);
-       //iSelectedCatFilter = iDefaultCatFilter;
+       iSelectedCatFilter = iDefaultCatFilter;
        //iSortOrder = SortAlpha;
        iSortNoticeShown = false;
 
@@ -827,7 +829,7 @@ void PackageView::on_lineEdit_textEdited(QString text)
        if( !ui->searchBar->isVisible() )
                return;
 
-       if( text=="" ) {
+       if( text.isEmpty() ) {
                on_btn_searchClose_clicked();
                return;
        }
@@ -1039,7 +1041,7 @@ void PackageView::on_actionLoad_selections_triggered()
                                } else {
                                        errors++;
                                }
-                       } else if( line!="" ){
+                       } else if( !line.isEmpty() ){
                                errors++;
                        }
                }