The branch, master, has been updated. - Log -----------------------------------------------------------------
commit a6e42e50791d8c4c9d34771c2b864d565fb1cf48 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Jun 26 22:41:53 2012 +0200 removed unused includes these files don't use the debug.h and also don't contain commented out debug code diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp index 556b79c..2a9eefa 100644 --- a/src/frontends/qt4/GuiBibtex.cpp +++ b/src/frontends/qt4/GuiBibtex.cpp @@ -30,7 +30,6 @@ #include "insets/InsetBibtex.h" -#include "support/debug.h" #include "support/ExceptionMessage.h" #include "support/FileName.h" #include "support/filetools.h" // changeExtension diff --git a/src/frontends/qt4/GuiCompareHistory.cpp b/src/frontends/qt4/GuiCompareHistory.cpp index 711cd51..a659629 100644 --- a/src/frontends/qt4/GuiCompareHistory.cpp +++ b/src/frontends/qt4/GuiCompareHistory.cpp @@ -9,7 +9,6 @@ */ #include <config.h> -#include <support/debug.h> #include "GuiCompareHistory.h" diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp index 7ef1a1a..0ed10fa 100644 --- a/src/frontends/qt4/GuiCompleter.cpp +++ b/src/frontends/qt4/GuiCompleter.cpp @@ -25,7 +25,6 @@ #include "version.h" #include "support/lassert.h" -#include "support/debug.h" #include <QApplication> #include <QHeaderView> diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp index 1797aee..e20c3bc 100644 --- a/src/frontends/qt4/GuiDialog.cpp +++ b/src/frontends/qt4/GuiDialog.cpp @@ -15,8 +15,6 @@ #include "GuiView.h" #include "qt_helpers.h" -#include "support/debug.h" - #include <QCloseEvent> using namespace std; diff --git a/src/frontends/qt4/GuiInfo.cpp b/src/frontends/qt4/GuiInfo.cpp index dcc5ee9..f640ee3 100644 --- a/src/frontends/qt4/GuiInfo.cpp +++ b/src/frontends/qt4/GuiInfo.cpp @@ -22,7 +22,6 @@ #include "insets/InsetInfo.h" -#include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/GuiLine.cpp b/src/frontends/qt4/GuiLine.cpp index 4ab2da8..ddf1a9a 100644 --- a/src/frontends/qt4/GuiLine.cpp +++ b/src/frontends/qt4/GuiLine.cpp @@ -21,7 +21,6 @@ #include "insets/InsetLine.h" -#include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp index 6591b55..b6f3ec7 100644 --- a/src/frontends/qt4/GuiListings.cpp +++ b/src/frontends/qt4/GuiListings.cpp @@ -21,7 +21,6 @@ #include "insets/InsetListingsParams.h" #include "support/convert.h" -#include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp index 6cad137..a42972a 100644 --- a/src/frontends/qt4/GuiParagraph.cpp +++ b/src/frontends/qt4/GuiParagraph.cpp @@ -28,7 +28,6 @@ #include "ParagraphParameters.h" #include "Spacing.h" -#include "support/debug.h" #include "support/gettext.h" #include <QCheckBox> diff --git a/src/frontends/qt4/GuiPrintNomencl.cpp b/src/frontends/qt4/GuiPrintNomencl.cpp index 1e41e3e..b287d44 100644 --- a/src/frontends/qt4/GuiPrintNomencl.cpp +++ b/src/frontends/qt4/GuiPrintNomencl.cpp @@ -21,7 +21,6 @@ #include "insets/InsetNomencl.h" -#include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp index d3d2b01..8b1d031 100644 --- a/src/frontends/qt4/GuiSelectionManager.cpp +++ b/src/frontends/qt4/GuiSelectionManager.cpp @@ -16,8 +16,6 @@ #include "GuiSelectionManager.h" -#include "support/debug.h" - #include <QAbstractListModel> #include <QItemSelection> #include <QListView> diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 79706d4..1f6edf3 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -32,7 +32,6 @@ #include "insets/InsetTabular.h" #include "support/convert.h" -#include "support/debug.h" #include <QCheckBox> #include <QPushButton> diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp index c28fdf1..27fb97c 100644 --- a/src/frontends/qt4/GuiThesaurus.cpp +++ b/src/frontends/qt4/GuiThesaurus.cpp @@ -24,7 +24,6 @@ #include "lyxfind.h" #include "WordLangTuple.h" -#include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp index 9711bb6..19fed71 100644 --- a/src/frontends/qt4/GuiToc.cpp +++ b/src/frontends/qt4/GuiToc.cpp @@ -23,7 +23,6 @@ #include "BufferParams.h" #include "FuncRequest.h" -#include "support/debug.h" #include "support/gettext.h" #include "support/lassert.h" diff --git a/src/frontends/qt4/InsetParamsDialog.cpp b/src/frontends/qt4/InsetParamsDialog.cpp index f76427d..f90d800 100644 --- a/src/frontends/qt4/InsetParamsDialog.cpp +++ b/src/frontends/qt4/InsetParamsDialog.cpp @@ -39,7 +39,6 @@ #include "FuncStatus.h" #include "LyX.h" -#include "support/debug.h" #include "support/lstrings.h" using namespace std; diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui index 9a6fd9a..867aa71 100644 --- a/src/frontends/qt4/ui/BoxUi.ui +++ b/src/frontends/qt4/ui/BoxUi.ui @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>BoxUi</class> <widget class="QWidget" name="BoxUi"> @@ -15,13 +16,121 @@ <property name="sizeGripEnabled" stdset="0"> <bool>true</bool> </property> - <layout class="QGridLayout"> - <property name="margin"> - <number>9</number> - </property> - <property name="spacing"> - <number>6</number> - </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="typeLA"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>&Decoration:</string> + </property> + <property name="buddy"> + <cstring>typeCO</cstring> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="typeCO"> + <property name="toolTip"> + <string>Supported box types</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="innerBoxLA"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Inner Bo&x:</string> + </property> + <property name="buddy"> + <cstring>innerBoxCO</cstring> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="innerBoxCO"> + <property name="toolTip"> + <string>Inner box -- needed for fixed width & line breaks</string> + </property> + <item> + <property name="text"> + <string>None</string> + </property> + </item> + <item> + <property name="text"> + <string>Parbox</string> + </property> + </item> + <item> + <property name="text"> + <string>Minipage</string> + </property> + </item> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="widthCB"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>&Width:</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <property name="tristate"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="widthED"> + <property name="toolTip"> + <string>Width value</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="LengthCombo" name="widthUnitsLC"/> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="heightCB"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>&Height:</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <property name="tristate"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLineEdit" name="heightED"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Height value</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="LengthCombo" name="heightUnitsLC"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> <item row="4" column="0" colspan="2"> <widget class="QCheckBox" name="pagebreakCB"> <property name="toolTip"> @@ -181,117 +290,6 @@ </layout> </widget> </item> - <item row="3" column="2"> - <widget class="LengthCombo" name="heightUnitsLC"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="heightCB"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>&Height:</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - <property name="tristate"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="innerBoxLA"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>Inner Bo&x:</string> - </property> - <property name="buddy"> - <cstring>innerBoxCO</cstring> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="LengthCombo" name="widthUnitsLC"/> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="typeLA"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>&Decoration:</string> - </property> - <property name="buddy"> - <cstring>typeCO</cstring> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="widthLA"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>&Width:</string> - </property> - <property name="buddy"> - <cstring>widthED</cstring> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="heightED"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Height value</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="widthED"> - <property name="toolTip"> - <string>Width value</string> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="QComboBox" name="innerBoxCO"> - <property name="toolTip"> - <string>Inner box -- needed for fixed width & line breaks</string> - </property> - <item> - <property name="text"> - <string>None</string> - </property> - </item> - <item> - <property name="text"> - <string>Parbox</string> - </property> - </item> - <item> - <property name="text"> - <string>Minipage</string> - </property> - </item> - </widget> - </item> - <item row="0" column="1" colspan="2"> - <widget class="QComboBox" name="typeCO"> - <property name="toolTip"> - <string>Supported box types</string> - </property> - </widget> - </item> </layout> </widget> <customwidgets> @@ -350,5 +348,37 @@ </hint> </hints> </connection> + <connection> + <sender>widthCB</sender> + <signal>toggled(bool)</signal> + <receiver>widthED</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>37</x> + <y>70</y> + </hint> + <hint type="destinationlabel"> + <x>124</x> + <y>70</y> + </hint> + </hints> + </connection> + <connection> + <sender>widthCB</sender> + <signal>toggled(bool)</signal> + <receiver>widthUnitsLC</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>37</x> + <y>70</y> + </hint> + <hint type="destinationlabel"> + <x>217</x> + <y>70</y> + </hint> + </hints> + </connection> </connections> </ui> ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiBibtex.cpp | 1 - src/frontends/qt4/GuiCompareHistory.cpp | 1 - src/frontends/qt4/GuiCompleter.cpp | 1 - src/frontends/qt4/GuiDialog.cpp | 2 - src/frontends/qt4/GuiInfo.cpp | 1 - src/frontends/qt4/GuiLine.cpp | 1 - src/frontends/qt4/GuiListings.cpp | 1 - src/frontends/qt4/GuiParagraph.cpp | 1 - src/frontends/qt4/GuiPrintNomencl.cpp | 1 - src/frontends/qt4/GuiSelectionManager.cpp | 2 - src/frontends/qt4/GuiTabular.cpp | 1 - src/frontends/qt4/GuiThesaurus.cpp | 1 - src/frontends/qt4/GuiToc.cpp | 1 - src/frontends/qt4/InsetParamsDialog.cpp | 1 - src/frontends/qt4/ui/BoxUi.ui | 266 ++++++++++++++++------------- 15 files changed, 148 insertions(+), 134 deletions(-) hooks/post-receive -- The LyX Source Repository