Hi all,

  Here's some minor bug fixes for bugs that I've come across.

  The first moves the Latex Argument option for tables into the column
property section in the dialog.  It got moved fairly recently by
accidently I think.

  The second fixes buddies in the same dialog (the connection between
the labels and the widgets.  Important for accelerator)

  The third fixes a null-pointer crash if a backend is missing when
viewing the source.

JohnFlux
From bf20c2c5db2284338489f003eb0e1b98d507dad4 Mon Sep 17 00:00:00 2001
From: John Tapsell <john.tapsell....@basyskom.com>
Date: Tue, 8 May 2012 21:51:32 +0100
Subject: [PATCH 1/3] Latex Argument is a column property, move it in the UI.  Also add WhatsThis help

---
 src/frontends/qt4/ui/TabularUi.ui |  499 +++++++++++++++++++++----------------
 1 files changed, 281 insertions(+), 218 deletions(-)

diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index 39c0922..b636912 100644
--- a/src/frontends/qt4/ui/TabularUi.ui
+++ b/src/frontends/qt4/ui/TabularUi.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>497</width>
-    <height>402</height>
+    <height>411</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -107,206 +107,6 @@
        <string>&amp;Table Settings</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_10">
-       <item row="0" column="0" colspan="2">
-        <widget class="QGroupBox" name="GroupBox12">
-         <property name="title">
-          <string>Column settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="hAlignLA">
-            <property name="text">
-             <string>&amp;Horizontal alignment:</string>
-            </property>
-            <property name="buddy">
-             <cstring>hAlignCO</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="hAlignCO">
-            <property name="toolTip">
-             <string>Horizontal alignment in column</string>
-            </property>
-            <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToContents</enum>
-            </property>
-            <item>
-             <property name="text">
-              <string>Justified</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Left</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Center</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Right</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>At Decimal Separator</string>
-             </property>
-            </item>
-           </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>4</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="3" colspan="2">
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLabel" name="decimalLA">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="text">
-               <string>&amp;Decimal separator:</string>
-              </property>
-              <property name="buddy">
-               <cstring>decimalPointED</cstring>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="decimalPointED">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="inputMask">
-               <string/>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="maxLength">
-               <number>32767</number>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="columnWidthLA">
-            <property name="text">
-             <string>&amp;Width:</string>
-            </property>
-            <property name="buddy">
-             <cstring>columnWidthED</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" colspan="3">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <item>
-             <widget class="QLineEdit" name="columnWidthED">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="toolTip">
-               <string>Fixed width of the column</string>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="LengthCombo" name="columnWidthUnitLC"/>
-            </item>
-           </layout>
-          </item>
-          <item row="1" column="4">
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>109</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="vAlignLA">
-            <property name="text">
-             <string>&amp;Vertical alignment in row:</string>
-            </property>
-            <property name="buddy">
-             <cstring>vAlignCO</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="vAlignCO">
-            <property name="toolTip">
-             <string>Specifies the vertical alignment of this cell in relation to the baseline of the row.</string>
-            </property>
-            <item>
-             <property name="text">
-              <string>Top</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Middle</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Bottom</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QCheckBox" name="multicolumnCB">
-            <property name="toolTip">
-             <string>Merge cells of different columns</string>
-            </property>
-            <property name="text">
-             <string>&amp;Multicolumn</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item row="1" column="0">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
@@ -561,21 +361,283 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="specialAlignmentLA">
-         <property name="text">
-          <string>LaTe&amp;X argument:</string>
-         </property>
-         <property name="buddy">
-          <cstring>specialAlignmentED</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="specialAlignmentED">
-         <property name="toolTip">
-          <string>Custom column format (LaTeX)</string>
+       <item row="0" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBox12">
+         <property name="title">
+          <string>Column settings</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="hAlignLA">
+            <property name="text">
+             <string>&amp;Horizontal alignment:</string>
+            </property>
+            <property name="buddy">
+             <cstring>hAlignCO</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="hAlignCO">
+            <property name="toolTip">
+             <string>Horizontal alignment in column</string>
+            </property>
+            <property name="sizeAdjustPolicy">
+             <enum>QComboBox::AdjustToContents</enum>
+            </property>
+            <item>
+             <property name="text">
+              <string>Justified</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Left</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Center</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Right</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>At Decimal Separator</string>
+             </property>
+            </item>
+           </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>4</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="3" colspan="2">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLabel" name="decimalLA">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="text">
+               <string>&amp;Decimal separator:</string>
+              </property>
+              <property name="buddy">
+               <cstring>decimalPointED</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="decimalPointED">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>20</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="inputMask">
+               <string/>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="maxLength">
+               <number>32767</number>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="columnWidthLA">
+            <property name="text">
+             <string>&amp;Width:</string>
+            </property>
+            <property name="buddy">
+             <cstring>columnWidthED</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" colspan="3">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLineEdit" name="columnWidthED">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="toolTip">
+               <string>Fixed width of the column</string>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="LengthCombo" name="columnWidthUnitLC"/>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="4">
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>109</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="vAlignLA">
+            <property name="text">
+             <string>&amp;Vertical alignment in row:</string>
+            </property>
+            <property name="buddy">
+             <cstring>vAlignCO</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="vAlignCO">
+            <property name="toolTip">
+             <string>Specifies the vertical alignment of this cell in relation to the baseline of the row.</string>
+            </property>
+            <item>
+             <property name="text">
+              <string>Top</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Middle</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Bottom</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="multicolumnCB">
+            <property name="toolTip">
+             <string>Merge cells of different columns</string>
+            </property>
+            <property name="text">
+             <string>&amp;Multicolumn</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="specialAlignmentLA">
+            <property name="text">
+             <string>LaTe&amp;X argument:</string>
+            </property>
+            <property name="buddy">
+             <cstring>specialAlignmentED</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="specialAlignmentED">
+            <property name="toolTip">
+             <string>Custom column format (LaTeX). See WhatsThis for more information.</string>
+            </property>
+            <property name="whatsThis">
+             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&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&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;&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;The string must contain one of the following:&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;
+&lt;tr&gt;
+&lt;td&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-family:'Courier New,courier';&quot;&gt;l&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&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;left-justified column&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td&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-family:'Courier New,courier';&quot;&gt;c&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&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;centered column&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td&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-family:'Courier New,courier';&quot;&gt;r&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&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;right-justified column&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td&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-family:'Courier New,courier';&quot;&gt;p{&lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-style:italic;&quot;&gt;width&lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;}&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&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;paragraph column with text vertically aligned at the top&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&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;By default, if the text in a column is too wide for the page, LaTeX won’t automatically wrap it. Using &lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;p{&lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-style:italic;&quot;&gt;width&lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;}&lt;/span&gt; you can define a special type of column which will wrap-around the text as in a normal paragraph. You can pass the width using any unit supported by LaTeX, such as pt and cm, or &lt;span style=&quot; font-style:italic;&quot;&gt;command lengths&lt;/span&gt;, such as &lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;\textwidth&lt;/span&gt;.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&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;Additionally it can contain, before or after the column type:&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;
+&lt;tr&gt;
+&lt;td&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-family:'Courier New,courier';&quot;&gt;|&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&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;vertical line&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td&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-family:'Courier New,courier';&quot;&gt;||&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&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;double vertical line&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td&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-family:'Courier New,courier';&quot;&gt;@{...}&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&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;column seperator&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&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;The column seperator is particularly useful.  It typically takes some text as its argument, and when appended to a column, it will automatically insert that text into each cell in that column before the actual data for that cell. This command kills the inter-column space and replaces it with whatever is between the curly braces. To add space, use &lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;@{\hspace{&lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-style:italic;&quot;&gt;width&lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;}}&lt;/span&gt;.  To remove the space entirely use &lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;@{}&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&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;Examples:&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&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;&amp;quot;r@{}&amp;quot;  - set text right aligned and kill the inter-column space.&lt;/p&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;&amp;quot;@{}l&amp;quot;  - set text left aligned and kill the inter-column space.  Typically these two are used together&lt;/p&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;&amp;quot;(r)&amp;quot;    -  draw every element in the column surrounded with brackets&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
       </layout>
