From: <ke...@us...> - 2007-03-11 12:51:31
|
Revision: 4343 http://bacula.svn.sourceforge.net/bacula/?rev=4343&view=rev Author: kerns Date: 2007-03-11 05:51:30 -0700 (Sun, 11 Mar 2007) Log Message: ----------- Add BNET_RUN_CMD to bat Modified Paths: -------------- trunk/bacula/src/qt-console/Makefile trunk/bacula/src/qt-console/console/console.cpp trunk/bacula/src/qt-console/restore/restore.cpp trunk/bacula/src/qt-console/run/run.h trunk/bacula/src/qt-console/run/runcmd.cpp Modified: trunk/bacula/src/qt-console/Makefile =================================================================== --- trunk/bacula/src/qt-console/Makefile 2007-03-10 21:04:23 UTC (rev 4342) +++ trunk/bacula/src/qt-console/Makefile 2007-03-11 12:51:30 UTC (rev 4343) @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bat -# Generated by qmake (2.01a) (Qt 4.2.1) on: Sat Mar 10 21:24:05 2007 +# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Mar 11 11:56:33 2007 # Project: bat.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile bat.pro Modified: trunk/bacula/src/qt-console/console/console.cpp =================================================================== --- trunk/bacula/src/qt-console/console/console.cpp 2007-03-10 21:04:23 UTC (rev 4342) +++ trunk/bacula/src/qt-console/console/console.cpp 2007-03-11 12:51:30 UTC (rev 4343) @@ -50,8 +50,6 @@ m_cursor = new QTextCursor(m_textEdit->document()); mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/disconnected.png"))); - - readSettings(); /* Check for messages every 5 seconds */ // m_timer = new QTimer(this); Modified: trunk/bacula/src/qt-console/restore/restore.cpp =================================================================== --- trunk/bacula/src/qt-console/restore/restore.cpp 2007-03-10 21:04:23 UTC (rev 4342) +++ trunk/bacula/src/qt-console/restore/restore.cpp 2007-03-11 12:51:30 UTC (rev 4343) @@ -139,8 +139,8 @@ { this->hide(); m_console->write("done"); + m_console->notify(true); delete this; - m_console->notify(true); mainWin->resetFocus(); } @@ -241,7 +241,7 @@ if ((stat = m_console->read()) > 0) { m_cwd = m_console->msg(); lineEdit->insert(m_cwd); - Dmsg2(000, "cwd=%s msg=%s\n", m_cwd.toUtf8().data(), m_console->msg()); + Dmsg2(100, "cwd=%s msg=%s\n", m_cwd.toUtf8().data(), m_console->msg()); } else { Dmsg1(000, "stat=%d\n", stat); QMessageBox::critical(this, "Error", "cd command failed", QMessageBox::Ok); Modified: trunk/bacula/src/qt-console/run/run.h =================================================================== --- trunk/bacula/src/qt-console/run/run.h 2007-03-10 21:04:23 UTC (rev 4342) +++ trunk/bacula/src/qt-console/run/run.h 2007-03-11 12:51:30 UTC (rev 4343) @@ -4,6 +4,7 @@ #include <QtGui> #include "ui_run.h" +#include "ui_runcmd.h" #include "console.h" class runDialog : public QDialog, public Ui::runForm @@ -23,7 +24,7 @@ }; -class runCmdDialog : public QDialog, public Ui::runForm +class runCmdDialog : public QDialog, public Ui::runCmdForm { Q_OBJECT @@ -35,8 +36,9 @@ void reject(); private: + void fillRunDialog(); + Console *m_console; - }; Modified: trunk/bacula/src/qt-console/run/runcmd.cpp =================================================================== --- trunk/bacula/src/qt-console/run/runcmd.cpp 2007-03-10 21:04:23 UTC (rev 4342) +++ trunk/bacula/src/qt-console/run/runcmd.cpp 2007-03-11 12:51:30 UTC (rev 4343) @@ -42,14 +42,70 @@ */ runCmdDialog::runCmdDialog(Console *console) { - QDateTime dt; - m_console = console; m_console->notify(false); setupUi(this); + fillRunDialog(); this->show(); + m_console->discardToPrompt(); } +void runCmdDialog::fillRunDialog() +{ + QString item, val; + QStringList items; + QRegExp rx("^.*:\\s*(\\S.*$)"); + + m_console->read(); + item = m_console->msg(); + items = item.split("\n"); + label->setText(items[0]); + Dmsg1(000, "Title=%s\n", items[0].toUtf8().data()); + items.removeFirst(); /* remove title */ + foreach(item, items) { + rx.indexIn(item); + val = rx.cap(1); + Dmsg1(000, "Item=%s\n", item.toUtf8().data()); + Dmsg1(000, "Value=%s\n", val.toUtf8().data()); + + if (item.startsWith("JobName:")) { + jobCombo->addItem(val); + continue; + } + if (item.startsWith("Bootstrap:")) { + bootstrap->setText(val); + continue; + } + if (item.startsWith("Client:")) { + clientCombo->addItem(val); + continue; + } + if (item.startsWith("Storage:")) { + storageCombo->addItem(val); + continue; + } + if (item.startsWith("Where:")) { + where->setText(val); + continue; + } + if (item.startsWith("When:")) { + continue; + } + if (item.startsWith("Catalog:")) { + catalogCombo->addItem(val); + continue; + } + if (item.startsWith("Fileset:")) { + filesetCombo->addItem(val); + continue; + } + if (item.startsWith("Priority:")) { +// prioritySpin->setValue(atoi(val)); + continue; + } + } +} + void runCmdDialog::accept() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |