[Bacula-commits] SF.net SVN: bacula:[8897] trunk/bacula/src/qt-console

[<bar...@us...>]

Revision: 8897
          http://bacula.svn.sourceforge.net/bacula/?rev=8897&view=rev
Author:   bartleyd2
Date:     2009-06-13 15:30:42 +0000 (Sat, 13 Jun 2009)

Log Message:
-----------
Add feature in pages to have a console command that does not set the console
current.   Then also use that feature in joblist to purge or delete a job.

Modified Paths:
--------------
    trunk/bacula/src/qt-console/joblist/joblist.cpp
    trunk/bacula/src/qt-console/pages.cpp
    trunk/bacula/src/qt-console/pages.h

Modified: trunk/bacula/src/qt-console/joblist/joblist.cpp
===================================================================
--- trunk/bacula/src/qt-console/joblist/joblist.cpp	2009-06-13 14:55:28 UTC (rev 8896)
+++ trunk/bacula/src/qt-console/joblist/joblist.cpp	2009-06-13 15:30:42 UTC (rev 8897)
@@ -486,7 +486,8 @@
 
    QString cmd("delete job jobid=");
    cmd += m_selectedJobs;
-   consoleCommand(cmd);
+   consoleCommand(cmd, false);
+   populateTable();
 }
 void JobList::consolePurgeFiles()
 {
@@ -505,8 +506,9 @@
    foreach(QString job, m_selectedJobsList) {
       QString cmd("purge files jobid=");
       cmd += job;
-      consoleCommand(cmd);
+      consoleCommand(cmd, false);
    }
+   populateTable();
 }
 
 /*

Modified: trunk/bacula/src/qt-console/pages.cpp
===================================================================
--- trunk/bacula/src/qt-console/pages.cpp	2009-06-13 14:55:28 UTC (rev 8896)
+++ trunk/bacula/src/qt-console/pages.cpp	2009-06-13 15:30:42 UTC (rev 8897)
@@ -230,6 +230,10 @@
  */
 void Pages::consoleCommand(QString &command)
 {
+   consoleCommand(command, true);
+}
+void Pages::consoleCommand(QString &command, bool setCurrent)
+{
    int conn;
    bool donotify = false;
    if (m_console->availableDirComm(conn))  {
@@ -237,14 +241,18 @@
          donotify = true;
          m_console->notify(conn, false);
       }
-      consoleCommand(command, conn);
+      consoleCommand(command, conn, setCurrent);
       if (donotify) { m_console->notify(conn, true); }
    }
 }
 void Pages::consoleCommand(QString &command, int conn)
 {
+   consoleCommand(command, conn, true);
+}
+void Pages::consoleCommand(QString &command, int conn, bool setCurrent)
+{
    /* Bring this director's console to the front of the stack */
-   setConsoleCurrent();
+   if (setCurrent) { setConsoleCurrent(); }
    QString displayhtml("<font color=\"blue\">");
    displayhtml += command + "</font>\n";
    m_console->display_html(displayhtml);

Modified: trunk/bacula/src/qt-console/pages.h
===================================================================
--- trunk/bacula/src/qt-console/pages.h	2009-06-13 14:55:28 UTC (rev 8896)
+++ trunk/bacula/src/qt-console/pages.h	2009-06-13 15:30:42 UTC (rev 8897)
@@ -71,6 +71,8 @@
    void setTreeWidgetItemDockColor();
    void consoleCommand(QString &);
    void consoleCommand(QString &, int conn);
+   void consoleCommand(QString &, bool setCurrent);
+   void consoleCommand(QString &, int conn, bool setCurrent);
    QString &name() { return m_name; };
    void getVolumeList(QStringList &);
    void getStatusList(QStringList &);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.