From: Heikki Holstila Date: Mon, 23 Aug 2010 11:08:05 +0000 (+0300) Subject: release 0.6.5 X-Git-Url: http://git.maemo.org/git/?p=fapman;a=commitdiff_plain;h=f6c4b3791de71411ca227c7ea105b9cbfa07e9a6 release 0.6.5 --- diff --git a/TODO.txt b/TODO.txt index 15fb75a..3d88521 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,12 +5,6 @@ ------------------------------------------------------------------------------------- -0.6.5 -* ignore upgrades to pinned packages and warn about install/remove -* warn when trying to do a system upgrade -- promote to extras-testing - - 0.7: - update install/remove changes directly to internal package db & don't require re-reading package lists afterwards - support loading .install files diff --git a/confirmdialog.cpp b/confirmdialog.cpp index 4249c3d..87add30 100644 --- a/confirmdialog.cpp +++ b/confirmdialog.cpp @@ -54,3 +54,8 @@ void ConfirmDialog::setText(QString title, QString text) ui->label->setText(text); this->adjustSize(); } + +void ConfirmDialog::disableButton() +{ + ui->btn_OK->setEnabled(false); +} diff --git a/confirmdialog.h b/confirmdialog.h index f24e823..ac4c12c 100644 --- a/confirmdialog.h +++ b/confirmdialog.h @@ -34,6 +34,7 @@ public: explicit ConfirmDialog(bool button, QWidget *parent); ~ConfirmDialog(); void setText(QString title, QString text); + void disableButton(); #ifdef Q_WS_MAEMO_5 // workaround for buggy Qt autorotation int exec() { QRect r = dynamic_cast(this->parent())->rect(); diff --git a/debian/changelog b/debian/changelog index d89f893..fcf8c96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ fapman (0.6.5-1) unstable; urgency=low - * + * ignore upgrades to pinned packages and warn about install/remove + * warn if trying to do a system upgrade - -- Heikki Holstila Fri, 20 Aug 2010 14:09:25 +0300 + -- Heikki Holstila Mon, 23 Aug 2010 14:06:35 +0300 fapman (0.6.4-1) unstable; urgency=low diff --git a/fapman b/fapman index 8468d29..9f0c13b 100755 Binary files a/fapman and b/fapman differ diff --git a/mainwindow.cpp b/mainwindow.cpp index ddebc48..28009c1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -446,6 +446,11 @@ void MainWindow::operationQueueFinished(QList last busyDialog(false); ConfirmDialog d(true, this); + if( inst.count()==0 && remv.count()==0 ) + { + pkglist = "None of the packages can be installed"; + d.disableButton(); + } d.setText("Confirmation",pkglist); if( d.exec() ) { iAptInterface->addQueuedOperation(AAptInterface::ModeAptGetInstall);