# HG changeset patch # User Santeri Piippo # Date 1365520561 -10800 # Node ID e61c50fdb8cc1b2ea1fe26dc05166de3ed690a15 # Parent 3970b22a836f36205aeba101cfba8ae26f780701 Touched up the error icon, show the error icon in the set contents dialog if the contents are gibberish. diff -r 3970b22a836f -r e61c50fdb8cc icons/error.png Binary file icons/error.png has changed diff -r 3970b22a836f -r e61c50fdb8cc zz_setContentsDialog.cpp --- a/zz_setContentsDialog.cpp Tue Apr 09 18:07:57 2013 +0300 +++ b/zz_setContentsDialog.cpp Tue Apr 09 18:16:01 2013 +0300 @@ -43,6 +43,11 @@ qErrorLabel = new QLabel; qErrorLabel->setText (str::mkfmt ("%s", static_cast (obj)->zReason.chars())); + + QPixmap qErrorPixmap = QPixmap ("icons/error.png").scaledToHeight (16); + + qErrorIcon = new QLabel; + qErrorIcon->setPixmap (qErrorPixmap); } IMPLEMENT_DIALOG_BUTTONS @@ -53,8 +58,10 @@ QHBoxLayout* layout2 = new QHBoxLayout; - if (obj->getType() == OBJ_Gibberish) + if (obj->getType() == OBJ_Gibberish) { + layout2->addWidget (qErrorIcon); layout2->addWidget (qErrorLabel); + } layout2->addWidget (qButtons); layout->addLayout (layout2); diff -r 3970b22a836f -r e61c50fdb8cc zz_setContentsDialog.h --- a/zz_setContentsDialog.h Tue Apr 09 18:07:57 2013 +0300 +++ b/zz_setContentsDialog.h Tue Apr 09 18:16:01 2013 +0300 @@ -31,7 +31,7 @@ // ============================================================================= class SetContentsDialog : public QDialog { public: - QLabel* qContentsLabel, *qErrorLabel; + QLabel* qContentsLabel, *qErrorIcon, *qErrorLabel; QLineEdit* qContents; QDialogButtonBox* qButtons;