Merge branch 'master' into websockets

2019-02-01 11:04:33 -08:00
parent f8f7aeb8c1 97461c373b
commit 7c71457cc1
21 changed files with 2516 additions and 819 deletions
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -38,6 +38,7 @@ public:
    ~MainWindow();

    void updateLabelsAutoComplete();
+    RPC* getRPC() { return rpc; }

    QString doSendTxValidations(Tx tx);
    void setDefaultPayFrom();
@@ -78,6 +79,8 @@ private:
    void addAddressSection();
    void maxAmountChecked(int checked);

+    void editSchedule();
+
    void addressChanged(int number, const QString& text);
    void amountChanged (int number, const QString& text);