Organize optionsdialog (split off Window and Network page)
This commit is contained in:
Wladimir J. van der Laan
parent
6bdb06a7b1
commit
6ddf861078
|
|
@ -20,72 +20,96 @@
|
|||
#include <QRegExpValidator>
|
||||
#include <QDialogButtonBox>
|
||||
|
||||
/* First page of options */
|
||||
class MainOptionsPage : public QWidget
|
||||
class OptionsPage: public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit OptionsPage(QWidget *parent=0): QWidget(parent) {}
|
||||
|
||||
virtual void setMapper(MonitoredDataMapper *mapper) = 0;
|
||||
};
|
||||
|
||||
class MainOptionsPage: public OptionsPage
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit MainOptionsPage(QWidget *parent=0);
|
||||
|
||||
void setMapper(MonitoredDataMapper *mapper);
|
||||
virtual void setMapper(MonitoredDataMapper *mapper);
|
||||
private:
|
||||
QCheckBox *detach_database;
|
||||
BitcoinAmountField *fee_edit;
|
||||
};
|
||||
|
||||
class WindowOptionsPage: public OptionsPage
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit WindowOptionsPage(QWidget *parent=0);
|
||||
|
||||
virtual 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;
|
||||
QCheckBox *detach_database;
|
||||
QLineEdit *proxy_ip;
|
||||
QLineEdit *proxy_port;
|
||||
BitcoinAmountField *fee_edit;
|
||||
|
||||
signals:
|
||||
|
||||
public slots:
|
||||
|
||||
};
|
||||
|
||||
class DisplayOptionsPage : public QWidget
|
||||
class DisplayOptionsPage: public OptionsPage
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit DisplayOptionsPage(QWidget *parent=0);
|
||||
|
||||
void setMapper(MonitoredDataMapper *mapper);
|
||||
virtual void setMapper(MonitoredDataMapper *mapper);
|
||||
private:
|
||||
QValueComboBox *unit;
|
||||
QCheckBox *display_addresses;
|
||||
signals:
|
||||
|
||||
public slots:
|
||||
|
||||
};
|
||||
|
||||
class NetworkOptionsPage: public OptionsPage
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit NetworkOptionsPage(QWidget *parent=0);
|
||||
|
||||
virtual void setMapper(MonitoredDataMapper *mapper);
|
||||
private:
|
||||
QCheckBox *map_port_upnp;
|
||||
QCheckBox *connect_socks4;
|
||||
QLineEdit *proxy_ip;
|
||||
QLineEdit *proxy_port;
|
||||
BitcoinAmountField *fee_edit;
|
||||
};
|
||||
|
||||
|
||||
#include "optionsdialog.moc"
|
||||
|
||||
OptionsDialog::OptionsDialog(QWidget *parent):
|
||||
QDialog(parent), contents_widget(0), pages_widget(0),
|
||||
model(0), main_page(0), display_page(0)
|
||||
model(0)
|
||||
{
|
||||
contents_widget = new QListWidget();
|
||||
contents_widget->setMaximumWidth(128);
|
||||
|
||||
pages_widget = new QStackedWidget();
|
||||
pages_widget->setMinimumWidth(300);
|
||||
pages_widget->setMinimumWidth(500);
|
||||
pages_widget->setMinimumHeight(300);
|
||||
|
||||
QListWidgetItem *item_main = new QListWidgetItem(tr("Main"));
|
||||
contents_widget->addItem(item_main);
|
||||
main_page = new MainOptionsPage(this);
|
||||
pages_widget->addWidget(main_page);
|
||||
pages.append(new MainOptionsPage(this));
|
||||
pages.append(new NetworkOptionsPage(this));
|
||||
pages.append(new WindowOptionsPage(this));
|
||||
pages.append(new DisplayOptionsPage(this));
|
||||
|
||||
QListWidgetItem *item_display = new QListWidgetItem(tr("Display"));
|
||||
contents_widget->addItem(item_display);
|
||||
display_page = new DisplayOptionsPage(this);
|
||||
pages_widget->addWidget(display_page);
|
||||
foreach(OptionsPage *page, pages)
|
||||
{
|
||||
QListWidgetItem *item = new QListWidgetItem(page->windowTitle());
|
||||
contents_widget->addItem(item);
|
||||
pages_widget->addWidget(page);
|
||||
}
|
||||
|
||||
contents_widget->setCurrentRow(0);
|
||||
|
||||
|
|
@ -125,8 +149,11 @@ void OptionsDialog::setModel(OptionsModel *model)
|
|||
this->model = model;
|
||||
|
||||
mapper->setModel(model);
|
||||
main_page->setMapper(mapper);
|
||||
display_page->setMapper(mapper);
|
||||
|
||||
foreach(OptionsPage *page, pages)
|
||||
{
|
||||
page->setMapper(mapper);
|
||||
}
|
||||
|
||||
mapper->toFirst();
|
||||
}
|
||||
|
|
@ -163,10 +190,85 @@ void OptionsDialog::disableApply()
|
|||
apply_button->setEnabled(false);
|
||||
}
|
||||
|
||||
/* Main options */
|
||||
MainOptionsPage::MainOptionsPage(QWidget *parent):
|
||||
QWidget(parent)
|
||||
OptionsPage(parent)
|
||||
{
|
||||
QVBoxLayout *layout = new QVBoxLayout();
|
||||
setWindowTitle(tr("Main"));
|
||||
|
||||
QLabel *fee_help = new QLabel(tr("Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended."));
|
||||
fee_help->setWordWrap(true);
|
||||
layout->addWidget(fee_help);
|
||||
|
||||
QHBoxLayout *fee_hbox = new QHBoxLayout();
|
||||
fee_hbox->addSpacing(18);
|
||||
QLabel *fee_label = new QLabel(tr("Pay transaction &fee"));
|
||||
fee_hbox->addWidget(fee_label);
|
||||
fee_edit = new BitcoinAmountField();
|
||||
|
||||
fee_label->setBuddy(fee_edit);
|
||||
fee_hbox->addWidget(fee_edit);
|
||||
fee_hbox->addStretch(1);
|
||||
|
||||
layout->addLayout(fee_hbox);
|
||||
|
||||
detach_database = new QCheckBox(tr("Detach databases at shutdown"));
|
||||
detach_database->setToolTip(tr("Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached."));
|
||||
layout->addWidget(detach_database);
|
||||
|
||||
layout->addStretch(1); // Extra space at bottom
|
||||
setLayout(layout);
|
||||
}
|
||||
|
||||
void MainOptionsPage::setMapper(MonitoredDataMapper *mapper)
|
||||
{
|
||||
// Map model to widgets
|
||||
mapper->addMapping(fee_edit, OptionsModel::Fee);
|
||||
mapper->addMapping(detach_database, OptionsModel::DetachDatabases);
|
||||
}
|
||||
|
||||
/* Display options */
|
||||
DisplayOptionsPage::DisplayOptionsPage(QWidget *parent):
|
||||
OptionsPage(parent)
|
||||
{
|
||||
setWindowTitle(tr("Display"));
|
||||
|
||||
QVBoxLayout *layout = new QVBoxLayout();
|
||||
|
||||
QHBoxLayout *unit_hbox = new QHBoxLayout();
|
||||
unit_hbox->addSpacing(18);
|
||||
QLabel *unit_label = new QLabel(tr("&Unit to show amounts in: "));
|
||||
unit_hbox->addWidget(unit_label);
|
||||
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);
|
||||
display_addresses->setToolTip(tr("Whether to show Bitcoin addresses in the transaction list"));
|
||||
layout->addWidget(display_addresses);
|
||||
|
||||
layout->addStretch();
|
||||
setLayout(layout);
|
||||
}
|
||||
|
||||
void DisplayOptionsPage::setMapper(MonitoredDataMapper *mapper)
|
||||
{
|
||||
mapper->addMapping(unit, OptionsModel::DisplayUnit);
|
||||
mapper->addMapping(display_addresses, OptionsModel::DisplayAddresses);
|
||||
}
|
||||
|
||||
/* Window options */
|
||||
WindowOptionsPage::WindowOptionsPage(QWidget *parent):
|
||||
OptionsPage(parent)
|
||||
{
|
||||
QVBoxLayout *layout = new QVBoxLayout();
|
||||
setWindowTitle(tr("Window"));
|
||||
|
||||
bitcoin_at_startup = new QCheckBox(tr("&Start Bitcoin on window system startup"));
|
||||
bitcoin_at_startup->setToolTip(tr("Automatically start Bitcoin after the computer is turned on"));
|
||||
|
|
@ -182,6 +284,29 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
|
|||
layout->addWidget(minimize_on_close);
|
||||
#endif
|
||||
|
||||
layout->addStretch(1); // Extra space at bottom
|
||||
setLayout(layout);
|
||||
}
|
||||
|
||||
void WindowOptionsPage::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
|
||||
#ifndef Q_WS_MAC
|
||||
mapper->addMapping(minimize_on_close, OptionsModel::MinimizeOnClose);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Network options */
|
||||
NetworkOptionsPage::NetworkOptionsPage(QWidget *parent):
|
||||
OptionsPage(parent)
|
||||
{
|
||||
QVBoxLayout *layout = new QVBoxLayout();
|
||||
setWindowTitle(tr("Network"));
|
||||
|
||||
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);
|
||||
|
|
@ -211,30 +336,9 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
|
|||
proxy_port_label->setBuddy(proxy_port);
|
||||
proxy_hbox->addWidget(proxy_port);
|
||||
proxy_hbox->addStretch(1);
|
||||
|
||||
layout->addLayout(proxy_hbox);
|
||||
QLabel *fee_help = new QLabel(tr("Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended."));
|
||||
fee_help->setWordWrap(true);
|
||||
layout->addWidget(fee_help);
|
||||
|
||||
QHBoxLayout *fee_hbox = new QHBoxLayout();
|
||||
fee_hbox->addSpacing(18);
|
||||
QLabel *fee_label = new QLabel(tr("Pay transaction &fee"));
|
||||
fee_hbox->addWidget(fee_label);
|
||||
fee_edit = new BitcoinAmountField();
|
||||
|
||||
fee_label->setBuddy(fee_edit);
|
||||
fee_hbox->addWidget(fee_edit);
|
||||
fee_hbox->addStretch(1);
|
||||
|
||||
layout->addLayout(fee_hbox);
|
||||
|
||||
detach_database = new QCheckBox(tr("Detach databases at shutdown"));
|
||||
detach_database->setToolTip(tr("Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached."));
|
||||
layout->addWidget(detach_database);
|
||||
|
||||
layout->addStretch(1); // Extra space at bottom
|
||||
|
||||
setLayout(layout);
|
||||
|
||||
connect(connect_socks4, SIGNAL(toggled(bool)), proxy_ip, SLOT(setEnabled(bool)));
|
||||
|
|
@ -245,53 +349,11 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
|
|||
#endif
|
||||
}
|
||||
|
||||
void MainOptionsPage::setMapper(MonitoredDataMapper *mapper)
|
||||
void NetworkOptionsPage::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);
|
||||
mapper->addMapping(fee_edit, OptionsModel::Fee);
|
||||
mapper->addMapping(detach_database, OptionsModel::DetachDatabases);
|
||||
}
|
||||
|
||||
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 to show amounts in: "));
|
||||
unit_hbox->addWidget(unit_label);
|
||||
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);
|
||||
display_addresses->setToolTip(tr("Whether to show Bitcoin addresses in the transaction list"));
|
||||
layout->addWidget(display_addresses);
|
||||
|
||||
layout->addStretch();
|
||||
|
||||
setLayout(layout);
|
||||
}
|
||||
|
||||
void DisplayOptionsPage::setMapper(MonitoredDataMapper *mapper)
|
||||
{
|
||||
mapper->addMapping(unit, OptionsModel::DisplayUnit);
|
||||
mapper->addMapping(display_addresses, OptionsModel::DisplayAddresses);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define OPTIONSDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QList>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QStackedWidget;
|
||||
|
|
@ -10,8 +11,7 @@ class QListWidgetItem;
|
|||
class QPushButton;
|
||||
QT_END_NAMESPACE
|
||||
class OptionsModel;
|
||||
class MainOptionsPage;
|
||||
class DisplayOptionsPage;
|
||||
class OptionsPage;
|
||||
class MonitoredDataMapper;
|
||||
|
||||
/** Preferences dialog. */
|
||||
|
|
@ -43,11 +43,7 @@ private:
|
|||
MonitoredDataMapper *mapper;
|
||||
QPushButton *apply_button;
|
||||
|
||||
// Pages
|
||||
MainOptionsPage *main_page;
|
||||
DisplayOptionsPage *display_page;
|
||||
|
||||
void setupMainPage();
|
||||
QList<OptionsPage*> pages;
|
||||
};
|
||||
|
||||
#endif // OPTIONSDIALOG_H
|
||||
|
|
|
|||
Loading…
Reference in a new issue