Merge pull request 'Bump version' (#47) from dsc/wowlet:bump-version2 into master

Reviewed-on: https://git.wownero.com/wowlet/wowlet/pulls/47

CMakeLists.txt

@@ -5,9 +5,9 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 set(VERSION_MAJOR "0")
-set(VERSION_MINOR "1")
+set(VERSION_MINOR "2")
 set(VERSION_REVISION "0")
-set(VERSION "beta-1")
+set(VERSION "beta-2")
 
 option(FETCH_DEPS "Download dependencies if they are not found" ON)
 option(XMRIG "Include XMRig module" ON)

src/assets.qrc

@@ -12,7 +12,6 @@
     <file>assets/images/appicons/128x128.png</file>
     <file>assets/images/appicons/256x256.png</file>
     <file>assets/images/arrow.svg</file>
-    <file>assets/images/banners/1.png</file>
     <file>assets/images/bitcoin.png</file>
     <file>assets/images/camera_dark.png</file>
     <file>assets/images/camera_white.png</file>
@@ -29,7 +28,6 @@
     <file>assets/images/confirmed.svg</file>
     <file>assets/images/connect.svg</file>
     <file>assets/images/copy.png</file>
-    <file>assets/images/cutexmrfox.png</file>
     <file>assets/images/edit.png</file>
     <file>assets/images/exchange.png</file>
     <file>assets/images/exchange_white.png</file>
@@ -54,54 +52,83 @@
     <file>assets/images/network.png</file>
     <file>assets/images/offline_tx.png</file>
     <file>assets/images/person.svg</file>
-    <file>assets/images/photos/illiterate_illuminati.png</file>
-    <file>assets/images/photos/wow1.png</file>
-    <file>assets/images/photos/wow2.png</file>
-    <file>assets/images/photos/wow3.png</file>
-    <file>assets/images/photos/wow4.png</file>
-    <file>assets/images/photos/wow5.png</file>
-    <file>assets/images/photos/wow6.png</file>
-    <file>assets/images/photos/wow7.png</file>
-    <file>assets/images/photos/wow8.png</file>
-    <file>assets/images/photos/wow9.png</file>
-    <file>assets/images/photos/wow10.png</file>
-    <file>assets/images/photos/wow11.png</file>
-    <file>assets/images/photos/wow12.png</file>
-    <file>assets/images/photos/wow13.png</file>
-    <file>assets/images/photos/wow14.png</file>
-    <file>assets/images/photos/wow15.png</file>
-    <file>assets/images/photos/wow16.png</file>
-    <file>assets/images/photos/wow17.png</file>
-    <file>assets/images/photos/wow18.png</file>
-    <file>assets/images/photos/wow19.png</file>
-    <file>assets/images/photos/wow20.png</file>
-    <file>assets/images/photos/wow21.png</file>
-    <file>assets/images/photos/wow22.png</file>
-    <file>assets/images/photos/wow23.png</file>
-    <file>assets/images/photos/wow24.png</file>
-    <file>assets/images/photos/wow25.png</file>
-    <file>assets/images/photos/wow26.png</file>
-    <file>assets/images/photos/wow27.png</file>
-    <file>assets/images/photos/wow28.png</file>
-    <file>assets/images/photos/wow29.png</file>
-    <file>assets/images/photos/wow30.png</file>
-    <file>assets/images/photos/wow31.png</file>
-    <file>assets/images/photos/wow32.png</file>
-    <file>assets/images/photos/wow33.png</file>
-    <file>assets/images/photos/wow34.png</file>
-    <file>assets/images/photos/wow35.png</file>
-    <file>assets/images/photos/wow36.png</file>
-    <file>assets/images/photos/wow37.png</file>
-    <file>assets/images/photos/wow38.png</file>
-    <file>assets/images/photos/wow39.png</file>
-    <file>assets/images/photos/wow40.png</file>
-    <file>assets/images/photos/wow41.png</file>
-    <file>assets/images/photos/wow42.png</file>
-    <file>assets/images/photos/wow43.png</file>
-    <file>assets/images/photos/wow44.png</file>
-    <file>assets/images/photos/wow45.png</file>
-    <file>assets/images/photos/wow46.png</file>
-    <file>assets/images/photos/wow47.png</file>
+    <file>assets/images/illiterate_illuminati.png</file>
+    <file>assets/images/welcome/wow1.png</file>
+    <file>assets/images/welcome/wow2.png</file>
+    <file>assets/images/welcome/wow3.png</file>
+    <file>assets/images/welcome/wow4.png</file>
+    <file>assets/images/welcome/wow5.png</file>
+    <file>assets/images/welcome/wow6.png</file>
+    <file>assets/images/welcome/wow7.png</file>
+    <file>assets/images/welcome/wow8.png</file>
+    <file>assets/images/welcome/wow9.png</file>
+    <file>assets/images/welcome/wow10.png</file>
+    <file>assets/images/welcome/wow11.png</file>
+    <file>assets/images/welcome/wow12.png</file>
+    <file>assets/images/welcome/wow13.png</file>
+    <file>assets/images/welcome/wow14.png</file>
+    <file>assets/images/welcome/wow15.png</file>
+    <file>assets/images/welcome/wow16.png</file>
+    <file>assets/images/welcome/wow17.png</file>
+    <file>assets/images/welcome/wow18.png</file>
+    <file>assets/images/welcome/wow19.png</file>
+    <file>assets/images/welcome/wow20.png</file>
+    <file>assets/images/welcome/wow21.png</file>
+    <file>assets/images/welcome/wow22.png</file>
+    <file>assets/images/welcome/wow23.png</file>
+    <file>assets/images/welcome/wow24.png</file>
+    <file>assets/images/welcome/wow25.png</file>
+    <file>assets/images/welcome/wow26.png</file>
+    <file>assets/images/welcome/wow27.png</file>
+    <file>assets/images/welcome/wow28.png</file>
+    <file>assets/images/welcome/wow29.png</file>
+    <file>assets/images/welcome/wow30.png</file>
+    <file>assets/images/welcome/wow31.png</file>
+    <file>assets/images/welcome/wow32.png</file>
+    <file>assets/images/welcome/wow33.png</file>
+    <file>assets/images/welcome/wow34.png</file>
+    <file>assets/images/welcome/wow35.png</file>
+    <file>assets/images/welcome/wow36.png</file>
+    <file>assets/images/welcome/wow37.png</file>
+    <file>assets/images/welcome/wow38.png</file>
+    <file>assets/images/welcome/wow39.png</file>
+    <file>assets/images/welcome/wow40.png</file>
+    <file>assets/images/welcome/wow41.png</file>
+    <file>assets/images/welcome/wow42.png</file>
+    <file>assets/images/welcome/wow43.png</file>
+    <file>assets/images/welcome/wow44.png</file>
+    <file>assets/images/welcome/wow45.png</file>
+    <file>assets/images/welcome/wow46.png</file>
+    <file>assets/images/welcome/wow47.png</file>
+    <file>assets/images/welcome/wow48.png</file>
+    <file>assets/images/welcome/wow49.png</file>
+    <file>assets/images/welcome/wow50.png</file>
+    <file>assets/images/welcome/wow51.png</file>
+    <file>assets/images/welcome/wow52.png</file>
+    <file>assets/images/welcome/wow53.png</file>
+    <file>assets/images/welcome/wow54.png</file>
+    <file>assets/images/welcome/wow55.png</file>
+    <file>assets/images/welcome/wow56.png</file>
+    <file>assets/images/welcome/wow57.png</file>
+    <file>assets/images/welcome/wow58.png</file>
+    <file>assets/images/welcome/wow59.png</file>
+    <file>assets/images/welcome/wow60.png</file>
+    <file>assets/images/welcome/wow61.png</file>
+    <file>assets/images/welcome/wow62.png</file>
+    <file>assets/images/welcome/wow63.png</file>
+    <file>assets/images/welcome/wow64.png</file>
+    <file>assets/images/welcome/wow65.png</file>
+    <file>assets/images/welcome/wow66.png</file>
+    <file>assets/images/welcome/wow67.png</file>
+    <file>assets/images/welcome/wow68.png</file>
+    <file>assets/images/welcome/wow69.png</file>
+    <file>assets/images/welcome/wow70.png</file>
+    <file>assets/images/welcome/wow71.png</file>
+    <file>assets/images/welcome/wow72.png</file>
+    <file>assets/images/welcome/wow73.png</file>
+    <file>assets/images/welcome/wow74.png</file>
+    <file>assets/images/welcome/wow75.png</file>
+    <file>assets/images/welcome/wow76.png</file>
     <file>assets/images/preferences.png</file>
     <file>assets/images/preferences.svg</file>
     <file>assets/images/qrcode.png</file>

src/dialog/aboutdialog.cpp

@@ -13,7 +13,7 @@ AboutDialog::AboutDialog(QWidget *parent)
     ui->setupUi(this);
     this->setWindowIcon(QIcon("://assets/images/appicons/64x64.png"));
 
-    QPixmap p(":assets/images/photos/illiterate_illuminati.png");
+    QPixmap p(":assets/images/illiterate_illuminati.png");
     ui->aboutImage->setPixmap(p.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation));
     auto about = Utils::fileOpenQRC(":assets/about.txt");
     auto about_text = Utils::barrayToString(about);

