X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Fmainwin.cpp;h=ff92afaf26c98a01a21705e24a0574738ccddea0;hb=95becad30b6e54822512c602cb26a2d293b436af;hp=c81f286e505cae359c4d501def3911ff68b17fe9;hpb=8f11c87b75ece5d2909e2434b0d07536dd83a600;p=bacula%2Fbacula diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index c81f286e50..ff92afaf26 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-2008 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. @@ -20,14 +20,13 @@ 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. */ /* - * Version $Id$ * * Main Window control for bat (qt-console) * @@ -36,6 +35,7 @@ */ #include "bat.h" +#include "version.h" #include "joblist/joblist.h" #include "storage/storage.h" #include "fileset/fileset.h" @@ -49,8 +49,12 @@ #include "restore/restoretree.h" #include "help/help.h" #include "jobs/jobs.h" +#include "medialist/mediaview.h" +#ifdef HAVE_QWT #include "jobgraphs/jobplot.h" +#endif #include "status/dirstat.h" +#include "util/fmtwidgetitem.h" /* * Daemon message callback @@ -62,7 +66,11 @@ void message_callback(int /* type */, char *msg) MainWin::MainWin(QWidget *parent) : QMainWindow(parent) { + app->setOverrideCursor(QCursor(Qt::WaitCursor)); m_isClosing = false; + m_waitState = false; + m_doConnect = false; + m_treeStackTrap = false; m_dtformat = "yyyy-MM-dd HH:mm:ss"; mainWin = this; setupUi(this); /* Setup UI defined by main.ui (designer) */ @@ -70,14 +78,17 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent) readPreferences(); treeWidget->clear(); treeWidget->setColumnCount(1); - treeWidget->setHeaderLabel("Select Page"); + treeWidget->setHeaderLabel( tr("Select Page") ); treeWidget->setContextMenuPolicy(Qt::ActionsContextMenu); - + // tabWidget->setTabsClosable(true); /* wait for QT 4.5 */ createPages(); - resetFocus(); + resetFocus(); /* lineEdit->setFocus() */ - createConnections(); +#ifndef HAVE_QWT + actionJobPlot->setEnabled(false); + actionJobPlot->setVisible(false); +#endif this->show(); @@ -87,12 +98,25 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent) console->connect_dir(); } m_currentConsole = (Console*)getFromHash(m_firstItem); - m_currentConsole->setCurrent(); + QTimer::singleShot(5000, this, SLOT(popLists())); if (m_miscDebug) { QString directoryResourceName; m_currentConsole->getDirResName(directoryResourceName); - Pmsg1(000, "Setting initial window to %s\n", directoryResourceName.toUtf8().data()); + Pmsg1(100, "Setting initial window to %s\n", directoryResourceName.toUtf8().data()); } + app->restoreOverrideCursor(); +} + +void MainWin::popLists() +{ + foreach(Console *console, m_consoleHash) { + console->populateLists(true); + } + m_doConnect = true; + connectConsoleSignals(); + connectSignals(); + app->restoreOverrideCursor(); + m_currentConsole->setCurrent(); } void MainWin::createPages() @@ -105,7 +129,7 @@ void MainWin::createPages() foreach_res(dir, R_DIRECTOR) { /* Create console tree stacked widget item */ - m_currentConsole = new Console(stackedWidget); + m_currentConsole = new Console(tabWidget); m_currentConsole->setDirRes(dir); m_currentConsole->readSettings(); @@ -121,7 +145,7 @@ void MainWin::createPages() /* Create Tree Widget Item */ item = new QTreeWidgetItem(topItem); - item->setText(0, "Console"); + item->setText(0, tr("Console")); if (!m_firstItem){ m_firstItem = item; } item->setIcon(0,QIcon(QString::fromUtf8(":images/utilities-terminal.png"))); @@ -133,7 +157,6 @@ void MainWin::createPages() */ QBrush redBrush(Qt::red); item->setForeground(0, redBrush); - m_currentConsole->dockPage(); /* * Create instances in alphabetic order of the rest @@ -144,11 +167,14 @@ void MainWin::createPages() new FileSet(); new Jobs(); createPageJobList("", "", "", "", NULL); +#ifdef HAVE_QWT JobPlotPass pass; pass.use = false; if (m_openPlot) new JobPlot(NULL, pass); +#endif new MediaList(); + new MediaView(); new Storage(); if (m_openBrowser) new restoreTree(); @@ -156,7 +182,9 @@ void MainWin::createPages() new DirStat(); treeWidget->expandItem(topItem); - stackedWidget->setCurrentWidget(m_currentConsole); + tabWidget->setCurrentWidget(m_currentConsole); + m_currentConsole->undockPage(); + m_currentConsole->dockPage(); } UnlockRes(); } @@ -219,31 +247,123 @@ void MainWin::keyPressEvent(QKeyEvent *event) lineEdit->setText(m_cmd_history[m_cmd_last]); } -void MainWin::createConnections() +void MainWin::connectSignals() { /* Connect signals to slots */ connect(lineEdit, SIGNAL(returnPressed()), this, SLOT(input_line())); connect(actionAbout_bat, SIGNAL(triggered()), this, SLOT(about())); connect(actionBat_Help, SIGNAL(triggered()), this, SLOT(help())); - connect(treeWidget, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, - SLOT(treeItemClicked(QTreeWidgetItem *, int))); - connect(treeWidget, SIGNAL( - currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), - this, SLOT(treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); - connect(stackedWidget, SIGNAL(currentChanged(int)), - this, SLOT(stackItemChanged(int))); + connect(treeWidget, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(treeItemClicked(QTreeWidgetItem *, int))); + connect(treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(stackItemChanged(int))); connect(actionQuit, SIGNAL(triggered()), app, SLOT(closeAllWindows())); connect(actionLabel, SIGNAL(triggered()), this, SLOT(labelButtonClicked())); 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())); +#ifdef HAVE_QWT connect(actionJobPlot, SIGNAL(triggered()), this, SLOT(jobPlotButtonClicked())); +#endif connect(actionRestore, SIGNAL(triggered()), this, SLOT(restoreButtonClicked())); connect(actionUndock, SIGNAL(triggered()), this, SLOT(undockWindowButton())); connect(actionToggleDock, SIGNAL(triggered()), this, SLOT(toggleDockContextWindow())); connect(actionClosePage, SIGNAL(triggered()), this, SLOT(closePage())); connect(actionPreferences, SIGNAL(triggered()), this, SLOT(setPreferences())); + connect(actionRepopLists, SIGNAL(triggered()), this, SLOT(repopLists())); + connect(actionReloadRepop, SIGNAL(triggered()), this, SLOT(reloadRepopLists())); +} + +void MainWin::disconnectSignals() +{ + /* Connect signals to slots */ + disconnect(lineEdit, SIGNAL(returnPressed()), this, SLOT(input_line())); + disconnect(actionAbout_bat, SIGNAL(triggered()), this, SLOT(about())); + disconnect(actionBat_Help, SIGNAL(triggered()), this, SLOT(help())); + disconnect(treeWidget, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(treeItemClicked(QTreeWidgetItem *, int))); + disconnect(treeWidget, SIGNAL( currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + disconnect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(stackItemChanged(int))); + disconnect(actionQuit, SIGNAL(triggered()), app, SLOT(closeAllWindows())); + disconnect(actionLabel, SIGNAL(triggered()), this, SLOT(labelButtonClicked())); + disconnect(actionRun, SIGNAL(triggered()), this, SLOT(runButtonClicked())); + disconnect(actionEstimate, SIGNAL(triggered()), this, SLOT(estimateButtonClicked())); + disconnect(actionBrowse, SIGNAL(triggered()), this, SLOT(browseButtonClicked())); + disconnect(actionStatusDirPage, SIGNAL(triggered()), this, SLOT(statusPageButtonClicked())); +#ifdef HAVE_QWT + disconnect(actionJobPlot, SIGNAL(triggered()), this, SLOT(jobPlotButtonClicked())); +#endif + disconnect(actionRestore, SIGNAL(triggered()), this, SLOT(restoreButtonClicked())); + disconnect(actionUndock, SIGNAL(triggered()), this, SLOT(undockWindowButton())); + disconnect(actionToggleDock, SIGNAL(triggered()), this, SLOT(toggleDockContextWindow())); + disconnect(actionClosePage, SIGNAL(triggered()), this, SLOT(closePage())); + disconnect(actionPreferences, SIGNAL(triggered()), this, SLOT(setPreferences())); + disconnect(actionRepopLists, SIGNAL(triggered()), this, SLOT(repopLists())); + disconnect(actionReloadRepop, SIGNAL(triggered()), this, SLOT(reloadRepopLists())); +} + +/* + * Enter wait state + */ +void MainWin::waitEnter() +{ + if (m_waitState){ + if (mainWin->m_connDebug) + Pmsg0(000, "Should Never Get Here DANGER DANGER, for now I'll return\n"); + return; + } + m_waitState = true; + if (mainWin->m_connDebug) + Pmsg0(000, "Entering Wait State\n"); + app->setOverrideCursor(QCursor(Qt::WaitCursor)); + disconnectSignals(); + disconnectConsoleSignals(m_currentConsole); + m_waitTreeItem = treeWidget->currentItem(); +} + +/* + * Leave wait state + */ +void MainWin::waitExit() +{ + m_waitState = false; + if (mainWin->m_connDebug) Pmsg0(000, "Exiting Wait State\n"); + if (m_waitTreeItem != treeWidget->currentItem()) + treeWidget->setCurrentItem(m_waitTreeItem); + if (m_doConnect) { + connectSignals(); + connectConsoleSignals(); + } + app->restoreOverrideCursor(); +} + +void MainWin::connectConsoleSignals() +{ + connect(actionConnect, SIGNAL(triggered()), m_currentConsole, SLOT(connect_dir())); + connect(actionSelectFont, SIGNAL(triggered()), m_currentConsole, SLOT(set_font())); + connect(actionMessages, SIGNAL(triggered()), m_currentConsole, SLOT(messages())); +} + +void MainWin::disconnectConsoleSignals(Console *console) +{ + disconnect(actionConnect, SIGNAL(triggered()), console, SLOT(connect_dir())); + disconnect(actionMessages, SIGNAL(triggered()), console, SLOT(messages())); + disconnect(actionSelectFont, SIGNAL(triggered()), console, SLOT(set_font())); +} + + +/* + * Two functions to respond to menu items to repop lists and execute reload and repopulate + * the lists for jobs, clients, filesets .. .. + */ +void MainWin::repopLists() +{ + m_currentConsole->populateLists(false); +} +void MainWin::reloadRepopLists() +{ + QString cmd = "reload"; + m_currentConsole->consoleCommand(cmd); + m_currentConsole->populateLists(false); } /* @@ -253,6 +373,13 @@ void MainWin::closeEvent(QCloseEvent *event) { m_isClosing = true; writeSettings(); + /* Remove all groups from settings for OpenOnExit so that we can start some of the status windows */ + foreach(Console *console, m_consoleHash){ + QSettings settings(console->m_dir->name(), "bat"); + settings.beginGroup("OpenOnExit"); + settings.remove(""); + settings.endGroup(); + } /* close all non console pages, this will call settings in destructors */ while (m_consoleHash.count() < m_pagehash.count()) { foreach(Pages *page, m_pagehash) { @@ -265,7 +392,6 @@ void MainWin::closeEvent(QCloseEvent *event) } } } - /* close the console pages and terminate connection */ foreach(Console *console, m_consoleHash){ console->writeSettings(); console->terminate(); @@ -283,6 +409,7 @@ void MainWin::writeSettings() settings.setValue("winPos", pos()); settings.setValue("state", saveState()); settings.endGroup(); + } void MainWin::readSettings() @@ -305,10 +432,10 @@ void MainWin::treeItemClicked(QTreeWidgetItem *item, int /*column*/) /* Is this a page that has been inserted into the hash */ if (getFromHash(item)) { Pages* page = getFromHash(item); - int stackindex=stackedWidget->indexOf(page); + int stackindex=tabWidget->indexOf(page); if (stackindex >= 0) { - stackedWidget->setCurrentWidget(page); + tabWidget->setCurrentWidget(page); } /* run the virtual function in case this class overrides it */ page->PgSeltreeWidgetClicked(); @@ -353,6 +480,9 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre /* this condition prevents a segfault. The first time there is no previousitem*/ if (previousitem) { + if (m_treeStackTrap == false) { /* keep track of previous items for going Back */ + m_treeWidgetStack.append(previousitem); + } /* knowing the treeWidgetItem, get the page from the hash */ previousPage = getFromHash(previousitem); previousConsole = m_consoleHash.value(previousitem); @@ -364,10 +494,7 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre if ((previousPage) || (previousConsole)) { if (nextConsole != previousConsole) { /* remove connections to the current console */ - disconnect(actionConnect, SIGNAL(triggered()), previousConsole, SLOT(connect_dir())); - disconnect(actionStatusDir, SIGNAL(triggered()), previousConsole, SLOT(status_dir())); - disconnect(actionMessages, SIGNAL(triggered()), previousConsole, SLOT(messages())); - disconnect(actionSelectFont, SIGNAL(triggered()), previousConsole, SLOT(set_font())); + disconnectConsoleSignals(previousConsole); QTreeWidgetItem *dirItem = previousConsole->directorTreeItem(); QBrush greyBrush(Qt::lightGray); dirItem->setBackground(0, greyBrush); @@ -381,22 +508,23 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre if (nextConsole != previousConsole) { /* make connections to the current console */ m_currentConsole = nextConsole; - connect(actionConnect, SIGNAL(triggered()), m_currentConsole, SLOT(connect_dir())); - connect(actionSelectFont, SIGNAL(triggered()), m_currentConsole, SLOT(set_font())); - connect(actionStatusDir, SIGNAL(triggered()), m_currentConsole, SLOT(status_dir())); - connect(actionMessages, SIGNAL(triggered()), m_currentConsole, SLOT(messages())); + connectConsoleSignals(); + setMessageIcon(); /* Set director's tree widget background to magenta for ease of identification */ QTreeWidgetItem *dirItem = m_currentConsole->directorTreeItem(); QBrush magentaBrush(Qt::magenta); dirItem->setBackground(0, magentaBrush); } /* set the value for the currently active console */ - int stackindex = stackedWidget->indexOf(nextPage); + int stackindex = tabWidget->indexOf(nextPage); + if (!nextPage->isOnceDocked()) { + nextPage->dockPage(); + } /* Is this page currently on the stack or is it undocked */ if (stackindex >= 0) { /* put this page on the top of the stack */ - stackedWidget->setCurrentIndex(stackindex); + tabWidget->setCurrentIndex(stackindex); } else { /* it is undocked, raise it to the front */ nextPage->raise(); @@ -441,14 +569,15 @@ void MainWin::statusPageButtonClicked() bool found = false; foreach(Pages *page, m_pagehash) { if (m_currentConsole == page->console()) { - if (page->name() == "Director Status") { + if (page->name() == tr("Director Status")) { found = true; page->setCurrent(); } } } - if (!found) + if (!found) { new DirStat(); + } } void MainWin::restoreButtonClicked() @@ -458,9 +587,11 @@ void MainWin::restoreButtonClicked() void MainWin::jobPlotButtonClicked() { +#ifdef HAVE_QWT JobPlotPass pass; pass.use = false; new JobPlot(NULL, pass); +#endif } /* @@ -468,13 +599,18 @@ void MainWin::jobPlotButtonClicked() */ void MainWin::input_line() { + int conn; QString cmdStr = lineEdit->text(); /* Get the text */ lineEdit->clear(); /* clear the lineEdit box */ if (m_currentConsole->is_connected()) { - /* Use consoleInput to allow typing anything */ - m_currentConsole->consoleInput(cmdStr); + if (m_currentConsole->findDirComm(conn)) { + m_currentConsole->consoleCommand(cmdStr, conn); + } else { + /* Use consoleCommand to allow typing anything */ + m_currentConsole->consoleCommand(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; @@ -486,10 +622,10 @@ void MainWin::input_line() 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." + tr("

