warn about system upgrade, minor fixes, code cleanup

[fapman] / packageview.cpp

diff --git a/packageview.cpp b/packageview.cpp
index c0fe01b..27ac149 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)
@@ -648,11 +643,24 @@ void PackageView::on_listWidget_itemClicked(QListWidgetItem* item)
        if( upg_pkg )
                bl_u = upg_pkg->isBlacklisted();
 
-       PackageSelector s(pkg, iAptInterface, this);
+       PackageSelector s(pkg, iAptInterface, iSettings, this);
        s.exec();
+       Package::operation op = s.selectedOperation();
 
-       pkg->setMarkedForOperation( s.selectedOperation() );
-       item->setData(UserRoleMarked, (int)s.selectedOperation());
+       QStringList confl = pkg->checkConflicts_RichText();
+       if( confl.count() > 0 && op != Package::PkgOpNone ) {
+               ConfirmDialog d(true, this);
+               QString t = "Package " + pkg->name() + " conflicts with another installed or marked package. Mark anyway?";
+               t += "<font size=\"-1\"><br><br>Conflicts: ";
+               t += confl.join(", ");
+               t += "</font>";
+               d.setText("Conflicting packages", t);
+               if( !d.exec() )
+                       op = Package::PkgOpNone;
+       }
+
+       pkg->setMarkedForOperation( op );
+       item->setData( UserRoleMarked, (int)op );
        updateLabel();
 
        if( pkg->isBlacklisted() != bl ) {
@@ -745,7 +753,7 @@ void PackageView::on_btn_StatusFilter_clicked()
                        iMainWindow->setNextOperation(MainWindow::OpOpenPkgView);
                        iMainWindow->busyDialog(true,"Operation in progress","Reading the rest of the package lists");
 
-                       if( iAptInterface->needRepoRefresh() )
+                       if( iAptInterface->needRepoRefresh() && !iSettings->qsettings()->value("no_catalogs_autoupdate",false).toBool() )
                                iAptInterface->addQueuedOperation(AAptInterface::ModeAptGetUpdate);
 
                        iAptInterface->addQueuedOperation(AAptInterface::ModeReadPackages);
@@ -757,8 +765,6 @@ void PackageView::on_btn_StatusFilter_clicked()
 
 void PackageView::resetWindow()
 {
-       iMainWindow->resetIdlingTime();
-
        iAptInterface->writeBlacklist();
 
        ui->btn_StatusFilter->setEnabled(true);
@@ -816,7 +822,7 @@ void PackageView::on_lineEdit_textEdited(QString text)
        if( !ui->searchBar->isVisible() )
                return;
 
-       if( text=="" ) {
+       if( text.isEmpty() ) {
                on_btn_searchClose_clicked();
                return;
        }
@@ -1028,7 +1034,7 @@ void PackageView::on_actionLoad_selections_triggered()
                                } else {
                                        errors++;
                                }
-                       } else if( line!="" ){
+                       } else if( !line.isEmpty() ){
                                errors++;
                        }
                }