Auto select console tree widget of current console when a command is entered in the

console command line entry LineEdit box.
Display and dress up the context sensitive command when a popup menu is pressed
causing a console command to be entered.  I'd almost prefer to see if there is a
way to have the command entered be BOLD or something to bring it out.

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

diff --git a/bacula/src/qt-console/TODO b/bacula/src/qt-console/TODO
index 5aa5cb6399cc26df60a4b0e0cfd9ba3f3c6024fd..7939e9170292750ba15a8b2dc1508f8cd0c74874 100644 (file)
--- a/bacula/src/qt-console/TODO
+++ b/bacula/src/qt-console/TODO
@@ -51,6 +51,11 @@ global one defined in the mainWin class (if I remember right).
 ============================================================
 DONE:
 ============================================================
+If the console command line entry docked widget gets the focus, make 
+m_currentConsole the top widget by setting the treewidgetitem selected.
+Did this in MainWin::input_line almost better to let the person see
+whatever they want until they hit enter.
+
 Set Window titles to reflect what director it is.
 
 Must:: get page selector to follow undocked windows.  Otherwise

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index c4089d57c4541fdf56ff4522841e9fa2430d6f03..c78cd37635b09d294290c65180e80be974d70f28 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -204,7 +204,7 @@ void Clients::showJobs()
 void Clients::consoleStatusClient()
 {
    QString cmd("status client=");
-   cmd += m_currentlyselected += "\n";
+   cmd += m_currentlyselected;
    consoleCommand(cmd);
 }
 

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index eb2337ed42fb475ba170841d5ded0ba77045a2b6..395d0bd6fa62a0fd4b6dd5d0ef980cc88980b52a 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -189,7 +189,7 @@ void FileSet::createContextMenu()
 void FileSet::consoleStatusFileSet()
 {
    QString cmd("status fileset=");
-   cmd += m_currentlyselected += "\n";
+   cmd += m_currentlyselected;
    consoleCommand(cmd);
 //   m_console->write_dir(cmd.toUtf8().data());
 //   m_console->displayToPrompt();

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 300510d90ca68268228a89054780db3baab1df0d..0f94ba6e7998a9bd5d4d4b025db4109fcea4586d 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -453,6 +453,9 @@ void MainWin::input_line()
    }
    m_cmd_history.append(cmdStr);
    m_cmd_last = -1;
+   if (treeWidget->currentItem() != getFromHash(m_currentConsole)){
+      treeWidget->setCurrentItem(getFromHash(m_currentConsole));
+   }
 }
 
 

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index 907e551498a9d31fe8a9daad85740defdb4b4426..1ef945f8923601b34e416230d37c83df495db724 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -213,6 +213,10 @@ void Pages::treeWidgetName(QString &name)
  */
 void Pages::consoleCommand(QString &command)
 {
+   m_console->display_text("Context sensitive command :\n\n");
+   m_console->display_text("****    ");
+   m_console->display_text(command + "    ****\n");
+   m_console->display_text("Director Response :\n\n");
    m_console->write_dir(command.toUtf8().data());
    m_console->displayToPrompt();
    /* Bring this directors console to the front of the stack */

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 2001bcad08f57b1fc5e98d99a0db1b5dcce6d043..8a8f7f06c067019a7b669c4462348d122a2ed950 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -189,7 +189,7 @@ void Storage::createContextMenu()
 void Storage::consoleStatusStorage()
 {
    QString cmd("status storage=");
-   cmd += m_currentlyselected += "\n";
+   cmd += m_currentlyselected;
    consoleCommand(cmd);
 //   m_console->write_dir(cmd.toUtf8().data());
 //   m_console->displayToPrompt();