From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 28 Jan 2007 16:59:39 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~6988
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=94ab27878618324de73cc26d78de2194c149d1ee;p=bacula%2Fbacula

Update


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

diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile
index e59111f8c6..f7d9b78f1a 100644
--- a/bacula/src/qt-console/Makefile
+++ b/bacula/src/qt-console/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: bat
-# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Jan 28 16:40:37 2007
+# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Jan 28 17:49:20 2007
 # Project:  bat.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile bat.pro
@@ -192,11 +192,17 @@ compiler_rcc_clean:
 qrc_main.cpp: main.qrc \
 		/usr/bin/rcc \
 		images/new.png \
+		images/label.png \
+		images/server.png \
+		images/restore.png \
 		images/copy.png \
 		images/cut.png \
+		images/connect.png \
+		images/big-server.png \
 		images/save.png \
 		images/bat.png \
 		images/paste.png \
+		images/run.png \
 		images/open.png
 	/usr/bin/rcc -name main main.qrc -o qrc_main.cpp
 
diff --git a/bacula/src/qt-console/bat_conf.h b/bacula/src/qt-console/bat_conf.h
index ec4c9431b9..5a583d465f 100644
--- a/bacula/src/qt-console/bat_conf.h
+++ b/bacula/src/qt-console/bat_conf.h
@@ -74,8 +74,13 @@ struct DIRRES {
    char *tls_keyfile;                 /* TLS Client Key File */
 
    TLS_CONTEXT *tls_ctx;              /* Shared TLS Context */
+
+   /* Methods */
+   char *name() const;
 };
 
+inline char *DIRRES::name() const { return hdr.name; }
+
 struct CONFONTRES {
    RES   hdr;
    char *fontface;                    /* Console Font specification */
diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 46fff3c01e..eeff11fc95 100644
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -43,12 +43,17 @@ Console::Console()
 
    m_textEdit = mainWin->textEdit;   /* our console screen */
 
+   /* Just take the first Director */
+   LockRes();
+   m_dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL);
+   UnlockRes();
+
    /* Dummy setup of treeWidget */
    treeWidget->clear();
    treeWidget->setColumnCount(1);
    treeWidget->setHeaderLabel("Selection");
    topItem = new QTreeWidgetItem(treeWidget);
-   topItem->setText(0, "Rufus");
+   topItem->setText(0, m_dir->name());
    item = new QTreeWidgetItem(topItem);
    item->setText(0, "Console");
    item->setText(1, "0");
@@ -68,10 +73,6 @@ bool Console::connect()
 
    m_textEdit = mainWin->textEdit;   /* our console screen */
 
-   /* Just take the first Director */
-   LockRes();
-   m_dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL);
-   UnlockRes();
 
    if (!m_dir) {
       return false;
diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index 180c51f1f6..a071dfc00b 100644
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -256,8 +256,11 @@
    <attribute name="toolBarArea" >
     <number>4</number>
    </attribute>
+   <addaction name="actionConnect" />
    <addaction name="actionSave" />
    <addaction name="actionPrint" />
+   <addaction name="actionLabel" />
+   <addaction name="actionRestore" />
   </widget>
   <action name="actionExit" >
    <property name="text" >
@@ -325,6 +328,30 @@
     <string>Save</string>
    </property>
   </action>
+  <action name="actionConnect" >
+   <property name="icon" >
+    <iconset>images/connect.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Connect</string>
+   </property>
+  </action>
+  <action name="actionLabel" >
+   <property name="icon" >
+    <iconset>images/label.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Label</string>
+   </property>
+  </action>
+  <action name="actionRestore" >
+   <property name="icon" >
+    <iconset>images/restore.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Restore</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="main.qrc" />