Only use the svg files for the generation of the png files.

[bacula/bacula] / bacula / src / qt-console / pages.cpp

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index 907e551498a9d31fe8a9daad85740defdb4b4426..5baff9d4c7ee18704f5b730402709102d456f1b2 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -7,8 +7,8 @@
    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
@@ -26,7 +26,7 @@
    Switzerland, email:ftf@fsfeurope.org.
 */
 /*
- *   Version $Id: batstack.cpp 4230 2007-02-21 20:07:37Z kerns $
+ *   Version $Id$
  *
  *   Dirk Bartley, March 2007
  */
@@ -46,13 +46,15 @@ void Pages::dockPage()
     * that it has the proper window flag and parent.
     */
    setWindowFlags(Qt::Widget);
-//   setParent(m_parent);
 
    /* This was being done already */
    m_parent->addWidget(this);
 
    /* Set docked flag */
    m_docked = true;
+   mainWin->stackedWidget->setCurrentWidget(this);
+   /* lets set the page selectors action for docking or undocking */
+   setContextMenuDockText();
 }
 
 /*
@@ -69,6 +71,8 @@ void Pages::undockPage()
    show();
    /* Clear docked flag */
    m_docked = false;
+   /* The window has been undocked, lets change the context menu */
+   setContextMenuDockText();
 }
 
 /*
@@ -117,26 +121,13 @@ void Pages::closeEvent(QCloseEvent* event)
    /* A Widget was closed, lets toggle it back into the window, and set it in front. */
    dockPage();
 
-   /* is the tree widget item for "this" the current widget item */
-   if (mainWin->treeWidget->currentItem() == mainWin->getFromHash(this))
-      /* in case the current widget is the one which represents this, lets set the context
-       * menu to undock */
-      mainWin->setContextMenuDockText();
-   else
-      /* in case the current widget is not the one which represents this, lets set the
-      * color back to black */
-      mainWin->setTreeWidgetItemDockColor(this);
-
    /* this fixes my woes of getting the widget to show up on top when closed */
    event->ignore();
 
-   /* put this widget on the top of the stack widget */
-   m_parent->setCurrentWidget(this);
-
    /* Set the current tree widget item in the Page Selector window to the item 
-    * which represents "this" */
-   QTreeWidgetItem *item= mainWin->getFromHash(this);
-   mainWin->treeWidget->setCurrentItem(item);
+    * which represents "this" 
+    * Which will also bring "this" to the top of the stacked widget */
+   setCurrent();
 }
 
 /*
@@ -196,6 +187,7 @@ void Pages::pgInitialize(QTreeWidgetItem *parentTreeWidgetItem)
    treeWidgetName(name);
    item->setText(0, name);
    mainWin->hashInsert(item, this);
+   setTitle();
 }
 
 /*
@@ -213,10 +205,29 @@ void Pages::treeWidgetName(QString &name)
  */
 void Pages::consoleCommand(QString &command)
 {
+   /*if (!m_console->is_connectedGui())
+       return;*/
+   if (!m_console->preventInUseConnect()) {
+       return;
+   }
+   consoleInput(command);
+}
+
+/*
+ * Function to simplify executing a console command, but does not
+ *  check for the connection in use.  We need this so that we can
+ *  *always* enter command from the command line.
+ */
+void Pages::consoleInput(QString &command)
+{
+   /* Bring this director's console to the front of the stack */
+   setConsoleCurrent();
+   QString displayhtml("<font color=\"blue\">");
+   displayhtml += command + "</font>\n";
+   m_console->display_html(displayhtml);
+   m_console->display_text("\n");
    m_console->write_dir(command.toUtf8().data());
    m_console->displayToPrompt();
-   /* Bring this directors console to the front of the stack */
-   mainWin->treeWidget->setCurrentItem(mainWin->getFromHash(m_console));
 }
 
 /*
@@ -228,7 +239,7 @@ void Pages::consoleCommand(QString &command)
 void Pages::changeEvent(QEvent *event)
 {
    if ((event->type() ==  QEvent::ActivationChange) && (isActiveWindow())) {
-      mainWin->treeWidget->setCurrentItem(mainWin->getFromHash(this));
+      setCurrent();
    }
 }
 
@@ -245,3 +256,60 @@ void Pages::setTitle()
    title += director;
    setWindowTitle(title);
 }
+
+/*
+ * Bring the current directors console window to the top of the stack.
+ */
+void Pages::setConsoleCurrent()
+{
+   mainWin->treeWidget->setCurrentItem(mainWin->getFromHash(m_console));
+}
+
+/*
+ * Bring this window to the top of the stack.
+ */
+void Pages::setCurrent()
+{
+   mainWin->treeWidget->setCurrentItem(mainWin->getFromHash(this));
+}
+
+/*
+ * Function to set the text of the toggle dock context menu when page and
+ * widget item are NOT known.  
+ */
+void Pages::setContextMenuDockText()
+{
+   QTreeWidgetItem *item = mainWin->getFromHash(this);
+   QString docktext("");
+   if (isDocked()) {
+       docktext += "UnDock ";
+   } else {
+       docktext += "ReDock ";
+   }
+   docktext += item->text(0) += " Window";
+      
+   mainWin->actionToggleDock->setText(docktext);
+   setTreeWidgetItemDockColor();
+}
+
+/*
+ * Function to set the color of the tree widget item based on whether it is
+ * docked or not.
+ */
+void Pages::setTreeWidgetItemDockColor()
+{
+   QTreeWidgetItem* item = mainWin->getFromHash(this);
+   if (item) {
+      if (item->text(0) != "Console") {
+         if (isDocked()) {
+         /* Set the brush to blue if undocked */
+            QBrush blackBrush(Qt::black);
+            item->setForeground(0, blackBrush);
+         } else {
+         /* Set the brush back to black if docked */
+            QBrush blueBrush(Qt::blue);
+            item->setForeground(0, blueBrush);
+         }
+      }
+   }
+}