Improve CryptoNoteCoin settings usage

README.md

@@ -29,5 +29,5 @@ Replace URL with git remote repository of your coin.
 **4. Build**
 
 ```
-mkdir build && cmake .. && make
+mkdir build && cd build && cmake .. && make
 ```

src/CommandLineParser.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCoreApplication>
 
 #include <common/util.h>

src/CommandLineParser.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QCommandLineParser>

src/CryptoNote.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "CryptoNote.h"
 #include "cryptonote_core/cryptonote_basic_impl.h"
 #include "cryptonote_core/cryptonote_format_utils.h"

src/CryptoNote.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <functional>

src/CurrencyAdapter.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "CurrencyAdapter.h"
 #include "CryptoNoteWalletConfig.h"
 
@@ -39,6 +38,10 @@ QString CurrencyAdapter::getCurrencyTicker() const {
   return WALLET_CURRENCY_TICKER;
 }
 
+quint64 CurrencyAdapter::getMinimumFee() const {
+  return m_currency.minimumFee();
+}
+
 QString CurrencyAdapter::formatAmount(quint64 _amount) const {
   QString result = QString::number(_amount);
   if (result.length() < getNumberOfDecimalPlaces() + 1) {

src/CurrencyAdapter.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QString>
@@ -20,6 +19,7 @@ public:
   QString getCurrencyDisplayName() const;
   QString getCurrencyName() const;
   QString getCurrencyTicker() const;
+  quint64 getMinimumFee() const;
   quintptr getNumberOfDecimalPlaces() const;
   QString formatAmount(quint64 _amount) const;
   quint64 parseAmount(const QString& _amountString) const;

src/NodeAdapter.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDir>
@@ -111,8 +110,7 @@ CryptoNote::IWallet* NodeAdapter::createWallet() const {
 
 bool NodeAdapter::init() {
   Q_ASSERT(m_node == nullptr);
-  // TODO Insert the right URL for the local daemon
+  QUrl localNodeUrl = QUrl::fromUserInput(QString("127.0.0.1:%1").arg(cryptonote::RPC_DEFAULT_PORT));
-  QUrl localNodeUrl = QUrl::fromUserInput("");
 
   m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, localNodeUrl.host().toStdString(), localNodeUrl.port());
 

src/NodeAdapter.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QObject>

src/Settings.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QApplication>
 #include <QFile>
 #include <QJsonDocument>

src/Settings.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDir>

src/SignalHandler.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <csignal>
 
 #include "SignalHandler.h"

src/SignalHandler.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QObject>

src/WalletAdapter.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QLocale>

src/WalletAdapter.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QMutex>

src/gui/AboutDialog.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "AboutDialog.h"
 #include "CurrencyAdapter.h"
 #include "Settings.h"

src/gui/AboutDialog.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

src/gui/AddressBookDialog.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "AddressBookDialog.h"
 #include "AddressBookModel.h"
 

src/gui/AddressBookDialog.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

src/gui/AddressBookFrame.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QApplication>
 #include <QClipboard>
 

src/gui/AddressBookFrame.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

src/gui/AddressBookModel.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QFile>
 #include <QJsonDocument>
 #include <QJsonObject>

src/gui/AddressBookModel.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QAbstractItemModel>

src/gui/AnimatedLabel.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "AnimatedLabel.h"
 
 namespace WalletGui {

src/gui/AnimatedLabel.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QLabel>

src/gui/ChangePasswordDialog.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "ChangePasswordDialog.h"
 
 #include "ui_changepassworddialog.h"

src/gui/ChangePasswordDialog.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma  once
 
 #include <QDialog>

src/gui/ExitWidget.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QMovie>
 
 #include "CurrencyAdapter.h"

src/gui/ExitWidget.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QWidget>

src/gui/MainWindow.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QInputDialog>

src/gui/MainWindow.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QLabel>

src/gui/MainWindow.mm

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #import <objc/runtime.h>
 #import <Cocoa/Cocoa.h>
 

src/gui/NewAddressDialog.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "NewAddressDialog.h"
 
 #include "ui_newaddressdialog.h"

src/gui/NewAddressDialog.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

src/gui/NewPasswordDialog.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "NewPasswordDialog.h"
 
 #include "ui_newpassworddialog.h"

src/gui/NewPasswordDialog.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

src/gui/OverviewFrame.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "CurrencyAdapter.h"
 #include "OverviewFrame.h"
 #include "TransactionFrame.h"

src/gui/OverviewFrame.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

src/gui/PasswordDialog.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "PasswordDialog.h"
 
 #include "ui_passworddialog.h"

src/gui/PasswordDialog.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

src/gui/ReceiveFrame.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QClipboard>
 
 #include "ReceiveFrame.h"

src/gui/ReceiveFrame.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

src/gui/RecentTransactionsModel.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "RecentTransactionsModel.h"
 #include "SortedTransactionsModel.h"
 

src/gui/RecentTransactionsModel.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QSortFilterProxyModel>

src/gui/SendFrame.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "AddressBookModel.h"
 #include "CurrencyAdapter.h"
 #include "MainWindow.h"
@@ -16,8 +15,6 @@
 
 namespace WalletGui {
 
-const quint64 MINIMAL_FEE = 1000000;
-
 SendFrame::SendFrame(QWidget* _parent) : QFrame(_parent), m_ui(new Ui::SendFrame) {
   m_ui->setupUi(this);
   clearAllClicked();
@@ -85,12 +82,7 @@ void SendFrame::sendClicked() {
     }
   }
 
-  quint64 fee = MINIMAL_FEE;
+  quint64 fee = CurrencyAdapter::instance().getMinimumFee();
-  if (fee < MINIMAL_FEE) {
-    QCoreApplication::postEvent(&MainWindow::instance(), new ShowMessageEvent(tr("Minimum allowed fee is 0.01"), QtCriticalMsg));
-    return;
-  }
-
   if (WalletAdapter::instance().isOpen()) {
     WalletAdapter::instance().sendTransaction(walletTransfers, fee, m_ui->m_paymentIdEdit->text(), m_ui->m_mixinSlider->value());
   }
@@ -100,11 +92,15 @@ void SendFrame::mixinValueChanged(int _value) {
   m_ui->m_mixinEdit->setText(QString::number(_value));
 }
 
-void SendFrame::sendTransactionCompleted(CryptoNote::TransactionId _id, bool _result, const QString& _errorText) {
+void SendFrame::sendTransactionCompleted(CryptoNote::TransactionId _id, bool _error, const QString& _errorText) {
   Q_UNUSED(_id);
-  Q_UNUSED(_result);
+  if (_error) {
-  Q_UNUSED(_errorText);
+    QCoreApplication::postEvent(
-  clearAllClicked();
+      &MainWindow::instance(),
+      new ShowMessageEvent(_errorText, QtCriticalMsg));
+  } else {
+    clearAllClicked();
+  }
 }
 
 void SendFrame::walletActualBalanceUpdated(quint64 _balance) {

src/gui/SendFrame.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>
@@ -29,7 +28,7 @@ private:
   QScopedPointer<Ui::SendFrame> m_ui;
   QList<TransferFrame*> m_transfers;
 
-  void sendTransactionCompleted(CryptoNote::TransactionId _id, bool _result, const QString& _error_text);
+  void sendTransactionCompleted(CryptoNote::TransactionId _id, bool _error, const QString& _error_text);
   void walletActualBalanceUpdated(quint64 _balance);
 
   Q_SLOT void addRecipientClicked();

src/gui/SortedTransactionsModel.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QDateTime>
 
 #include "SortedTransactionsModel.h"

src/gui/SortedTransactionsModel.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QSortFilterProxyModel>

src/gui/TransactionDetailsDialog.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QDateTime>
 
 #include "CurrencyAdapter.h"

src/gui/TransactionDetailsDialog.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

src/gui/TransactionFrame.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QFontDatabase>
 
 #include "MainWindow.h"

src/gui/TransactionFrame.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDataWidgetMapper>

src/gui/TransactionsFrame.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QFileDialog>
 #include <QLabel>
 

src/gui/TransactionsFrame.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

src/gui/TransactionsListModel.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "SortedTransactionsModel.h"
 #include "TransactionsListModel.h"
 #include "TransactionsModel.h"

src/gui/TransactionsListModel.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QSortFilterProxyModel>

src/gui/TransactionsModel.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QDateTime>
 #include <QFont>
 #include <QMetaEnum>

src/gui/TransactionsModel.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QAbstractItemModel>

src/gui/TransferFrame.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QApplication>
 #include <QClipboard>
 

src/gui/TransferFrame.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

src/gui/WalletEvents.h

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QEvent>

src/gui/ui/sendframe.ui

@@ -72,60 +72,6 @@
      <property name="topMargin">
       <number>5</number>
      </property>
-     <item row="1" column="1">
-      <widget class="QSlider" name="m_mixinSlider">
-       <property name="maximumSize">
-        <size>
-         <width>200</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="maximum">
-        <number>10</number>
-       </property>
-       <property name="pageStep">
-        <number>1</number>
-       </property>
-       <property name="value">
-        <number>2</number>
-       </property>
-       <property name="tracking">
-        <bool>false</bool>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="tickPosition">
-        <enum>QSlider::TicksBothSides</enum>
-       </property>
-       <property name="tickInterval">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="3">
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>298</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>PaymentID:</string>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="2">
       <widget class="QLineEdit" name="m_mixinEdit">
        <property name="maximumSize">
@@ -158,6 +104,60 @@
        </property>
       </widget>
      </item>
+     <item row="1" column="3">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>298</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>PaymentID:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSlider" name="m_mixinSlider">
+       <property name="maximumSize">
+        <size>
+         <width>200</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="maximum">
+        <number>10</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="value">
+        <number>1</number>
+       </property>
+       <property name="tracking">
+        <bool>false</bool>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBothSides</enum>
+       </property>
+       <property name="tickInterval">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

src/main.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QLocale>