First cut of bat rerun a Job from Jobs Run

[bacula/bacula] / bacula / src / qt-console / run / runcmd.cpp

diff --git a/bacula/src/qt-console/run/runcmd.cpp b/bacula/src/qt-console/run/runcmd.cpp
index f83de90820b24f8e9185e277ae27e14021c36708..6b21a4b46da3b5fe45ac6b71533be9f1fb029840 100644 (file)
--- a/bacula/src/qt-console/run/runcmd.cpp
+++ b/bacula/src/qt-console/run/runcmd.cpp
@@ -1,26 +1,26 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -37,7 +37,6 @@
  *
  *   Kern Sibbald, March MMVII
  *
- *  $Id: $
  */ 
 
 #include "bat.h"
@@ -46,20 +45,22 @@
 /*
  * Setup all the combo boxes and display the dialog
  */
-runCmdPage::runCmdPage()
+runCmdPage::runCmdPage(int conn)
 {
-   m_dtformat = "yyyy-MM-dd HH:mm:ss";
-   m_name = "Restore Run";
+   m_name = tr("Restore Run");
    pgInitialize();
    setupUi(this);
-   m_console->notify(false);
+   QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
+   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/restore.png")));
+   m_conn = conn;
+   m_console->notify(conn, false);
 
    fill();
-   m_console->discardToPrompt();
+   m_console->discardToPrompt(m_conn);
 
    connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed()));
    connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed()));
-   dockPage();
+   //dockPage();
    setCurrent();
    this->show();
 
@@ -73,22 +74,24 @@ void runCmdPage::fill()
 
    clientCombo->addItems(m_console->client_list);
    filesetCombo->addItems(m_console->fileset_list);
-   replaceCombo->addItems(QStringList() << "never" << "always" << "ifnewer" << "ifolder");
+   replaceCombo->addItems(QStringList() << tr("never") << tr("always") << tr("ifnewer") 
+        << tr("ifolder"));
+   replaceCombo->setCurrentIndex(replaceCombo->findText(tr("never"), Qt::MatchExactly));
    storageCombo->addItems(m_console->storage_list);
-   dateTimeEdit->setDisplayFormat(m_dtformat);
+   dateTimeEdit->setDisplayFormat(mainWin->m_dtformat);
 
-   m_console->read();
-   item = m_console->msg();
+   m_console->read(m_conn);
+   item = m_console->msg(m_conn);
    items = item.split("\n");
-   label->setText(items[0]);
-   Dmsg1(200, "Title=%s\n", items[0].toUtf8().data());
-   items.removeFirst();               /* remove title */
    foreach(item, items) {
       rx.indexIn(item);
       val = rx.cap(1);
-      Dmsg1(200, "Item=%s\n", item.toUtf8().data());
-      Dmsg1(200, "Value=%s\n", val.toUtf8().data());
+      Dmsg1(000, "Item=%s\n", item.toUtf8().data());
+      Dmsg1(000, "Value=%s\n", val.toUtf8().data());
 
+      if (item.startsWith("Title:")) {
+         run->setText(val);
+      }
       if (item.startsWith("JobName:")) {
          jobCombo->addItem(val);
          continue;
@@ -110,7 +113,7 @@ void runCmdPage::fill()
          continue;
       }
       if (item.startsWith("When:")) {
-         dateTimeEdit->setDateTime(QDateTime::fromString(val,m_dtformat));
+         dateTimeEdit->setDateTime(QDateTime::fromString(val,mainWin->m_dtformat));
          continue;
       }
       if (item.startsWith("Catalog:")) {
@@ -129,7 +132,9 @@ void runCmdPage::fill()
          continue;
       }
       if (item.startsWith("Replace:")) {
-         replaceCombo->setCurrentIndex(replaceCombo->findText(val, Qt::MatchExactly));
+         int replaceIndex = replaceCombo->findText(val, Qt::MatchExactly);
+         if (replaceIndex >= 0)
+            replaceCombo->setCurrentIndex(replaceIndex);
          continue;
       }
    }
@@ -142,7 +147,7 @@ void runCmdPage::okButtonPushed()
    cmd += " fileset=\"" + filesetCombo->currentText() + "\"";
    cmd += " storage=\"" + storageCombo->currentText() + "\"";
    cmd += " replace=\"" + replaceCombo->currentText() + "\"";
-   cmd += " when=\"" + dateTimeEdit->dateTime().toString(m_dtformat) + "\"";
+   cmd += " when=\"" + dateTimeEdit->dateTime().toString(mainWin->m_dtformat) + "\"";
    cmd += " bootstrap=\"" + bootstrap->text() + "\"";
    cmd += " where=\"" + where->text() + "\"";
    QString pri;
@@ -155,23 +160,23 @@ void runCmdPage::okButtonPushed()
    displayhtml += cmd + "</font>\n";
    m_console->display_html(displayhtml);
    m_console->display_text("\n");
-   m_console->write_dir(cmd.toUtf8().data());
-   m_console->displayToPrompt();
+   m_console->write_dir(m_conn, cmd.toUtf8().data());
+   m_console->displayToPrompt(m_conn);
 //   consoleCommand(cmd); ***FIXME set back to consoleCommand when connection issue is resolved
 
-   m_console->notify(true);
+   m_console->notify(m_conn, true);
    closeStackPage();
 }
 
 
 void runCmdPage::cancelButtonPushed()
 {
-   m_console->displayToPrompt();
+   m_console->displayToPrompt(m_conn);
    m_console->write_dir(".");
-   m_console->displayToPrompt();
-   mainWin->set_status(" Canceled");
+   m_console->displayToPrompt(m_conn);
+   mainWin->set_status(tr(" Canceled"));
    this->hide();
-   m_console->notify(true);
+   m_console->notify(m_conn, true);
    closeStackPage();
    mainWin->resetFocus();
 }