use buttonbox for options dialog

This commit is contained in:
Wladimir J. van der Laan 2011-06-24 21:23:43 +02:00
parent daaee738fc
commit 6665c2431b
2 changed files with 11 additions and 17 deletions

View file

@ -361,7 +361,7 @@ void BitcoinGUI::setNumConnections(int count)
default: icon = ":/icons/connect_4"; break;
}
labelConnections->setTextFormat(Qt::RichText);
labelConnections->setText("<img src=\""+icon+"\"> " + QLocale::system().toString(count)+" "+tr("connection(s)", "", count));
labelConnections->setText("<img src=\""+icon+"\"> " + tr("%n connection(s)", "", count));
}
void BitcoinGUI::setNumBlocks(int count)
@ -380,12 +380,12 @@ void BitcoinGUI::setNumBlocks(int count)
progressBar->setVisible(false);
}
labelBlocks->setText(QLocale::system().toString(count)+" "+tr("block(s)", "", count));
labelBlocks->setText(tr("%n block(s)", "", count));
}
void BitcoinGUI::setNumTransactions(int count)
{
labelTransactions->setText(QLocale::system().toString(count)+" "+tr("transaction(s)", "", count));
labelTransactions->setText(tr("%n transaction(s)", "", count));
}
void BitcoinGUI::error(const QString &title, const QString &message)

View file

@ -16,6 +16,7 @@
#include <QIntValidator>
#include <QDoubleValidator>
#include <QRegExpValidator>
#include <QDialogButtonBox>
/* First (currently only) page of options */
class MainOptionsPage : public QWidget
@ -64,17 +65,10 @@ OptionsDialog::OptionsDialog(QWidget *parent):
QVBoxLayout *layout = new QVBoxLayout();
layout->addLayout(main_layout);
QHBoxLayout *buttons = new QHBoxLayout();
buttons->addStretch(1);
QPushButton *ok_button = new QPushButton(tr("OK"));
buttons->addWidget(ok_button);
QPushButton *cancel_button = new QPushButton(tr("Cancel"));
buttons->addWidget(cancel_button);
apply_button = new QPushButton(tr("Apply"));
apply_button->setEnabled(false);
buttons->addWidget(apply_button);
layout->addLayout(buttons);
QDialogButtonBox *buttonbox = new QDialogButtonBox();
buttonbox->setStandardButtons(QDialogButtonBox::Apply|QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
apply_button = buttonbox->button(QDialogButtonBox::Apply);
layout->addWidget(buttonbox);
setLayout(layout);
setWindowTitle(tr("Options"));
@ -89,9 +83,9 @@ OptionsDialog::OptionsDialog(QWidget *parent):
connect(mapper, SIGNAL(currentIndexChanged(int)), this, SLOT(disableApply()));
/* Event bindings */
connect(ok_button, SIGNAL(clicked()), this, SLOT(okClicked()));
connect(cancel_button, SIGNAL(clicked()), this, SLOT(cancelClicked()));
connect(apply_button, SIGNAL(clicked()), this, SLOT(applyClicked()));
connect(buttonbox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(okClicked()));
connect(buttonbox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(cancelClicked()));
connect(buttonbox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(applyClicked()));
}
void OptionsDialog::setModel(OptionsModel *model)