Change the icon on the graph button in joblist.

Get new client status window to show up in the page selector as a child of the
client window.

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

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 2727005b6cfce822f4f7c425a1f8872faf0f2acd..9e39ab9ecce31e3c804d80fb8fbf5592bcdd3323 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -281,5 +281,6 @@ void Clients::prune()
  */
 void Clients::statusClientWindow()
 {
-   new ClientStat(m_currentlyselected);
+   QTreeWidgetItem *parentItem = mainWin->getFromHash(this);
+   new ClientStat(m_currentlyselected, parentItem);
 }

diff --git a/bacula/src/qt-console/joblist/joblist.ui b/bacula/src/qt-console/joblist/joblist.ui
index d283bc9ef49e20742860f7823ac3629c2f76862c..ef1899244cd766e64b48e883c69a1daad8f9412e 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.ui
+++ b/bacula/src/qt-console/joblist/joblist.ui
@@ -44,18 +44,42 @@
     <enum>QFrame::Raised</enum>
    </property>
    <layout class="QGridLayout" >
-    <property name="margin" >
+    <property name="leftMargin" >
      <number>9</number>
     </property>
-    <property name="spacing" >
+    <property name="topMargin" >
+     <number>9</number>
+    </property>
+    <property name="rightMargin" >
+     <number>9</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>9</number>
+    </property>
+    <property name="horizontalSpacing" >
+     <number>6</number>
+    </property>
+    <property name="verticalSpacing" >
      <number>6</number>
     </property>
     <item row="0" column="4" >
      <layout class="QGridLayout" >
-      <property name="margin" >
+      <property name="leftMargin" >
        <number>0</number>
       </property>
-      <property name="spacing" >
+      <property name="topMargin" >
+       <number>0</number>
+      </property>
+      <property name="rightMargin" >
+       <number>0</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>0</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
        <number>6</number>
       </property>
       <item row="1" column="1" >
@@ -76,10 +100,22 @@
       </item>
       <item row="1" column="0" >
        <layout class="QGridLayout" >
-        <property name="margin" >
+        <property name="leftMargin" >
          <number>3</number>
         </property>
-        <property name="spacing" >
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>3</number>
+        </property>
+        <property name="verticalSpacing" >
          <number>3</number>
         </property>
         <item row="0" column="0" >
@@ -98,7 +134,7 @@
            <string>Graph</string>
           </property>
           <property name="icon" >
-           <iconset resource="../main.qrc" >:/images/graph1.png</iconset>
+           <iconset resource="../main.qrc" >:/images/applications-graphics.png</iconset>
           </property>
          </widget>
         </item>
@@ -106,12 +142,21 @@
       </item>
       <item row="0" column="0" colspan="2" >
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="fileSetLabel" >
           <property name="maximumSize" >
@@ -134,20 +179,38 @@
     </item>
     <item row="0" column="3" >
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>3</number>
-      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
+      <property name="leftMargin" >
+       <number>3</number>
+      </property>
+      <property name="topMargin" >
+       <number>3</number>
+      </property>
+      <property name="rightMargin" >
+       <number>3</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>3</number>
+      </property>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="statusLabel" >
           <property name="text" >
@@ -162,12 +225,21 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="purgedLabel" >
           <property name="text" >
@@ -184,20 +256,38 @@
     </item>
     <item row="0" column="0" >
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>3</number>
-      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
+      <property name="leftMargin" >
+       <number>3</number>
+      </property>
+      <property name="topMargin" >
+       <number>3</number>
+      </property>
+      <property name="rightMargin" >
+       <number>3</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>3</number>
+      </property>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QCheckBox" name="limitCheckBox" >
           <property name="text" >
@@ -207,12 +297,12 @@
         </item>
         <item>
          <widget class="QSpinBox" name="limitSpinBox" >
-          <property name="maximum" >
-           <number>10000</number>
-          </property>
           <property name="minimum" >
            <number>1</number>
           </property>
+          <property name="maximum" >
+           <number>10000</number>
+          </property>
           <property name="singleStep" >
            <number>25</number>
           </property>
@@ -222,12 +312,21 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QCheckBox" name="daysCheckBox" >
           <property name="text" >
@@ -248,20 +347,38 @@
     </item>
     <item row="0" column="1" >
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>3</number>
-      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
+      <property name="leftMargin" >
+       <number>3</number>
+      </property>
+      <property name="topMargin" >
+       <number>3</number>
+      </property>
+      <property name="rightMargin" >
+       <number>3</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>3</number>
+      </property>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="clientsLabel" >
           <property name="text" >
@@ -276,12 +393,21 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="volumeLabel" >
           <property name="text" >
@@ -298,20 +424,38 @@
     </item>
     <item row="0" column="2" >
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>3</number>
-      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
+      <property name="leftMargin" >
+       <number>3</number>
+      </property>
+      <property name="topMargin" >
+       <number>3</number>
+      </property>
+      <property name="rightMargin" >
+       <number>3</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>3</number>
+      </property>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="jobLabel" >
           <property name="text" >
@@ -326,12 +470,21 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>3</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>3</number>
+        </property>
+        <property name="topMargin" >
+         <number>3</number>
+        </property>
+        <property name="rightMargin" >
+         <number>3</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="levelLabel" >
           <property name="text" >

diff --git a/bacula/src/qt-console/status/clientstat.cpp b/bacula/src/qt-console/status/clientstat.cpp
index 54e9aedb6e1926edce38de1b868c0a5ef1420af9..297691e89f192fa2f1f5c0ecbb93b60cda0671ea 100644 (file)
--- a/bacula/src/qt-console/status/clientstat.cpp
+++ b/bacula/src/qt-console/status/clientstat.cpp
@@ -45,13 +45,13 @@
 /*
  * Constructor for the class
  */
-ClientStat::ClientStat(QString &client)
+ClientStat::ClientStat(QString &client, QTreeWidgetItem *parentTreeWidgetItem)
 {
    m_client = client;
    setupUi(this);
-   m_name = tr("Director Status");
+   m_name = tr("Client Status");
    m_closeable = true;
-   pgInitialize();
+   pgInitialize(parentTreeWidgetItem);
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
    thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/status.png")));
    m_cursor = new QTextCursor(textEdit->document());
@@ -63,6 +63,7 @@ ClientStat::ClientStat(QString &client)
    m_timer->start(mainWin->m_refreshStatusDirInterval*1000);
 
    createConnections();
+   setCurrent();
 }
 
 void ClientStat::getFont()

diff --git a/bacula/src/qt-console/status/clientstat.h b/bacula/src/qt-console/status/clientstat.h
index a2ab3f13dc6e6ca34069ecfc256a55c4f94c37f8..b3896a7987d0f0ba80056df6450598aa3ecff1bf 100644 (file)
--- a/bacula/src/qt-console/status/clientstat.h
+++ b/bacula/src/qt-console/status/clientstat.h
@@ -43,7 +43,7 @@ class ClientStat : public Pages, public Ui::ClientStatForm
    Q_OBJECT 
 
 public:
-   ClientStat(QString&);
+   ClientStat(QString&, QTreeWidgetItem*);
    ~ClientStat();
    virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();