From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 16 Feb 2013 18:11:54 +0000 (+0100)
Subject: Fix text input in bat. Fixe bug #1965
X-Git-Tag: Release-7.0.0~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=601fc2b152d151717dcb09e9d122bd155c41b0a1;p=bacula%2Fbacula

Fix text input in bat. Fixe bug #1965
---

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 94ddd6d105..b2261f9508 100644
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -371,7 +371,8 @@ int DirComm::read()
       case BNET_TEXT_INPUT:
          if (mainWin->m_commDebug) Pmsg4(000, "conn %i TEXT_INPUT at_prompt=%d  m_in_select=%d notify=%d\n", 
                m_conn, m_at_prompt, m_in_select, is_notify_enabled());
-         if (!m_in_select && is_notify_enabled()) {
+         //if (!m_in_select && is_notify_enabled()) {
+         if (!m_in_select) {
             mainWin->waitExit();
             new textInputDialog(m_console, m_conn);
          } else {
diff --git a/bacula/src/qt-console/select/textinput.ui b/bacula/src/qt-console/select/textinput.ui
index a72fc8a201..4991b8f2cd 100644
--- a/bacula/src/qt-console/select/textinput.ui
+++ b/bacula/src/qt-console/select/textinput.ui
@@ -10,47 +10,89 @@
     <x>0</x>
     <y>0</y>
     <width>430</width>
-    <height>132</height>
+    <height>96</height>
    </rect>
   </property>
+  <property name="focusPolicy">
+   <enum>Qt::StrongFocus</enum>
+  </property>
   <property name="windowTitle">
-   <string>Selection dialog</string>
+   <string>Text input dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelWidget">
-     <property name="text">
-      <string/>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="lineEdit">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>50</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>100</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="label">
+   <item row="0" column="0">
+    <widget class="QLabel" name="labelWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
-      <string>TextLabel</string>
+      <string>Message</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="lineEdit"/>
-   </item>
-   <item row="3" column="1">
+   <item row="2" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>5</number>
+     </property>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>40</width>
-         <height>20</height>
+         <width>26</width>
+         <height>9</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>38</height>
+        </size>
+       </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>