X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Foptionsmodel.h;h=09197f71c55353c939c95951dcaeb41ff0267ebf;hb=24b2f2d42d10153c24ccef4a14ba57ad24aac183;hp=7f489c5014dd960177cf1294c83add7047562cde;hpb=2f5d380943c4f56114f81a6aee81a57579492103;p=novacoin.git

diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 7f489c5..09197f7 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -3,10 +3,8 @@
 
 #include <QAbstractListModel>
 
-class CWallet;
-
-/* Interface from QT to configuration data structure for bitcoin client.
-   To QT, the options are presented as a list with the different options
+/** Interface from Qt to configuration data structure for Bitcoin client.
+   To Qt, the options are presented as a list with the different options
    laid out vertically.
    This can be changed to a tree once the settings become sufficiently
    complex.
@@ -14,23 +12,38 @@ class CWallet;
 class OptionsModel : public QAbstractListModel
 {
     Q_OBJECT
+
 public:
-    explicit OptionsModel(CWallet *wallet, QObject *parent = 0);
+    explicit OptionsModel(QObject *parent = 0);
 
     enum OptionID {
-        StartAtStartup, // bool
-        MinimizeToTray, // bool
-        MapPortUPnP, // bool
-        MinimizeOnClose, // bool
-        ConnectSOCKS4, // bool
-        ProxyIP, // QString
-        ProxyPort, // QString
-        Fee, // qint64
-        DisplayUnit, // BitcoinUnits::Unit
-        DisplayAddresses, // bool
-        OptionIDRowCount
+        StartAtStartup,    // bool
+        MinimizeToTray,    // bool
+        MapPortUPnP,       // bool
+        MinimizeOnClose,   // bool
+        ProxyUse,          // bool
+        ProxyIP,           // QString
+        ProxyPort,         // int
+        ProxySocksVersion, // int
+        TorUse,            // bool
+        TorIP,             // QString
+        TorPort,           // int
+        TorOnly,           // bool
+        Fee,               // qint64
+        DisplayUnit,       // BitcoinUnits::Unit
+        DisplayAddresses,  // bool
+        ThirdPartyTxUrls,  // QString
+        DetachDatabases,   // bool
+        Language,          // QString
+        CoinControlFeatures, // bool
+        OptionIDRowCount,
     };
 
+    void Init();
+
+    /* Migrate settings from wallet.dat after app initialization */
+    bool Upgrade(); /* returns true if settings upgraded */
+
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
     bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
@@ -41,16 +54,23 @@ public:
     bool getMinimizeOnClose();
     int getDisplayUnit();
     bool getDisplayAddresses();
+    bool getCoinControlFeatures();
+    QString getThirdPartyTxUrls() { return strThirdPartyTxUrls; }
+    QString getLanguage() { return language; }
+
 private:
-    // Wallet stores persistent options
-    CWallet *wallet;
     int nDisplayUnit;
     bool bDisplayAddresses;
+    bool fMinimizeToTray;
+    bool fMinimizeOnClose;
+    bool fCoinControlFeatures;
+    QString language;
+    QString strThirdPartyTxUrls;
+
 signals:
     void displayUnitChanged(int unit);
-
-public slots:
-
+    void transactionFeeChanged(qint64);
+    void coinControlFeaturesChanged(bool);
 };
 
 #endif // OPTIONSMODEL_H