@@ -1603,13 +1665,13 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>TabWidget</tabstop>
   <tabstop>hAlignCO</tabstop>
   <tabstop>decimalPointED</tabstop>
   <tabstop>columnWidthED</tabstop>
   <tabstop>columnWidthUnitLC</tabstop>
   <tabstop>vAlignCO</tabstop>
   <tabstop>multicolumnCB</tabstop>
+  <tabstop>specialAlignmentED</tabstop>
   <tabstop>multirowCB</tabstop>
   <tabstop>multirowOffsetED</tabstop>
   <tabstop>multirowOffsetUnitLC</tabstop>
@@ -1619,8 +1681,7 @@
   <tabstop>tabularWidthUnitLC</tabstop>
   <tabstop>TableAlignCO</tabstop>
   <tabstop>rotateTabularCB</tabstop>
-  <tabstop>specialAlignmentED</tabstop>
-  <tabstop>borderSetPB</tabstop>
+  <tabstop>rotateTabularAngleSB</tabstop>
   <tabstop>borderDefaultRB</tabstop>
   <tabstop>borderUnsetPB</tabstop>
   <tabstop>booktabsRB</tabstop>
@@ -1653,6 +1714,8 @@
   <tabstop>leftRB</tabstop>
   <tabstop>centerRB</tabstop>
   <tabstop>rightRB</tabstop>
