Update description of PAGES and changes to TODO. Also removed spacers

[bacula/bacula] / bacula / src / qt-console / restore / prerestore.cpp

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index 2aefaeb98ff6897de3670d3ab4c137b4238fae08..a1a8423ecb051586f0d29921089180fe59561c9d 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -39,22 +39,32 @@
 #include "restore.h"
 
 
-prerestoreDialog::prerestoreDialog(Console *console)
+prerestorePage::prerestorePage()
 {
-   m_console = console;               /* keep compiler quiet */
+   m_name = "Pre-Restore";
    setupUi(this);
-   jobCombo->addItems(console->job_list);
-   filesetCombo->addItems(console->fileset_list);
-   clientCombo->addItems(console->client_list);
-   poolCombo->addItems(console->pool_list);
-   storageCombo->addItems(console->storage_list);
+   pgInitialize();
+   m_console->notify(false);
+   m_closeable = true;
+
+   jobCombo->addItems(m_console->job_list);
+   filesetCombo->addItems(m_console->fileset_list);
+   clientCombo->addItems(m_console->client_list);
+   poolCombo->addItems(m_console->pool_list);
+   storageCombo->addItems(m_console->storage_list);
+   beforeDateTime->setDateTime(QDateTime::currentDateTime());
+   beforeDateTime->setEnabled(false);
    job_name_change(0);
    connect(jobCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(job_name_change(int)));
+   connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed()));
+   connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed()));
 
+   dockPage();
+   setCurrent();
    this->show();
 }
 
-void prerestoreDialog::accept()
+void prerestorePage::okButtonPushed()
 {
    QString cmd;
 
@@ -68,22 +78,26 @@ void prerestoreDialog::accept()
              .arg(poolCombo->currentText())
              .arg(storageCombo->currentText());
 
+   /* ***FIXME*** */
+   //printf("preRestore command \"%s\"\n", cmd.toUtf8().data());
    m_console->write(cmd);
    m_console->display_text(cmd);
-   new restoreDialog(m_console);
-   delete this;
+   /* Note, do not turn notifier back on here ... */
+   new restorePage();
+   closeStackPage();
 }
 
 
-void prerestoreDialog::reject()
+void prerestorePage::cancelButtonPushed()
 {
    mainWin->set_status("Canceled");
    this->hide();
-   delete this;
+   m_console->notify(true);
+   closeStackPage();
 }
 
 
-void prerestoreDialog::job_name_change(int index)
+void prerestorePage::job_name_change(int index)
 {
    job_defaults job_defs;