* fix spelling in comments to please John.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33262 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 8d9eadef49540259b340991f20a0cee887cdc6b0..41e43e73dcad89640658dd8da614621128197478 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1534,7 +1534,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        //   before hyperref. Then hyperref has a chance to detect babel.
        // * Has to be loaded before the "LyX specific LaTeX commands" to
        //   avoid errors with algorithm floats.
-       // use hyperref explicitely when it is required
+       // use hyperref explicitly when it is required
        if (features.isRequired("hyperref")) {
                odocstringstream oss;
                pdfoptions().writeLaTeX(oss, documentClass().provides("hyperref"));
@@ -2261,7 +2261,7 @@ string const BufferParams::loadFonts(string const & rm,
        }
 
        // ROMAN FONTS
-       // Computer Modern (must be explicitely selectable -- there might be classes
+       // Computer Modern (must be explicitly selectable -- there might be classes
        // that define a different default font!
        if (rm == "cmr") {
                os << "\\renewcommand{\\rmdefault}{cmr}\n";

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 02390de4b6c4be657590cfcad0509f78f984c08c..3b1bf0ddaae4d6567f7a747f143aa96120ffa6e7 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -343,7 +343,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 {
        DispatchResult dr;
        // redraw the screen at the end (first of the two drawing steps).
-       //This is done unless explicitely requested otherwise
+       //This is done unless explicitly requested otherwise
        dr.update(Update::FitCursor);
        dispatch(cmd, dr);
 

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index ff44a17ddbd09d37193591930b64d8720c9336bd..ecfc1d067c4425dcef0c3aab14ca8c2561f80f2e 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -95,7 +95,7 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyperref_already_provided) con
        opt += "unicode=true, ";
        
        // try to extract author and title from document when none is
-       // explicitely given
+       // explicitly given
        if (pdfusetitle && title.empty() && author.empty())
                opt += "pdfusetitle,";
        opt += "\n ";

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index f78594f54dad9860e42a6f2f05aedc13224edb32..37cf7a799158f9f4dcf3151201e57f555af54f4a 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -377,7 +377,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 bool TextMetrics::redoParagraph(pit_type const pit)
 {
        Paragraph & par = text_->getPar(pit);
-       // IMPORTANT NOTE: We pass 'false' explicitely in order to not call
+       // IMPORTANT NOTE: We pass 'false' explicitly in order to not call
        // redoParagraph() recursively inside parMetrics.
        Dimension old_dim = parMetrics(pit, false).dim();
        ParagraphMetrics & pm = par_metrics_[pit];

diff --git a/src/frontends/qt4/GuiSetBorder.cpp b/src/frontends/qt4/GuiSetBorder.cpp
index dd13288e064c2c373be9e1b66fd9bcb02ca9da97..0d49f1112704aaaa1cc042fd9226ff70fce77657 100644 (file)
--- a/src/frontends/qt4/GuiSetBorder.cpp
+++ b/src/frontends/qt4/GuiSetBorder.cpp
@@ -119,7 +119,7 @@ void GuiSetBorder::drawLeft(bool draw)
 {
        QColor col(draw ? Qt::black : Qt::white);
        if (!left_.enabled)
-               col = QColor("grey");
+               col = QColor(Qt::lightGray);
        drawLine(col, m + l, m + l + 2, m + l, h - m - l - 1);
 }
 
@@ -128,7 +128,7 @@ void GuiSetBorder::drawRight(bool draw)
 {
        QColor col(draw ? Qt::black : Qt::white);
        if (!right_.enabled)
-               col = QColor("grey");
+               col = QColor(Qt::lightGray);
        drawLine(col, h - m - l + 1, m + l + 2, h - m - l + 1, h - m - l - 1);
 }
 
@@ -137,7 +137,7 @@ void GuiSetBorder::drawTop(bool draw)
 {
        QColor col(draw ? Qt::black : Qt::white);
        if (!top_.enabled)
-               col = QColor("grey");
+               col = QColor(Qt::lightGray);
        drawLine(col, m + l + 2, m + l, w - m - l - 1, m + l);
 }
 
@@ -146,7 +146,7 @@ void GuiSetBorder::drawBottom(bool draw)
 {
        QColor col(draw ? Qt::black : Qt::white);
        if (!bottom_.enabled)
-               col = QColor("grey");
+               col = QColor(Qt::lightGray);
        drawLine(col, m + l + 2, w - m - l + 1, w - m - l - 1, w - m - l + 1);
 }
 

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index e66f97896d6095a6ab936b14b32590b2fe13e2ff..2a6a26bb3aa7b86aa0b6154e938eab4bc45e0d12 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -42,12 +42,25 @@ namespace frontend {
 GuiTabular::GuiTabular(GuiView & lv)
        : GuiDialog(lv, "tabular", qt_("Table Settings")),
        // tabular_ is initialised at dialog construction in initialiseParams()
-       tabular_(&(lv.currentBufferView()->buffer()), 0, 0)
+       tabular_(&(lv.currentBufferView()->buffer()), 0, 0),
+       applying_(false)
 {
        active_cell_ = Tabular::npos;
 
        setupUi(this);
 
+       connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
+       connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
+       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+       connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
+
+       // Manage the restore, ok, apply, restore and cancel/close buttons
+       bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
+       bc().setOK(okPB);
+       bc().setApply(applyPB);
+       bc().setCancel(closePB);
+       bc().setRestore(restorePB);
+
        widthED->setValidator(unsignedLengthValidator(widthED));
        topspaceED->setValidator(new LengthValidator(topspaceED));
        bottomspaceED->setValidator(new LengthValidator(bottomspaceED));
@@ -55,22 +68,22 @@ GuiTabular::GuiTabular(GuiView & lv)
 
        widthUnitCB->setCurrentItem(Length::defaultUnit());
 
-       connect(topspaceED, SIGNAL(returnPressed()),
-               this, SLOT(topspace_changed()));
+       connect(topspaceED, SIGNAL(textChanged(QString)),
+               this, SLOT(change_adaptor()));
        connect(topspaceUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
-               this, SLOT(topspace_changed()));
+               this, SLOT(change_adaptor()));
        connect(topspaceCO, SIGNAL(activated(int)),
                this, SLOT(topspace_changed()));
-       connect(bottomspaceED, SIGNAL(returnPressed()),
-               this, SLOT(bottomspace_changed()));
+       connect(bottomspaceED, SIGNAL(textChanged(QString)),
+               this, SLOT(change_adaptor()));
        connect(bottomspaceUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
-               this, SLOT(bottomspace_changed()));
+               this, SLOT(change_adaptor()));
        connect(bottomspaceCO, SIGNAL(activated(int)),
                this, SLOT(bottomspace_changed()));
-       connect(interlinespaceED, SIGNAL(returnPressed()),
-               this, SLOT(interlinespace_changed()));
+       connect(interlinespaceED, SIGNAL(textChanged(QString)),
+               this, SLOT(change_adaptor()));
        connect(interlinespaceUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
-               this, SLOT(interlinespace_changed()));
+               this, SLOT(change_adaptor()));
        connect(interlinespaceCO, SIGNAL(activated(int)),
                this, SLOT(interlinespace_changed()));
        connect(booktabsRB, SIGNAL(clicked(bool)),
@@ -91,74 +104,66 @@ GuiTabular::GuiTabular(GuiView & lv)
        connect(longTabularCB, SIGNAL(toggled(bool)),
                TableAlignCB, SLOT(setDisabled(bool)));
        connect(hAlignCB, SIGNAL(activated(int)),
-               this, SLOT(hAlign_changed(int)));
+               this, SLOT(change_adaptor()));
        connect(vAlignCB, SIGNAL(activated(int)),
-               this, SLOT(vAlign_changed(int)));
+               this, SLOT(change_adaptor()));
        connect(multicolumnCB, SIGNAL(clicked()),
-               this, SLOT(multicolumn_clicked()));
+               this, SLOT(change_adaptor()));
        connect(newpageCB, SIGNAL(clicked()),
-               this, SLOT(ltNewpage_clicked()));
+               this, SLOT(change_adaptor()));
+       connect(captionStatusCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
        connect(headerStatusCB, SIGNAL(clicked()),
-               this, SLOT(ltHeaderStatus_clicked()));
+               this, SLOT(change_adaptor()));
        connect(headerBorderAboveCB, SIGNAL(clicked()),
-               this, SLOT(ltHeaderBorderAbove_clicked()));
+               this, SLOT(change_adaptor()));
        connect(headerBorderBelowCB, SIGNAL(clicked()),
-               this, SLOT(ltHeaderBorderBelow_clicked()));
+               this, SLOT(change_adaptor()));
        connect(firstheaderStatusCB, SIGNAL(clicked()),
-               this, SLOT(ltFirstHeaderStatus_clicked()));
+               this, SLOT(change_adaptor()));
        connect(firstheaderBorderAboveCB, SIGNAL(clicked()),
-               this, SLOT(ltFirstHeaderBorderAbove_clicked()));
+               this, SLOT(change_adaptor()));
        connect(firstheaderBorderBelowCB, SIGNAL(clicked()),
-               this, SLOT(ltFirstHeaderBorderBelow_clicked()));
+               this, SLOT(change_adaptor()));
        connect(firstheaderNoContentsCB, SIGNAL(clicked()),
-               this, SLOT(ltFirstHeaderEmpty_clicked()));
+               this, SLOT(change_adaptor()));
        connect(footerStatusCB, SIGNAL(clicked()),
-               this, SLOT(ltFooterStatus_clicked()));
+               this, SLOT(change_adaptor()));
        connect(footerBorderAboveCB, SIGNAL(clicked()),
-               this, SLOT(ltFooterBorderAbove_clicked()));
+               this, SLOT(change_adaptor()));
        connect(footerBorderBelowCB, SIGNAL(clicked()),
-               this, SLOT(ltFooterBorderBelow_clicked()));
+               this, SLOT(change_adaptor()));
        connect(lastfooterStatusCB, SIGNAL(clicked()),
-               this, SLOT(ltLastFooterStatus_clicked()));
+               this, SLOT(change_adaptor()));
        connect(lastfooterBorderAboveCB, SIGNAL(clicked()),
-               this, SLOT(ltLastFooterBorderAbove_clicked()));
+               this, SLOT(change_adaptor()));
        connect(lastfooterBorderBelowCB, SIGNAL(clicked()),
-               this, SLOT(ltLastFooterBorderBelow_clicked()));
+               this, SLOT(change_adaptor()));
        connect(lastfooterNoContentsCB, SIGNAL(clicked()),
-               this, SLOT(ltLastFooterEmpty_clicked()));
-       connect(specialAlignmentED, SIGNAL(returnPressed()),
-               this, SLOT(specialAlignment_changed()));
-       connect(widthED, SIGNAL(editingFinished()),
-               this, SLOT(width_changed()));
+               this, SLOT(change_adaptor()));
+       connect(specialAlignmentED, SIGNAL(textChanged(QString)),
+               this, SLOT(change_adaptor()));
+       connect(widthED, SIGNAL(textChanged(QString)),
+               this, SLOT(change_adaptor()));
        connect(widthUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
-               this, SLOT(width_changed()));
-       connect(closePB, SIGNAL(clicked()),
-               this, SLOT(close_clicked()));
-       connect(borders, SIGNAL(topSet(bool)),
-               this, SLOT(topBorder_changed()));
-       connect(borders, SIGNAL(bottomSet(bool)),
-               this, SLOT(bottomBorder_changed()));
-       connect(borders, SIGNAL(rightSet(bool)),
-               this, SLOT(rightBorder_changed()));
-       connect(borders, SIGNAL(leftSet(bool)),
-               this, SLOT(leftBorder_changed()));
+               this, SLOT(change_adaptor()));
+       connect(borders, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
        connect(rotateTabularCB, SIGNAL(clicked()),
-               this, SLOT(rotateTabular()));
+               this, SLOT(change_adaptor()));
        connect(rotateCellCB, SIGNAL(clicked()),
-               this, SLOT(rotateCell()));
+               this, SLOT(change_adaptor()));
        connect(TableAlignCB, SIGNAL(activated(int)),
-               this, SLOT(tableAlignment_changed(int)));
+               this, SLOT(change_adaptor()));
        connect(longTabularCB, SIGNAL(clicked()),
-               this, SLOT(longTabular()));
+               this, SLOT(change_adaptor()));
        connect(leftRB, SIGNAL(clicked()),
-               this, SLOT(ltAlignment_clicked()));
+               this, SLOT(change_adaptor()));
        connect(centerRB, SIGNAL(clicked()),
-               this, SLOT(ltAlignment_clicked()));
+               this, SLOT(change_adaptor()));
        connect(rightRB, SIGNAL(clicked()),
-               this, SLOT(ltAlignment_clicked()));
-               
-       bc().setPolicy(ButtonPolicy::IgnorantPolicy);
-       
+               this, SLOT(change_adaptor()));
+
        bc().addReadOnly(topspaceED);
        bc().addReadOnly(topspaceUnit);
        bc().addReadOnly(topspaceCO);
