From 07ba1d04fbdc2c860015d0833a63be57d38193ae Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 29 Dec 2018 11:47:37 +0100
Subject: [PATCH] Fixup LocalLayout ui after [3847e0ef/lyxgit]

(cherry picked from commit a67c541d6b329ed2db6906904c1e1dbadc49aa0a)
---
 src/frontends/qt4/GuiDocument.cpp     |  10 +-
 src/frontends/qt4/ui/LocalLayoutUi.ui | 137 +++++++++++++++-----------
 2 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 07a067bcde..146d0abde7 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -632,8 +632,10 @@ void LocalLayout::hideConvert()
 
 void LocalLayout::textChanged()
 {
-	static const QString message =
-		qt_("Press button to check validity...");
+	// Flashy red bold text
+	static const QString ivpar("<p style=\"color: #c00000; font-weight: bold; text-align:left\">"
+				   "%1</p>");
+	static const QString message = ivpar.arg(qt_("Validation required!"));
 	string const layout =
 		fromqstr(locallayoutTE->document()->toPlainText().trimmed());
 
@@ -673,9 +675,9 @@ void LocalLayout::convertPressed() {
 
 void LocalLayout::validate() {
 	// Bold text
-	static const QString vpar("<p style=\"font-weight: bold;\">%1</p>");
+	static const QString vpar("<p style=\"font-weight: bold; text-align:left\">%1</p>");
 	// Flashy red bold text
-	static const QString ivpar("<p style=\"color: #c00000; font-weight: bold; \">"
+	static const QString ivpar("<p style=\"color: #c00000; font-weight: bold; text-align:left\">"
 	                           "%1</p>");
 	string const layout =
 		fromqstr(locallayoutTE->document()->toPlainText().trimmed());
diff --git a/src/frontends/qt4/ui/LocalLayoutUi.ui b/src/frontends/qt4/ui/LocalLayoutUi.ui
index 7202199ce6..8a942f5fb2 100644
--- a/src/frontends/qt4/ui/LocalLayoutUi.ui
+++ b/src/frontends/qt4/ui/LocalLayoutUi.ui
@@ -6,71 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>377</width>
-    <height>434</height>
+    <width>331</width>
+    <height>376</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="2">
-    <widget class="QLabel" name="convertLB">
-     <property name="contextMenuPolicy">
-      <enum>Qt::NoContextMenu</enum>
-     </property>
-     <property name="toolTip">
-      <string>Errors reported in terminal.</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QPushButton" name="convertPB">
-     <property name="text">
-      <string>Convert</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QLabel" name="validLB">
-     <property name="contextMenuPolicy">
-      <enum>Qt::NoContextMenu</enum>
-     </property>
-     <property name="toolTip">
-      <string>Errors reported in terminal.</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QPushButton" name="editPB">
-     <property name="text">
-      <string>Edit</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QPushButton" name="validatePB">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="text">
-      <string>&amp;Validate</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" rowspan="2" colspan="3">
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
     <widget class="QTextEdit" name="locallayoutTE">
      <property name="toolTip">
       <string>Document-specific layout information</string>
@@ -83,6 +27,79 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QPushButton" name="validatePB">
+       <property name="toolTip">
+        <string/>
+       </property>
+       <property name="text">
+        <string>&amp;Validate</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="validLB">
+       <property name="contextMenuPolicy">
+        <enum>Qt::NoContextMenu</enum>
+       </property>
+       <property name="toolTip">
+        <string>Errors reported in terminal.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="3">
+      <widget class="QPushButton" name="editPB">
+       <property name="text">
+        <string>Edit</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QPushButton" name="convertPB">
+       <property name="text">
+        <string>Convert</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="convertLB">
+       <property name="contextMenuPolicy">
+        <enum>Qt::NoContextMenu</enum>
+       </property>
+       <property name="toolTip">
+        <string>Errors reported in terminal.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <includes>
-- 
2.39.5