diff --git a/application.qrc b/application.qrc index 5c3f586..f5cccea 100644 --- a/application.qrc +++ b/application.qrc @@ -48,6 +48,7 @@ res/unknownBlack.png res/unknownWhite.png res/hush-passion.png + res/dark-01.png res/hushdlogo.gif diff --git a/res/SilentDragonLite.png b/res/SilentDragonLite.png new file mode 100644 index 0000000..a6339b3 Binary files /dev/null and b/res/SilentDragonLite.png differ diff --git a/src/firsttimewizard.cpp b/src/firsttimewizard.cpp index 5b04cf1..5be3733 100644 --- 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); + + } diff --git a/src/newwallet.ui b/src/newwallet.ui index 6168e47..23bbee4 100644 --- a/src/newwallet.ui +++ b/src/newwallet.ui @@ -6,26 +6,89 @@ 0 0 - 936 - 736 + 950 + 734 - 936 - 736 + 0 + 0 + + + + + 950 + 734 Create New SDL Wallet - + + + + + 0 + 291 + + + + + 949 + 16777213 + + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QAbstractScrollArea::AdjustToContentsOnFirstShow + + + + + + + + 251 + 16777215 + + + + I accept the Terms of Service + + + + + + + Qt::Vertical + + + + 20 + 29 + + + + + - 918 - 481 + 0 + 191 + + + + + 949 + 16777215 @@ -33,7 +96,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<h1 style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:600;">Hush + HushChat ToS</span></h1> +<h1 align="center" style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:600;">Hush + HushChat Terms of Service</span></h1> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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 <a href="https://en.wikipedia.org/wiki/Non-aggression_principle"><span style=" text-decoration: underline; color:#0000ff;">Non-Aggression Principle</span></a>.</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">THE SERVICE IS PROVIDED “AS IS” AND The Hush Developers DO NOT MAKE ANY SPECIFIC COMMITMENTS OR WARRANTIES ABOUT THE SERVICE.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> @@ -46,20 +109,7 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 20 - 38 - - - - - + @@ -67,6 +117,12 @@ p, li { white-space: pre-wrap; } 0 + + + 711 + 0 + + color: red; @@ -78,7 +134,20 @@ p, li { white-space: pre-wrap; } - + + + + Qt::Vertical + + + + 20 + 14 + + + + + @@ -91,42 +160,54 @@ p, li { white-space: pre-wrap; } - + Encryption Passphrase: - + + + + 611 + 0 + + QLineEdit::Password - + Confirm Passphrase: - + + + + 611 + 0 + + QLineEdit::Password - + Qt::Horizontal - + @@ -170,7 +251,7 @@ p, li { white-space: pre-wrap; } - + @@ -214,19 +295,6 @@ p, li { white-space: pre-wrap; } - - - - - 251 - 16777215 - - - - I accept the TOS - - -