From 26c14db6a3444c800ecfd2c37c25bbdfc17406a6 Mon Sep 17 00:00:00 2001 From: nils Date: Tue, 29 Mar 2011 20:45:58 +0000 Subject: removed background colour and added icon in message in keyserverimportdialog git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@487 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- keyserverimportdialog.cpp | 28 +++++++++++++++++++--------- keyserverimportdialog.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp index 8174562..189a8e9 100644 --- a/keyserverimportdialog.cpp +++ b/keyserverimportdialog.cpp @@ -22,7 +22,7 @@ #include #include - +#include #include "keyserverimportdialog.h" KeyServerImportDialog::KeyServerImportDialog(GpgME::Context *ctx, QWidget *parent) @@ -30,8 +30,10 @@ KeyServerImportDialog::KeyServerImportDialog(GpgME::Context *ctx, QWidget *paren { mCtx = ctx; message = new QLabel; - message->setAutoFillBackground(true); - + icon = new QLabel; + QIcon undoicon = QIcon::fromTheme("dialog-information"); + QPixmap pixmap = undoicon.pixmap(QSize(32,32),QIcon::Normal,QIcon::On); + icon->setPixmap(pixmap); closeButton = createButton(tr("&Close"), SLOT(close())); importButton = createButton(tr("&Import"), SLOT(import())); searchButton = createButton(tr("&Search"), SLOT(search())); @@ -53,12 +55,14 @@ KeyServerImportDialog::KeyServerImportDialog(GpgME::Context *ctx, QWidget *paren mainLayout->addWidget(keyServerLabel, 2, 0); mainLayout->addWidget(keyServerComboBox, 2, 1); mainLayout->addWidget(keysTable, 3, 0, 1, 3); - mainLayout->addWidget(message, 4, 0, 1, 3); + mainLayout->addWidget(icon, 4, 0, 1, 3); + mainLayout->addWidget(message, 4, 1, 1, 3); mainLayout->addLayout(buttonsLayout, 5, 0, 1, 3); setLayout(mainLayout); setWindowTitle(tr("Import Keys from Keyserver")); resize(700, 300); + setModal(true); } static void updateComboBox(QComboBox *comboBox) @@ -95,21 +99,26 @@ void KeyServerImportDialog::createKeysTable() keysTable->setHorizontalHeaderLabels(labels); keysTable->verticalHeader()->hide(); keysTable->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents); - + setMessage("doubleclick on a key to import it", false); connect(keysTable, SIGNAL(cellActivated(int,int)), this, SLOT(import())); + } void KeyServerImportDialog::setMessage(const QString &text, bool error) { message->setText(text); - QPalette filesFoundPalette = message->palette(); if (error) { - filesFoundPalette.setColor(QPalette::Background, "#ff8080"); + QIcon undoicon = QIcon::fromTheme("dialog-error"); + QPixmap pixmap = undoicon.pixmap(QSize(32,32),QIcon::Normal,QIcon::On); + icon->setPixmap(pixmap); + } else { - filesFoundPalette.setColor(QPalette::Background, "#0dff6e"); + QIcon undoicon = QIcon::fromTheme("dialog-information"); + QPixmap pixmap = undoicon.pixmap(QSize(32,32),QIcon::Normal,QIcon::On); + icon->setPixmap(pixmap); + } - message->setPalette(filesFoundPalette); } void KeyServerImportDialog::search() @@ -166,6 +175,7 @@ void KeyServerImportDialog::searchFinished() keysTable->setItem(row-1,0,tmp1); } } + setMessage(tr("%1 keys found. Doubleclick a key to import it.").arg(row),false); } //keysTree->insertTopLevelItems(0,items); keysTable->resizeColumnsToContents(); diff --git a/keyserverimportdialog.h b/keyserverimportdialog.h index c3ac6ac..17531a5 100644 --- a/keyserverimportdialog.h +++ b/keyserverimportdialog.h @@ -73,6 +73,7 @@ private: QLabel *searchLabel; QLabel *keyServerLabel; QLabel *message; + QLabel *icon; QPushButton *closeButton; QPushButton *importButton; QPushButton *searchButton; -- cgit v1.2.3