Fix incorrectly setting first item to console of top director.

Add feature to identify the active director "console" to be grey background if
inactive and magenta background if active.  Pick your colors, it could even be
user configurable when we get there.  I just chose magenta and grey as an
example of what looked good in short time.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4586 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/TODO b/bacula/src/qt-console/TODO
index 53005ff0d125e7924e3e6b64ac5fa16f82b32776..b1d4485cc859a47fad4edfd6a51e46654f75f9ee 100644 (file)
--- a/bacula/src/qt-console/TODO
+++ b/bacula/src/qt-console/TODO
@@ -37,15 +37,10 @@ Font is being set on a per console basis, should it be.
 Tried to get the settings to write for a second, but not coming up next time
 
 ========================================================
+Things to do:
 
 - Possibly some other things I didn't think of.
 
-- I think we need to make the current Director more explicit, by
-perhaps highlighting it in the page selector when it is current
-and unhighlighting it when it is not (we could use color as we do
-for the console, though some color blind people may have
-problems.
-
 Another idea for what you have implemented:
 - I think that the dynamic pages that you create on the fly
 should be nested under the item that creates them more like a
@@ -83,7 +78,13 @@ global one defined in the mainWin class (if I remember right).
 ============================================================
 DONE:
 ============================================================
-Things to do:
+
+- I think we need to make the current Director more explicit, by
+perhaps highlighting it in the page selector when it is current
+and unhighlighting it when it is not (we could use color as we do
+for the console, though some color blind people may have
+problems.
+
 - When any director is clicked, we need to set it as the current
 director and set the current console as well.
 

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 56b62a112689d05e047a8d15d5de601d29b3e8dd..4012429b1bd839a969c55bbdb05a2e6c3e2da0ff 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -58,22 +58,20 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent)
 
    readSettings();
 
-   bool first = true;
    foreach(Console *console, m_consoleHash){
       console->connect();
-      if (first) {
-         m_currentConsole = console;
-         treeWidget->setCurrentItem(getFromHash(console));
-         first = false;
-      }
    }
+   m_currentConsole = (Console*)getFromHash(m_firstItem);
+   treeWidget->setCurrentItem(getFromHash(m_currentConsole));
+   DIRRES* dirres = m_currentConsole->getDirRes();
+   printf("Setting initial window to %s\n", dirres->name());
 }
 
 void MainWin::createPages()
 {
    DIRRES *dir;
-   QTreeWidgetItem *item, *topItem, *firstItem;
-   firstItem = NULL;
+   QTreeWidgetItem *item, *topItem;
+   m_firstItem = NULL;
 
    LockRes();
    foreach_res(dir, R_DIRECTOR) {
@@ -86,14 +84,15 @@ void MainWin::createPages()
       /* The top tree item representing the director */
       topItem = createTopPage(dir->name());
       topItem->setIcon(0, QIcon(QString::fromUtf8("images/server.png")));
+      /* Set background to grey for ease of identification of inactive dirfector */
+      QBrush greyBrush(Qt::lightGray);
+      topItem->setBackground(0, greyBrush);
       m_currentConsole->setDirectorTreeItem(topItem);
       m_consoleHash.insert(topItem, m_currentConsole);
 
       /* Create Tree Widget Item */
       item = createPage("Console", topItem);
-      if (!firstItem){
-         firstItem = item;
-      }
+      if (!m_firstItem){ m_firstItem = item; }
 
       /* insert the cosole and tree widget item into the hashes */
       hashInsert(item, m_currentConsole);
@@ -304,71 +303,98 @@ void MainWin::treeItemClicked(QTreeWidgetItem *item, int /*column*/)
  */
 void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *previousitem)
 {
-   Pages* page;
-   Console* console;
+   Pages *previousPage, *nextPage;
+   Console *previousConsole, *nextConsole;
+
+   /* first determine the next item */
+
+   /* knowing the treeWidgetItem, get the page from the hash */
+   nextPage = getFromHash(currentitem);
+   nextConsole = m_consoleHash.value(currentitem);
+   /* Is this a page that has been inserted into the hash  */
+   if (nextPage) {
+      nextConsole = nextPage->console();
+      /* then is it a treeWidgetItem representing a director */
+   } else if (nextConsole) {
+      /* let the next page BE the console */
+      nextPage = nextConsole;
+   } else {
+      printf("Should never get here\n");
+      nextPage = NULL;
+      nextConsole = NULL;
+   }
+          
    /* The Previous item */
 
+   /* this condition prevents a segfault.  The first time there is no previousitem*/
    if (previousitem) {
       /* knowing the treeWidgetItem, get the page from the hash */
-      page = getFromHash(previousitem);
-      console = m_consoleHash.value(previousitem);
-      if (page) {
-         console = page->console();
-      } else if (console) {
-         page = console;
+      previousPage = getFromHash(previousitem);
+      previousConsole = m_consoleHash.value(previousitem);
+      if (previousPage) {
+         previousConsole = previousPage->console();
+      } else if (previousConsole) {
+         previousPage = previousConsole;
       }
-      /* make connections to the current console */
-      disconnect(actionConnect, SIGNAL(triggered()), console, SLOT(connect()));
-      disconnect(actionStatusDir, SIGNAL(triggered()), console, SLOT(status_dir()));
-      disconnect(actionSelectFont, SIGNAL(triggered()), console, SLOT(set_font()));
-      /* 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 (page) {
-         foreach(QAction* pageaction, page->m_contextActions) {
-            treeWidget->removeAction(pageaction);
+      if ((previousPage) || (previousConsole)) {
+         if (nextConsole != previousConsole) {
+            /* remove connections to the current console */
+            disconnect(actionConnect, SIGNAL(triggered()), previousConsole, SLOT(connect()));
+            disconnect(actionStatusDir, SIGNAL(triggered()), previousConsole, SLOT(status_dir()));
+            disconnect(actionSelectFont, SIGNAL(triggered()), previousConsole, SLOT(set_font()));
+            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);
+            }
          } 
       }
    }
 
