[PATCH 1 of 2] (Issue22) Fix painting problems with fixed size in windows style

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1404293202 -7200
# Node ID 31c3d2bc988074848788cfd889da82b9510b02df
# Parent  bf87feccb26cc6e02d08ac601b08c36bcc656bad
(Issue22) Fix painting problems with fixed size in windows style.

    We now use fusion style also on Windows for the combobox to
    let it be shown in the same way as we do on GNU/Linux.

diff -r bf87feccb26c -r 31c3d2bc9880 ui/certificateitemwidget.cpp
--- a/ui/certificateitemwidget.cpp	Wed Jul 02 10:53:43 2014 +0200
+++ b/ui/certificateitemwidget.cpp	Wed Jul 02 11:26:42 2014 +0200
@@ -9,6 +9,7 @@
 
 #include <QHBoxLayout>
 #include <QDebug>
+#include <QStyleFactory>
 
 CertificateItemWidget::CertificateItemWidget(QWidget *parent,
                                              const Certificate &cert,
@@ -26,18 +27,32 @@
     setupGUI();
 }
 
+
+/* We use the label as data to hide it in the normal dropdown menu and only
+ * show it when the popup is shown.*/
+
 void CertificateItemWidget::setupGUI()
 {
     mLabel = new QLabel(mCertificate.subjectCN());
-    mComboBox = new QComboBox;
+    mComboBox = new IconOnlyTextPopupBox;
+    QStyle *fusionStyle = QStyleFactory::create("Fusion");
+    if (!fusionStyle) {
+        qDebug() << "Failed to create fusion style";
+    } else {
+        mComboBox->setStyle(fusionStyle);
+    }
+
     mComboBox->setFixedWidth(46);
+
+    mLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    mComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
     connect(mComboBox, SIGNAL(currentIndexChanged(int)),
         this, SLOT(currentStateChanged(int)));
 
     QHBoxLayout *layout = new QHBoxLayout;
     if (mCertificate.isInstallCert()) {
-        mComboBox->addItem(QIcon(":/img/security-high.png"), mInstallLabel, QVariant("true"));
-        mComboBox->addItem(QIcon(":/img/security-low.png"), mRemoveLabel, QVariant("false"));
+        mComboBox->addItem(QIcon(":/img/security-high.png"), QString(), mInstallLabel);
+        mComboBox->addItem(QIcon(":/img/security-low.png"), QString(), mRemoveLabel);
         if (mState)
             mComboBox->setCurrentIndex(0);
         else {
@@ -72,7 +87,14 @@
     if (!mEditable) {
         return true;
     }
-    return mComboBox->currentData().toBool();
+
+    const QString currentString = mComboBox->currentData().toString();
+
+    if (!mCertificate.isInstallCert()) {
+        return currentString == tr("uninstall");
+    }
+
+    return currentString == mInstallLabel;
 }
 
 void CertificateItemWidget::setState(bool state)
@@ -100,3 +122,17 @@
     bool state = mComboBox->currentData().toBool();
     emit stateChanged(state, mCertificate);
 }
+
+void IconOnlyTextPopupBox::showPopup() {
+    for (int i = 0; i < count(); i++) {
+        setItemText(i, itemData(i).toString());
+    }
+    QComboBox::showPopup();
+}
+
+void IconOnlyTextPopupBox::hidePopup() {
+    for (int i = 0; i < count(); i++) {
+        setItemText(i, QString());
+    }
+    QComboBox::hidePopup();
+}
diff -r bf87feccb26c -r 31c3d2bc9880 ui/certificateitemwidget.h
--- a/ui/certificateitemwidget.h	Wed Jul 02 10:53:43 2014 +0200
+++ b/ui/certificateitemwidget.h	Wed Jul 02 11:26:42 2014 +0200
@@ -17,6 +17,17 @@
 #include <QComboBox>
 
 #include "certificate.h"
+/** @brief A combo box that shows the text only in the popup
+ *
+ * The text shown is the data set as Qt::UserRole
+ */
+class IconOnlyTextPopupBox : public QComboBox
+{
+protected:
+    virtual void showPopup();
+    virtual void hidePopup();
+};
+
 
 class CertificateItemWidget : public QWidget
 {
@@ -41,7 +52,7 @@
     bool mState;
     bool mEditable;
     QLabel *mLabel;
-    QComboBox *mComboBox;
+    IconOnlyTextPopupBox *mComboBox;
     QString mInstallLabel;
     QString mRemoveLabel;