Merge pull request #5632

98c222b [Qt] optimize helpmessage dialog (Jonas Schnelli)
TrezarCoin · Jan 16, 2015 · 9fe53a8 · 9fe53a8
2 parents a353ad4 + 98c222b
commit 9fe53a8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 35 deletions.
diff --git 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
@@ -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
@@ -6,32 +6,14 @@
    <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>
@@ -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
diff --git 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);