-   /* knowing the treeWidgetItem, get the page from the hash */
-   page = getFromHash(currentitem);
-   console = m_consoleHash.value(currentitem);
-   /* Is this a page that has been inserted into the hash  */
-   if (page) {
-      m_currentConsole = page->console();
-   } else if (console) {
-      m_currentConsole = console;
-      page = console;
-   }
-   if ((page) || (console)) {
-      /* make connections to the current console */
-      connect(actionConnect, SIGNAL(triggered()), m_currentConsole, SLOT(connect()));
-      connect(actionSelectFont, SIGNAL(triggered()), m_currentConsole, SLOT(set_font()));
-      connect(actionStatusDir, SIGNAL(triggered()), m_currentConsole, SLOT(status_dir()));
+   /* now process the next item */
+   
+   if ((nextPage) || (nextConsole)) {
+      if (nextConsole != previousConsole) {
+         /* make connections to the current console */
+         m_currentConsole = nextConsole;
+         connect(actionConnect, SIGNAL(triggered()), m_currentConsole, SLOT(connect()));
+         connect(actionSelectFont, SIGNAL(triggered()), m_currentConsole, SLOT(set_font()));
+         connect(actionStatusDir, SIGNAL(triggered()), m_currentConsole, SLOT(status_dir()));
+         /* 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(page);
+      int stackindex = stackedWidget->indexOf(nextPage);
    
-      /* Is this page currently on the stack */
+      /* 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);
       } else {
          /* it is undocked, raise it to the front */
-         page->raise();
+         nextPage->raise();
       }
-      setContextMenuDockText(page, currentitem);
+      /* for the page selectors menu action to dock or undock, set the text */
+      setContextMenuDockText(nextPage, currentitem);
 
       treeWidget->addAction(actionToggleDock);
       /* if this page is closeable, then add that action */
-      if (page->isCloseable()) {
+      if (nextPage->isCloseable()) {
          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*/
-      treeWidget->addActions(page->m_contextActions);
+      treeWidget->addActions(nextPage->m_contextActions);
    }
 }
 

diff --git a/bacula/src/qt-console/mainwin.h b/bacula/src/qt-console/mainwin.h
index 054e6be79f6104dbee2102939ca58802bc03eb63..130b5a516c49d72a845952a2958228a80c8ee256 100644 (file)
--- a/bacula/src/qt-console/mainwin.h
+++ b/bacula/src/qt-console/mainwin.h
@@ -111,6 +111,7 @@ private:
    Pages *m_pagespophold;
    QStringList m_cmd_history;
    int m_cmd_last;
+   QTreeWidgetItem *m_firstItem;
 };
 
 #endif /* _MAINWIN_H_ */