bat %1 (%2), by Dirk H Bartley and Kern Sibbald

" + "

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

The bat is an administrative console" - " interface to the Director.")); + " interface to the Director.").arg(VERSION).arg(BDATE).arg(BYEAR)); } void MainWin::help() @@ -510,7 +646,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) @@ -523,7 +664,7 @@ void MainWin::set_status(const char *buf) */ void MainWin::undockWindowButton() { - Pages* page = (Pages*)stackedWidget->currentWidget(); + Pages* page = (Pages*)tabWidget->currentWidget(); page->togglePageDocking(); } @@ -551,9 +692,16 @@ void MainWin::toggleDockContextWindow() void MainWin::stackItemChanged(int) { if (m_isClosing) return; /* if closing the application, do nothing here */ - Pages* page = (Pages*)stackedWidget->currentWidget(); + Pages* page = (Pages*)tabWidget->currentWidget(); /* run the virtual function in case this class overrides it */ page->currentStackItem(); + if (!m_waitState) { + disconnect(treeWidget, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(treeItemClicked(QTreeWidgetItem *, int))); + disconnect(treeWidget, SIGNAL( currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + treeWidget->setCurrentItem(getFromHash(page)); + connect(treeWidget, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(treeItemClicked(QTreeWidgetItem *, int))); + connect(treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + } } /* @@ -620,6 +768,7 @@ Console *MainWin::currentConsole() { return m_currentConsole; } + /* Quick function to return the tree item for the director */ QTreeWidgetItem *MainWin::currentTopItem() { @@ -631,6 +780,7 @@ void MainWin::setPreferences() { prefsDialog prefs; prefs.commDebug->setCheckState(m_commDebug ? Qt::Checked : Qt::Unchecked); + prefs.connDebug->setCheckState(m_connDebug ? Qt::Checked : Qt::Unchecked); prefs.displayAll->setCheckState(m_displayAll ? Qt::Checked : Qt::Unchecked); prefs.sqlDebug->setCheckState(m_sqlDebug ? Qt::Checked : Qt::Unchecked); prefs.commandDebug->setCheckState(m_commandDebug ? Qt::Checked : Qt::Unchecked); @@ -654,15 +804,21 @@ void MainWin::setPreferences() 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) { + switch (ItemFormatterBase::getBytesConversion()) { + case ItemFormatterBase::BYTES_CONVERSION_NONE: prefs.radioConvertOff->setChecked(Qt::Checked); - } else if (m_radioConvert == 1){ + break; + case ItemFormatterBase::BYTES_CONVERSION_IEC: prefs.radioConvertIEC->setChecked(Qt::Checked); - } else { - m_radioConvert = 2; + break; + default: prefs.radioConvertStandard->setChecked(Qt::Checked); + break; } prefs.openPlotCheckBox->setCheckState(m_openPlot ? Qt::Checked : Qt::Unchecked); +#ifndef HAVE_QWT + prefs.openPlotCheckBox->setVisible(false); +#endif prefs.openBrowserCheckBox->setCheckState(m_openBrowser ? Qt::Checked : Qt::Unchecked); prefs.openDirStatCheckBox->setCheckState(m_openDirStat ? Qt::Checked : Qt::Unchecked); prefs.exec(); @@ -678,6 +834,7 @@ void prefsDialog::accept() { this->hide(); mainWin->m_commDebug = this->commDebug->checkState() == Qt::Checked; + mainWin->m_connDebug = this->connDebug->checkState() == Qt::Checked; mainWin->m_displayAll = this->displayAll->checkState() == Qt::Checked; mainWin->m_sqlDebug = this->sqlDebug->checkState() == Qt::Checked; mainWin->m_commandDebug = this->commandDebug->checkState() == Qt::Checked; @@ -703,11 +860,11 @@ void prefsDialog::accept() mainWin->m_rtRestore2Debug = this->rtRestore2CheckBox->checkState() == Qt::Checked; mainWin->m_rtRestore3Debug = this->rtRestore3CheckBox->checkState() == Qt::Checked; if (this->radioConvertOff->isChecked()) { - mainWin->m_radioConvert = 0; + ItemFormatterBase::setBytesConversion(ItemFormatterBase::BYTES_CONVERSION_NONE); } else if (this->radioConvertIEC->isChecked()){ - mainWin->m_radioConvert = 1; + ItemFormatterBase::setBytesConversion(ItemFormatterBase::BYTES_CONVERSION_IEC); } else { - mainWin->m_radioConvert = 2; + ItemFormatterBase::setBytesConversion(ItemFormatterBase::BYTES_CONVERSION_SI); } mainWin->m_openPlot = this->openPlotCheckBox->checkState() == Qt::Checked; mainWin->m_openBrowser = this->openBrowserCheckBox->checkState() == Qt::Checked; @@ -716,6 +873,7 @@ void prefsDialog::accept() QSettings settings("www.bacula.org", "bat"); settings.beginGroup("Debug"); settings.setValue("commDebug", mainWin->m_commDebug); + settings.setValue("connDebug", mainWin->m_connDebug); settings.setValue("displayAll", mainWin->m_displayAll); settings.setValue("sqlDebug", mainWin->m_sqlDebug); settings.setValue("commandDebug", mainWin->m_commandDebug); @@ -727,13 +885,13 @@ 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.endGroup(); settings.beginGroup("Misc"); settings.setValue("longList", mainWin->m_longList); - settings.setValue("byteConvert", mainWin->m_radioConvert); + settings.setValue("byteConvert", ItemFormatterBase::getBytesConversion()); settings.setValue("openplot", mainWin->m_openPlot); settings.setValue("openbrowser", mainWin->m_openBrowser); settings.setValue("opendirstat", mainWin->m_openDirStat); @@ -752,15 +910,12 @@ void prefsDialog::accept() settings.setValue("rtRestore2Debug", mainWin->m_rtRestore2Debug); settings.setValue("rtRestore3Debug", mainWin->m_rtRestore3Debug); settings.endGroup(); - foreach(Console *console, mainWin->m_consoleHash) { - console->startTimer(); - } } void prefsDialog::reject() { this->hide(); - mainWin->set_status("Canceled"); + mainWin->set_status(tr("Canceled")); } /* read preferences for the prefences dialog box */ @@ -769,6 +924,7 @@ void MainWin::readPreferences() QSettings settings("www.bacula.org", "bat"); settings.beginGroup("Debug"); m_commDebug = settings.value("commDebug", false).toBool(); + m_connDebug = settings.value("connDebug", false).toBool(); m_displayAll = settings.value("displayAll", false).toBool(); m_sqlDebug = settings.value("sqlDebug", false).toBool(); m_commandDebug = settings.value("commandDebug", false).toBool(); @@ -780,13 +936,15 @@ 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(); settings.endGroup(); settings.beginGroup("Misc"); m_longList = settings.value("longList", false).toBool(); - m_radioConvert = settings.value("byteConvert", false).toInt(); + ItemFormatterBase::setBytesConversion( + (ItemFormatterBase::BYTES_CONVERSION) settings.value("byteConvert", + ItemFormatterBase::BYTES_CONVERSION_IEC).toInt()); m_openPlot = settings.value("openplot", false).toBool(); m_openBrowser = settings.value("openbrowser", false).toBool(); m_openDirStat = settings.value("opendirstat", false).toBool(); @@ -807,70 +965,37 @@ void MainWin::readPreferences() settings.endGroup(); } -void MainWin::hrConvert(QString &ret, qlonglong &inval) +void MainWin::setMessageIcon() { - double net = 0; - qlonglong base; - QStringList suflist; + if (m_currentConsole->is_messagesPending()) + actionMessages->setIcon(QIcon(QString::fromUtf8(":/images/mail-message-pending.png"))); + else + actionMessages->setIcon(QIcon(QString::fromUtf8(":/images/mail-message-new.png"))); +} - 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"); +void MainWin::goToPreviousPage() +{ + m_treeStackTrap = true; 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)) { + while (!done) { + /* If stack list is emtpty, then done */ + if (m_treeWidgetStack.isEmpty()) { 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"; + } else { + QTreeWidgetItem* testItem = m_treeWidgetStack.takeLast(); + QTreeWidgetItemIterator it(treeWidget); + /* lets avoid a segfault by setting an item current that no longer exists */ + while (*it) { + if (*it == testItem) { + if (testItem != treeWidget->currentItem()) { + treeWidget->setCurrentItem(testItem); + done = true; + } + break; + } + ++it; + } } - count += 1; } + m_treeStackTrap = false; }