From e9aeca506d2513f375f229dc176b15151e06533f Mon Sep 17 00:00:00 2001 From: fsb4000 Date: Thu, 12 Feb 2015 09:33:11 +0600 Subject: [PATCH] =?utf8?q?=D0=9E=D0=BA=D0=BD=D0=BE=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D0=BC=D0=B5=D0=BD=D1=8F=D1=82=D1=8C=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=20=D0=B8=20=D0=BF=D0=BE=D1=8F=D0=B2=D0=B8=D0=BB=D0=B0=D1=81=D1=8C=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D1=8C(=D0=BA=D1=80=D0=B5=D1=81=D1=82=D0=B8=D0=BA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/qt/guiutil.cpp | 4 ++++ src/qt/guiutil.h | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 6fdc5c9..bf4c500 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -462,6 +462,10 @@ HelpMessageBox::HelpMessageBox(QWidget *parent) : // setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider. setText(header + QString(QChar(0x2003)).repeated(50)); setDetailedText(coreOptions + "\n" + uiOptions); + //addButton("OK", QMessageBox::RejectRole); //кнопка OK будет справа от кнопки "Скрыть подробности" + addButton("OK", QMessageBox::NoRole); //кнопка OK будет слева от кнопки "Скрыть подробности" + setMouseTracking(true); + setSizeGripEnabled(true); } void HelpMessageBox::printToConsole() diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index fd72668..84fa749 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -4,6 +4,9 @@ #include #include #include +#include +#include +#include QT_BEGIN_NAMESPACE class QFont; @@ -114,6 +117,23 @@ namespace GUIUtil QString header; QString coreOptions; QString uiOptions; + + virtual bool event(QEvent *e) + { + bool res = QMessageBox::event(e); + switch (e->type()) + { + case QEvent::MouseMove: + case QEvent::MouseButtonPress: + setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); + if (QWidget *textEdit = findChild()) + { + textEdit->setMaximumHeight(QWIDGETSIZE_MAX); + } + } + + return res; + } }; /* Convert seconds into a QString with days, hours, mins, secs */ QString formatDurationStr(int secs); -- 1.7.1