+  <tabstop>borderSetPB</tabstop>
+  <tabstop>TabWidget</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>
-- 
1.7.4.1

From 16cba2fcf6dbed167dd0462ab0913c2440f1df8b Mon Sep 17 00:00:00 2001
From: John Tapsell <john.tapsell....@basyskom.com>
Date: Tue, 8 May 2012 21:56:59 +0100
Subject: [PATCH 2/3] TabularUi - Fix buddies

---
 src/frontends/qt4/ui/TabularUi.ui |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index b636912..97c7cf6 100644
--- a/src/frontends/qt4/ui/TabularUi.ui
+++ b/src/frontends/qt4/ui/TabularUi.ui
@@ -208,7 +208,7 @@
                <string>degrees</string>
               </property>
               <property name="buddy">
-               <cstring>tabularWidthED</cstring>
+               <cstring>rotateCellAngleSB</cstring>
               </property>
              </widget>
             </item>
@@ -261,7 +261,7 @@
              <string>Verti&amp;cal alignment:</string>
             </property>
             <property name="buddy">
-             <cstring>vAlignCO</cstring>
+             <cstring>TableAlignCO</cstring>
             </property>
            </widget>
           </item>
@@ -352,7 +352,7 @@
                <string>degrees</string>
               </property>
               <property name="buddy">
-               <cstring>tabularWidthED</cstring>
+               <cstring>rotateTabularAngleSB</cstring>
               </property>
              </widget>
             </item>
-- 
1.7.4.1

From 751ce075791d43a5440d905f80c6e57ca7bf4941 Mon Sep 17 00:00:00 2001
From: John Tapsell <john.tapsell....@basyskom.com>
Date: Tue, 8 May 2012 23:51:35 +0100
Subject: [PATCH 3/3] GuiViewSource - prevent null-pointer crash if backend format is not found

---
 src/frontends/qt4/GuiViewSource.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
index aeaf105..17ba47f 100644
--- a/src/frontends/qt4/GuiViewSource.cpp
+++ b/src/frontends/qt4/GuiViewSource.cpp
@@ -205,9 +205,10 @@ void ViewSourceWidget::updateDefaultFormat()
 	for (; it != en; ++it) {
 		string const format = *it;
 		Format const * fmt = formats.getFormat(format);
-		if (!fmt)
+		if (!fmt) {
 			LYXERR0("Can't find format for backend " << format << "!");
-		else if (fmt->name() == "lyx")
+            continue;
+        } else if (fmt->name() == "lyx")
 			// we can't presently display the LyX format itself
 			continue;
 
-- 
1.7.4.1

Reply via email to