Improved Mac experience; QDoubleSpinBox for BitcoinAmountField

[novacoin.git] / src / qt / optionsdialog.cpp

diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 94f7aba..ea3164e 100644 (file)
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -3,6 +3,8 @@
 #include "bitcoinamountfield.h"
 #include "monitoreddatamapper.h"
 #include "guiutil.h"
+#include "bitcoinunits.h"
+#include "qvaluecombobox.h"
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -17,20 +19,24 @@
 #include <QDoubleValidator>
 #include <QRegExpValidator>
 #include <QDialogButtonBox>
-#include <QDebug>
 
 /* First page of options */
 class MainOptionsPage : public QWidget
 {
+    Q_OBJECT
 public:
     explicit MainOptionsPage(QWidget *parent=0);
 
     void setMapper(MonitoredDataMapper *mapper);
 private:
     QCheckBox *bitcoin_at_startup;
+#ifndef Q_WS_MAC
     QCheckBox *minimize_to_tray;
+#endif
     QCheckBox *map_port_upnp;
+#ifndef Q_WS_MAC
     QCheckBox *minimize_on_close;
+#endif
     QCheckBox *connect_socks4;
     QLineEdit *proxy_ip;
     QLineEdit *proxy_port;
@@ -44,18 +50,22 @@ public slots:
 
 class DisplayOptionsPage : public QWidget
 {
+    Q_OBJECT
 public:
     explicit DisplayOptionsPage(QWidget *parent=0);
 
     void setMapper(MonitoredDataMapper *mapper);
 private:
-    QLineEdit *unit;
+    QValueComboBox *unit;
+    QCheckBox *display_addresses;
 signals:
 
 public slots:
 
 };
 
+#include "optionsdialog.moc"
+
 OptionsDialog::OptionsDialog(QWidget *parent):
     QDialog(parent), contents_widget(0), pages_widget(0),
     model(0), main_page(0), display_page(0)
@@ -72,7 +82,7 @@ OptionsDialog::OptionsDialog(QWidget *parent):
     pages_widget->addWidget(main_page);
 
     QListWidgetItem *item_display = new QListWidgetItem(tr("Display"));
-    //contents_widget->addItem(item_display);
+    contents_widget->addItem(item_display);
     display_page = new DisplayOptionsPage(this);
     pages_widget->addWidget(display_page);
 
@@ -122,7 +132,6 @@ void OptionsDialog::setModel(OptionsModel *model)
 
 void OptionsDialog::changePage(int index)
 {
-    qDebug() << "page" << index;
     pages_widget->setCurrentIndex(index);
 }
 
@@ -162,17 +171,21 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
     bitcoin_at_startup->setToolTip(tr("Automatically start Bitcoin after the computer is turned on"));
     layout->addWidget(bitcoin_at_startup);
 
+#ifndef Q_WS_MAC
     minimize_to_tray = new QCheckBox(tr("&Minimize to the tray instead of the taskbar"));
     minimize_to_tray->setToolTip(tr("Show only a tray icon after minimizing the window"));
     layout->addWidget(minimize_to_tray);
+#endif
 
     map_port_upnp = new QCheckBox(tr("Map port using &UPnP"));
     map_port_upnp->setToolTip(tr("Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled."));
     layout->addWidget(map_port_upnp);
 
+#ifndef Q_WS_MAC
     minimize_on_close = new QCheckBox(tr("M&inimize on close"));
     minimize_on_close->setToolTip(tr("Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu."));
     layout->addWidget(minimize_on_close);
+#endif
 
     connect_socks4 = new QCheckBox(tr("&Connect through SOCKS4 proxy:"));
     connect_socks4->setToolTip(tr("Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)"));
@@ -234,9 +247,13 @@ void MainOptionsPage::setMapper(MonitoredDataMapper *mapper)
 {
     // Map model to widgets
     mapper->addMapping(bitcoin_at_startup, OptionsModel::StartAtStartup);
+#ifndef Q_WS_MAC
     mapper->addMapping(minimize_to_tray, OptionsModel::MinimizeToTray);
+#endif
     mapper->addMapping(map_port_upnp, OptionsModel::MapPortUPnP);
+#ifndef Q_WS_MAC
     mapper->addMapping(minimize_on_close, OptionsModel::MinimizeOnClose);
+#endif
     mapper->addMapping(connect_socks4, OptionsModel::ConnectSOCKS4);
     mapper->addMapping(proxy_ip, OptionsModel::ProxyIP);
     mapper->addMapping(proxy_port, OptionsModel::ProxyPort);
@@ -247,16 +264,23 @@ DisplayOptionsPage::DisplayOptionsPage(QWidget *parent):
         QWidget(parent)
 {
     QVBoxLayout *layout = new QVBoxLayout();
+
     QHBoxLayout *unit_hbox = new QHBoxLayout();
     unit_hbox->addSpacing(18);
-    QLabel *unit_label = new QLabel(tr("&Unit: "));
+    QLabel *unit_label = new QLabel(tr("&Unit to show amounts in: "));
     unit_hbox->addWidget(unit_label);
-    unit = new QLineEdit();
+    unit = new QValueComboBox(this);
+    unit->setModel(new BitcoinUnits(this));
+    unit->setToolTip(tr("Choose the default subdivision unit to show in the interface, and when sending coins"));
 
     unit_label->setBuddy(unit);
     unit_hbox->addWidget(unit);
 
     layout->addLayout(unit_hbox);
+
+    display_addresses = new QCheckBox(tr("Display addresses in transaction list"), this);
+    layout->addWidget(display_addresses);
+
     layout->addStretch();
 
     setLayout(layout);
@@ -264,4 +288,6 @@ DisplayOptionsPage::DisplayOptionsPage(QWidget *parent):
 
 void DisplayOptionsPage::setMapper(MonitoredDataMapper *mapper)
 {
+    mapper->addMapping(unit, OptionsModel::DisplayUnit);
+    mapper->addMapping(display_addresses, OptionsModel::DisplayAddresses);
 }