diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp index d44d09657..538e5bae0 100644 --- a/src/blackgui/overlaymessages.cpp +++ b/src/blackgui/overlaymessages.cpp @@ -54,7 +54,7 @@ namespace BlackGui connect(sGui, &CGuiApplication::styleSheetsChanged, this, &COverlayMessages::ps_onStyleSheetsChanged); connect(ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::ps_okClicked); connect(ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::ps_cancelClicked); - connect(ui->pb_Kill, &QPushButton::clicked, this, &COverlayMessages::ps_killClicked); + connect(ui->tb_Kill, &QPushButton::clicked, this, &COverlayMessages::ps_killClicked); ui->tvp_StatusMessages->setResizeMode(CStatusMessageView::ResizingAuto); ui->fr_Confirmation->setVisible(false); @@ -134,8 +134,8 @@ namespace BlackGui void COverlayMessages::showKill(bool show) { - ui->pb_Kill->setVisible(show); - ui->pb_Kill->setEnabled(show); + ui->tb_Kill->setVisible(show); + ui->tb_Kill->setEnabled(show); } bool COverlayMessages::displayTextMessage(const CTextMessage &textMessage) const @@ -264,23 +264,23 @@ namespace BlackGui { if (variant.canConvert()) { - showOverlayMessages(variant.value(), timeOutMs); + this->showOverlayMessages(variant.value(), timeOutMs); } else if (variant.canConvert()) { - showOverlayMessage(variant.value(), timeOutMs); + this->showOverlayMessage(variant.value(), timeOutMs); } else if (variant.canConvert()) { - showOverlayTextMessage(variant.value(), timeOutMs); + this->showOverlayTextMessage(variant.value(), timeOutMs); } else if (variant.canConvert()) { - showOverlayImage(variant.value(), timeOutMs); + this->showOverlayImage(variant.value(), timeOutMs); } else if (variant.canConvert()) { - showOverlayImage(variant.value(), timeOutMs); + this->showOverlayImage(variant.value(), timeOutMs); } else { @@ -361,16 +361,16 @@ namespace BlackGui ui->pb_Cancel->setAutoDefault(false); ui->pb_Ok->setDefault(true); ui->pb_Ok->setAutoDefault(true); - this->m_lastConfirmation = QMessageBox::Ok; ui->pb_Ok->setFocus(); + this->m_lastConfirmation = QMessageBox::Ok; break; case QMessageBox::Cancel: ui->pb_Ok->setDefault(false); ui->pb_Ok->setAutoDefault(false); ui->pb_Cancel->setDefault(true); ui->pb_Cancel->setAutoDefault(true); - this->m_lastConfirmation = QMessageBox::Cancel; ui->pb_Cancel->setFocus(); + this->m_lastConfirmation = QMessageBox::Cancel; break; default: break; diff --git a/src/blackgui/overlaymessages.ui b/src/blackgui/overlaymessages.ui index e06c5e49c..a46abde57 100644 --- a/src/blackgui/overlaymessages.ui +++ b/src/blackgui/overlaymessages.ui @@ -98,7 +98,7 @@ - + false @@ -106,14 +106,18 @@ kill application - Kill + kill application + + + + :/misc/icons/misc/skull64.png:/misc/icons/misc/skull64.png - PushButton + close diff --git a/src/blackgui/overlaymessagesframe.cpp b/src/blackgui/overlaymessagesframe.cpp index 81b0b31c4..af3d54783 100644 --- a/src/blackgui/overlaymessagesframe.cpp +++ b/src/blackgui/overlaymessagesframe.cpp @@ -10,6 +10,7 @@ #include "blackgui/overlaymessagesframe.h" #include "blackgui/overlaymessages.h" #include "blackgui/stylesheetutility.h" +#include "blackgui/guiutility.h" #include "blackmisc/network/textmessage.h" #include @@ -98,8 +99,8 @@ namespace BlackGui QSize COverlayMessagesFrame::innerFrameSize() const { - int w = this->width(); - int h = this->height(); + const int w = this->width(); + const int h = this->height(); int wInner = this->m_widthFactor * w; int hInner = this->m_heightFactor * h; if (wInner > this->maximumWidth()) wInner = this->maximumWidth(); @@ -109,17 +110,19 @@ namespace BlackGui void COverlayMessagesFrame::initInnerFrame() { - QSize inner(innerFrameSize()); + const QSize inner(innerFrameSize()); if (!this->m_overlayMessages) { this->m_overlayMessages = new COverlayMessages(inner.width(), inner.height(), this); } - QPoint middle = this->geometry().center(); - int w = inner.width(); - int h = inner.height(); - int x = middle.x() - w / 2; - int y = middle.y() - h / 2; + const bool isFrameless = CGuiUtility::isMainWindowFrameless(); + const QPoint middle = this->geometry().center(); + const double yFactor = isFrameless ? 1.25 : 1.5; // 2 is middle in normal window + const int w = inner.width(); + const int h = inner.height(); + const int x = middle.x() - w / 2; + const int y = middle.y() - h / yFactor; this->m_overlayMessages->setGeometry(x, y, w, h); } } // ns diff --git a/src/blackgui/overlaymessagesframe.h b/src/blackgui/overlaymessagesframe.h index 43debe463..a1769ca30 100644 --- a/src/blackgui/overlaymessagesframe.h +++ b/src/blackgui/overlaymessagesframe.h @@ -98,7 +98,7 @@ namespace BlackGui void initInnerFrame(); double m_widthFactor = 0.7; //!< inner frame x factor - double m_heightFactor = 0.7; //!< inner frame x factor + double m_heightFactor = 0.6; //!< inner frame x factor }; } // ns diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index ae204523f..f2bec0c02 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -522,4 +522,10 @@ icons/preloaders/FloatingRays16.gif icons/preloaders/FloatingRays32.gif + + icons/misc/skull64.png + icons/misc/skull128.png + icons/misc/skull256.png + icons/misc/skull512.png + diff --git a/src/blackmisc/icons/misc/skull128.png b/src/blackmisc/icons/misc/skull128.png new file mode 100644 index 000000000..1d8d16cfc Binary files /dev/null and b/src/blackmisc/icons/misc/skull128.png differ diff --git a/src/blackmisc/icons/misc/skull256.png b/src/blackmisc/icons/misc/skull256.png new file mode 100644 index 000000000..0f95f9a68 Binary files /dev/null and b/src/blackmisc/icons/misc/skull256.png differ diff --git a/src/blackmisc/icons/misc/skull512.png b/src/blackmisc/icons/misc/skull512.png new file mode 100644 index 000000000..70bef15f1 Binary files /dev/null and b/src/blackmisc/icons/misc/skull512.png differ diff --git a/src/blackmisc/icons/misc/skull64.png b/src/blackmisc/icons/misc/skull64.png new file mode 100644 index 000000000..f94bfc25d Binary files /dev/null and b/src/blackmisc/icons/misc/skull64.png differ