diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-16 11:44:06 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-16 11:53:45 +0100 |
| commit | 9fe53a85e0e50ca82e369b7d29485a0a6f0f8dbf (patch) | |
| tree | 251042d2e35f823ae06abafc4aa61ef721c538ef /src/qt | |
| parent | a353ad4cdb085c23e4c157063c5540326eacb4e2 (diff) | |
| parent | 98c222b5aa94543fce683b989356b0d8ad1f1d22 (diff) | |
Merge pull request #5632
98c222b [Qt] optimize helpmessage dialog (Jonas Schnelli)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.qrc | 3 | ||||
| -rw-r--r-- | src/qt/forms/helpmessagedialog.ui | 30 | ||||
| -rw-r--r-- | src/qt/res/images/about.png | bin | 1136 -> 0 bytes | |||
| -rw-r--r-- | src/qt/utilitydialog.cpp | 4 |
4 files changed, 4 insertions, 33 deletions
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index bcaf95d91c..63af146fd0 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -46,9 +46,6 @@ <file alias="about_qt">res/icons/about_qt.png</file> <file alias="verify">res/icons/verify.png</file> </qresource> - <qresource prefix="/images"> - <file alias="about">res/images/about.png</file> - </qresource> <qresource prefix="/movies"> <file alias="spinner-000">res/movies/spinner-000.png</file> <file alias="spinner-001">res/movies/spinner-001.png</file> diff --git a/src/qt/forms/helpmessagedialog.ui b/src/qt/forms/helpmessagedialog.ui index 9ace9afd79..37008f047e 100644 --- a/src/qt/forms/helpmessagedialog.ui +++ b/src/qt/forms/helpmessagedialog.ui @@ -6,33 +6,15 @@ <rect> <x>0</x> <y>0</y> - <width>585</width> - <height>225</height> + <width>780</width> + <height>400</height> </rect> </property> - <property name="font"> - <font> - <pointsize>10</pointsize> - </font> - </property> <property name="windowTitle"> <string notr="true">Bitcoin Core - Command-line options</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QLabel" name="graphic"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Ignored"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="pixmap"> - <pixmap resource="../bitcoin.qrc">:/images/about</pixmap> - </property> - </widget> - </item> - <item> <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QTextEdit" name="helpMessage"> @@ -50,14 +32,6 @@ <bool>true</bool> </property> <widget class="QWidget" name="scrollAreaWidgetContents"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>447</width> - <height>68</height> - </rect> - </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QLabel" name="aboutMessage"> diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png Binary files differdeleted file mode 100644 index fdede66172..0000000000 --- a/src/qt/res/images/about.png +++ /dev/null diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 1e1583fb19..4ef42b927e 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -74,8 +74,8 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : tf.setBorderStyle(QTextFrameFormat::BorderStyle_None); tf.setCellPadding(2); QVector<QTextLength> widths; - widths << QTextLength(QTextLength::PercentageLength, 20); - widths << QTextLength(QTextLength::PercentageLength, 80); + widths << QTextLength(QTextLength::PercentageLength, 35); + widths << QTextLength(QTextLength::PercentageLength, 65); tf.setColumnWidthConstraints(widths); QTextTable *table = cursor.insertTable(2, 2, tf); |
