diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-24 16:03:17 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-24 16:03:17 +0200 |
| commit | 65d9bde4981c9e053fdb05e0d4ee9b3bd86e05c5 (patch) | |
| tree | 0e3332e7e5cd3578c3829c803d407a39fb69c509 /src | |
| parent | 6a40d38b9357ffcc86c062ff5f336b084eefd82c (diff) | |
| parent | 97362504e8e3339beedec2a5637df0d2557698c9 (diff) | |
| download | monzero-gui-65d9bde4981c9e053fdb05e0d4ee9b3bd86e05c5.tar.gz monzero-gui-65d9bde4981c9e053fdb05e0d4ee9b3bd86e05c5.tar.xz monzero-gui-65d9bde4981c9e053fdb05e0d4ee9b3bd86e05c5.zip | |
Merge pull request #481
9736250 Add updates notifier (moneromooo.monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/DaemonManager.cpp | 3 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.cpp | 8 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.h | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp index 5298743a..8533f7ef 100644 --- a/src/daemon/DaemonManager.cpp +++ b/src/daemon/DaemonManager.cpp @@ -40,9 +40,10 @@ bool DaemonManager::start(const QString &flags) arguments << str; } + arguments << "--updates" << "disabled"; qDebug() << "starting monerod " + m_monerod; - qDebug() << "With command line arguments " << m_monerod; + qDebug() << "With command line arguments " << arguments; m_daemon = new QProcess(); initialized = true; diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index df0ffdbd..de3378d5 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -328,6 +328,14 @@ bool WalletManager::saveQrCode(const QString &code, const QString &path) const return QRCodeImageProvider::genQrImage(code, &size).scaled(size.expandedTo(QSize(240, 240)), Qt::KeepAspectRatio).save(path, "PNG", 100); } +QString WalletManager::checkUpdates(const QString &software, const QString &subdir) const +{ + const std::tuple<bool, std::string, std::string, std::string, std::string> result = Monero::WalletManager::checkUpdates(software.toStdString(), subdir.toStdString()); + if (!std::get<0>(result)) + return QString(""); + return QString::fromStdString(std::get<1>(result) + "|" + std::get<2>(result) + "|" + std::get<3>(result) + "|" + std::get<4>(result)); +} + WalletManager::WalletManager(QObject *parent) : QObject(parent) { m_pimpl = Monero::WalletManagerFactory::getWalletManager(); diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 6bba0ce6..bb55c587 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -134,6 +134,7 @@ public: Q_INVOKABLE QString resolveOpenAlias(const QString &address) const; Q_INVOKABLE bool parse_uri(const QString &uri, QString &address, QString &payment_id, uint64_t &amount, QString &tx_description, QString &recipient_name, QVector<QString> &unknown_parameters, QString &error); Q_INVOKABLE bool saveQrCode(const QString &, const QString &) const; + Q_INVOKABLE QString checkUpdates(const QString &software, const QString &subdir) const; signals: |