namespacing, user friendly base58 entry, addressbook work

3 files changed, 29 insertions, 6 deletions

diff --git a/gui/include/bitcoinaddressvalidator.h b/gui/include/bitcoinaddressvalidator.h
index 8322eef739..c7b2eefc69 100644
--- a/gui/include/bitcoinaddressvalidator.h
+++ b/gui/include/bitcoinaddressvalidator.h
@@ -9,6 +9,8 @@ class BitcoinAddressValidator : public QRegExpValidator
 public:
     explicit BitcoinAddressValidator(QObject *parent = 0);
 
+    State validate(QString &input, int &pos) const;
+
     static const int MaxAddressLength = 34;
 signals:
 
diff --git a/gui/include/editaddressdialog.h b/gui/include/editaddressdialog.h
index 650ed534a0..8e4a0388c2 100644
--- a/gui/include/editaddressdialog.h
+++ b/gui/include/editaddressdialog.h
@@ -12,8 +12,15 @@ class EditAddressDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit EditAddressDialog(QWidget *parent = 0);
-    ~EditAddressDialog();
+    enum Mode {
+        NewReceivingAddress,
+        NewSendingAddress,
+        EditReceivingAddress,
+        EditSendingAddress
+    };
+
+    explicit EditAddressDialog(Mode mode, QWidget *parent = 0);
+    ~EditAddressDialog();    
 
 private:
     Ui::EditAddressDialog *ui;
diff --git a/gui/include/guiutil.h b/gui/include/guiutil.h
index eaa8199900..748e29bf37 100644
--- a/gui/include/guiutil.h
+++ b/gui/include/guiutil.h
@@ -2,10 +2,24 @@
 #define GUIUTIL_H
 
 #include <QString>
-#include <QFont>
 
-QString DateTimeStr(qint64 nTime);
-/* Render bitcoin addresses in monospace font */
-QFont bitcoinAddressFont();
+QT_BEGIN_NAMESPACE
+class QFont;
+class QLineEdit;
+class QWidget;
+QT_END_NAMESPACE
+
+class GUIUtil
+{
+public:
+    static QString DateTimeStr(qint64 nTime);
+
+    /* Render bitcoin addresses in monospace font */
+    static QFont bitcoinAddressFont();
+
+    static void setupAddressWidget(QLineEdit *widget, QWidget *parent);
+
+    static void setupAmountWidget(QLineEdit *widget, QWidget *parent);
+};
 
 #endif // GUIUTIL_H