X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Fmainwin.cpp;h=a1352c742960cb8944970e4cf55bfec931aa8a30;hb=afd4ac31e0f65357c5264c04b804e86b2095a304;hp=12a943221a0735b5d2ab8a81eb81d7a5fc712689;hpb=1cad392fed9ebee7646f5dd1468322cf77f838ec;p=bacula%2Fbacula
diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 12a943221a..a1352c7429 100644
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -1,14 +1,14 @@
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2007-2009 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.
+ 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
@@ -20,7 +20,7 @@
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.
@@ -36,6 +36,7 @@
*/
#include "bat.h"
+#include "version.h"
#include "joblist/joblist.h"
#include "storage/storage.h"
#include "fileset/fileset.h"
@@ -46,8 +47,14 @@
#include "medialist/medialist.h"
#include "joblist/joblist.h"
#include "clients/clients.h"
+#include "restore/restoretree.h"
#include "help/help.h"
#include "jobs/jobs.h"
+#ifdef HAVE_QWT
+#include "jobgraphs/jobplot.h"
+#endif
+#include "status/dirstat.h"
+#include "util/fmtwidgetitem.h"
/*
* Daemon message callback
@@ -59,6 +66,10 @@ 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_dtformat = "yyyy-MM-dd HH:mm:ss";
mainWin = this;
setupUi(this); /* Setup UI defined by main.ui (designer) */
@@ -66,31 +77,44 @@ 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);
createPages();
- resetFocus();
+ resetFocus(); /* lineEdit->setFocus() */
- createConnections();
+#ifndef HAVE_QWT
+ actionJobPlot->setEnabled(false);
+ actionJobPlot->setVisible(false);
+#endif
this->show();
readSettings();
- foreach(Console *console, m_consoleHash) {
+ foreach(Console *console, m_consoleHash)
console->connect_dir();
- }
m_currentConsole = (Console*)getFromHash(m_firstItem);
- m_currentConsole->setCurrent();
+ QTimer::singleShot(750, 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());
}
}
+void MainWin::popLists()
+{
+ foreach(Console *console, m_consoleHash)
+ console->populateLists(true);
+ app->restoreOverrideCursor();
+ m_doConnect = true;
+ connectConsoleSignals();
+ connectSignals();
+ m_currentConsole->setCurrent();
+}
+
void MainWin::createPages()
{
DIRRES *dir;
@@ -106,7 +130,8 @@ void MainWin::createPages()
m_currentConsole->readSettings();
/* The top tree item representing the director */
- topItem = createTopPage(dir->name());
+ topItem = new QTreeWidgetItem(treeWidget);
+ topItem->setText(0, dir->name());
topItem->setIcon(0, QIcon(":images/server.png"));
/* Set background to grey for ease of identification of inactive Director */
QBrush greyBrush(Qt::lightGray);
@@ -115,9 +140,10 @@ void MainWin::createPages()
m_consoleHash.insert(topItem, m_currentConsole);
/* Create Tree Widget Item */
- item = createPage("Console", topItem);
+ item = new QTreeWidgetItem(topItem);
+ item->setText(0, tr("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);
@@ -133,14 +159,23 @@ void MainWin::createPages()
* Create instances in alphabetic order of the rest
* of the classes that will by default exist under each Director.
*/
-// new new bRestore();
+// new bRestore();
new Clients();
new FileSet();
new Jobs();
- QString emptymedia(""), emptyclient("");
- createPageJobList(emptymedia, emptyclient, NULL);
+ createPageJobList("", "", "", "", NULL);
+#ifdef HAVE_QWT
+ JobPlotPass pass;
+ pass.use = false;
+ if (m_openPlot)
+ new JobPlot(NULL, pass);
+#endif
new MediaList();
new Storage();
+ if (m_openBrowser)
+ new restoreTree();
+ if (m_openDirStat)
+ new DirStat();
treeWidget->expandItem(topItem);
stackedWidget->setCurrentWidget(m_currentConsole);
@@ -151,16 +186,16 @@ void MainWin::createPages()
/*
* create an instance of the the joblist class on the stack
*/
-void MainWin::createPageJobList(QString &media, QString &client,
- QTreeWidgetItem *parentTreeWidgetItem)
+void MainWin::createPageJobList(const QString &media, const QString &client,
+ const QString &job, const QString &fileset, QTreeWidgetItem *parentTreeWidgetItem)
{
QTreeWidgetItem *holdItem;
/* save current tree widget item in case query produces no results */
holdItem = treeWidget->currentItem();
- JobList* joblist = new JobList(media, client, parentTreeWidgetItem);
+ JobList* joblist = new JobList(media, client, job, fileset, parentTreeWidgetItem);
/* If this is a query of jobs on a specific media */
- if ((media != "") || (client != "")) {
+ if ((media != "") || (client != "") || (job != "") || (fileset != "")) {
joblist->setCurrent();
/* did query produce results, if not close window and set back to hold */
if (joblist->m_resultCount == 0) {
@@ -170,22 +205,6 @@ void MainWin::createPageJobList(QString &media, QString &client,
}
}
-/* Create a root Tree Widget */
-QTreeWidgetItem *MainWin::createTopPage(char *name)
-{
- QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget);
- item->setText(0, name);
- return item;
-}
-
-/* Create A Tree Widget Item which will be associated with a Page in the stacked widget */
-QTreeWidgetItem *MainWin::createPage(char *name, QTreeWidgetItem *parent)
-{
- QTreeWidgetItem *item = new QTreeWidgetItem(parent);
- item->setText(0, name);
- return item;
-}
-
/*
* Handle up and down arrow keys for the command line
* history.
@@ -222,28 +241,113 @@ 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(stackedWidget, 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()));
+}
+
+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(stackedWidget, 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()));
+}
+
+/*
+ * 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");
+ app->restoreOverrideCursor();
+ if (m_waitTreeItem != treeWidget->currentItem())
+ treeWidget->setCurrentItem(m_waitTreeItem);
+ if (m_doConnect) {
+ connectSignals();
+ connectConsoleSignals();
+ }
+}
+
+void MainWin::connectConsoleSignals()
+{
+ 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()));
+}
+
+void MainWin::disconnectConsoleSignals(Console *console)
+{
+ disconnect(actionConnect, SIGNAL(triggered()), console, SLOT(connect_dir()));
+ disconnect(actionStatusDir, SIGNAL(triggered()), console, SLOT(status_dir()));
+ disconnect(actionMessages, SIGNAL(triggered()), console, SLOT(messages()));
+ disconnect(actionSelectFont, SIGNAL(triggered()), console, SLOT(set_font()));
+}
+
+void MainWin::repopLists()
+{
+ m_currentConsole->populateLists(false);
}
/*
@@ -251,16 +355,26 @@ 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();
+ }
+ }
+ }
+ }
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()
@@ -309,8 +423,16 @@ 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()) {
+ treeWidget->removeAction(pageAction);
+ }
/* first determine the next item */
@@ -345,23 +467,11 @@ 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);
}
- /* make sure the close window and toggle dock options are removed */
- treeWidget->removeAction(actionClosePage);
- treeWidget->removeAction(actionToggleDock);
- /* Is this a page that has been inserted into the hash */
- if (previousPage) {
- foreach(QAction* pageaction, previousPage->m_contextActions) {
- treeWidget->removeAction(pageaction);
- }
- }
}
}
@@ -371,10 +481,8 @@ 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);
@@ -395,10 +503,9 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre
nextPage->setContextMenuDockText();
treeWidget->addAction(actionToggleDock);
- /* if this page is closeable, then add that action */
- if (nextPage->isCloseable()) {
+ /* if this page is closeable, and it has no childern, then add that action */
+ if ((nextPage->isCloseable()) && (currentitem->child(0) == NULL))
treeWidget->addAction(actionClosePage);
- }
/* Add the actions to the Page Selectors tree widget that are part of the
* current items list of desired actions regardless of whether on top of stack*/
@@ -413,7 +520,7 @@ void MainWin::labelButtonClicked()
void MainWin::runButtonClicked()
{
- new runPage();
+ new runPage("");
}
void MainWin::estimateButtonClicked()
@@ -421,11 +528,41 @@ void MainWin::estimateButtonClicked()
new estimatePage();
}
+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() == tr("Director Status")) {
+ found = true;
+ page->setCurrent();
+ }
+ }
+ }
+ if (!found)
+ new DirStat();
+}
+
void MainWin::restoreButtonClicked()
{
new prerestorePage();
}
+void MainWin::jobPlotButtonClicked()
+{
+#ifdef HAVE_QWT
+ JobPlotPass pass;
+ pass.use = false;
+ new JobPlot(NULL, pass);
+#endif
+}
+
/*
* The user just finished typing a line in the command line edit box
*/
@@ -434,9 +571,10 @@ void MainWin::input_line()
QString cmdStr = lineEdit->text(); /* Get the text */
lineEdit->clear(); /* clear the lineEdit box */
if (m_currentConsole->is_connected()) {
+ /* 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;
@@ -448,10 +586,10 @@ void MainWin::input_line()
void MainWin::about()
{
QMessageBox::about(this, tr("About bat"),
- tr("
Copyright © " BYEAR " Free Software Foundation Europe e.V."
+ tr("
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() @@ -472,7 +610,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) @@ -512,6 +655,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(); @@ -581,6 +725,7 @@ Console *MainWin::currentConsole() { return m_currentConsole; } + /* Quick function to return the tree item for the director */ QTreeWidgetItem *MainWin::currentTopItem() { @@ -592,6 +737,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); @@ -602,8 +748,38 @@ 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); + switch (ItemFormatterBase::getBytesConversion()) { + case ItemFormatterBase::BYTES_CONVERSION_NONE: + prefs.radioConvertOff->setChecked(Qt::Checked); + break; + case ItemFormatterBase::BYTES_CONVERSION_IEC: + prefs.radioConvertIEC->setChecked(Qt::Checked); + 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(); } @@ -617,6 +793,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; @@ -627,10 +804,37 @@ 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()) { + ItemFormatterBase::setBytesConversion(ItemFormatterBase::BYTES_CONVERSION_NONE); + } else if (this->radioConvertIEC->isChecked()){ + ItemFormatterBase::setBytesConversion(ItemFormatterBase::BYTES_CONVERSION_IEC); + } else { + ItemFormatterBase::setBytesConversion(ItemFormatterBase::BYTES_CONVERSION_SI); + } + 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); + settings.setValue("connDebug", mainWin->m_connDebug); settings.setValue("displayAll", mainWin->m_displayAll); settings.setValue("sqlDebug", mainWin->m_sqlDebug); settings.setValue("commandDebug", mainWin->m_commandDebug); @@ -642,22 +846,39 @@ 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", ItemFormatterBase::getBytesConversion()); + 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(); - } } void prefsDialog::reject() { this->hide(); - mainWin->set_status("Canceled"); + mainWin->set_status(tr("Canceled")); } /* read preferences for the prefences dialog box */ @@ -666,6 +887,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(); @@ -677,11 +899,41 @@ 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(); + 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(); + 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::setMessageIcon() +{ + 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"))); +}