src/dialog/viewonlydialog.cpp

@@ -26,7 +26,7 @@ ViewOnlyDialog::ViewOnlyDialog(AppContext *ctx, QWidget *parent)
 }
 
 void ViewOnlyDialog::onWriteViewOnlyWallet(){
-    QString fn = QFileDialog::getSaveFileName(this, "Save .keys wallet file", QDir::homePath(), "Monero wallet (*.keys)");
+    QString fn = QFileDialog::getSaveFileName(this, "Save .keys wallet file", QDir::homePath(), "Wownero wallet (*.keys)");
     if(fn.isEmpty()) return;
     if(!fn.endsWith(".keys")) fn += ".keys";
 

src/main.cpp

@@ -82,7 +82,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
     QCommandLineOption exportTxHistoryOption(QStringList() << "export-txhistory", "Output wallet transaction history as CSV to specified path.", "file");
     parser.addOption(exportTxHistoryOption);
 
-    QCommandLineOption backgroundOption(QStringList() << "daemon", "Start Feather in the background and start a websocket server (IPv4:port)", "backgroundAddress");
+    QCommandLineOption backgroundOption(QStringList() << "daemon", "Start WOWlet in the background and start a websocket server (IPv4:port)", "backgroundAddress");
     parser.addOption(backgroundOption);
 
     QCommandLineOption backgroundPasswordOption(QStringList() << "daemon-password", "Password for connecting to the wowlet websocket service", "backgroundPassword");

src/model/CCSModel.cpp

@@ -58,7 +58,7 @@ QVariant CCSModel::data(const QModelIndex &index, int role) const
                 return entry->author;
 #ifdef Q_OS_MACOS
             case Progress:
-                return QString("%1/%2 XMR").arg(entry->raised_amount).arg(entry->target_amount);
+                return QString("%1/%2 WOW").arg(entry->raised_amount).arg(entry->target_amount);
 #endif
             default:
                 return QVariant();

src/sendwidget.cpp

@@ -32,7 +32,7 @@ SendWidget::SendWidget(QWidget *parent) :
     ui->btn_openAlias->hide();
 
     ui->label_PayTo->setHelpText("Recipient of the funds.\n\n"
-                                 "You may enter a Monero address, or an alias (email-like address that forwards to a Monero address)");
+                                 "You may enter a Wownero address, or an alias (email-like address that forwards to a Wownero address)");
     ui->label_Description->setHelpText("Description of the transaction (optional).\n\n"
                                        "The description is not sent to the recipient of the funds. It is stored in your wallet cache, "
                                        "and displayed in the 'History' tab.");

