X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Fmainwin.cpp;h=0465ac3cd9f88afed8c9ced0e9651daedc4cb3fb;hb=ff963fce22ab64308beeaae594c3c872a40bf31f;hp=0dcf4f60158fba25f555548e476938437ba313ae;hpb=de571fc3d4cf88e8b3d39b874f8e5e44b3890997;p=bacula%2Fbacula diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index 0dcf4f6015..0465ac3cd9 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2007 Free Software Foundation Europe e.V. + Copyright (C) 2007-2008 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. @@ -49,6 +49,8 @@ #include "restore/restoretree.h" #include "help/help.h" #include "jobs/jobs.h" +#include "jobgraphs/jobplot.h" +#include "status/dirstat.h" /* * Daemon message callback @@ -60,6 +62,7 @@ void message_callback(int /* type */, char *msg) MainWin::MainWin(QWidget *parent) : QMainWindow(parent) { + m_isClosing = false; m_dtformat = "yyyy-MM-dd HH:mm:ss"; mainWin = this; setupUi(this); /* Setup UI defined by main.ui (designer) */ @@ -120,7 +123,7 @@ void MainWin::createPages() item = new QTreeWidgetItem(topItem); item->setText(0, "Console"); if (!m_firstItem){ m_firstItem = item; } - item->setIcon(0,QIcon(QString::fromUtf8(":images/utilities-terminal.svg"))); + item->setIcon(0,QIcon(QString::fromUtf8(":images/utilities-terminal.png"))); /* insert the cosole and tree widget item into the hashes */ hashInsert(item, m_currentConsole); @@ -141,9 +144,16 @@ void MainWin::createPages() new FileSet(); new Jobs(); createPageJobList("", "", "", "", NULL); + JobPlotPass pass; + pass.use = false; + if (m_openPlot) + new JobPlot(NULL, pass); new MediaList(); new Storage(); - new restoreTree(); + if (m_openBrowser) + new restoreTree(); + if (m_openDirStat) + new DirStat(); treeWidget->expandItem(topItem); stackedWidget->setCurrentWidget(m_currentConsole); @@ -227,6 +237,8 @@ void MainWin::createConnections() connect(actionRun, SIGNAL(triggered()), this, SLOT(runButtonClicked())); connect(actionEstimate, SIGNAL(triggered()), this, SLOT(estimateButtonClicked())); connect(actionBrowse, SIGNAL(triggered()), this, SLOT(browseButtonClicked())); + connect(actionStatusDirPage, SIGNAL(triggered()), this, SLOT(statusPageButtonClicked())); + connect(actionJobPlot, SIGNAL(triggered()), this, SLOT(jobPlotButtonClicked())); connect(actionRestore, SIGNAL(triggered()), this, SLOT(restoreButtonClicked())); connect(actionUndock, SIGNAL(triggered()), this, SLOT(undockWindowButton())); connect(actionToggleDock, SIGNAL(triggered()), this, SLOT(toggleDockContextWindow())); @@ -239,16 +251,27 @@ void MainWin::createConnections() */ void MainWin::closeEvent(QCloseEvent *event) { + m_isClosing = true; writeSettings(); + /* close all non console pages, this will call settings in destructors */ + while (m_consoleHash.count() < m_pagehash.count()) { + foreach(Pages *page, m_pagehash) { + if (page != page->console()) { + QTreeWidgetItem* pageSelectorTreeWidgetItem = mainWin->getFromHash(page); + if (pageSelectorTreeWidgetItem->childCount() == 0) { + page->console()->setCurrent(); + page->closeStackPage(); + } + } + } + } + /* close the console pages and terminate connection */ foreach(Console *console, m_consoleHash){ console->writeSettings(); console->terminate(); + console->closeStackPage(); } event->accept(); - foreach(Pages *page, m_pagehash) { - if (!page->isDocked()) - page->close(); - } } void MainWin::writeSettings() @@ -297,8 +320,11 @@ void MainWin::treeItemClicked(QTreeWidgetItem *item, int /*column*/) */ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *previousitem) { + if (m_isClosing) return; /* if closing the application, do nothing here */ + Pages *previousPage, *nextPage; - Console *previousConsole, *nextConsole; + Console *previousConsole = NULL; + Console *nextConsole; /* remove all actions before adding actions appropriate for new page */ foreach(QAction* pageAction, treeWidget->actions()) { @@ -396,7 +422,7 @@ void MainWin::labelButtonClicked() void MainWin::runButtonClicked() { - new runPage(); + new runPage(""); } void MainWin::estimateButtonClicked() @@ -409,11 +435,34 @@ void MainWin::browseButtonClicked() new restoreTree(); } +void MainWin::statusPageButtonClicked() +{ + /* if one exists, then just set it current */ + bool found = false; + foreach(Pages *page, m_pagehash) { + if (m_currentConsole == page->console()) { + if (page->name() == "Director Status") { + found = true; + page->setCurrent(); + } + } + } + if (!found) + new DirStat(); +} + void MainWin::restoreButtonClicked() { new prerestorePage(); } +void MainWin::jobPlotButtonClicked() +{ + JobPlotPass pass; + pass.use = false; + new JobPlot(NULL, pass); +} + /* * The user just finished typing a line in the command line edit box */ @@ -425,7 +474,7 @@ void MainWin::input_line() /* Use consoleInput to allow typing anything */ m_currentConsole->consoleInput(cmdStr); } else { - set_status("Director not connected. Click on connect button."); + set_status(tr("Director not connected. Click on connect button.")); } m_cmd_history.append(cmdStr); m_cmd_last = -1; @@ -438,7 +487,7 @@ void MainWin::about() { QMessageBox::about(this, tr("About bat"), tr("

