From 17e321d78966f34752f91c6cbcc997acdf22b665 Mon Sep 17 00:00:00 2001 From: Dirk H Bartley Date: Sun, 9 Mar 2008 17:10:35 +0000 Subject: [PATCH] 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 --- bacula/src/qt-console/clients/clients.cpp | 3 +- bacula/src/qt-console/joblist/joblist.ui | 251 ++++++++++++++++---- bacula/src/qt-console/status/clientstat.cpp | 7 +- bacula/src/qt-console/status/clientstat.h | 2 +- 4 files changed, 209 insertions(+), 54 deletions(-) diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp index 2727005b6c..9e39ab9ecc 100644 --- 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 d283bc9ef4..ef1899244c 100644 --- a/bacula/src/qt-console/joblist/joblist.ui +++ b/bacula/src/qt-console/joblist/joblist.ui @@ -44,18 +44,42 @@ QFrame::Raised - + 9 - + + 9 + + + 9 + + + 9 + + + 6 + + 6 - + 0 - + + 0 + + + 0 + + + 0 + + + 6 + + 6 @@ -76,10 +100,22 @@ - + 3 - + + 3 + + + 3 + + + 3 + + + 3 + + 3 @@ -98,7 +134,7 @@ Graph - :/images/graph1.png + :/images/applications-graphics.png @@ -106,12 +142,21 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -134,20 +179,38 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -162,12 +225,21 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -184,20 +256,38 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -207,12 +297,12 @@ - - 10000 - 1 + + 10000 + 25 @@ -222,12 +312,21 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -248,20 +347,38 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -276,12 +393,21 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -298,20 +424,38 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + @@ -326,12 +470,21 @@ - - 3 - 6 + + 3 + + + 3 + + + 3 + + + 3 + diff --git a/bacula/src/qt-console/status/clientstat.cpp b/bacula/src/qt-console/status/clientstat.cpp index 54e9aedb6e..297691e89f 100644 --- 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 a2ab3f13dc..b3896a7987 100644 --- 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(); -- 2.39.5