xPut debug code on test + fix focus on Volume in label dialog box

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 81fce7c02c75e89a684cce319c0567c9e966ff33..dad9a32d913439d2446379fbd841592c1cb489dd 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -614,7 +614,7 @@ void Console::beginNewCommand(int conn)
    for (int i=0; i < 3; i++) {
       dircomm->write(".");
       while (dircomm->read() > 0) {
-         Pmsg2(000, "begin new command loop %i %s\n", i, m_dir->name());
+         if (mainWin->m_commDebug) Pmsg2(000, "begin new command loop %i %s\n", i, m_dir->name());
          if (mainWin->m_displayAll) display_text(dircomm->msg());
       }
       if (dircomm->m_at_main_prompt) {

diff --git a/bacula/src/qt-console/label/label.ui b/bacula/src/qt-console/label/label.ui
index c0fe5741ce1057ed9760e3e01859320c20b1635e..49db6e4c78c32f78e1bdba8f81baa14fbe3fb18e 100644 (file)
--- a/bacula/src/qt-console/label/label.ui
+++ b/bacula/src/qt-console/label/label.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>labelForm</class>
- <widget class="QWidget" name="labelForm" >
-  <property name="geometry" >
+ <widget class="QWidget" name="labelForm">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,25 +10,28 @@
     <height>357</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="focusPolicy">
+   <enum>Qt::NoFocus</enum>
+  </property>
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="0" column="1" >
+   <item row="0" column="1">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>421</width>
        <height>48</height>
@@ -35,15 +39,15 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="1" >
+   <item row="2" column="1">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>431</width>
        <height>48</height>
@@ -51,28 +55,28 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="1" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
+   <item row="1" column="1">
+    <layout class="QGridLayout">
+     <property name="margin">
       <number>0</number>
      </property>
-     <property name="spacing" >
+     <property name="spacing">
       <number>6</number>
      </property>
-     <item row="5" column="0" colspan="2" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
+     <item row="5" column="0" colspan="2">
+      <layout class="QHBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
@@ -81,106 +85,115 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="okButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="okButton">
+         <property name="text">
           <string>OK</string>
          </property>
+         <property name="default">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="cancelButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="cancelButton">
+         <property name="text">
           <string>Cancel</string>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="label_5" >
-       <property name="text" >
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
         <string>Volume Name:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>volumeName</cstring>
        </property>
       </widget>
      </item>
-     <item row="2" column="1" >
-      <widget class="QComboBox" name="poolCombo" />
+     <item row="2" column="1">
+      <widget class="QComboBox" name="poolCombo"/>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>Storage:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>storageCombo</cstring>
        </property>
       </widget>
      </item>
-     <item row="3" column="1" >
-      <widget class="QLineEdit" name="volumeName" >
-       <property name="minimumSize" >
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="volumeName">
+       <property name="minimumSize">
         <size>
          <width>200</width>
          <height>0</height>
         </size>
        </property>
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+       <property name="whatsThis">
+        <string>Enter Name of Volume to create</string>
+       </property>
       </widget>
      </item>
-     <item row="4" column="1" >
-      <widget class="QSpinBox" name="slotSpin" >
-       <property name="maximum" >
+     <item row="4" column="1">
+      <widget class="QSpinBox" name="slotSpin">
+       <property name="maximum">
         <number>10000</number>
        </property>
       </widget>
      </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="label_4" >
-       <property name="text" >
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
         <string>Slot:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>slotSpin</cstring>
        </property>
       </widget>
      </item>
-     <item rowspan="6" row="0" column="2" >
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
+     <item row="0" column="2" rowspan="6">
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QLabel" name="label_6" >
-         <property name="text" >
+        <widget class="QLabel" name="label_6">
+         <property name="text">
           <string>Execute Automount</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="automountOnButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="automountOnButton">
+         <property name="text">
           <string>On</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="automountOffButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="automountOffButton">
+         <property name="text">
           <string>Off</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>61</height>
@@ -190,33 +203,33 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="1" >
-      <widget class="QComboBox" name="storageCombo" />
+     <item row="1" column="1">
+      <widget class="QComboBox" name="storageCombo"/>
      </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
         <string>Pool:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>poolCombo</cstring>
        </property>
       </widget>
      </item>
-     <item row="0" column="0" colspan="2" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
+     <item row="0" column="0" colspan="2">
+      <layout class="QHBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>71</width>
            <height>21</height>
@@ -225,27 +238,27 @@
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="label" >
-         <property name="maximumSize" >
+        <widget class="QLabel" name="label">
+         <property name="maximumSize">
           <size>
            <width>16777215</width>
            <height>30</height>
           </size>
          </property>
-         <property name="text" >
-          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:12pt; font-weight:600;">Label a Volume&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Label a Volume&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>81</width>
            <height>20</height>
@@ -257,12 +270,12 @@ p, li { white-space: pre-wrap; }
      </item>
     </layout>
    </item>
-   <item row="1" column="2" >
+   <item row="1" column="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>131</height>
@@ -270,12 +283,12 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" >
+   <item row="1" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>121</height>