- GuiTabular.cpp: longtables cannot have a vertical alignment

[features.git] / src / frontends / qt4 / GuiTabular.cpp

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index c162f1fa0cd234487f9a44975fa84cfc9e81893c..91b68678a682101c8f44b729b7b4a475b35de334 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -84,6 +84,9 @@ GuiTabular::GuiTabular(GuiView & lv)
                newpageCB, SLOT(setEnabled(bool)));
        connect(longTabularCB, SIGNAL(toggled(bool)),
                alignmentGB, SLOT(setEnabled(bool)));
+       // longtables cannot have a vertical alignment
+       connect(longTabularCB, SIGNAL(toggled(bool)),
+               TableAlignCB, SLOT(setDisabled(bool)));
        connect(hAlignCB, SIGNAL(activated(int)),
                this, SLOT(hAlign_changed(int)));
        connect(vAlignCB, SIGNAL(activated(int)),
@@ -826,7 +829,7 @@ void GuiTabular::updateContents()
        hAlignCB->setEnabled(true);
        vAlignCB->setEnabled(!pwidth.zero());
 
-       int tableValign = 0;
+       int tableValign = 1;
        switch (tabular_.tabular_valignment) {
        case Tabular::LYX_VALIGN_TOP:
                tableValign = 0;
@@ -864,7 +867,9 @@ void GuiTabular::updateContents()
                captionStatusCB->setChecked(false);
                captionStatusCB->blockSignals(false);
                return;
-       }
+       } else
+               // longtables cannot have a vertical alignment
+               TableAlignCB->setCurrentIndex(Tabular::LYX_VALIGN_MIDDLE);
 
        switch (tabular_.longtabular_alignment) {
        case Tabular::LYX_LONGTABULAR_ALIGN_LEFT: