Remove jobq.c constraint that read and write SD must be

[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 f5de2823841de8fbb7ad4993ed7848a363956e5a..6823c3ec2dc87cb3fa0e705e91a4c341463ff86c 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-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.
@@ -20,13 +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: batstack.cpp 4230 2007-02-21 20:07:37Z kerns $
+ *   Version $Id$
  *
  *   Dirk Bartley, March 2007
  */
@@ -34,6 +34,22 @@
 #include "pages.h"
 #include "bat.h"
 
+/* A global function */
+bool isWin32Path(QString &fullPath) 
+{
+   char *buf = fullPath.left(2).toUtf8().data();
+
+   //bool toret = B_ISALPHA(buf[1]);
+   bool toret = buf[1] == ':' && B_ISALPHA(buf[0]);
+   if (mainWin->m_miscDebug) {
+      if (toret)
+         Pmsg1(000, "returning from isWin32Path true %s\n", fullPath.toUtf8().data());
+      else
+         Pmsg1(000, "returning from isWin32Path false %s\n", fullPath.toUtf8().data());
+   }
+   return toret;
+}
+
 /*
  * dockPage
  * This function is intended to be called from within the Pages class to pull
@@ -170,11 +186,19 @@ void Pages::closeStackPage()
  */
 void Pages::pgInitialize()
 {
-   pgInitialize(NULL);
+   pgInitialize(QString(), NULL);
+}
+
+void Pages::pgInitialize(const QString &name)
+{
+   pgInitialize(name, NULL);
 }
 
-void Pages::pgInitialize(QTreeWidgetItem *parentTreeWidgetItem)
+void Pages::pgInitialize(const QString &tname, QTreeWidgetItem *parentTreeWidgetItem)
 {
+   if (tname.size()) {
+      m_name = tname;
+   }
    m_parent = mainWin->stackedWidget;
    m_console = mainWin->currentConsole();
 
@@ -207,9 +231,20 @@ void Pages::consoleCommand(QString &command)
 {
    /*if (!m_console->is_connectedGui())
        return;*/
-   if (!m_console->preventInUseConnect())
+   if (!m_console->preventInUseConnect()) {
        return;
-   /* Bring this directors console to the front of the stack */
+   }
+   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";
@@ -238,11 +273,10 @@ void Pages::changeEvent(QEvent *event)
  */
 void Pages::setTitle()
 {
-   QString title, director;
-   treeWidgetName(title);
+   QString wdgname, director;
+   treeWidgetName(wdgname);
    m_console->getDirResName(director);
-   title += " of Director ";
-   title += director;
+   QString title = tr("%1 of Director %2").arg(wdgname).arg(director);
    setWindowTitle(title);
 }
 
@@ -269,13 +303,12 @@ void Pages::setCurrent()
 void Pages::setContextMenuDockText()
 {
    QTreeWidgetItem *item = mainWin->getFromHash(this);
-   QString docktext("");
+   QString docktext;
    if (isDocked()) {
-       docktext += "UnDock ";
+      docktext = tr("UnDock %1 Window").arg(item->text(0));
    } else {
-       docktext += "ReDock ";
+      docktext = tr("ReDock %1 Window").arg(item->text(0));
    }
-   docktext += item->text(0) += " Window";
       
    mainWin->actionToggleDock->setText(docktext);
    setTreeWidgetItemDockColor();
@@ -289,7 +322,7 @@ void Pages::setTreeWidgetItemDockColor()
 {
    QTreeWidgetItem* item = mainWin->getFromHash(this);
    if (item) {
-      if (item->text(0) != "Console") {
+      if (item->text(0) != tr("Console")) {
          if (isDocked()) {
          /* Set the brush to blue if undocked */
             QBrush blackBrush(Qt::black);