From a6e42e50791d8c4c9d34771c2b864d565fb1cf48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 26 Jun 2012 22:41:53 +0200 Subject: [PATCH] removed unused includes these files don't use the debug.h and also don't contain commented out debug code --- 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(-) diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp index 556b79ce80..2a9eefac2f 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 711cd51dcb..a659629938 100644 --- a/src/frontends/qt4/GuiCompareHistory.cpp +++ b/src/frontends/qt4/GuiCompareHistory.cpp @@ -9,7 +9,6 @@ */ #include -#include #include "GuiCompareHistory.h" diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp index 7ef1a1a579..0ed10fa7c1 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 #include diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp index 1797aeee5f..e20c3bc66e 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 using namespace std; diff --git a/src/frontends/qt4/GuiInfo.cpp b/src/frontends/qt4/GuiInfo.cpp index dcc5ee9855..f640ee30c5 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 4ab2da8c94..ddf1a9ac76 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 6591b5550c..b6f3ec7f7d 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 6cad137673..a42972a6b1 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 diff --git a/src/frontends/qt4/GuiPrintNomencl.cpp b/src/frontends/qt4/GuiPrintNomencl.cpp index 1e41e3e93b..b287d44eb6 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 d3d2b01f41..8b1d031b2f 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 #include #include diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 79706d41c5..1f6edf33cf 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 #include diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp index c28fdf113e..27fb97cb0d 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 9711bb68f6..19fed71cec 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 f76427d68d..f90d800670 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 9a6fd9a3ea..867aa712c2 100644 --- a/src/frontends/qt4/ui/BoxUi.ui +++ b/src/frontends/qt4/ui/BoxUi.ui @@ -1,3 +1,4 @@ + BoxUi @@ -15,13 +16,121 @@ true - - - 9 - - - 6 - + + + + + + + + &Decoration: + + + typeCO + + + + + + + Supported box types + + + + + + + + + + Inner Bo&x: + + + innerBoxCO + + + + + + + Inner box -- needed for fixed width & line breaks + + + + None + + + + + Parbox + + + + + Minipage + + + + + + + + + + + &Width: + + + false + + + false + + + + + + + Width value + + + + + + + + + + + + + &Height: + + + false + + + false + + + + + + + false + + + Height value + + + + + + + false + + + @@ -181,117 +290,6 @@ - - - - false - - - - - - - - - - &Height: - - - false - - - false - - - - - - - - - - Inner Bo&x: - - - innerBoxCO - - - - - - - - - - - - - &Decoration: - - - typeCO - - - - - - - - - - &Width: - - - widthED - - - - - - - false - - - Height value - - - - - - - Width value - - - - - - - Inner box -- needed for fixed width & line breaks - - - - None - - - - - Parbox - - - - - Minipage - - - - - - - - Supported box types - - - @@ -350,5 +348,37 @@ + + widthCB + toggled(bool) + widthED + setEnabled(bool) + + + 37 + 70 + + + 124 + 70 + + + + + widthCB + toggled(bool) + widthUnitsLC + setEnabled(bool) + + + 37 + 70 + + + 217 + 70 + + + -- 2.39.2