From 307430dbce3f9c3996ff2ac9b6f1a13657033a69 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 16 Jul 2009 21:18:53 +0000
Subject: [PATCH] tweak bat screens

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@9041 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/qt-console/clients/clients.cpp   |  4 ----
 bacula/src/qt-console/clients/clients.ui    | 26 ++++++++-------------
 bacula/src/qt-console/status/clientstat.cpp |  4 ++--
 bacula/src/qt-console/status/clientstat.ui  |  2 +-
 bacula/technotes                            |  1 +
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 93adf9ed01..df56522fb2 100644
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -208,7 +208,6 @@ void Clients::tableItemChanged(QTableWidgetItem *currentwidgetitem, QTableWidget
       /* The Previous item */
       if (previouswidgetitem) { /* avoid a segfault if first time */
          tableWidget->removeAction(actionListJobsofClient);
-         tableWidget->removeAction(actionStatusClientInConsole);
          tableWidget->removeAction(actionStatusClientWindow);
          tableWidget->removeAction(actionPurgeJobs);
          tableWidget->removeAction(actionPrune);
@@ -218,7 +217,6 @@ void Clients::tableItemChanged(QTableWidgetItem *currentwidgetitem, QTableWidget
          /* set a hold variable to the client name in case the context sensitive
           * menu is used */
          tableWidget->addAction(actionListJobsofClient);
-         tableWidget->addAction(actionStatusClientInConsole);
          tableWidget->addAction(actionStatusClientWindow);
          tableWidget->addAction(actionPurgeJobs);
          tableWidget->addAction(actionPrune);
@@ -245,8 +243,6 @@ void Clients::createContextMenu()
                 SLOT(populateTable()));
    connect(actionListJobsofClient, SIGNAL(triggered()), this,
                 SLOT(showJobs()));
-   connect(actionStatusClientInConsole, SIGNAL(triggered()), this,
-                SLOT(consoleStatusClient()));
    connect(actionStatusClientWindow, SIGNAL(triggered()), this,
                 SLOT(statusClientWindow()));
    connect(actionPurgeJobs, SIGNAL(triggered()), this,
diff --git a/bacula/src/qt-console/clients/clients.ui b/bacula/src/qt-console/clients/clients.ui
index 8f65323d66..c62149b84e 100644
--- a/bacula/src/qt-console/clients/clients.ui
+++ b/bacula/src/qt-console/clients/clients.ui
@@ -19,7 +19,8 @@
   </layout>
   <action name="actionRefreshClients" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
+    <iconset resource="../main.qrc" >
+     <normaloff>:/images/view-refresh.png</normaloff>:/images/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Client List</string>
@@ -30,7 +31,8 @@
   </action>
   <action name="actionListJobsofClient" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/emblem-system.png</iconset>
+    <iconset resource="../main.qrc" >
+     <normaloff>:/images/emblem-system.png</normaloff>:/images/emblem-system.png</iconset>
    </property>
    <property name="text" >
     <string>List Jobs of Client</string>
@@ -39,20 +41,10 @@
     <string>Open a joblist page selecting this client.</string>
    </property>
   </action>
-  <action name="actionStatusClientInConsole" >
-   <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/status-console.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Status Client In Console</string>
-   </property>
-   <property name="statusTip" >
-    <string>Execute status client in console.</string>
-   </property>
-  </action>
   <action name="actionPurgeJobs" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/weather-severe-alert.png</iconset>
+    <iconset resource="../main.qrc" >
+     <normaloff>:/images/weather-severe-alert.png</normaloff>:/images/weather-severe-alert.png</iconset>
    </property>
    <property name="text" >
     <string>Purge Jobs</string>
@@ -63,7 +55,8 @@
   </action>
   <action name="actionPrune" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/edit-cut.png</iconset>
+    <iconset resource="../main.qrc" >
+     <normaloff>:/images/edit-cut.png</normaloff>:/images/edit-cut.png</iconset>
    </property>
    <property name="text" >
     <string>Prune Jobs</string>
@@ -74,7 +67,8 @@
   </action>
   <action name="actionStatusClientWindow" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/status.png</iconset>
+    <iconset resource="../main.qrc" >
+     <normaloff>:/images/status.png</normaloff>:/images/status.png</iconset>
    </property>
    <property name="text" >
     <string>Status Client Window</string>
diff --git a/bacula/src/qt-console/status/clientstat.cpp b/bacula/src/qt-console/status/clientstat.cpp
index a193e777ca..9260c785d6 100644
--- a/bacula/src/qt-console/status/clientstat.cpp
+++ b/bacula/src/qt-console/status/clientstat.cpp
@@ -111,9 +111,9 @@ void ClientStat::timerTriggered()
 void ClientStat::populateCurrentTab(int index)
 {
    if (index == 0)
-      populateHeader();
-   if (index == 1)
       populateRunning();
+   if (index == 1)
+      populateHeader();
 }
 
 /*
diff --git a/bacula/src/qt-console/status/clientstat.ui b/bacula/src/qt-console/status/clientstat.ui
index 9862c58e65..f425965f3c 100644
--- a/bacula/src/qt-console/status/clientstat.ui
+++ b/bacula/src/qt-console/status/clientstat.ui
@@ -165,7 +165,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="layoutWidget" >
+     <widget class="QWidget" name="layoutWidget1" >
       <layout class="QGridLayout" >
        <item row="0" column="0" >
         <widget class="QLabel" name="terminatedLabel" >
diff --git a/bacula/technotes b/bacula/technotes
index def296bb49..39df901193 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,6 +3,7 @@
 General:
 
 16Jul09
+ebl  tweak some bat screens
 ebl  Replace info_msg by send_msg in status slots command.
 ebl  Fix #1323 about a problem when mounting a requested volume
      during a restore.
-- 
2.39.5