src/utils/utils.cpp

@@ -275,7 +275,7 @@ QString Utils::xdgDesktopEntry(){
         "Exec=\"%1\" %u\n"
         "Terminal=false\n"
         "Type=Application\n"
-        "Icon=monero\n"
+        "Icon=wowlet\n"
         "Categories=Network;GNOME;Qt;\n"
         "StartupNotify=true\n"
         "X-GNOME-Bugzilla-Bugzilla=GNOME\n"

src/utils/wsserver.cpp

@@ -33,7 +33,7 @@ WSServer::WSServer(AppContext *ctx, const QHostAddress &host, const quint16 port
         m_ctx(ctx),
         m_password(password),
         m_pWebSocketServer(
-                new QWebSocketServer(QStringLiteral("Feather Daemon WS"),
+                new QWebSocketServer(QStringLiteral("WOWlet Daemon WS"),
                                      QWebSocketServer::NonSecureMode, this)) {
     if (!m_pWebSocketServer->listen(QHostAddress::Any, port))
         return;

src/utils/wsserver.h

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#ifndef FEATHER_WSSERVER_H
-#define FEATHER_WSSERVER_H
+#ifndef WOWLET_WSSERVER_H
+#define WOWLET_WSSERVER_H
 
 
 #include <QObject>
@@ -71,4 +71,4 @@ private:
     void sendAll(const QString &cmd, const QString &val);
 };
 
-#endif //FEATHER_WSSERVER_H
+#endif //WOWLET_WSSERVER_H

src/wizard/walletwizard.cpp

@@ -42,7 +42,88 @@ WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidge
         setStartId(Page_Menu);
 
     setButtonText(QWizard::CancelButton, "Close");
-    setPixmap(QWizard::WatermarkPixmap, QPixmap(":/assets/images/photos/wow40.png"));
+    QStringList headers = {
+            ":/assets/images/welcome/wow1.png",
+            ":/assets/images/welcome/wow2.png",
+            ":/assets/images/welcome/wow3.png",
+            ":/assets/images/welcome/wow4.png",
+            ":/assets/images/welcome/wow5.png",
+            ":/assets/images/welcome/wow6.png",
+            ":/assets/images/welcome/wow7.png",
+            ":/assets/images/welcome/wow8.png",
+            ":/assets/images/welcome/wow9.png",
+            ":/assets/images/welcome/wow10.png",
+            ":/assets/images/welcome/wow11.png",
+            ":/assets/images/welcome/wow12.png",
+            ":/assets/images/welcome/wow13.png",
+            ":/assets/images/welcome/wow14.png",
+            ":/assets/images/welcome/wow15.png",
+            ":/assets/images/welcome/wow16.png",
+            ":/assets/images/welcome/wow17.png",
+            ":/assets/images/welcome/wow18.png",
+            ":/assets/images/welcome/wow19.png",
+            ":/assets/images/welcome/wow20.png",
+            ":/assets/images/welcome/wow21.png",
+            ":/assets/images/welcome/wow22.png",
+            ":/assets/images/welcome/wow23.png",
+            ":/assets/images/welcome/wow24.png",
+            ":/assets/images/welcome/wow25.png",
+            ":/assets/images/welcome/wow26.png",
+            ":/assets/images/welcome/wow27.png",
+            ":/assets/images/welcome/wow28.png",
+            ":/assets/images/welcome/wow29.png",
+            ":/assets/images/welcome/wow30.png",
+            ":/assets/images/welcome/wow31.png",
+            ":/assets/images/welcome/wow32.png",
+            ":/assets/images/welcome/wow33.png",
+            ":/assets/images/welcome/wow34.png",
+            ":/assets/images/welcome/wow35.png",
+            ":/assets/images/welcome/wow36.png",
+            ":/assets/images/welcome/wow37.png",
+            ":/assets/images/welcome/wow38.png",
+            ":/assets/images/welcome/wow39.png",
+            ":/assets/images/welcome/wow40.png",
+            ":/assets/images/welcome/wow41.png",
+            ":/assets/images/welcome/wow42.png",
+            ":/assets/images/welcome/wow43.png",
+            ":/assets/images/welcome/wow44.png",
+            ":/assets/images/welcome/wow45.png",
+            ":/assets/images/welcome/wow46.png",
+            ":/assets/images/welcome/wow47.png",
+            ":/assets/images/welcome/wow48.png",
+            ":/assets/images/welcome/wow49.png",
+            ":/assets/images/welcome/wow50.png",
+            ":/assets/images/welcome/wow51.png",
+            ":/assets/images/welcome/wow52.png",
+            ":/assets/images/welcome/wow53.png",
+            ":/assets/images/welcome/wow54.png",
+            ":/assets/images/welcome/wow55.png",
+            ":/assets/images/welcome/wow56.png",
+            ":/assets/images/welcome/wow57.png",
+            ":/assets/images/welcome/wow58.png",
+            ":/assets/images/welcome/wow59.png",
+            ":/assets/images/welcome/wow60.png",
+            ":/assets/images/welcome/wow61.png",
+            ":/assets/images/welcome/wow62.png",
+            ":/assets/images/welcome/wow63.png",
+            ":/assets/images/welcome/wow64.png",
+            ":/assets/images/welcome/wow65.png",
+            ":/assets/images/welcome/wow66.png",
+            ":/assets/images/welcome/wow67.png",
+            ":/assets/images/welcome/wow68.png",
+            ":/assets/images/welcome/wow69.png",
+            ":/assets/images/welcome/wow70.png",
+            ":/assets/images/welcome/wow71.png",
+            ":/assets/images/welcome/wow72.png",
+            ":/assets/images/welcome/wow73.png",
+            ":/assets/images/welcome/wow74.png",
+            ":/assets/images/welcome/wow75.png",
+            ":/assets/images/welcome/wow76.png"
+    };
+    int random = QRandomGenerator::global()->bounded(headers.count());
+    auto header = headers.at(random);
+    setPixmap(QWizard::WatermarkPixmap, QPixmap(header));
+
     setWizardStyle(WizardStyle::ModernStyle);
     setOption(QWizard::NoBackButtonOnStartPage);