trayIcon(0),
notificator(0),
rpcConsole(0),
- aboutDialog(0)
+ aboutDialog(0),
+ optionsDialog(0)
{
resize(850, 550);
setWindowTitle(tr("NovaCoin") + " - " + tr("Wallet"));
connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));
aboutDialog = new AboutDialog(0);
+ optionsDialog = new OptionsDialog(0);
// Clicking on "Verify Message" in the address book sends you to the verify message tab
connect(addressBookPage, SIGNAL(verifyMessage(QString)), this, SLOT(gotoVerifyMessageTab(QString)));
delete rpcConsole;
delete aboutDialog;
+ delete optionsDialog;
}
void BitcoinGUI::createActions()
{
if(!clientModel || !clientModel->getOptionsModel())
return;
- OptionsDialog dlg;
- dlg.setModel(clientModel->getOptionsModel());
- dlg.exec();
+
+ optionsDialog->setModel(clientModel->getOptionsModel());
+ optionsDialog->setWindowModality(Qt::ApplicationModal);
+ optionsDialog->show();
}
void BitcoinGUI::aboutClicked()
class Notificator;
class RPCConsole;
class AboutDialog;
+class OptionsDialog;
QT_BEGIN_NAMESPACE
class QLabel;
MintingView *mintingView;
RPCConsole *rpcConsole;
AboutDialog *aboutDialog;
+ OptionsDialog *optionsDialog;
QMovie *syncIconMovie;
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>OptionsDialog</class>
- <widget class="QDialog" name="OptionsDialog">
+ <widget class="QWidget" name="OptionsDialog">
<property name="geometry">
<rect>
<x>0</x>
<property name="windowTitle">
<string>Options</string>
</property>
- <property name="modal">
- <bool>true</bool>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTabWidget" name="tabWidget">
#include <QMessageBox>
#include <QRegExp>
#include <QRegExpValidator>
+#include <QKeyEvent>
OptionsDialog::OptionsDialog(QWidget *parent) :
- QDialog(parent, DIALOGWINDOWHINTS),
+ QWidget(parent, DIALOGWINDOWHINTS),
ui(new Ui::OptionsDialog),
model(0),
mapper(0),
void OptionsDialog::on_okButton_clicked()
{
mapper->submit();
- accept();
+// accept();
+ close();
}
void OptionsDialog::on_cancelButton_clicked()
{
- reject();
+// reject();
+ close();
}
void OptionsDialog::on_applyButton_clicked()
emit torIpValid(ui->torIp, LookupNumeric(ui->torIp->text().toStdString().c_str(), addr));
}
}
- return QDialog::eventFilter(object, event);
+ return QWidget::eventFilter(object, event);
}
+
+void OptionsDialog::keyPressEvent(QKeyEvent *event)
+{
+#ifdef ANDROID
+ if(windowType() != Qt::Widget && event->key() == Qt::Key_Back)
+ {
+ close();
+ }
+#else
+ if(windowType() != Qt::Widget && event->key() == Qt::Key_Escape)
+ {
+ close();
+ }
+#endif
+}
\ No newline at end of file
#ifndef OPTIONSDIALOG_H
#define OPTIONSDIALOG_H
-#include <QDialog>
+#include <QWidget>
namespace Ui {
class OptionsDialog;
class QValidatedLineEdit;
/** Preferences dialog. */
-class OptionsDialog : public QDialog
+class OptionsDialog : public QWidget
{
Q_OBJECT
protected:
bool eventFilter(QObject *object, QEvent *event);
+ void keyPressEvent(QKeyEvent *);
private slots:
/* enable only apply button */