Sorry, this patch updates the
0001-Latex-Argument-is-a-column-property-move-it-in-the-U.patch to
change a smart quote and clean up the html.
John
From 7147346b24b876b01ae72661fa8e866ea4bc588e 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 | 472 ++++++++++++++++++++-----------------
1 files changed, 254 insertions(+), 218 deletions(-)
diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index 39c0922..29f9155 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>&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>&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>&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>&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>&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>&Multicolumn</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -561,21 +361,256 @@
</layout>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="specialAlignmentLA">
- <property name="text">
- <string>LaTe&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>&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>&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>&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>&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>&Multicolumn</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="specialAlignmentLA">
+ <property name="text">
+ <string>LaTe&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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body>
+<p>The string must contain one of the following:</p>
+<p></p>
+<table border="0">
+<tr><td>l</td>
+<td>left-justified column</td></tr>
+<tr><td>c</td>
+<td>centered column</td></tr>
+<tr><td>r</td>
+<td>right-justified column</td></tr>
+<tr><td>p{<i>width</i>}</td>
+<td>paragraph column with text vertically aligned at the top</td></tr></table>
+<p>
+By default, if the text in a column is too wide for the page, LaTeX won't automatically wrap it. Using <span style=" font-family:'Courier New,courier';">p{<i>width</i>}</span> 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 <i>command lengths</i>, such as <span style=" font-family:'Courier New,courier';">\textwidth</span>.</p>
+
+<p>Additionally it can contain, before or after the column type:</p>
+<table border="0" >
+<tr>
+<td>|</td><td>vertical line</td></tr>
+<tr><td>||</td><td>double vertical line</td></tr>
+<tr><td>@{...}</td><td>column seperator</td></tr></table>
+<p>
+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 <span style=" font-family:'Courier New,courier';">@{\hspace{<i>width</i>}}</span>. To remove the space entirely use <span style=" font-family:'Courier New,courier';">@{}</span></p>
+<p>
+<p>Examples:</p>
+<p>
+<p>&quot;r@{}&quot; - set text right aligned and kill the inter-column space.</p>
+<p>&quot;@{}l&quot; - set text left aligned and kill the inter-column space. Typically these two are used together</p>
+<p>&quot;(r)&quot; - draw every element in the column surrounded with brackets</p>
+</body></html></string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
@@ -1603,13 +1638,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 +1654,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 +1687,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
