[GUI] welcome tutorial, typo fixed + privacy and MN text changed.

furszy · Aug 12, 2019 · a7987d0 · a7987d0
1 parent dc4dbe7
commit a7987d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/src/qt/pivx/forms/welcomecontentwidget.ui b/src/qt/pivx/forms/welcomecontentwidget.ui
@@ -598,7 +598,7 @@
                      </size>
                     </property>
                     <property name="text">
-                     <string>Languague</string>
+                     <string>Language</string>
                     </property>
                     <property name="checkable">
                      <bool>true</bool>
@@ -1032,7 +1032,7 @@ PIVX Core Wallet</string>
                 <item>
                  <widget class="QLabel" name="labelMessage3">
                   <property name="text">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;As our manifesto says: privacy is non-negotiable, it's a basic human right. Privacy allows the freedom to share what you wish when you want and whoever you want, we believe in each person's choice.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;As our manifesto says: Privacy is a non-negotiable basic human right; it grants users the freedom the share their data whenever and with whomever they want - PIVX believes in self sovereignty&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignHCenter|Qt::AlignTop</set>
@@ -1092,7 +1092,7 @@ PIVX Core Wallet</string>
                    </size>
                   </property>
                   <property name="text">
-                   <string>What is a Master node?</string>
+                   <string>What is a Masternode?</string>
                   </property>
                  </widget>
                 </item>
@@ -1115,7 +1115,7 @@ PIVX Core Wallet</string>
                 <item>
                  <widget class="QLabel" name="labelMessage4">
                   <property name="text">
-                   <string>The Master Nodes network is a second layer network on top of the PIVX blockchain that enable our decentralized governance and treasury system and swiftX transactions.</string>
+                   <string>The masternode network is PIVX's second layer network on top of the blockchain that enables our DAO to provide decentralized governance, treasury, and SwiftX transactions.</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>

diff --git a/src/qt/pivx/receivewidget.cpp b/src/qt/pivx/receivewidget.cpp
@@ -7,19 +7,12 @@
 #include "qt/pivx/requestdialog.h"
 #include "qt/pivx/addnewcontactdialog.h"
 #include "qt/pivx/qtutils.h"
-
-#include "qt/pivx/PIVXGUI.h"
 #include "qt/pivx/myaddressrow.h"
-#include "qt/pivx/qtutils.h"
 #include "qt/pivx/furlistrow.h"
 #include "walletmodel.h"
 #include "guiutil.h"
-#include "base58.h"
-#include "script/standard.h"
 
-#include <QPainter>
 #include <QModelIndex>
-#include <QClipboard>
 #include <QColor>
 #include <QDateTime>
 
@@ -44,7 +37,6 @@ class AddressHolder : public FurListRow<QWidget*>
         uint time = index.sibling(index.row(), AddressTableModel::Date).data(Qt::DisplayRole).toUInt();
         QString date = (time == 0) ? "" : GUIUtil::dateTimeStr(QDateTime::fromTime_t(time));
         row->updateView(address, label, date);
-
     }
 
     QColor rectColor(bool isHovered, bool isSelected) override{
@@ -63,16 +55,14 @@ ReceiveWidget::ReceiveWidget(PIVXGUI* parent) :
     ui(new Ui::ReceiveWidget)
 {
     ui->setupUi(this);
+    this->setStyleSheet(parent->styleSheet());
 
     delegate = new FurAbstractListItemDelegate(
                 DECORATION_SIZE,
                 new AddressHolder(isLightTheme()),
                 this
                 );
 
-    // Stylesheet
-    this->setStyleSheet(parent->styleSheet());
-
     // Containers
     setCssProperty(ui->left, "container");
     ui->left->setContentsMargins(20,20,20,20);
@@ -81,9 +71,8 @@ ReceiveWidget::ReceiveWidget(PIVXGUI* parent) :
 
     // Title
     ui->labelTitle->setText(tr("Receive"));
-    setCssTitleScreen(ui->labelTitle);
-
     ui->labelSubtitle1->setText(tr("Scan the QR code or copy the address to receive PIV."));
+    setCssTitleScreen(ui->labelTitle);
     setCssSubtitleScreen(ui->labelSubtitle1);
 
     // Address
@@ -113,7 +102,6 @@ ReceiveWidget::ReceiveWidget(PIVXGUI* parent) :
     ui->pushButtonNewAddress->setLayoutDirection(Qt::RightToLeft);
     setCssProperty(ui->pushButtonNewAddress, "btn-secundary-new-address");
 
-
     ui->pushButtonCopy->setText(tr("Copy"));
     ui->pushButtonCopy->setLayoutDirection(Qt::RightToLeft);
     setCssProperty(ui->pushButtonCopy, "btn-secundary-copy");
@@ -223,12 +211,10 @@ void ReceiveWidget::onLabelClicked(){
                     "receive"
             )
                     ) {
-                // Show snackbar
                 // update label status (icon color)
                 updateLabel();
                 inform(tr("Address label saved"));
             } else {
-                // Show snackbar error
                 inform(tr("Error storing address label"));
             }
         }
@@ -246,7 +232,6 @@ void ReceiveWidget::onNewAddressClicked(){
         inform(tr("New address created"));
     } catch (const std::runtime_error& error){
         // Error generating address
-        std::cout << "Error generating address, correct me" << std::endl;
         inform("Error generating address");
     }
 }