@@ -222,34 +227,20 @@ void GuiTabular::change_adaptor()
 }
 
 
-void GuiTabular::booktabsChanged(bool)
-{
-       changed();
-       booktabs(booktabsRB->isChecked());
-       update_borders();
-}
-
-
 void GuiTabular::topspace_changed()
 {
        switch (topspaceCO->currentIndex()) {
                case 0: {
-                       set(Tabular::SET_TOP_SPACE, "");
                        topspaceED->setEnabled(false);
                        topspaceUnit->setEnabled(false);
                        break;
                }
                case 1: {
-                       set(Tabular::SET_TOP_SPACE, "default");
                        topspaceED->setEnabled(false);
                        topspaceUnit->setEnabled(false);
                        break;
                }
                case 2: {
-                       if (!topspaceED->text().isEmpty())
-                               set(Tabular::SET_TOP_SPACE,
-                                       widgetsToLength(topspaceED,
-                                                       topspaceUnit));
                        if (!bc().policy().isReadOnly()) {
                                topspaceED->setEnabled(true);
                                topspaceUnit->setEnabled(true);
@@ -265,22 +256,16 @@ void GuiTabular::bottomspace_changed()
 {
        switch (bottomspaceCO->currentIndex()) {
                case 0: {
-                       set(Tabular::SET_BOTTOM_SPACE, "");
-                               bottomspaceED->setEnabled(false);
-                               bottomspaceUnit->setEnabled(false);
+                       bottomspaceED->setEnabled(false);
+                       bottomspaceUnit->setEnabled(false);
                        break;
                }
                case 1: {
-                       set(Tabular::SET_BOTTOM_SPACE, "default");
                        bottomspaceED->setEnabled(false);
                        bottomspaceUnit->setEnabled(false);
                        break;
                }
                case 2: {
-                       if (!bottomspaceED->text().isEmpty())
-                               set(Tabular::SET_BOTTOM_SPACE,
-                                       widgetsToLength(bottomspaceED,
-                                                       bottomspaceUnit));
                        if (!bc().policy().isReadOnly()) {
                                bottomspaceED->setEnabled(true);
                                bottomspaceUnit->setEnabled(true);
@@ -296,22 +281,16 @@ void GuiTabular::interlinespace_changed()
 {
        switch (interlinespaceCO->currentIndex()) {
                case 0: {
-                       set(Tabular::SET_INTERLINE_SPACE, "");
-                               interlinespaceED->setEnabled(false);
-                               interlinespaceUnit->setEnabled(false);
+                       interlinespaceED->setEnabled(false);
+                       interlinespaceUnit->setEnabled(false);
                        break;
                }
                case 1: {
-                       set(Tabular::SET_INTERLINE_SPACE, "default");
                        interlinespaceED->setEnabled(false);
                        interlinespaceUnit->setEnabled(false);
                        break;
                }
                case 2: {
-                       if (!interlinespaceED->text().isEmpty())
-                               set(Tabular::SET_INTERLINE_SPACE,
-                                       widgetsToLength(interlinespaceED,
-                                                       interlinespaceUnit));
                        if (!bc().policy().isReadOnly()) {
                                interlinespaceED->setEnabled(true);
                                interlinespaceUnit->setEnabled(true);
@@ -323,359 +302,345 @@ void GuiTabular::interlinespace_changed()
 }
 
 
-void GuiTabular::close_clicked()
+void GuiTabular::booktabsChanged(bool)
 {
-       closeGUI();
-       slotClose();
+       if (booktabsRB->isChecked()) {
+               borders->setLeft(false);
+               borders->setRight(false);
+               borders->setLeftEnabled(false);
+               borders->setRightEnabled(false);
+       } else {
+               borders->setLeftEnabled(true);
+               borders->setRightEnabled(true); 
+       }
+       // repaint the setborder widget
+       borders->update();
+       changed();
 }
 
 
 void GuiTabular::borderSet_clicked()
 {
-       set(Tabular::SET_ALL_LINES);
-       update_borders();
+       borders->setTop(true);
+       borders->setBottom(true);
+       borders->setLeft(true);
+       borders->setRight(true);
+       // repaint the setborder widget
+       borders->update();
        changed();
 }
 
 
 void GuiTabular::borderUnset_clicked()
 {
-       set(Tabular::UNSET_ALL_LINES);
-       update_borders();
+       borders->setTop(false);
+       borders->setBottom(false);
+       borders->setLeft(false);
+       borders->setRight(false);
+       // repaint the setborder widget
+       borders->update();
        changed();
 }
 
 
-void GuiTabular::leftBorder_changed()
+void GuiTabular::update_borders()
 {
-       set(Tabular::TOGGLE_LINE_LEFT);
-       changed();
+       Tabular::idx_type const cell = getActiveCell();
+       borders->setTop(tabular_.topLine(cell));
+       borders->setBottom(tabular_.bottomLine(cell));
+       borders->setLeft(tabular_.leftLine(cell));
+       borders->setRight(tabular_.rightLine(cell));
+       borders->setLeftEnabled(!booktabsRB->isChecked());
+       borders->setRightEnabled(!booktabsRB->isChecked());
+       // repaint the setborder widget
+       borders->update();
 }
 
 
-void GuiTabular::rightBorder_changed()
-{
-       set(Tabular::TOGGLE_LINE_RIGHT);
-       changed();
-}
-
+namespace {
 
-void GuiTabular::topBorder_changed()
+Length getColumnPWidth(Tabular const & t, size_t cell)
 {
-       set(Tabular::TOGGLE_LINE_TOP);
-       changed();
+       return t.column_info[t.cellColumn(cell)].p_width;
 }
 
 
-void GuiTabular::bottomBorder_changed()
+Length getMColumnPWidth(Tabular const & t, size_t cell)
 {
-       set(Tabular::TOGGLE_LINE_BOTTOM);
-       changed();
+       if (t.isMultiColumn(cell))
+               return t.cellInfo(cell).p_width;
+       return Length();
 }
 
 
-void GuiTabular::specialAlignment_changed()
+docstring getAlignSpecial(Tabular const & t, size_t cell, int what)
 {
-       string special = fromqstr(specialAlignmentED->text());
-       setSpecial(special);
-       changed();
+       if (what == Tabular::SET_SPECIAL_MULTI)
+               return t.cellInfo(cell).align_special;
+       return t.column_info[t.cellColumn(cell)].align_special;
 }
 
-
-void GuiTabular::width_changed()
-{
-       changed();
-       string const width = widgetsToLength(widthED, widthUnitCB);
-       setWidth(width);
 }
 
 
-void GuiTabular::multicolumn_clicked()
+void GuiTabular::applyView()
 {
-       toggleMultiColumn();
-       changed();
-}
-
+       applying_ = true;
 
-void GuiTabular::rotateTabular()
-{
-       rotateTabular(rotateTabularCB->isChecked());
-       changed();
-}
+       Tabular::idx_type const cell = getActiveCell();
+       Tabular::row_type const row = tabular_.cellRow(cell);
+       bool const multicol = tabular_.isMultiColumn(cell);
 
+       Tabular::Feature num = Tabular::ALIGN_LEFT;
+       Tabular::Feature multi_num = Tabular::M_ALIGN_LEFT;
 
-void GuiTabular::rotateCell()
-{
-       rotateCell(rotateCellCB->isChecked());
-       changed();
-}
+       switch (hAlignCB->currentIndex()) {
+               case 0:
+                       num = Tabular::ALIGN_LEFT;
+                       multi_num = Tabular::M_ALIGN_LEFT;
+                       break;
+               case 1:
+                       num = Tabular::ALIGN_CENTER;
+                       multi_num = Tabular::M_ALIGN_CENTER;
+                       break;
+               case 2:
+                       num = Tabular::ALIGN_RIGHT;
+                       multi_num = Tabular::M_ALIGN_RIGHT;
+                       break;
+               case 3:
+                       num = Tabular::ALIGN_BLOCK;
+                       //multi_num: no equivalent
+                       break;
+       }
+       if (multicol)
+               set(multi_num);
+       else
+               set(num);
 
+       num = Tabular::VALIGN_MIDDLE;
+       multi_num = Tabular::M_VALIGN_MIDDLE;
 
-void GuiTabular::hAlign_changed(int align)
-{
-       GuiTabular::HALIGN h = GuiTabular::LEFT;
+       switch (vAlignCB->currentIndex()) {
+               case 0:
+                       num = Tabular::VALIGN_TOP;
+                       multi_num = Tabular::M_VALIGN_TOP;
+                       break;
+               case 1:
+                       num = Tabular::VALIGN_MIDDLE;
+                       multi_num = Tabular::M_VALIGN_MIDDLE;
+                       break;
+               case 2:
+                       num = Tabular::VALIGN_BOTTOM;
+                       multi_num = Tabular::M_VALIGN_BOTTOM;
+                       break;
+       }
+       if (multicol)
+               set(multi_num);
+       else
+               set(num);
 
-       switch (align) {
-               case 0: h = GuiTabular::LEFT; break;
-               case 1: h = GuiTabular::CENTER; break;
-               case 2: h = GuiTabular::RIGHT; break;
-               case 3: h = GuiTabular::BLOCK; break;
+       switch (TableAlignCB->currentIndex()) {
+               case 0:
+                       set(Tabular::TABULAR_VALIGN_TOP);
+                       break;
+               case 1:
+                       set(Tabular::TABULAR_VALIGN_MIDDLE);
+                       break;
+               case 2:
+                       set(Tabular::TABULAR_VALIGN_BOTTOM);
+                       break;
        }
 
-       halign(h);
-}
+       string value;
 
+       value = fromqstr(specialAlignmentED->text());
+       if (multicol)
+               set(Tabular::SET_SPECIAL_MULTI, value);
+       else
+               set(Tabular::SET_SPECIAL_COLUMN, value);
 
-void GuiTabular::vAlign_changed(int align)
-{
-       GuiTabular::VALIGN v = GuiTabular::TOP;
+       value = widgetsToLength(widthED, widthUnitCB);
+       if (multicol)
+               set(Tabular::SET_MPWIDTH, value);
+       else
+               set(Tabular::SET_PWIDTH, value);
 
-       switch (align) {
-               case 0: v = GuiTabular::TOP; break;
-               case 1: v = GuiTabular::MIDDLE; break;
-               case 2: v = GuiTabular::BOTTOM; break;
-       }
+       if (multicolumnCB->isChecked() != multicol)
+               set(Tabular::MULTICOLUMN);;
 
-       valign(v);
-}
+       if (rotateTabularCB->isChecked())
+               set(Tabular::SET_ROTATE_TABULAR);
+       else
+               set(Tabular::UNSET_ROTATE_TABULAR);
 
+       if (rotateCellCB->isChecked())
+               set(Tabular::SET_ROTATE_CELL);
+       else
+               set(Tabular::UNSET_ROTATE_CELL);
 
-void GuiTabular::tableAlignment_changed(int align)
-{
-       switch (align) {
-               case 0: set(Tabular::TABULAR_VALIGN_TOP);
+       // Borders
+       if (borders->getLeft() != tabular_.leftLine(cell))
+               set(Tabular::TOGGLE_LINE_LEFT);
+       if (borders->getRight() != tabular_.rightLine(cell))
+               set(Tabular::TOGGLE_LINE_RIGHT);
+       if (borders->getTop() != tabular_.topLine(cell))
+               set(Tabular::TOGGLE_LINE_TOP);
+       if (borders->getBottom() != tabular_.bottomLine(cell))
+               set(Tabular::TOGGLE_LINE_BOTTOM);
+
+       if (booktabsRB->isChecked())
+               set(Tabular::SET_BOOKTABS);
+       else
+               set(Tabular::UNSET_BOOKTABS);
+       
+       switch (topspaceCO->currentIndex()) {
+               case 0:
+                       set(Tabular::SET_TOP_SPACE, "");
                        break;
-               case 1: set(Tabular::TABULAR_VALIGN_MIDDLE);
+               case 1:
+                       set(Tabular::SET_TOP_SPACE, "default");
                        break;
-               case 2: set(Tabular::TABULAR_VALIGN_BOTTOM);
+               case 2:
+                       set(Tabular::SET_TOP_SPACE,
+                               widgetsToLength(topspaceED,
+                                               topspaceUnit));
+                       break;
+       }
+       
+       switch (bottomspaceCO->currentIndex()) {
+               case 0:
+                       set(Tabular::SET_BOTTOM_SPACE, "");
+                       break;
+               case 1:
+                       set(Tabular::SET_BOTTOM_SPACE, "default");
+                       break;
+               case 2:
+                       set(Tabular::SET_BOTTOM_SPACE,
+                               widgetsToLength(bottomspaceED,
+                                               bottomspaceUnit));
                        break;
        }
-}
-
-
-void GuiTabular::longTabular()
-{
-       longTabular(longTabularCB->isChecked());
-       changed();
-}
-
-
-void GuiTabular::ltNewpage_clicked()
-{
-       set(Tabular::SET_LTNEWPAGE);
-       changed();
-}
-
 
-void GuiTabular::on_captionStatusCB_toggled()
-{
-       set(Tabular::TOGGLE_LTCAPTION);
-       changed();
-}
+       switch (interlinespaceCO->currentIndex()) {
+               case 0:
+                       set(Tabular::SET_INTERLINE_SPACE, "");
+                       break;
+               case 1:
+                       set(Tabular::SET_INTERLINE_SPACE, "default");
+                       break;
+               case 2:
+                       set(Tabular::SET_INTERLINE_SPACE,
+                               widgetsToLength(interlinespaceED,
+                                               interlinespaceUnit));
+                       break;
+       }
 
+       // Longtabular
+       if (longTabularCB->isChecked())
+               set(Tabular::SET_LONGTABULAR);
+       else
+               set(Tabular::UNSET_LONGTABULAR);
 
-void GuiTabular::ltHeaderStatus_clicked()
-{
-       bool enable = headerStatusCB->isChecked();
-       if (enable)
+       if (headerStatusCB->isChecked())
                set(Tabular::SET_LTHEAD, "");
        else
                set(Tabular::UNSET_LTHEAD, "");
-       changed();
-}
-
-
-void GuiTabular::ltHeaderBorderAbove_clicked()
-{
+       
        if (headerBorderAboveCB->isChecked())
                set(Tabular::SET_LTHEAD, "dl_above");
        else
                set(Tabular::UNSET_LTHEAD, "dl_above");
-       changed();
-}
 
+       if (headerBorderAboveCB->isChecked())
+               set(Tabular::SET_LTHEAD, "dl_above");
+       else
+               set(Tabular::UNSET_LTHEAD, "dl_above");
 
-void GuiTabular::ltHeaderBorderBelow_clicked()
-{
        if (headerBorderBelowCB->isChecked())
                set(Tabular::SET_LTHEAD, "dl_below");
        else
                set(Tabular::UNSET_LTHEAD, "dl_below");
-       changed();
-}
 
-
-void GuiTabular::ltFirstHeaderBorderAbove_clicked()
-{
        if (firstheaderBorderAboveCB->isChecked())
                set(Tabular::SET_LTFIRSTHEAD, "dl_above");
        else
                set(Tabular::UNSET_LTFIRSTHEAD, "dl_above");
-       changed();
-}
-
 
-void GuiTabular::ltFirstHeaderBorderBelow_clicked()
-{
        if (firstheaderBorderBelowCB->isChecked())
                set(Tabular::SET_LTFIRSTHEAD, "dl_below");
        else
                set(Tabular::UNSET_LTFIRSTHEAD, "dl_below");
-       changed();
-}
-
 
-void GuiTabular::ltFirstHeaderStatus_clicked()
-{
-       bool enable = firstheaderStatusCB->isChecked();
-       if (enable)
+       if (firstheaderStatusCB->isChecked())
                set(Tabular::SET_LTFIRSTHEAD, "");
        else
                set(Tabular::UNSET_LTFIRSTHEAD, "");
-       changed();
-}
-
 
-void GuiTabular::ltFirstHeaderEmpty_clicked()
-{
-       bool enable = firstheaderNoContentsCB->isChecked();
-       if (enable)
+       if (firstheaderNoContentsCB->isChecked())
                set(Tabular::SET_LTFIRSTHEAD, "empty");
        else
                set(Tabular::UNSET_LTFIRSTHEAD, "empty");
-       changed();
-}
 
-
-void GuiTabular::ltFooterStatus_clicked()
-{
-       bool enable = footerStatusCB->isChecked();
-       if (enable)
+       if (footerStatusCB->isChecked())
                set(Tabular::SET_LTFOOT, "");
        else
                set(Tabular::UNSET_LTFOOT, "");
-       changed();
-}
 
-
-void GuiTabular::ltFooterBorderAbove_clicked()
-{
        if (footerBorderAboveCB->isChecked())
                set(Tabular::SET_LTFOOT, "dl_above");
        else
                set(Tabular::UNSET_LTFOOT, "dl_above");
-       changed();
-}
-
 
-void GuiTabular::ltFooterBorderBelow_clicked()
-{
        if (footerBorderBelowCB->isChecked())
                set(Tabular::SET_LTFOOT, "dl_below");
        else
                set(Tabular::UNSET_LTFOOT, "dl_below");
-       changed();
-}
-
 
-void GuiTabular::ltLastFooterStatus_clicked()
-{
-       bool enable = lastfooterStatusCB->isChecked();
-       if (enable)
+       if (lastfooterStatusCB->isChecked())
                set(Tabular::SET_LTLASTFOOT, "");
        else
                set(Tabular::UNSET_LTLASTFOOT, "");
-       changed();
-}
 
-
-void GuiTabular::ltLastFooterBorderAbove_clicked()
-{
        if (lastfooterBorderAboveCB->isChecked())
                set(Tabular::SET_LTLASTFOOT, "dl_above");
        else
                set(Tabular::UNSET_LTLASTFOOT, "dl_above");
-       changed();
-}
-
 
-void GuiTabular::ltLastFooterBorderBelow_clicked()
-{
        if (lastfooterBorderBelowCB->isChecked())
                set(Tabular::SET_LTLASTFOOT, "dl_below");
        else
                set(Tabular::UNSET_LTLASTFOOT, "dl_below");
-       changed();
-}
-
 
-void GuiTabular::ltLastFooterEmpty_clicked()
-{
-       bool enable = lastfooterNoContentsCB->isChecked();
-       if (enable)
+       if (lastfooterNoContentsCB->isChecked())
                set(Tabular::SET_LTLASTFOOT, "empty");
        else
                set(Tabular::UNSET_LTLASTFOOT, "empty");
-       changed();
-}
 
+       if (newpageCB->isChecked() != tabular_.getLTNewPage(row))
+               set(Tabular::SET_LTNEWPAGE);
+
+       if (captionStatusCB->isChecked() != tabular_.ltCaption(row))
+               set(Tabular::TOGGLE_LTCAPTION);
 
-void GuiTabular::ltAlignment_clicked()
-{
        if (leftRB->isChecked())
                set(Tabular::LONGTABULAR_ALIGN_LEFT);
        else if (centerRB->isChecked())
                set(Tabular::LONGTABULAR_ALIGN_CENTER);
        else if (rightRB->isChecked())
                set(Tabular::LONGTABULAR_ALIGN_RIGHT);
-       changed();
-}
 
-
-void GuiTabular::update_borders()
-{
-       Tabular::idx_type const cell = getActiveCell();
-       borders->setTop(tabular_.topLine(cell));
-       borders->setBottom(tabular_.bottomLine(cell));
-       borders->setLeft(tabular_.leftLine(cell));
-       borders->setRight(tabular_.rightLine(cell));
-       // repaint the setborder widget
-       borders->update();
+       applying_ = false;
 }
 
 
-namespace {
-
-Length getColumnPWidth(Tabular const & t, size_t cell)
-{
-       return t.column_info[t.cellColumn(cell)].p_width;
-}
-
-
-Length getMColumnPWidth(Tabular const & t, size_t cell)
-{
-       if (t.isMultiColumn(cell))
-               return t.cellInfo(cell).p_width;
-       return Length();
-}
-
-
-docstring getAlignSpecial(Tabular const & t, size_t cell, int what)
-{
-       if (what == Tabular::SET_SPECIAL_MULTI)
-               return t.cellInfo(cell).align_special;
-       return t.column_info[t.cellColumn(cell)].align_special;
-}
-
-}
-
-
-
 void GuiTabular::updateContents()
 {
+       if (applying_)
+               return;
+
        initialiseParams(string());
 
-       size_t const cell = getActiveCell();
+       Tabular::idx_type const cell = getActiveCell();
 
        Tabular::row_type const row = tabular_.cellRow(cell);
        Tabular::col_type const col = tabular_.cellColumn(cell);
@@ -1009,100 +974,6 @@ void GuiTabular::updateContents()
 }
 
 
-void GuiTabular::closeGUI()
-{
-       // ugly hack to auto-apply the stuff that hasn't been
-       // yet. don't let this continue to exist ...
-
-       // Subtle here, we must /not/ apply any changes and
-       // then refer to tabular, as it will have been freed
-       // since the changes update the actual tabular_
-       //
-       // apply the fixed width values
-       size_t const cell = getActiveCell();
-       bool const multicol = tabular_.isMultiColumn(cell);
-       string width = widgetsToLength(widthED, widthUnitCB);
-       string width2;
-
-       Length llen = getColumnPWidth(tabular_, cell);
-       Length llenMulti = getMColumnPWidth(tabular_, cell);
-
-       if (multicol && !llenMulti.zero())
-               width2 = llenMulti.asString();
-       else if (!multicol && !llen.zero())
-               width2 = llen.asString();
-
-       // apply the special alignment
-       docstring const sa1 = qstring_to_ucs4(specialAlignmentED->text());
-       docstring sa2;
-
-       if (multicol)
-               sa2 = getAlignSpecial(tabular_, cell,
-                       Tabular::SET_SPECIAL_MULTI);
-       else
-               sa2 = getAlignSpecial(tabular_, cell,
-                       Tabular::SET_SPECIAL_COLUMN);
-
-       if (sa1 != sa2) {
-               if (multicol)
-                       set(Tabular::SET_SPECIAL_MULTI, to_utf8(sa1));
-               else
-                       set(Tabular::SET_SPECIAL_COLUMN, to_utf8(sa1));
-       }
-
-       if (width != width2) {
-               if (multicol)
-                       set(Tabular::SET_MPWIDTH, width);
-               else
-                       set(Tabular::SET_PWIDTH, width);
-       }
-
-       /* DO WE NEED THIS?
-       switch (topspaceCO->currentIndex()) {
-               case 0:
-                       set(Tabular::SET_TOP_SPACE, "");
-                       break;
-               case 1:
-                       set(Tabular::SET_TOP_SPACE, "default");
-                       break;
-               case 2:
-                       set(Tabular::SET_TOP_SPACE,
-                               widgetsToLength(topspaceED,
-                                       topspaceUnit));
-                       break;
-       }
-
-       switch (bottomspaceCO->currentIndex()) {
-               case 0:
-                       set(Tabular::SET_BOTTOM_SPACE, "");
-                       break;
-               case 1:
-                       set(Tabular::SET_BOTTOM_SPACE, "default");
-                       break;
-               case 2:
-                       set(Tabular::SET_BOTTOM_SPACE,
-                               widgetsToLength(bottomspaceED,
-                                       bottomspaceUnit));
-                       break;
-       }
-
-       switch (interlinespaceCO->currentIndex()) {
-               case 0:
-                       set(Tabular::SET_INTERLINE_SPACE, "");
-                       break;
-               case 1:
-                       set(Tabular::SET_INTERLINE_SPACE, "default");
-                       break;
-               case 2:
-                       set(Tabular::SET_INTERLINE_SPACE,
-                               widgetsToLength(interlinespaceED,
-                                       interlinespaceUnit));
-                       break;
-       }
-*/
-}
-
-
 bool GuiTabular::initialiseParams(string const & data)
 {
        // try to get the current cell
@@ -1159,127 +1030,6 @@ void GuiTabular::set(Tabular::Feature f, string const & arg)
 }
 
 
-void GuiTabular::setSpecial(string const & special)
-{
-       if (tabular_.isMultiColumn(getActiveCell()))
-               set(Tabular::SET_SPECIAL_MULTI, special);
-       else
-               set(Tabular::SET_SPECIAL_COLUMN, special);
-}
-
-
-void GuiTabular::setWidth(string const & width)
-{
-       if (tabular_.isMultiColumn(getActiveCell()))
-               set(Tabular::SET_MPWIDTH, width);
-       else
-               set(Tabular::SET_PWIDTH, width);
-
-       updateView();
-}
-
-
-void GuiTabular::toggleMultiColumn()
-{
-       set(Tabular::MULTICOLUMN);
-       updateView();
-}
-
-
-void GuiTabular::rotateTabular(bool yes)
-{
-       if (yes)
-               set(Tabular::SET_ROTATE_TABULAR);
-       else
-               set(Tabular::UNSET_ROTATE_TABULAR);
-}
-
-
-void GuiTabular::rotateCell(bool yes)
-{
-       if (yes)
-               set(Tabular::SET_ROTATE_CELL);
-       else
-               set(Tabular::UNSET_ROTATE_CELL);
-}
-
-
-void GuiTabular::halign(GuiTabular::HALIGN h)
-{
-       Tabular::Feature num = Tabular::ALIGN_LEFT;
-       Tabular::Feature multi_num = Tabular::M_ALIGN_LEFT;
-
-       switch (h) {
-               case LEFT:
-                       num = Tabular::ALIGN_LEFT;
-                       multi_num = Tabular::M_ALIGN_LEFT;
-                       break;
-               case CENTER:
-                       num = Tabular::ALIGN_CENTER;
-                       multi_num = Tabular::M_ALIGN_CENTER;
-                       break;
-               case RIGHT:
-                       num = Tabular::ALIGN_RIGHT;
-                       multi_num = Tabular::M_ALIGN_RIGHT;
-                       break;
-               case BLOCK:
-                       num = Tabular::ALIGN_BLOCK;
-                       //multi_num: no equivalent
-                       break;
-       }
-
-       if (tabular_.isMultiColumn(getActiveCell()))
-               set(multi_num);
-       else
-               set(num);
-}
-
-
-void GuiTabular::valign(GuiTabular::VALIGN v)
-{
-       Tabular::Feature num = Tabular::VALIGN_MIDDLE;
-       Tabular::Feature multi_num = Tabular::M_VALIGN_MIDDLE;
-
-       switch (v) {
-               case TOP:
-                       num = Tabular::VALIGN_TOP;
-                       multi_num = Tabular::M_VALIGN_TOP;
-                       break;
-               case MIDDLE:
-                       num = Tabular::VALIGN_MIDDLE;
-                       multi_num = Tabular::M_VALIGN_MIDDLE;
-                       break;
-               case BOTTOM:
-                       num = Tabular::VALIGN_BOTTOM;
-                       multi_num = Tabular::M_VALIGN_BOTTOM;
-                       break;
-       }
-
-       if (tabular_.isMultiColumn(getActiveCell()))
-               set(multi_num);
-       else
-               set(num);
-}
-
-
-void GuiTabular::booktabs(bool yes)
-{
-       if (yes)
-               set(Tabular::SET_BOOKTABS);
-       else
-               set(Tabular::UNSET_BOOKTABS);
-}
-
-
-void GuiTabular::longTabular(bool yes)
-{
-       if (yes)
-               set(Tabular::SET_LONGTABULAR);
-       else
-               set(Tabular::UNSET_LONGTABULAR);
-}
-
-
 // to get the status of the longtable row settings
 bool GuiTabular::funcEnabled(Tabular::Feature f) const
 {

diff --git a/src/frontends/qt4/GuiTabular.h b/src/frontends/qt4/GuiTabular.h
index 158a0ad6f1434842904c5f32203a4fde510f7773..e546e831ab10868a0f3a0d5c227a2e6a31b326ab 100644 (file)
--- a/src/frontends/qt4/GuiTabular.h
+++ b/src/frontends/qt4/GuiTabular.h
@@ -37,49 +37,18 @@ private Q_SLOTS:
        void bottomspace_changed();
        void interlinespace_changed();
        void booktabsChanged(bool);
-       void close_clicked();
        void borderSet_clicked();
        void borderUnset_clicked();
-       void leftBorder_changed();
-       void rightBorder_changed();
-       void topBorder_changed();
-       void bottomBorder_changed();
-       void multicolumn_clicked();
-       void rotateTabular();
-       void rotateCell();
-       void hAlign_changed(int align);
-       void vAlign_changed(int align);
-       void tableAlignment_changed(int align);
-       void specialAlignment_changed();
-       void width_changed();
-       void longTabular();
-       void ltNewpage_clicked();
-       void ltHeaderStatus_clicked();
-       void ltHeaderBorderAbove_clicked();
-       void ltHeaderBorderBelow_clicked();
-       void ltFirstHeaderStatus_clicked();
-       void ltFirstHeaderBorderAbove_clicked();
-       void ltFirstHeaderBorderBelow_clicked();
-       void ltFirstHeaderEmpty_clicked();
-       void ltFooterStatus_clicked();
-       void ltFooterBorderAbove_clicked();
-       void ltFooterBorderBelow_clicked();
-       void ltLastFooterStatus_clicked();
-       void ltLastFooterBorderAbove_clicked();
-       void ltLastFooterBorderBelow_clicked();
-       void ltLastFooterEmpty_clicked();
-       void ltAlignment_clicked();
-       void on_captionStatusCB_toggled();
 
 private:
        ///
        bool isValid() { return true; }
        /// update borders
        void update_borders();
+       ///
+       void applyView();
        /// update
        void updateContents();
-       /// save some values before closing the gui
-       void closeGUI();
        ///
        bool initialiseParams(std::string const & data);
        /// clean-up on hide.
@@ -96,33 +65,14 @@ private:
        /// set a parameter
        void set(Tabular::Feature, std::string const & arg = std::string());
 
-       void setSpecial(std::string const & special);
-
-       void setWidth(std::string const & width);
-
-       void toggleMultiColumn();
-
-       void rotateTabular(bool yes);
-       void rotateCell(bool yes);
-
-       enum HALIGN { LEFT, RIGHT, CENTER, BLOCK };
-
-       void halign(HALIGN h);
-
-       enum VALIGN { TOP, MIDDLE, BOTTOM };
-
-       void valign(VALIGN h);
-
-       void booktabs(bool yes);
-
-       void longTabular(bool yes);
-
        bool funcEnabled(Tabular::Feature f) const;
 
        ///
        Tabular::idx_type active_cell_;
        ///
        Tabular tabular_;
+       ///
+       bool applying_;
 };
 
 } // namespace frontend

diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index 6385ac9ea67b9a60db73e9d20cc7293887026deb..cea30780cffded4faeffd0d0a0f301c618944b62 100644 (file)
--- a/src/frontends/qt4/ui/TabularUi.ui
+++ b/src/frontends/qt4/ui/TabularUi.ui
@@ -1,188 +1,162 @@
-<ui version="4.0">
+<ui version="4.0" >
  <class>TabularUi</class>
- <widget class="QDialog" name="TabularUi">
-  <property name="geometry">
+ <widget class="QDialog" name="TabularUi" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>378</width>
-    <height>401</height>
+    <width>470</width>
+    <height>491</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string/>
   </property>
-  <property name="sizeGripEnabled">
+  <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
+  <layout class="QGridLayout" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="spacing">
+   <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="TextLabel1">
-       <property name="text">
-        <string>Current cell:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tabularRowED">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>32767</height>
-        </size>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Current row position</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tabularColumnED">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>32767</height>
-        </size>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Current column position</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0">
-    <widget class="QTabWidget" name="TabWidget">
-     <property name="toolTip">
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="TabWidget" >
+     <property name="toolTip" >
       <string/>
      </property>
-     <property name="tabShape">
+     <property name="tabShape" >
       <enum>QTabWidget::Rounded</enum>
      </property>
-     <property name="currentIndex">
+     <property name="currentIndex" >
       <number>0</number>
      </property>
-     <widget class="QWidget" name="Settings">
-      <attribute name="title">
+     <widget class="QWidget" name="Settings" >
+      <attribute name="title" >
        <string>&amp;Table Settings</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_6">
-       <item row="0" column="0">
-        <widget class="QGroupBox" name="GroupBox12">
-         <property name="title">
-          <string>Column settings</string>
+      <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item row="2" column="0" >
+        <widget class="QGroupBox" name="tabAlignmentGB" >
+         <property name="enabled" >
+          <bool>true</bool>
          </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="0" column="0">
-           <widget class="QLabel" name="hAlignCO">
-            <property name="text">
-             <string>&amp;Horizontal alignment:</string>
+         <property name="title" >
+          <string>Table-wide settings</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="2" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
             </property>
-            <property name="buddy">
-             <cstring>hAlignCB</cstring>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>153</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="0" colspan="2" >
+           <widget class="QCheckBox" name="rotateTabularCB" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+            <property name="toolTip" >
+             <string>Rotate the table by 90 degrees</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Rotate table 90 degrees</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="hAlignCB">
-            <property name="toolTip">
-             <string>Horizontal alignment in column</string>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="TableAlignCB" >
+            <property name="toolTip" >
+             <string>Vertical alignment of the table</string>
+            </property>
+            <property name="currentIndex" >
+             <number>1</number>
             </property>
             <item>
-             <property name="text">
-              <string>Justified</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Left</string>
+             <property name="text" >
+              <string>Top</string>
              </property>
             </item>
             <item>
-             <property name="text">
-              <string>Center</string>
+             <property name="text" >
+              <string>Middle</string>
              </property>
             </item>
             <item>
-             <property name="text">
-              <string>Right</string>
+             <property name="text" >
+              <string>Bottom</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="0" column="2">
+          <item row="0" column="0" >
+           <widget class="QLabel" name="TableAlignCO" >
+            <property name="text" >
+             <string>Verti&amp;cal alignment:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>vAlignCB</cstring>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupBox12" >
+         <property name="title" >
+          <string>Column settings</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="3" column="0" >
+           <widget class="QCheckBox" name="multicolumnCB" >
+            <property name="toolTip" >
+             <string>Merge cells</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Multicolumn</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2" >
            <spacer>
-            <property name="orientation">
+            <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType">
+            <property name="sizeType" >
              <enum>QSizePolicy::Expanding</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+            <property name="sizeHint" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -190,41 +164,47 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="fixedWidthColLA">
-            <property name="text">
-             <string>&amp;Width:</string>
-            </property>
-            <property name="buddy">
-             <cstring>widthED</cstring>
+          <item row="2" column="1" >
+           <widget class="QComboBox" name="vAlignCB" >
+            <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="1" column="1">
-           <widget class="QLineEdit" name="widthED">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="toolTip">
-             <string>Fixed width of the column</string>
+          <item row="2" column="0" >
+           <widget class="QLabel" name="vAlignCO" >
+            <property name="text" >
+             <string>&amp;Vertical alignment in row:</string>
             </property>
-            <property name="text">
-             <string/>
+            <property name="buddy" >
+             <cstring>vAlignCB</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="LengthCombo" name="widthUnitCB"/>
-          </item>
-          <item row="1" column="3">
-           <spacer name="spacer_3">
-            <property name="orientation">
+          <item row="1" column="3" >
+           <spacer>
+            <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType">
+            <property name="sizeType" >
              <enum>QSizePolicy::Expanding</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+            <property name="sizeHint" >
              <size>
               <width>7</width>
               <height>20</height>
@@ -232,47 +212,41 @@
             </property>
            </spacer>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="vAlignCO">
-            <property name="text">
-             <string>&amp;Vertical alignment in row:</string>
+          <item row="1" column="2" >
+           <widget class="LengthCombo" name="widthUnitCB" />
+          </item>
+          <item row="1" column="1" >
+           <widget class="QLineEdit" name="widthED" >
+            <property name="enabled" >
+             <bool>true</bool>
             </property>
-            <property name="buddy">
-             <cstring>vAlignCB</cstring>
+            <property name="toolTip" >
+             <string>Fixed width of the column</string>
+            </property>
+            <property name="text" >
+             <string/>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="vAlignCB">
-            <property name="toolTip">
-             <string>Specifies the vertical alignment of this cell in relation to the baseline of the row.</string>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="fixedWidthColLA" >
+            <property name="text" >
+             <string>&amp;Width:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>widthED</cstring>
             </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="2" column="2">
-           <spacer name="spacer">
-            <property name="orientation">
+          <item row="0" column="2" >
+           <spacer>
+            <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType">
+            <property name="sizeType" >
              <enum>QSizePolicy::Expanding</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+            <property name="sizeHint" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -280,31 +254,64 @@
             </property>
            </spacer>
           </item>
-          <item row="3" column="0">
-           <widget class="QCheckBox" name="multicolumnCB">
-            <property name="toolTip">
-             <string>Merge cells</string>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="hAlignCB" >
+            <property name="toolTip" >
+             <string>Horizontal alignment in column</string>
             </property>
-            <property name="text">
-             <string>&amp;Multicolumn</string>
+            <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>
+           </widget>
+          </item>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="hAlignCO" >
+            <property name="text" >
+             <string>&amp;Horizontal alignment:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>hAlignCB</cstring>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
+       <item row="1" column="0" >
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
           <string>Cell setting</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="rotateCellCB">
-            <property name="toolTip">
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <widget class="QCheckBox" name="rotateCellCB" >
+            <property name="toolTip" >
              <string>Rotate this cell by 90 degrees</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>Rotate &amp;cell 90 degrees</string>
             </property>
            </widget>
@@ -312,293 +319,459 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="tabAlignmentGB">
-         <property name="enabled">
-          <bool>true</bool>
+       <item row="3" column="0" >
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
          </property>
-         <property name="title">
-          <string>Table-wide settings</string>
+         <property name="spacing" >
+          <number>6</number>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="0" column="0">
-           <widget class="QLabel" name="TableAlignCO">
-            <property name="text">
-             <string>Verti&amp;cal alignment:</string>
+         <item>
+          <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>
+          <widget class="QLineEdit" name="specialAlignmentED" >
+           <property name="toolTip" >
+            <string>Custom column format (LaTeX)</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Borders" >
+      <attribute name="title" >
+       <string>&amp;Borders</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item row="3" column="1" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>43</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="0" colspan="4" >
+        <widget class="QGroupBox" name="SpaceGB" >
+         <property name="title" >
+          <string>Additional Space</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="topspaceLA" >
+            <property name="text" >
+             <string>T&amp;op of row:</string>
             </property>
-            <property name="buddy">
-             <cstring>vAlignCB</cstring>
+            <property name="buddy" >
+             <cstring>topspaceCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="TableAlignCB">
-            <property name="toolTip">
-             <string>Vertical alignment of the table</string>
-            </property>
-            <property name="currentIndex">
-             <number>1</number>
-            </property>
+          <item row="0" column="2" >
+           <widget class="QLineEdit" name="topspaceED" />
+          </item>
+          <item row="0" column="3" >
+           <widget class="LengthCombo" name="topspaceUnit" />
+          </item>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="topspaceCO" >
             <item>
-             <property name="text">
-              <string>Top</string>
+             <property name="text" >
+              <string>None</string>
              </property>
             </item>
             <item>
-             <property name="text">
-              <string>Middle</string>
+             <property name="text" >
+              <string>Default</string>
              </property>
             </item>
             <item>
-             <property name="text">
-              <string>Bottom</string>
+             <property name="text" >
+              <string>Custom</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="0" column="2">
-           <spacer name="spacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
+          <item row="1" column="1" >
+           <widget class="QComboBox" name="bottomspaceCO" >
+            <item>
+             <property name="text" >
+              <string>None</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Default</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Custom</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="3" >
+           <widget class="LengthCombo" name="bottomspaceUnit" />
+          </item>
+          <item row="1" column="2" >
+           <widget class="QLineEdit" name="bottomspaceED" />
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="bottomspaceLA" >
+            <property name="text" >
+             <string>Botto&amp;m of row:</string>
             </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>153</width>
-              <height>20</height>
-             </size>
+            <property name="buddy" >
+             <cstring>bottomspaceCO</cstring>
             </property>
-           </spacer>
+           </widget>
           </item>
-          <item row="1" column="0" colspan="2">
-           <widget class="QCheckBox" name="rotateTabularCB">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="toolTip">
-             <string>Rotate the table by 90 degrees</string>
+          <item row="2" column="2" >
+           <widget class="QLineEdit" name="interlinespaceED" />
+          </item>
+          <item row="2" column="0" >
+           <widget class="QLabel" name="interlinespaceLA" >
+            <property name="text" >
+             <string>Bet&amp;ween rows:</string>
             </property>
-            <property name="text">
-             <string>&amp;Rotate table 90 degrees</string>
+            <property name="buddy" >
+             <cstring>interlinespaceCO</cstring>
             </property>
            </widget>
           </item>
+          <item row="2" column="1" >
+           <widget class="QComboBox" name="interlinespaceCO" >
+            <item>
+             <property name="text" >
+              <string>None</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Default</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Custom</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="2" column="3" >
+           <widget class="LengthCombo" name="interlinespaceUnit" />
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <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>
-          <widget class="QLineEdit" name="specialAlignmentED">
-           <property name="toolTip">
-            <string>Custom column format (LaTeX)</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
+       <item row="1" column="1" >
+        <spacer>
+         <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0">
+         <property name="sizeHint" >
           <size>
            <width>20</width>
-           <height>68</height>
+           <height>44</height>
           </size>
          </property>
         </spacer>
        </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="Borders">
-      <attribute name="title">
-       <string>&amp;Borders</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_8">
-       <item row="0" column="0">
-        <widget class="QGroupBox" name="setBordersGB">
-         <property name="title">
+       <item row="0" column="3" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>63</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="2" >
+        <widget class="QGroupBox" name="borderStyleGB" >
+         <property name="title" >
+          <string>Style</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="booktabsRB" >
+            <property name="toolTip" >
+             <string>Use formal (a.k.a. booktabs) border style (no vertical borders)</string>
+            </property>
+            <property name="text" >
+             <string>Fo&amp;rmal</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="borderDefaultRB" >
+            <property name="toolTip" >
+             <string>Use default (grid-like) border style</string>
+            </property>
+            <property name="text" >
+             <string>De&amp;fault</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QGroupBox" name="allBordersGB" >
+         <property name="title" >
+          <string>All Borders</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <widget class="QPushButton" name="borderSetPB" >
+            <property name="toolTip" >
+             <string>Set all borders of the current (selected) cell(s)</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Set</string>
+            </property>
+            <property name="checkable" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QPushButton" name="borderUnsetPB" >
+            <property name="toolTip" >
+             <string>Unset all borders of the current (selected) cell(s)</string>
+            </property>
+            <property name="text" >
+             <string>C&amp;lear</string>
+            </property>
+            <property name="checkable" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QGroupBox" name="setBordersGB" >
+         <property name="title" >
           <string>Set Borders</string>
          </property>
-         <layout class="QGridLayout">
-          <property name="margin">
+         <layout class="QGridLayout" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="spacing">
+          <property name="spacing" >
            <number>6</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QFrame" name="bordersF">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <item row="0" column="0" >
+           <widget class="QFrame" name="bordersF" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>0</hsizetype>
+              <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="palette">
+            <property name="palette" >
              <palette>
               <active>
-               <colorrole role="WindowText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="WindowText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Button">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Button" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>230</red>
                   <green>240</green>
                   <blue>249</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Light">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Light" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Midlight">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Midlight" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>242</red>
                   <green>247</green>
                   <blue>252</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Dark">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Dark" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>115</red>
                   <green>120</green>
                   <blue>124</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Mid">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Mid" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>154</red>
                   <green>160</green>
                   <blue>166</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Text">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Text" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="BrightText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="BrightText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="ButtonText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="ButtonText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Base">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Base" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Window">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Window" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Shadow">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Shadow" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Highlight">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Highlight" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>16</red>
                   <green>145</green>
                   <blue>210</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="HighlightedText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="HighlightedText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Link">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Link" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="LinkVisited">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="LinkVisited" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>0</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="AlternateBase">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="AlternateBase" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>232</red>
                   <green>232</green>
                   <blue>232</blue>
@@ -607,153 +780,153 @@
                </colorrole>
               </active>
               <inactive>
-               <colorrole role="WindowText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="WindowText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Button">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Button" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>230</red>
                   <green>240</green>
                   <blue>249</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Light">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Light" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Midlight">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Midlight" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Dark">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Dark" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>115</red>
                   <green>120</green>
                   <blue>124</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Mid">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Mid" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>154</red>
                   <green>160</green>
                   <blue>166</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Text">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Text" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="BrightText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="BrightText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="ButtonText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="ButtonText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Base">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Base" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Window">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Window" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Shadow">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Shadow" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>0</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Highlight">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Highlight" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>16</red>
                   <green>145</green>
                   <blue>210</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="HighlightedText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="HighlightedText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>255</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="Link">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="Link" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>0</red>
                   <green>0</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="LinkVisited">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="LinkVisited" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>255</red>
                   <green>0</green>
                   <blue>255</blue>
                  </color>
                 </brush>
                </colorrole>
-               <colorrole role="AlternateBase">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="AlternateBase" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>232</red>
                   <green>232</green>
                   <blue>232</blue>
@@ -762,656 +935,435 @@
                </colorrole>
               </inactive>
               <disabled>
-               <colorrole role="WindowText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>128</red>
-                  <green>128</green>
-                  <blue>128</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Button">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>230</red>
-                  <green>240</green>
-                  <blue>249</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Light">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>255</red>
-                  <green>255</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Midlight">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>255</red>
-                  <green>255</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Dark">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>115</red>
-                  <green>120</green>
-                  <blue>124</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Mid">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>154</red>
-                  <green>160</green>
-                  <blue>166</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Text">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>0</red>
-                  <green>0</green>
-                  <blue>0</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="BrightText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>255</red>
-                  <green>255</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="ButtonText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
+               <colorrole role="WindowText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
                   <red>128</red>
-                  <green>128</green>
-                  <blue>128</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Base">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>255</red>
-                  <green>255</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Window">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>255</red>
-                  <green>255</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Shadow">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>0</red>
-                  <green>0</green>
-                  <blue>0</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Highlight">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>16</red>
-                  <green>145</green>
-                  <blue>210</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="HighlightedText">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>255</red>
-                  <green>255</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="Link">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>0</red>
-                  <green>0</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="LinkVisited">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>255</red>
-                  <green>0</green>
-                  <blue>255</blue>
-                 </color>
-                </brush>
-               </colorrole>
-               <colorrole role="AlternateBase">
-                <brush brushstyle="SolidPattern">
-                 <color alpha="255">
-                  <red>232</red>
-                  <green>232</green>
-                  <blue>232</blue>
-                 </color>
-                </brush>
-               </colorrole>
-              </disabled>
-             </palette>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::StyledPanel</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Sunken</enum>
-            </property>
-            <layout class="QGridLayout">
-             <property name="margin">
-              <number>9</number>
-             </property>
-             <property name="spacing">
-              <number>6</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="GuiSetBorder" name="borders" native="true">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="toolTip">
-                <string>Set borders of the current (selected) cell(s)</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QGroupBox" name="allBordersGB">
-         <property name="title">
-          <string>All Borders</string>
-         </property>
-         <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QPushButton" name="borderSetPB">
-            <property name="toolTip">
-             <string>Set all borders of the current (selected) cell(s)</string>
-            </property>
-            <property name="text">
-             <string>&amp;Set</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="borderUnsetPB">
-            <property name="toolTip">
-             <string>Unset all borders of the current (selected) cell(s)</string>
-            </property>
-            <property name="text">
-             <string>C&amp;lear</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QGroupBox" name="borderStyleGB">
-         <property name="title">
-          <string>Style</string>
-         </property>
-         <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item row="1" column="0">
-           <widget class="QRadioButton" name="booktabsRB">
-            <property name="toolTip">
-             <string>Use formal (a.k.a. booktabs) border style (no vertical borders)</string>
-            </property>
-            <property name="text">
-             <string>Fo&amp;rmal</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QRadioButton" name="borderDefaultRB">
-            <property name="toolTip">
-             <string>Use default (grid-like) border style</string>
-            </property>
-            <property name="text">
-             <string>De&amp;fault</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="0" column="3">
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>63</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="1">
-        <spacer name="spacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>44</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0" colspan="4">
-        <widget class="QGroupBox" name="SpaceGB">
-         <property name="title">
-          <string>Additional Space</string>
-         </property>
-         <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="topspaceLA">
-            <property name="text">
-             <string>T&amp;op of row:</string>
-            </property>
-            <property name="buddy">
-             <cstring>topspaceCO</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QLineEdit" name="topspaceED"/>
-          </item>
-          <item row="0" column="3">
-           <widget class="LengthCombo" name="topspaceUnit"/>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="topspaceCO">
-            <item>
-             <property name="text">
-              <string>None</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Custom</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="bottomspaceCO">
-            <item>
-             <property name="text">
-              <string>None</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Custom</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="LengthCombo" name="bottomspaceUnit"/>
-          </item>
-          <item row="1" column="2">
-           <widget class="QLineEdit" name="bottomspaceED"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="bottomspaceLA">
-            <property name="text">
-             <string>Botto&amp;m of row:</string>
-            </property>
-            <property name="buddy">
-             <cstring>bottomspaceCO</cstring>
+                  <green>128</green>
+                  <blue>128</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Button" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>230</red>
+                  <green>240</green>
+                  <blue>249</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Light" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>255</red>
+                  <green>255</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Midlight" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>255</red>
+                  <green>255</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Dark" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>115</red>
+                  <green>120</green>
+                  <blue>124</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Mid" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>154</red>
+                  <green>160</green>
+                  <blue>166</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Text" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>0</red>
+                  <green>0</green>
+                  <blue>0</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="BrightText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>255</red>
+                  <green>255</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="ButtonText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>128</red>
+                  <green>128</green>
+                  <blue>128</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Base" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>255</red>
+                  <green>255</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Window" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>255</red>
+                  <green>255</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Shadow" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>0</red>
+                  <green>0</green>
+                  <blue>0</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Highlight" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>16</red>
+                  <green>145</green>
+                  <blue>210</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="HighlightedText" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>255</red>
+                  <green>255</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="Link" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>0</red>
+                  <green>0</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="LinkVisited" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>255</red>
+                  <green>0</green>
+                  <blue>255</blue>
+                 </color>
+                </brush>
+               </colorrole>
+               <colorrole role="AlternateBase" >
+                <brush brushstyle="SolidPattern" >
+                 <color alpha="255" >
+                  <red>232</red>
+                  <green>232</green>
+                  <blue>232</blue>
+                 </color>
+                </brush>
+               </colorrole>
+              </disabled>
+             </palette>
             </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QLineEdit" name="interlinespaceED"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="interlinespaceLA">
-            <property name="text">
-             <string>Bet&amp;ween rows:</string>
+            <property name="frameShape" >
+             <enum>QFrame::StyledPanel</enum>
             </property>
-            <property name="buddy">
-             <cstring>interlinespaceCO</cstring>
+            <property name="frameShadow" >
+             <enum>QFrame::Sunken</enum>
             </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="interlinespaceCO">
-            <item>
-             <property name="text">
-              <string>None</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Default</string>
+            <layout class="QGridLayout" >
+             <property name="margin" >
+              <number>9</number>
              </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Custom</string>
+             <property name="spacing" >
+              <number>6</number>
              </property>
-            </item>
+             <item row="0" column="0" >
+              <widget class="GuiSetBorder" native="1" name="borders" >
+               <property name="sizePolicy" >
+                <sizepolicy>
+                 <hsizetype>0</hsizetype>
+                 <vsizetype>0</vsizetype>
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="toolTip" >
+                <string>Set borders of the current (selected) cell(s)</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
            </widget>
           </item>
-          <item row="2" column="3">
-           <widget class="LengthCombo" name="interlinespaceUnit"/>
-          </item>
          </layout>
         </widget>
        </item>
-       <item row="3" column="1">
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>43</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="Longtables">
-      <attribute name="title">
+     <widget class="QWidget" name="Longtables" >
+      <attribute name="title" >
        <string>&amp;Longtable</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_7">
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="longTabularCB">
-         <property name="toolTip">
+      <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item row="0" column="0" >
+        <widget class="QCheckBox" name="longTabularCB" >
+         <property name="toolTip" >
           <string>Select for tables that span multiple pages</string>
          </property>
-         <property name="text">
+         <property name="text" >
           <string>&amp;Use long table</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="longtableGB">
-         <property name="enabled">
+       <item row="1" column="0" >
+        <widget class="QGroupBox" name="longtableGB" >
+         <property name="enabled" >
           <bool>false</bool>
          </property>
-         <property name="title">
+         <property name="title" >
           <string>Row settings</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="1">
-           <widget class="QLabel" name="StatusLA">
-            <property name="text">
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="1" >
+           <widget class="QLabel" name="StatusLA" >
+            <property name="text" >
              <string>Status</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QLabel" name="BorderAboveLA">
-            <property name="text">
+          <item row="0" column="2" >
+           <widget class="QLabel" name="BorderAboveLA" >
+            <property name="text" >
              <string>Border above</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <widget class="QLabel" name="BorderBelowLA">
-            <property name="text">
+          <item row="0" column="3" >
+           <widget class="QLabel" name="BorderBelowLA" >
+            <property name="text" >
              <string>Border below</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="4">
-           <widget class="QLabel" name="ContentsLA">
-            <property name="text">
+          <item row="0" column="4" >
+           <widget class="QLabel" name="ContentsLA" >
+            <property name="text" >
              <string>Contents</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="HeaderLA">
-            <property name="text">
+          <item row="1" column="0" >
+           <widget class="QLabel" name="HeaderLA" >
+            <property name="text" >
              <string>Header:</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="headerStatusCB">
-            <property name="toolTip">
+          <item row="1" column="1" >
+           <widget class="QCheckBox" name="headerStatusCB" >
+            <property name="toolTip" >
              <string>Repeat this row as header on every (except the first) page</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>on</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QCheckBox" name="headerBorderAboveCB">
-            <property name="toolTip">
+          <item row="1" column="2" >
+           <widget class="QCheckBox" name="headerBorderAboveCB" >
+            <property name="toolTip" >
              <string/>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
-           <widget class="QCheckBox" name="headerBorderBelowCB">
-            <property name="text">
+          <item row="1" column="3" >
+           <widget class="QCheckBox" name="headerBorderBelowCB" >
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="FirstHeaderLA">
-            <property name="text">
+          <item row="2" column="0" >
+           <widget class="QLabel" name="FirstHeaderLA" >
+            <property name="text" >
              <string>First header:</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QCheckBox" name="firstheaderStatusCB">
-            <property name="toolTip">
+          <item row="2" column="1" >
+           <widget class="QCheckBox" name="firstheaderStatusCB" >
+            <property name="toolTip" >
              <string>This row is the header of the first page</string>
             </property>
-            <property name="whatsThis">
+            <property name="whatsThis" >
              <string/>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>on</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="2">
-           <widget class="QCheckBox" name="firstheaderBorderAboveCB">
-            <property name="text">
+          <item row="2" column="2" >
+           <widget class="QCheckBox" name="firstheaderBorderAboveCB" >
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="3">
-           <widget class="QCheckBox" name="firstheaderBorderBelowCB">
-            <property name="text">
+          <item row="2" column="3" >
+           <widget class="QCheckBox" name="firstheaderBorderBelowCB" >
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="4">
-           <widget class="QCheckBox" name="firstheaderNoContentsCB">
-            <property name="toolTip">
+          <item row="2" column="4" >
+           <widget class="QCheckBox" name="firstheaderNoContentsCB" >
+            <property name="toolTip" >
              <string>Don't output the first header</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>is empty</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="FooterLA">
-            <property name="text">
+          <item row="3" column="0" >
+           <widget class="QLabel" name="FooterLA" >
+            <property name="text" >
              <string>Footer:</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QCheckBox" name="footerStatusCB">
-            <property name="toolTip">
+          <item row="3" column="1" >
+           <widget class="QCheckBox" name="footerStatusCB" >
+            <property name="toolTip" >
              <string>Repeat this row as footer on every (except the last) page</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>on</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="2">
-           <widget class="QCheckBox" name="footerBorderAboveCB">
-            <property name="text">
+          <item row="3" column="2" >
+           <widget class="QCheckBox" name="footerBorderAboveCB" >
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="3">
-           <widget class="QCheckBox" name="footerBorderBelowCB">
-            <property name="text">
+          <item row="3" column="3" >
+           <widget class="QCheckBox" name="footerBorderBelowCB" >
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="LastFooterLA">
-            <property name="text">
+          <item row="4" column="0" >
+           <widget class="QLabel" name="LastFooterLA" >
+            <property name="text" >
              <string>Last footer:</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QCheckBox" name="lastfooterStatusCB">
-            <property name="toolTip">
+          <item row="4" column="1" >
+           <widget class="QCheckBox" name="lastfooterStatusCB" >
+            <property name="toolTip" >
              <string>This row is the footer of the last page</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>on</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="2">
-           <widget class="QCheckBox" name="lastfooterBorderAboveCB">
-            <property name="text">
+          <item row="4" column="2" >
+           <widget class="QCheckBox" name="lastfooterBorderAboveCB" >
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="3">
-           <widget class="QCheckBox" name="lastfooterBorderBelowCB">
-            <property name="text">
+          <item row="4" column="3" >
+           <widget class="QCheckBox" name="lastfooterBorderBelowCB" >
+            <property name="text" >
              <string>double</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="4">
-           <widget class="QCheckBox" name="lastfooterNoContentsCB">
-            <property name="toolTip">
+          <item row="4" column="4" >
+           <widget class="QCheckBox" name="lastfooterNoContentsCB" >
+            <property name="toolTip" >
              <string>Don't output the last footer</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>is empty</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
+          <item row="5" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
              <string>Caption:</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="1">
-           <widget class="QCheckBox" name="captionStatusCB">
-            <property name="text">
+          <item row="5" column="1" >
+           <widget class="QCheckBox" name="captionStatusCB" >
+            <property name="text" >
              <string>on</string>
             </property>
            </widget>
           </item>
-          <item row="6" column="0" colspan="3">
-           <widget class="QCheckBox" name="newpageCB">
-            <property name="enabled">
+          <item row="6" column="0" colspan="3" >
+           <widget class="QCheckBox" name="newpageCB" >
+            <property name="enabled" >
              <bool>false</bool>
             </property>
-            <property name="toolTip">
+            <property name="toolTip" >
              <string>Set a page break on the current row</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>Page &amp;break on current row</string>
             </property>
            </widget>
@@ -1419,38 +1371,44 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="alignmentGB">
-         <property name="enabled">
+       <item row="2" column="0" >
+        <widget class="QGroupBox" name="alignmentGB" >
+         <property name="enabled" >
           <bool>false</bool>
          </property>
-         <property name="toolTip">
+         <property name="toolTip" >
           <string>Horizontal alignment of the longtable</string>
          </property>
-         <property name="title">
+         <property name="title" >
           <string>Longtable alignment</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout9">
-          <item row="0" column="0">
-           <widget class="QRadioButton" name="leftRB">
-            <property name="text">
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="leftRB" >
+            <property name="text" >
              <string>Left</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QRadioButton" name="centerRB">
-            <property name="text">
+          <item row="0" column="1" >
+           <widget class="QRadioButton" name="centerRB" >
+            <property name="text" >
              <string>Center</string>
             </property>
-            <property name="checked">
+            <property name="checked" >
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QRadioButton" name="rightRB">
-            <property name="text">
+          <item row="0" column="2" >
+           <widget class="QRadioButton" name="rightRB" >
+            <property name="text" >
              <string>Right</string>
             </property>
            </widget>
@@ -1458,23 +1416,154 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>91</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
     </widget>
    </item>
+   <item row="2" column="0" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="restorePB" >
+       <property name="text" >
+        <string>&amp;Restore</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>31</width>
+         <height>27</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okPB" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyPB" >
+       <property name="text" >
+        <string>&amp;Apply</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closePB" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="TextLabel1" >
+       <property name="text" >
+        <string>Current cell:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="tabularRowED" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>40</width>
+         <height>32767</height>
+        </size>
+       </property>
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="toolTip" >
+        <string>Current row position</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="tabularColumnED" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>40</width>
+         <height>32767</height>
+        </size>
+       </property>
+       <property name="focusPolicy" >
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="toolTip" >
+        <string>Current column position</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -1499,7 +1588,6 @@
   <tabstop>rotateTabularCB</tabstop>
   <tabstop>rotateCellCB</tabstop>
   <tabstop>specialAlignmentED</tabstop>
-  <tabstop>closePB</tabstop>
   <tabstop>borderSetPB</tabstop>
   <tabstop>borderUnsetPB</tabstop>
   <tabstop>borderDefaultRB</tabstop>
@@ -1531,7 +1619,7 @@
   <tabstop>newpageCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local">qt_i18n.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 440bb03c66c978a4ddcb3145de9da262f49bfaa9..f5d6af679f354994ff91f42ba13d9f62ade9df14 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -829,7 +829,7 @@ void latexParagraphs(Buffer const & buf,
                texrow.newline();
                open_encoding_ = CJK;
        }
-       // if "auto begin" is switched off, explicitely switch the
+       // if "auto begin" is switched off, explicitly switch the
        // language on at start
        if (maintext && !lyxrc.language_auto_begin &&
            !bparams.language->babel().empty()) {
@@ -903,7 +903,7 @@ void latexParagraphs(Buffer const & buf,
                texrow.newline();
        }
 
-       // if "auto end" is switched off, explicitely close the language at the end
+       // if "auto end" is switched off, explicitly close the language at the end
        // but only if the last par is in a babel language
        if (maintext && !lyxrc.language_auto_end && !bparams.language->babel().empty() &&
                lastpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {