fix #6581, #6590

[fapman] / packageselector.cpp

diff --git a/packageselector.cpp b/packageselector.cpp
index 54d0827..580177e 100644 (file)
--- a/packageselector.cpp
+++ b/packageselector.cpp
@@ -17,7 +17,7 @@
        (C) Heikki Holstila 2010
 */
 
-#include <QtNetwork>
+#include <Qt>
 #include <QDBusConnection>
 #include <QDBusInterface>
 
@@ -29,18 +29,17 @@
 #include "blacklistselect.h"
 #include "aaptinterface.h"
 #include "settings.h"
+#include "mainwindow.h"
 
-PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, Settings* set, QWidget *parent) :
+PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, Settings* set, MainWindow* mw, QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::PackageSelector)
+       ui(new Ui::PackageSelector), iNetworkAccessManager(0), iChangelogFetched(false), iFetchInProgress(false)
 {
-    ui->setupUi(this); 
+       ui->setupUi(this);
        iPkg = pkg;
        iAptInterface = apt;
        iSettings = set;
-       iNetworkAccessManager = 0;
-       iChangelogFetched = false;
-       iFetchInProgress = false;
+       iMainWindow = mw;
        iChangelog = "";
 
        ui->pushButton_website->setIcon(QPixmap("/usr/share/icons/hicolor/48x48/hildon/general_web.png"));
@@ -51,7 +50,8 @@ PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, Settings* set
                ui->pushButton_blacklist->setEnabled(false);
 
        if( pkg->icon() && !pkg->icon()->isNull() ) {
-               ui->label_appicon->setPixmap( *pkg->icon() );
+               QPixmap aicon( *pkg->icon() );
+               ui->label_appicon->setPixmap( aicon.scaled(48,48) );
        } else {
                ui->label_appicon->setPixmap( QPixmap(":/icons/icons/appdefault.png") );
        }
@@ -385,6 +385,10 @@ void PackageSelector::on_radioTabBasic_clicked()
                }
        }
 
+       if( !iPkg->maintainerRichText().isEmpty() ) {
+               longtext +="Maintainer: " + iPkg->maintainerRichText() + "<br>";
+       }
+
        longtext += "<br>" + iPkg->descShort();
        QString descLong = iPkg->descLong();
        if( descLong.length()>0 ) {
@@ -521,6 +525,9 @@ void PackageSelector::queryChangelog()
        if( iChangelogFetched || iFetchInProgress )
                return;
 
+       if( iMainWindow )
+               iMainWindow->openNetworkConnection();
+
        iChangelogFetched = false;
        iFetchInProgress = true;
        iChangelog = "";
@@ -536,7 +543,7 @@ void PackageSelector::queryChangelog()
 
        if( !iNetworkAccessManager ) {
                iNetworkAccessManager = new QNetworkAccessManager(this);
-               connect(iNetworkAccessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(changelogFetchNetworkReply(QNetworkReply*)));
+               connect(iNetworkAccessManager,SIGNAL(finished(QReply*)),this,SLOT(changelogFetchNetworkReply(QReply*)));
 
                if( iSettings->qsettings()->value("use_proxies").toBool() && !iSettings->qsettings()->value("http_proxy").toString().isEmpty() )
                {
@@ -569,7 +576,7 @@ void PackageSelector::changelogFetchNetworkReply(QNetworkReply* reply)
 
                qDebug() << "changelog fetched";
        } else {
-               iChangelog = "Not available (Network error)";
+               iChangelog = "Not available ( error)";
                qDebug() << "changelog fetch error:" << reply->error() << reply->errorString();
        }