Mercurial > trustbridge
changeset 1204:939f26d3db59
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Tue, 23 Sep 2014 14:52:10 +0200 |
| parents | b4185dd3810f (current diff) 407f2c1286ae (diff) |
| children | c536d031df2b |
| files | ui/img/view-refresh.png |
| diffstat | 5 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/icons.qrc Tue Sep 23 14:51:53 2014 +0200 +++ b/ui/icons.qrc Tue Sep 23 14:52:10 2014 +0200 @@ -9,7 +9,7 @@ <file>img/document-open.png</file> <file>img/document-new.png</file> <file>img/document-close.png</file> - <file>img/view-refresh.png</file> + <file>img/pending-changes-overview-48.png</file> <file>img/view-refresh_16px.png</file> <file>img/document-encrypt.png</file> <file>img/dialog-warning.png</file>
--- a/ui/img/README.txt Tue Sep 23 14:51:53 2014 +0200 +++ b/ui/img/README.txt Tue Sep 23 14:52:10 2014 +0200 @@ -56,3 +56,6 @@ cert-is-installed-bad.svg -> Inkscape: tools -> rgb "tonne" +== pending-changes-overview +renamed from 48x48/places/bookmarks.png +
--- a/ui/mainwindow.cpp Tue Sep 23 14:51:53 2014 +0200 +++ b/ui/mainwindow.cpp Tue Sep 23 14:52:10 2014 +0200 @@ -1001,7 +1001,7 @@ TextOverlayButton *updatesButton = new TextOverlayButton; updatesButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); updatesButton->setBackgroundIcon(":/img/red-circle.png"); - updatesButton->setIcon(QIcon(":/img/view-refresh.png")); + updatesButton->setIcon(QIcon(":/img/pending-changes-overview-48.png")); updatesButton->setIconSize(QSize(48, 48)); updatesButton->setText(tr("Pending\nchanges")); updatesButton->setFixedWidth(120); @@ -1493,10 +1493,19 @@ if (!mUpdatesManual->contains(cert)) { QToolButton* actionBtn = new QToolButton(); QIcon btnIcon; - btnIcon.addFile(":/img/write-into-48.png", QSize(48, 48), QIcon::Normal, QIcon::On); - btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off); - actionBtn->setProperty("ToolTip_On", tr("Certificate will be installed.")); - actionBtn->setProperty("ToolTip_Off", tr("Certificate will be removed.")); + if (mRemoveList->contains(cert)) { + btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::On); + btnIcon.addFile(":/img/cert-is-installed-bad-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off); + actionBtn->setProperty("ToolTip_On", tr("Certificate will be removed.")); + /* Off should never be possible here + * As the manual change of removed certificates is disabled */ + actionBtn->setProperty("ToolTip_Off", tr("Certificate will not be removed.")); + } else { + btnIcon.addFile(":/img/write-into-48.png", QSize(48, 48), QIcon::Normal, QIcon::On); + btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off); + actionBtn->setProperty("ToolTip_On", tr("Certificate will be installed.")); + actionBtn->setProperty("ToolTip_Off", tr("Certificate will be removed.")); + } actionBtn->setIcon(btnIcon); mUpdatesManual->addCertificate(cert, state, actionBtn); }