From 98c222b5aa94543fce683b989356b0d8ad1f1d22 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Fri, 9 Jan 2015 20:57:17 +0100 Subject: [PATCH] [Qt] optimize helpmessage dialog - enlarge standard size - remove fixed 10px font - remove left mood image - ensure that table has no ugly line-breaks on OSX, Linux --- src/Makefile.qt.include | 3 +-- src/qt/bitcoin.qrc | 3 --- src/qt/forms/helpmessagedialog.ui | 30 ++---------------------------- src/qt/res/images/about.png | Bin 1136 -> 0 bytes src/qt/utilitydialog.cpp | 4 ++-- 5 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 src/qt/res/images/about.png diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index cdd8f8d08..31fe3a9f6 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -314,8 +314,7 @@ BITCOIN_QT_CPP += \ qt/walletview.cpp endif -RES_IMAGES = \ - qt/res/images/about.png +RES_IMAGES = RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index bcaf95d91..63af146fd 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -46,9 +46,6 @@ res/icons/about_qt.png res/icons/verify.png - - res/images/about.png - res/movies/spinner-000.png res/movies/spinner-001.png diff --git a/src/qt/forms/helpmessagedialog.ui b/src/qt/forms/helpmessagedialog.ui index 9ace9afd7..37008f047 100644 --- a/src/qt/forms/helpmessagedialog.ui +++ b/src/qt/forms/helpmessagedialog.ui @@ -6,32 +6,14 @@ 0 0 - 585 - 225 + 780 + 400 - - - 10 - - Bitcoin Core - Command-line options - - - - - 0 - 0 - - - - :/images/about - - - @@ -50,14 +32,6 @@ true - - - 0 - 0 - 447 - 68 - - diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png deleted file mode 100644 index fdede6617264cbb3ffec888fc35679c192344aaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1136 zcmXX`YfO_@7=BvlD3=lnEthh?D4iw9EZq!BXlYA@Fl@Cf6MK``89ys985PZ!-|0+I4;||@B6yv&p9XOJ@50p&->;y zX$v$wKan2*UhW>%K58uk*y&s^YBw=5`3=AlX!G@IX{Q?}R+0QQiZ^ijZ{)2ae-fdu z5ZQ#PRY+G*wF&(Kc8#L;rJ>&qiyMa*AR9!*3NE=J?M3D=3^URmH};NW_W<_I!25GZ zRuMmm{ST1#8LFlsyN8TlP&|Wx4A4v%}ibfIn3AWxh47v?NZe-cPU5EcAR4>B+C^%|EQAqmvjrzpPDLnP>u@&fZI^vgvYS0;FM$4RY=f(xD@qdbp zZC%Q7)t6$9k>JKr&?arq5M|>KaOChD}^*+lf-O=)sp-g;)I`Bzwr2GIQ$5*eu zt7T0QL*}o7X!fPL0iws=iU)+aBZTy4tE46q~wU!NF+lB&2!`$NF0rpDFZysw{TJCb9&W zJx+0XR7cw_;{F?hh0GAJGi`iz?NHizW^ diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 9ee408179..06560627f 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -73,8 +73,8 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : tf.setBorderStyle(QTextFrameFormat::BorderStyle_None); tf.setCellPadding(2); QVector 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);