Update

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

diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile
index f7d9b78f1a8560297a95914d57898c2d57d05e2b..b7b1bbcf3da6fe131ec2b5e46c37afb034dc6a71 100644 (file)
--- 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 17:49:20 2007
+# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Jan 28 22:55:01 2007
 # Project:  bat.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile bat.pro

diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index 6451ea78e869798f448b0aadd527952ffd49443b..26895f12bc5592bd12f6cb401a6e54284ff6847f 100644 (file)
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -216,12 +216,6 @@
      <height>33</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuHelp" >
-    <property name="title" >
-     <string>&amp;Help</string>
-    </property>
-    <addaction name="actionAbout_bat" />
-   </widget>
    <widget class="QMenu" name="menuEdit" >
     <property name="title" >
      <string>&amp;Edit</string>
@@ -238,6 +232,12 @@
     <addaction name="actionSave" />
     <addaction name="actionQuit" />
    </widget>
+   <widget class="QMenu" name="menuHelp" >
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionAbout_bat" />
+   </widget>
    <addaction name="menuFile" />
    <addaction name="menuEdit" />
    <addaction name="menuHelp" />
@@ -285,6 +285,9 @@
    </property>
   </action>
   <action name="actionAbout_bat" >
+   <property name="icon" >
+    <iconset>images/bat.png</iconset>
+   </property>
    <property name="text" >
     <string>&amp;About bat</string>
    </property>

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index cee73289e44f7a606cdfb4daf85d6436eb9e6535..7df2cb222bedd156b39dc22df8ad6f39ecd48a8b 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -86,7 +86,7 @@ void MainWin::input_line()
 void MainWin::about()
 {
    QMessageBox::about(this, tr("About bat"),
-            tr("<h2>bat 0.1</h2>"
+            tr("<br><h2>bat 0.1</h2>"
             "<p>Copyright &copy; " BYEAR " Free Software Foundation Europe e.V."
             "<p>The <b>bat</b> is an administrative console"
                " interface to the Director."));