Merge pull request #413

fb8d9bd Settings: allow setting log categories (moneromooo.monero)
ea8bc5b LineEdit: forward editingFinished signal (moneromooo.monero)
d4b3834 Build against monero with new logging system (moneromooo.monero)

2 files changed, 6 insertions, 0 deletions

diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index ce37b9bb..fa06edd3 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -261,6 +261,11 @@ void WalletManager::setLogLevel(int logLevel)
     Monero::WalletManagerFactory::setLogLevel(logLevel);
 }
 
+void WalletManager::setLogCategories(const QString &categories)
+{
+    Monero::WalletManagerFactory::setLogCategories(categories.toStdString());
+}
+
 QString WalletManager::urlToLocalPath(const QUrl &url) const
 {
     return QDir::toNativeSeparators(url.toLocalFile());
diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h
index 12972efe..5b8adf5a 100644
--- a/src/libwalletqt/WalletManager.h
+++ b/src/libwalletqt/WalletManager.h
@@ -112,6 +112,7 @@ public:
     Q_INVOKABLE QUrl localPathToUrl(const QString &path) const;
 
     Q_INVOKABLE void setLogLevel(int logLevel);
+    Q_INVOKABLE void setLogCategories(const QString &categories);
 
     Q_INVOKABLE quint64 add(quint64 x, quint64 y) const { return x + y; }
     Q_INVOKABLE quint64 sub(quint64 x, quint64 y) const { return x - y; }