diff --git a/src/blackgui/infowindowcomponent.cpp b/src/blackgui/infowindowcomponent.cpp index 284aa1d29..a61baecb8 100644 --- a/src/blackgui/infowindowcomponent.cpp +++ b/src/blackgui/infowindowcomponent.cpp @@ -21,6 +21,7 @@ namespace BlackGui this->m_hideTimer = new QTimer(this); this->m_hideTimer->setSingleShot(true); connect(this->m_hideTimer, &QTimer::timeout, this, &CInfoWindowComponent::hide); + connect(this->ui->pb_Close, &QPushButton::pressed, this, &CInfoWindowComponent::hide); } /* @@ -80,7 +81,7 @@ namespace BlackGui this->ui->le_SmSeverity->setText(statusMessage.getSeverityAsString()); this->ui->le_SmType->setText(statusMessage.getTypeAsString()); this->ui->te_SmStatusMessage->setText(statusMessage.getMessage()); - this->ui->lbl_SmSeverity->setPixmap(statusMessage.toIcon()); + this->ui->lbl_SmSeverityIcon->setPixmap(statusMessage.toIcon()); this->setCurrentPage(this->ui->pg_StatusMessage); this->showWindow(displayTimeMs); diff --git a/src/blackgui/infowindowcomponent.ui b/src/blackgui/infowindowcomponent.ui index 05ba9e283..598603975 100644 --- a/src/blackgui/infowindowcomponent.ui +++ b/src/blackgui/infowindowcomponent.ui @@ -6,18 +6,25 @@ 0 0 - 278 - 143 + 300 + 180 WizardPage - QWidget { + QFrame#fr_InfoWindow { + border-style: solid; + border-width: 2px; + border-radius: 20px; + border-color: white; +} + +QStackedWidget { font-family: arial-rounded; font: bold 10px; - color: black; /** font **/ + color: white; /** font not in text edit **/ } QPushButton { @@ -36,10 +43,13 @@ QTextEdit { border-radius:6px; border-color: green; opacity: 0.5; -} - + color: black; /** font **/ +} - + + Information + + 0 @@ -56,128 +66,176 @@ QTextEdit { 0 - - - 2 + + + QFrame::StyledPanel - - - - - - true - + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + + + + :/blackgui/icons/close.png:/blackgui/icons/close.png + + + + + + + 2 + + + + + + + true + + + + - - - - - - - - - - - To - - - - - - - Received - - - - - - - - - - From - - - - - - - true - - - - - - - true - - - - - - - - - - - - - - - - - - Severity - - - - - - - Type - - - - - - - true - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - - - - :/blackgui/icons/close.png:/blackgui/icons/close.png - + + + + + + + + To + + + + + + + Received + + + + + + + + + + From + + + + + + + true + + + + + + + true + + + + + + + + + + + + + + + + + + Type + + + + + + + severity + + + true + + + + + + + type + + + true + + + + + + + true + + + + + + + Severity + + + + + + + icon + + + + + + + + + + @@ -185,22 +243,5 @@ QTextEdit { - - - pb_Close - clicked() - InfoWindow - hide() - - - 272 - 52 - - - 302 - 67 - - - - +