bat 1.0, by Dirk H Bartley and Kern Sibbald

" - "

Copyright © " BYEAR " Free Software Foundation Europe e.V." + "

Copyright © 2007-" BYEAR " Free Software Foundation Europe e.V." "

The bat is an administrative console" " interface to the Director.")); } @@ -461,7 +510,12 @@ void MainWin::set_statusf(const char *fmt, ...) void MainWin::set_status_ready() { - set_status(" Ready"); + set_status(tr(" Ready")); +} + +void MainWin::set_status(const QString &str) +{ + statusBar()->showMessage(str); } void MainWin::set_status(const char *buf) @@ -501,6 +555,7 @@ void MainWin::toggleDockContextWindow() */ void MainWin::stackItemChanged(int) { + if (m_isClosing) return; /* if closing the application, do nothing here */ Pages* page = (Pages*)stackedWidget->currentWidget(); /* run the virtual function in case this class overrides it */ page->currentStackItem(); @@ -591,8 +646,32 @@ void MainWin::setPreferences() prefs.daysSpinBox->setValue(m_daysLimitVal); prefs.checkMessages->setCheckState(m_checkMessages ? Qt::Checked : Qt::Unchecked); prefs.checkMessagesSpin->setValue(m_checkMessagesInterval); + prefs.refreshStatusDir->setCheckState(m_refreshStatusDir ? Qt::Checked : Qt::Unchecked); + prefs.refreshStatusDirSpin->setValue(m_refreshStatusDirInterval); prefs.executeLongCheckBox->setCheckState(m_longList ? Qt::Checked : Qt::Unchecked); - + prefs.rtPopDirCheckBox->setCheckState(m_rtPopDirDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtDirCurICCheckBox->setCheckState(m_rtDirCurICDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtDirICCheckBox->setCheckState(m_rtDirICDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtFileTabICCheckBox->setCheckState(m_rtFileTabICDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtVerTabICCheckBox->setCheckState(m_rtVerTabICDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtUpdateFTCheckBox->setCheckState(m_rtUpdateFTDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtUpdateVTCheckBox->setCheckState(m_rtUpdateVTDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtChecksCheckBox->setCheckState(m_rtChecksDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtIconStateCheckBox->setCheckState(m_rtIconStateDebug ? Qt::Checked : Qt::Unchecked); + prefs.rtRestore1CheckBox->setCheckState(m_rtRestore1Debug ? Qt::Checked : Qt::Unchecked); + prefs.rtRestore2CheckBox->setCheckState(m_rtRestore2Debug ? Qt::Checked : Qt::Unchecked); + prefs.rtRestore3CheckBox->setCheckState(m_rtRestore3Debug ? Qt::Checked : Qt::Unchecked); + if (m_radioConvert == 0) { + prefs.radioConvertOff->setChecked(Qt::Checked); + } else if (m_radioConvert == 1){ + prefs.radioConvertIEC->setChecked(Qt::Checked); + } else { + m_radioConvert = 2; + prefs.radioConvertStandard->setChecked(Qt::Checked); + } + prefs.openPlotCheckBox->setCheckState(m_openPlot ? Qt::Checked : Qt::Unchecked); + prefs.openBrowserCheckBox->setCheckState(m_openBrowser ? Qt::Checked : Qt::Unchecked); + prefs.openDirStatCheckBox->setCheckState(m_openDirStat ? Qt::Checked : Qt::Unchecked); prefs.exec(); } @@ -616,7 +695,33 @@ void prefsDialog::accept() mainWin->m_daysLimitVal = this->daysSpinBox->value(); mainWin->m_checkMessages = this->checkMessages->checkState() == Qt::Checked; mainWin->m_checkMessagesInterval = this->checkMessagesSpin->value(); + mainWin->m_refreshStatusDir = this->refreshStatusDir->checkState() == Qt::Checked; + mainWin->m_refreshStatusDirInterval = this->refreshStatusDirSpin->value(); mainWin->m_longList = this->executeLongCheckBox->checkState() == Qt::Checked; + + mainWin->m_rtPopDirDebug = this->rtPopDirCheckBox->checkState() == Qt::Checked; + mainWin->m_rtDirCurICDebug = this->rtDirCurICCheckBox->checkState() == Qt::Checked; + mainWin->m_rtDirICDebug = this->rtDirICCheckBox->checkState() == Qt::Checked; + mainWin->m_rtFileTabICDebug = this->rtFileTabICCheckBox->checkState() == Qt::Checked; + mainWin->m_rtVerTabICDebug = this->rtVerTabICCheckBox->checkState() == Qt::Checked; + mainWin->m_rtUpdateFTDebug = this->rtUpdateFTCheckBox->checkState() == Qt::Checked; + mainWin->m_rtUpdateVTDebug = this->rtUpdateVTCheckBox->checkState() == Qt::Checked; + mainWin->m_rtChecksDebug = this->rtChecksCheckBox->checkState() == Qt::Checked; + mainWin->m_rtIconStateDebug = this->rtIconStateCheckBox->checkState() == Qt::Checked; + mainWin->m_rtRestore1Debug = this->rtRestore1CheckBox->checkState() == Qt::Checked; + mainWin->m_rtRestore2Debug = this->rtRestore2CheckBox->checkState() == Qt::Checked; + mainWin->m_rtRestore3Debug = this->rtRestore3CheckBox->checkState() == Qt::Checked; + if (this->radioConvertOff->isChecked()) { + mainWin->m_radioConvert = 0; + } else if (this->radioConvertIEC->isChecked()){ + mainWin->m_radioConvert = 1; + } else { + mainWin->m_radioConvert = 2; + } + mainWin->m_openPlot = this->openPlotCheckBox->checkState() == Qt::Checked; + mainWin->m_openBrowser = this->openBrowserCheckBox->checkState() == Qt::Checked; + mainWin->m_openDirStat = this->openDirStatCheckBox->checkState() == Qt::Checked; + QSettings settings("www.bacula.org", "bat"); settings.beginGroup("Debug"); settings.setValue("commDebug", mainWin->m_commDebug); @@ -631,12 +736,32 @@ void prefsDialog::accept() settings.setValue("daysLimitCheck", mainWin->m_daysLimitCheck); settings.setValue("daysLimitVal", mainWin->m_daysLimitVal); settings.endGroup(); - settings.beginGroup("Messages"); + settings.beginGroup("Timers"); settings.setValue("checkMessages", mainWin->m_checkMessages); settings.setValue("checkMessagesInterval", mainWin->m_checkMessagesInterval); + settings.setValue("refreshStatusDir", mainWin->m_refreshStatusDir); + settings.setValue("refreshStatusDirInterval", mainWin->m_refreshStatusDirInterval); settings.endGroup(); settings.beginGroup("Misc"); settings.setValue("longList", mainWin->m_longList); + settings.setValue("byteConvert", mainWin->m_radioConvert); + settings.setValue("openplot", mainWin->m_openPlot); + settings.setValue("openbrowser", mainWin->m_openBrowser); + settings.setValue("opendirstat", mainWin->m_openDirStat); + settings.endGroup(); + settings.beginGroup("RestoreTree"); + settings.setValue("rtPopDirDebug", mainWin->m_rtPopDirDebug); + settings.setValue("rtDirCurICDebug", mainWin->m_rtDirCurICDebug); + settings.setValue("rtDirCurICRetDebug", mainWin->m_rtDirICDebug); + settings.setValue("rtFileTabICDebug", mainWin->m_rtFileTabICDebug); + settings.setValue("rtVerTabICDebug", mainWin->m_rtVerTabICDebug); + settings.setValue("rtUpdateFTDebug", mainWin->m_rtUpdateFTDebug); + settings.setValue("rtUpdateVTDebug", mainWin->m_rtUpdateVTDebug); + settings.setValue("rtChecksDebug", mainWin->m_rtChecksDebug); + settings.setValue("rtIconStateDebug", mainWin->m_rtIconStateDebug); + settings.setValue("rtRestore1Debug", mainWin->m_rtRestore1Debug); + settings.setValue("rtRestore2Debug", mainWin->m_rtRestore2Debug); + settings.setValue("rtRestore3Debug", mainWin->m_rtRestore3Debug); settings.endGroup(); foreach(Console *console, mainWin->m_consoleHash) { console->startTimer(); @@ -646,7 +771,7 @@ void prefsDialog::accept() void prefsDialog::reject() { this->hide(); - mainWin->set_status("Canceled"); + mainWin->set_status(tr("Canceled")); } /* read preferences for the prefences dialog box */ @@ -666,11 +791,99 @@ void MainWin::readPreferences() m_daysLimitCheck = settings.value("daysLimitCheck", false).toBool(); m_daysLimitVal = settings.value("daysLimitVal", 28).toInt(); settings.endGroup(); - settings.beginGroup("Messages"); + settings.beginGroup("Timers"); m_checkMessages = settings.value("checkMessages", false).toBool(); m_checkMessagesInterval = settings.value("checkMessagesInterval", 28).toInt(); + m_refreshStatusDir = settings.value("refreshStatusDir", false).toBool(); + m_refreshStatusDirInterval = settings.value("refreshStatusDirInterval", 28).toInt(); settings.endGroup(); settings.beginGroup("Misc"); m_longList = settings.value("longList", false).toBool(); + m_radioConvert = settings.value("byteConvert", false).toInt(); + m_openPlot = settings.value("openplot", false).toBool(); + m_openBrowser = settings.value("openbrowser", false).toBool(); + m_openDirStat = settings.value("opendirstat", false).toBool(); + settings.endGroup(); + settings.beginGroup("RestoreTree"); + m_rtPopDirDebug = settings.value("rtPopDirDebug", false).toBool(); + m_rtDirCurICDebug = settings.value("rtDirCurICDebug", false).toBool(); + m_rtDirICDebug = settings.value("rtDirCurICRetDebug", false).toBool(); + m_rtFileTabICDebug = settings.value("rtFileTabICDebug", false).toBool(); + m_rtVerTabICDebug = settings.value("rtVerTabICDebug", false).toBool(); + m_rtUpdateFTDebug = settings.value("rtUpdateFTDebug", false).toBool(); + m_rtUpdateVTDebug = settings.value("rtUpdateVTDebug", false).toBool(); + m_rtChecksDebug = settings.value("rtChecksDebug", false).toBool(); + m_rtIconStateDebug = settings.value("rtIconStateDebug", false).toBool(); + m_rtRestore1Debug = settings.value("rtRestore1Debug", false).toBool(); + m_rtRestore2Debug = settings.value("rtRestore2Debug", false).toBool(); + m_rtRestore3Debug = settings.value("rtRestore3Debug", false).toBool(); settings.endGroup(); } + +void MainWin::hrConvert(QString &ret, qlonglong &inval) +{ + double net = 0; + qlonglong base; + QStringList suflist; + + if (m_radioConvert == 0) { + ret = QString("%1").arg(inval); + return; + } else if (m_radioConvert == 1){ + base = 1000; + suflist = (QStringList() << "B" << "KiB" << "MiB" << "GiB" << "TiB" << "PiB" << "EiB" << "ZiB"); + } else { + base = 1024; + suflist = (QStringList() << "B" << "KB" << "MB" << "GB" << "TB" << "PB" << "EB" << "ZB"); + } + qlonglong running = base; + bool done = false; + int count = 1; + while (done == false) { + QString test1 = QString("%1").arg(inval); + QString test2 = QString("%1").arg(running); + if (float(inval) < (float)(running)) { + done = true; + ret = suflist[count - 1]; + net = (float)inval / (float)(running/base); + } + count += 1; + if (count > suflist.count()) done = true; + running *= base; + } + char format = 'f'; + if (net != 0) + ret = QString("%1 %2") + .arg(net, 0, format, 2, QLatin1Char(' ')) + .arg(ret); + else ret = "0 B"; +} + +void MainWin::hrConvertSeconds(QString &ret, qlonglong &inval) +{ + double net = 0; + QList durations; + durations.append(1); + durations.append(60); + durations.append(3600); + durations.append(86400); + durations.append(2592000); + durations.append(31536000); + QStringList abbrlist = (QStringList() << "Sec" << "Min" << "Hrs" << "Days" << "Mnth" << "Yrs"); + bool done = false; + int count = 1; + while (done == false) { + QString test1 = QString("%1").arg(inval); + QString test2 = QString("%1").arg(durations[count]); + if ((inval < durations[count]) || (count >= abbrlist.count() - 1)) { + done = true; + net = (float)inval / (float)(durations[count - 1]); + if (net != 0) + ret = QString("%1 %2") + .arg(net, 0, 'f', 2, QLatin1Char(' ')) + .arg(abbrlist[count - 1]); + else ret = "0 S"; + } + count += 1; + } +}