set image for TOS

4 years ago · 66d3aa8974
4 changed files with 124 additions and 43 deletions
--- a/application.qrc
+++ b/application.qrc
@ -48,6 +48,7 @@
        <file>res/unknownBlack.png</file>
        <file>res/unknownWhite.png</file>
        <file>res/hush-passion.png</file>
+        <file>res/dark-01.png</file>
    </qresource>
    <qresource prefix="/img">
        <file>res/hushdlogo.gif</file>
--- a/res/SilentDragonLite.png
+++ b/res/SilentDragonLite.png
--- a/src/firsttimewizard.cpp
+++ b/src/firsttimewizard.cpp
@ -55,6 +55,16 @@ NewOrRestorePage::NewOrRestorePage(FirstTimeWizard *parent) : QWizardPage(parent
    Ui_CreateWalletForm form;
    form.setupUi(pageWidget);

+    QGraphicsScene* scene = new QGraphicsScene();
+    QGraphicsView* view = new QGraphicsView(scene);
+   // QPixmap pixmap(":/icons/res/hush-passion.png");
+    form.Logo->setScene(scene);
+    QPixmap pixmap(":/icons/res/dark-01.png");
+   // QGraphicsPixmapItem* item = new QGraphicsPixmapItem(pixmap));
+   scene->addPixmap(pixmap);
+    form.Logo->show();
+
+
    parent->button(QWizard::CommitButton)->setEnabled(false);
    setButtonText(QWizard::CommitButton, "Next");

@ -156,6 +166,8 @@ NewOrRestorePage::NewOrRestorePage(FirstTimeWizard *parent) : QWizardPage(parent
    form.radioRestoreWallet->setEnabled(false);
    form.radioNewWallet->setEnabled(false);
    setCommitPage(true);
+
+
    
    
 }
--- a/src/newwallet.ui
+++ b/src/newwallet.ui
@ -6,26 +6,89 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>936</width>
-    <height>736</height>
+    <width>950</width>
+    <height>734</height>
   </rect>
  </property>
  <property name="minimumSize">
   <size>
-    <width>936</width>
-    <height>736</height>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>950</width>
+    <height>734</height>
   </size>
  </property>
  <property name="windowTitle">
   <string>Create New SDL Wallet</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
+   <item row="0" column="0" colspan="6">
+    <widget class="QGraphicsView" name="Logo">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>291</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>949</width>
+       <height>16777213</height>
+      </size>
+     </property>
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QRadioButton" name="TOS">
+     <property name="maximumSize">
+      <size>
+       <width>251</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>I accept the Terms of Service</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>29</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="6">
    <widget class="QTextBrowser" name="textBrowser">
     <property name="minimumSize">
      <size>
-       <width>918</width>
-       <height>481</height>
+       <width>0</width>
+       <height>191</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>949</width>
+       <height>16777215</height>
      </size>
     </property>
     <property name="html">
@ -33,7 +96,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;h1 style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:xx-large; font-weight:600;&quot;&gt;Hush + HushChat ToS&lt;/span&gt;&lt;/h1&gt;
+&lt;h1 align=&quot;center&quot; style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:xx-large; font-weight:600;&quot;&gt;Hush + HushChat Terms of Service&lt;/span&gt;&lt;/h1&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;All users of this platform agree to not use it for initiating or threatening any forceful interference or violence on an individual or their property, aka, the &lt;a href=&quot;https://en.wikipedia.org/wiki/Non-aggression_principle&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Non-Aggression Principle&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;THE SERVICE IS PROVIDED “AS IS” AND The Hush Developers DO NOT MAKE ANY SPECIFIC COMMITMENTS OR WARRANTIES ABOUT THE SERVICE.&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
@ -46,20 +109,7 @@ p, li { white-space: pre-wrap; }
     </property>
    </widget>
   </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>38</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0">
+   <item row="3" column="0" colspan="3">
    <widget class="QLabel" name="lblPasswordMatch">
     <property name="sizePolicy">
      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -67,6 +117,12 @@ p, li { white-space: pre-wrap; }
       <verstretch>0</verstretch>
      </sizepolicy>
     </property>
+     <property name="minimumSize">
+      <size>
+       <width>711</width>
+       <height>0</height>
+      </size>
+     </property>
     <property name="styleSheet">
      <string notr="true">color: red;</string>
     </property>
@ -78,7 +134,20 @@ p, li { white-space: pre-wrap; }
     </property>
    </widget>
   </item>
-   <item row="2" column="1">
+   <item row="3" column="3">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>14</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="5">
    <widget class="QLabel" name="label_5">
     <property name="sizePolicy">
      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -91,42 +160,54 @@ p, li { white-space: pre-wrap; }
     </property>
    </widget>
   </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
    <widget class="QLabel" name="label_4">
     <property name="text">
      <string>Encryption Passphrase:</string>
     </property>
    </widget>
   </item>
-   <item row="3" column="1">
+   <item row="4" column="1" colspan="5">
    <widget class="QLineEdit" name="txtPassword">
+     <property name="minimumSize">
+      <size>
+       <width>611</width>
+       <height>0</height>
+      </size>
+     </property>
     <property name="echoMode">
      <enum>QLineEdit::Password</enum>
     </property>
    </widget>
   </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
    <widget class="QLabel" name="label_6">
     <property name="text">
      <string>Confirm Passphrase:</string>
     </property>
    </widget>
   </item>
-   <item row="4" column="1">
+   <item row="5" column="1" colspan="5">
    <widget class="QLineEdit" name="txtConfirmPassword">
+     <property name="minimumSize">
+      <size>
+       <width>611</width>
+       <height>0</height>
+      </size>
+     </property>
     <property name="echoMode">
      <enum>QLineEdit::Password</enum>
     </property>
    </widget>
   </item>
-   <item row="5" column="0" colspan="3">
+   <item row="6" column="0" colspan="6">
    <widget class="Line" name="line_2">
     <property name="orientation">
      <enum>Qt::Horizontal</enum>
     </property>
    </widget>
   </item>
-   <item row="6" column="0" colspan="2">
+   <item row="7" column="0" colspan="2">
    <widget class="QGroupBox" name="groupBox">
     <property name="sizePolicy">
      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@ -170,7 +251,7 @@ p, li { white-space: pre-wrap; }
     </layout>
    </widget>
   </item>
-   <item row="6" column="2">
+   <item row="7" column="2" colspan="4">
    <widget class="QGroupBox" name="groupBox_2">
     <property name="sizePolicy">
      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@ -214,19 +295,6 @@ p, li { white-space: pre-wrap; }
     </layout>
    </widget>
   </item>
-   <item row="1" column="2">
-    <widget class="QRadioButton" name="TOS">
-     <property name="maximumSize">
-      <size>
-       <width>251</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>I accept the TOS</string>
-     </property>
-    </widget>
-   </item>
  </layout>
 </widget>
 <resources/>