]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiTabular.cpp
* fix spelling in comments to please John.
[lyx.git] / src / frontends / qt4 / GuiTabular.cpp
index 9a6650b3ef9a2689a8c45406142146c6fda72b38..2a6a26bb3aa7b86aa0b6154e938eab4bc45e0d12 100644 (file)
@@ -4,8 +4,9 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Jürgen Spitzmüller
- * \author Herbert Voß
+ * \author Jürgen Spitzmüller
+ * \author Herbert Voß
+ * \author Uwe Stöhr
  *
  * Full author contact details are available in file CREDITS.
  */
 #include "GuiTabular.h"
 
 #include "GuiSetBorder.h"
+#include "GuiView.h"
 #include "LengthCombo.h"
-#include "Validator.h"
 #include "qt_helpers.h"
+#include "Validator.h"
 
-#include "support/convert.h"
+#include "BufferView.h"
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "LyXFunc.h"
+
+#include "insets/InsetTabular.h"
 
-#include <QCloseEvent>
 #include <QCheckBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QLineEdit>
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-/////////////////////////////////////////////////////////////////////
-//
-// GuiTabularDialog
-//
-/////////////////////////////////////////////////////////////////////
-
-GuiTabularDialog::GuiTabularDialog(GuiTabular * form)
-       : form_(form)
+GuiTabular::GuiTabular(GuiView & lv)
+       : GuiDialog(lv, "tabular", qt_("Table Settings")),
+       // tabular_ is initialised at dialog construction in initialiseParams()
+       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));
        interlinespaceED->setValidator(new LengthValidator(interlinespaceED));
 
-       connect(topspaceED, SIGNAL(returnPressed()),
-               this, SLOT(topspace_changed()));
+       widthUnitCB->setCurrentItem(Length::defaultUnit());
+
+       connect(topspaceED, SIGNAL(textChanged(QString)),
+               this, SLOT(change_adaptor()));
        connect(topspaceUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+               this, SLOT(change_adaptor()));
+       connect(topspaceCO, SIGNAL(activated(int)),
                this, SLOT(topspace_changed()));
-       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(change_adaptor()));
+       connect(bottomspaceCO, SIGNAL(activated(int)),
                this, SLOT(bottomspace_changed()));
-       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(change_adaptor()));
+       connect(interlinespaceCO, SIGNAL(activated(int)),
                this, SLOT(interlinespace_changed()));
-       connect(interlinespaceCO, SIGNAL(activated(int)), this, SLOT(interlinespace_changed()));
-       connect(booktabsRB, SIGNAL(clicked(bool)), this, SLOT(booktabsChanged(bool)));
-       connect(borderDefaultRB, SIGNAL(clicked(bool)), this, SLOT(booktabsChanged(bool)));
-       connect(borderSetPB, SIGNAL(clicked()), this, SLOT(borderSet_clicked()));
-       connect(borderUnsetPB, SIGNAL(clicked()), this, SLOT(borderUnset_clicked()));
-       connect(longTabularCB, SIGNAL(toggled(bool)), longtableGB, SLOT(setEnabled(bool)));
-       connect(longTabularCB, SIGNAL(toggled(bool)), newpageCB, SLOT(setEnabled(bool)));
-       connect(hAlignCB, SIGNAL(activated(int)), this, SLOT(hAlign_changed(int)));
-       connect(vAlignCB, SIGNAL(activated(int)), this, SLOT(vAlign_changed(int)));
-       connect(multicolumnCB, SIGNAL(clicked()), this, SLOT(multicolumn_clicked()));
-       connect(newpageCB, SIGNAL(clicked()), this, SLOT(ltNewpage_clicked()));
-       connect(headerStatusCB, SIGNAL(clicked()), this, SLOT(ltHeaderStatus_clicked()));
-       connect(headerBorderAboveCB, SIGNAL(clicked()), this, SLOT(ltHeaderBorderAbove_clicked()));
-       connect(headerBorderBelowCB, SIGNAL(clicked()), this, SLOT(ltHeaderBorderBelow_clicked()));
-       connect(firstheaderStatusCB, SIGNAL(clicked()), this, SLOT(ltFirstHeaderStatus_clicked()));
-       connect(firstheaderBorderAboveCB, SIGNAL(clicked()), this, SLOT(ltFirstHeaderBorderAbove_clicked()));
-       connect(firstheaderBorderBelowCB, SIGNAL(clicked()), this, SLOT(ltFirstHeaderBorderBelow_clicked()));
-       connect(firstheaderNoContentsCB, SIGNAL(clicked()), this, SLOT(ltFirstHeaderEmpty_clicked()));
-       connect(footerStatusCB, SIGNAL(clicked()), this, SLOT(ltFooterStatus_clicked()));
-       connect(footerBorderAboveCB, SIGNAL(clicked()), this, SLOT(ltFooterBorderAbove_clicked()));
-       connect(footerBorderBelowCB, SIGNAL(clicked()), this, SLOT(ltFooterBorderBelow_clicked()));
-       connect(lastfooterStatusCB, SIGNAL(clicked()), this, SLOT(ltLastFooterStatus_clicked()));
-       connect(lastfooterBorderAboveCB, SIGNAL(clicked()), this, SLOT(ltLastFooterBorderAbove_clicked()));
-       connect(lastfooterBorderBelowCB, SIGNAL(clicked()), this, SLOT(ltLastFooterBorderBelow_clicked()));
-       connect(lastfooterNoContentsCB, SIGNAL(clicked()), this, SLOT(ltLastFooterEmpty_clicked()));
-       connect(specialAlignmentED, SIGNAL(returnPressed()), this, SLOT(specialAlignment_changed()));
-       connect(widthED, SIGNAL(returnPressed()), this, SLOT(width_changed()));
-       connect(widthUnit, 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()));
-       connect(rotateTabularCB, SIGNAL(clicked()), this, SLOT(rotateTabular()));
-       connect(rotateCellCB, SIGNAL(clicked()), this, SLOT(rotateCell()));
-       connect(longTabularCB, SIGNAL(clicked()), this, SLOT(longTabular()));
-}
-
-
-void GuiTabularDialog::change_adaptor()
-{
-       form_->changed();
+       connect(booktabsRB, SIGNAL(clicked(bool)),
+               this, SLOT(booktabsChanged(bool)));
+       connect(borderDefaultRB, SIGNAL(clicked(bool)),
+               this, SLOT(booktabsChanged(bool)));
+       connect(borderSetPB, SIGNAL(clicked()),
+               this, SLOT(borderSet_clicked()));
+       connect(borderUnsetPB, SIGNAL(clicked()), 
+               this, SLOT(borderUnset_clicked()));
+       connect(longTabularCB, SIGNAL(toggled(bool)),
+               longtableGB, SLOT(setEnabled(bool)));
+       connect(longTabularCB, SIGNAL(toggled(bool)),
+               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(change_adaptor()));
+       connect(vAlignCB, SIGNAL(activated(int)),
+               this, SLOT(change_adaptor()));
+       connect(multicolumnCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(newpageCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(captionStatusCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(headerStatusCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(headerBorderAboveCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(headerBorderBelowCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(firstheaderStatusCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(firstheaderBorderAboveCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(firstheaderBorderBelowCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(firstheaderNoContentsCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(footerStatusCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(footerBorderAboveCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(footerBorderBelowCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(lastfooterStatusCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(lastfooterBorderAboveCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(lastfooterBorderBelowCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(lastfooterNoContentsCB, SIGNAL(clicked()),
+               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(change_adaptor()));
+       connect(borders, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(rotateTabularCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(rotateCellCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(TableAlignCB, SIGNAL(activated(int)),
+               this, SLOT(change_adaptor()));
+       connect(longTabularCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(leftRB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(centerRB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(rightRB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+
+       bc().addReadOnly(topspaceED);
+       bc().addReadOnly(topspaceUnit);
+       bc().addReadOnly(topspaceCO);
+       bc().addReadOnly(bottomspaceED);
+       bc().addReadOnly(bottomspaceUnit);
+       bc().addReadOnly(bottomspaceCO);
+       bc().addReadOnly(interlinespaceED);
+       bc().addReadOnly(interlinespaceUnit);
+       bc().addReadOnly(interlinespaceCO);
+       bc().addReadOnly(borderDefaultRB);
+       bc().addReadOnly(booktabsRB);
+
+       bc().addReadOnly(multicolumnCB);
+       bc().addReadOnly(rotateCellCB);
+       bc().addReadOnly(rotateTabularCB);
+       bc().addReadOnly(specialAlignmentED);
+       bc().addReadOnly(widthED);
+       bc().addReadOnly(widthUnitCB);
+       bc().addReadOnly(hAlignCB);
+       bc().addReadOnly(vAlignCB);
+       bc().addReadOnly(TableAlignCB);
+       bc().addReadOnly(borderSetPB);
+       bc().addReadOnly(borderUnsetPB);
+       bc().addReadOnly(borders);
+       bc().addReadOnly(longTabularCB);
+       bc().addReadOnly(headerStatusCB);
+       bc().addReadOnly(headerBorderAboveCB);
+       bc().addReadOnly(headerBorderBelowCB);
+       bc().addReadOnly(firstheaderStatusCB);
+       bc().addReadOnly(firstheaderBorderAboveCB);
+       bc().addReadOnly(firstheaderBorderBelowCB);
+       bc().addReadOnly(firstheaderNoContentsCB);
+       bc().addReadOnly(footerStatusCB);
+       bc().addReadOnly(footerBorderAboveCB);
+       bc().addReadOnly(footerBorderBelowCB);
+       bc().addReadOnly(lastfooterStatusCB);
+       bc().addReadOnly(lastfooterBorderAboveCB);
+       bc().addReadOnly(lastfooterBorderBelowCB);
+       bc().addReadOnly(lastfooterNoContentsCB);
+       bc().addReadOnly(newpageCB);
+       bc().addReadOnly(leftRB);
+       bc().addReadOnly(centerRB);
+       bc().addReadOnly(rightRB);
+       
+       // initialize the length validator
+       bc().addCheckedLineEdit(widthED, fixedWidthColLA);
+       bc().addCheckedLineEdit(topspaceED, topspaceLA);
+       bc().addCheckedLineEdit(bottomspaceED, bottomspaceLA);
+       bc().addCheckedLineEdit(interlinespaceED, interlinespaceLA);
 }
 
 
-void GuiTabularDialog::closeEvent(QCloseEvent * e)
+GuiTabular::~GuiTabular()
 {
-       form_->slotWMHide();
-       e->accept();
 }
 
 
-void GuiTabularDialog::booktabsChanged(bool)
+void GuiTabular::change_adaptor()
 {
-       form_->changed();
-       form_->controller().booktabs(booktabsRB->isChecked());
-       form_->update_borders();
+       changed();
 }
 
 
-void GuiTabularDialog::topspace_changed()
+void GuiTabular::topspace_changed()
 {
-       switch(topspaceCO->currentIndex()) {
+       switch (topspaceCO->currentIndex()) {
                case 0: {
-                       form_->controller().set(Tabular::SET_TOP_SPACE, "");
-                               topspaceED->setEnabled(false);
-                               topspaceUnit->setEnabled(false);
+                       topspaceED->setEnabled(false);
+                       topspaceUnit->setEnabled(false);
                        break;
                }
                case 1: {
-                       form_->controller().set(Tabular::SET_TOP_SPACE, "default");
                        topspaceED->setEnabled(false);
                        topspaceUnit->setEnabled(false);
                        break;
                }
                case 2: {
-                       if (!topspaceED->text().isEmpty())
-                               form_->controller().set(Tabular::SET_TOP_SPACE,
-                                       widgetsToLength(topspaceED, topspaceUnit));
-                       if (!form_->bc().policy().isReadOnly()) {
+                       if (!bc().policy().isReadOnly()) {
                                topspaceED->setEnabled(true);
                                topspaceUnit->setEnabled(true);
                        }
                        break;
                }
        }
-       form_->changed();
+       changed();
 }
 
 
-void GuiTabularDialog::bottomspace_changed()
+void GuiTabular::bottomspace_changed()
 {
-       switch(bottomspaceCO->currentIndex()) {
+       switch (bottomspaceCO->currentIndex()) {
                case 0: {
-                       form_->controller().set(Tabular::SET_BOTTOM_SPACE, "");
-                               bottomspaceED->setEnabled(false);
-                               bottomspaceUnit->setEnabled(false);
+                       bottomspaceED->setEnabled(false);
+                       bottomspaceUnit->setEnabled(false);
                        break;
                }
                case 1: {
-                       form_->controller().set(Tabular::SET_BOTTOM_SPACE, "default");
                        bottomspaceED->setEnabled(false);
                        bottomspaceUnit->setEnabled(false);
                        break;
                }
                case 2: {
-                       if (!bottomspaceED->text().isEmpty())
-                               form_->controller().set(Tabular::SET_BOTTOM_SPACE,
-                                       widgetsToLength(bottomspaceED, bottomspaceUnit));
-                       if (!form_->bc().policy().isReadOnly()) {
+                       if (!bc().policy().isReadOnly()) {
                                bottomspaceED->setEnabled(true);
                                bottomspaceUnit->setEnabled(true);
                        }
                        break;
                }
        }
-       form_->changed();
+       changed();
 }
 
 
-void GuiTabularDialog::interlinespace_changed()
+void GuiTabular::interlinespace_changed()
 {
-       switch(interlinespaceCO->currentIndex()) {
+       switch (interlinespaceCO->currentIndex()) {
                case 0: {
-                       form_->controller().set(Tabular::SET_INTERLINE_SPACE, "");
-                               interlinespaceED->setEnabled(false);
-                               interlinespaceUnit->setEnabled(false);
+                       interlinespaceED->setEnabled(false);
+                       interlinespaceUnit->setEnabled(false);
                        break;
                }
                case 1: {
-                       form_->controller().set(Tabular::SET_INTERLINE_SPACE, "default");
                        interlinespaceED->setEnabled(false);
                        interlinespaceUnit->setEnabled(false);
                        break;
                }
                case 2: {
-                       if (!interlinespaceED->text().isEmpty())
-                               form_->controller().set(Tabular::SET_INTERLINE_SPACE,
-                                       widgetsToLength(interlinespaceED, interlinespaceUnit));
-                       if (!form_->bc().policy().isReadOnly()) {
+                       if (!bc().policy().isReadOnly()) {
                                interlinespaceED->setEnabled(true);
                                interlinespaceUnit->setEnabled(true);
                        }
                        break;
                }
        }
-       form_->changed();
-}
-
-
-void GuiTabularDialog::close_clicked()
-{
-       form_->closeGUI();
-       form_->slotClose();
-}
-
-
-void GuiTabularDialog::borderSet_clicked()
-{
-       form_->controller().set(Tabular::SET_ALL_LINES);
-       form_->update_borders();
-       form_->changed();
+       changed();
 }
 
 
-void GuiTabularDialog::borderUnset_clicked()
+void GuiTabular::booktabsChanged(bool)
 {
-       form_->controller().set(Tabular::UNSET_ALL_LINES);
-       form_->update_borders();
-       form_->changed();
+       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 GuiTabularDialog::leftBorder_changed()
+void GuiTabular::borderSet_clicked()
 {
-       form_->controller().toggleLeftLine();
-       form_->changed();
+       borders->setTop(true);
+       borders->setBottom(true);
+       borders->setLeft(true);
+       borders->setRight(true);
+       // repaint the setborder widget
+       borders->update();
+       changed();
 }
 
 
-void GuiTabularDialog::rightBorder_changed()
+void GuiTabular::borderUnset_clicked()
 {
-       form_->controller().toggleRightLine();
-       form_->changed();
+       borders->setTop(false);
+       borders->setBottom(false);
+       borders->setLeft(false);
+       borders->setRight(false);
+       // repaint the setborder widget
+       borders->update();
+       changed();
 }
 
 
-void GuiTabularDialog::topBorder_changed()
+void GuiTabular::update_borders()
 {
-       form_->controller().toggleTopLine();
-       form_->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 GuiTabularDialog::bottomBorder_changed()
-{
-       form_->controller().toggleBottomLine();
-       form_->changed();
-}
-
+namespace {
 
-void GuiTabularDialog::specialAlignment_changed()
+Length getColumnPWidth(Tabular const & t, size_t cell)
 {
-       string special = fromqstr(specialAlignmentED->text());
-       form_->controller().setSpecial(special);
-       form_->changed();
+       return t.column_info[t.cellColumn(cell)].p_width;
 }
 
 
-void GuiTabularDialog::width_changed()
+Length getMColumnPWidth(Tabular const & t, size_t cell)
 {
-       form_->changed();
-       string const width = widgetsToLength(widthED, widthUnit);
-       form_->controller().setWidth(width);
+       if (t.isMultiColumn(cell))
+               return t.cellInfo(cell).p_width;
+       return Length();
 }
 
 
-void GuiTabularDialog::multicolumn_clicked()
+docstring getAlignSpecial(Tabular const & t, size_t cell, int what)
 {
-       form_->controller().toggleMultiColumn();
-       form_->changed();
+       if (what == Tabular::SET_SPECIAL_MULTI)
+               return t.cellInfo(cell).align_special;
+       return t.column_info[t.cellColumn(cell)].align_special;
 }
 
-
-void GuiTabularDialog::rotateTabular()
-{
-       form_->controller().rotateTabular(rotateTabularCB->isChecked());
-       form_->changed();
 }
 
 
-void GuiTabularDialog::rotateCell()
+void GuiTabular::applyView()
 {
-       form_->controller().rotateCell(rotateCellCB->isChecked());
-       form_->changed();
-}
+       applying_ = true;
 
+       Tabular::idx_type const cell = getActiveCell();
+       Tabular::row_type const row = tabular_.cellRow(cell);
+       bool const multicol = tabular_.isMultiColumn(cell);
 
-void GuiTabularDialog::hAlign_changed(int align)
-{
-       ControlTabular::HALIGN h = ControlTabular::LEFT;
+       Tabular::Feature num = Tabular::ALIGN_LEFT;
+       Tabular::Feature multi_num = Tabular::M_ALIGN_LEFT;
 
-       switch (align) {
-               case 0: h = ControlTabular::LEFT; break;
-               case 1: h = ControlTabular::CENTER; break;
-               case 2: h = ControlTabular::RIGHT; break;
-               case 3: h = ControlTabular::BLOCK; break;
+       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);
 
-       form_->controller().halign(h);
-}
-
+       num = Tabular::VALIGN_MIDDLE;
+       multi_num = Tabular::M_VALIGN_MIDDLE;
 
-void GuiTabularDialog::vAlign_changed(int align)
-{
-       ControlTabular::VALIGN v = ControlTabular::TOP;
-
-       switch (align) {
-               case 0: v = ControlTabular::TOP; break;
-               case 1: v = ControlTabular::MIDDLE; break;
-               case 2: v = ControlTabular::BOTTOM; break;
+       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);
 
-       form_->controller().valign(v);
-}
+       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;
+       }
 
+       string value;
 
-void GuiTabularDialog::longTabular()
-{
-       form_->controller().longTabular(longTabularCB->isChecked());
-       form_->changed();
-}
+       value = fromqstr(specialAlignmentED->text());
+       if (multicol)
+               set(Tabular::SET_SPECIAL_MULTI, value);
+       else
+               set(Tabular::SET_SPECIAL_COLUMN, value);
 
+       value = widgetsToLength(widthED, widthUnitCB);
+       if (multicol)
+               set(Tabular::SET_MPWIDTH, value);
+       else
+               set(Tabular::SET_PWIDTH, value);
 
-void GuiTabularDialog::ltNewpage_clicked()
-{
-       form_->controller().set(Tabular::SET_LTNEWPAGE);
-       form_->changed();
-}
+       if (multicolumnCB->isChecked() != multicol)
+               set(Tabular::MULTICOLUMN);;
 
+       if (rotateTabularCB->isChecked())
+               set(Tabular::SET_ROTATE_TABULAR);
+       else
+               set(Tabular::UNSET_ROTATE_TABULAR);
 
-void GuiTabularDialog::ltHeaderStatus_clicked()
-{
-       bool enable(headerStatusCB->isChecked());
-       if (enable)
-               form_->controller().set(Tabular::SET_LTHEAD, "");
+       if (rotateCellCB->isChecked())
+               set(Tabular::SET_ROTATE_CELL);
        else
-               form_->controller().set(Tabular::UNSET_LTHEAD, "");
-       headerBorderAboveCB->setEnabled(enable);
-       headerBorderBelowCB->setEnabled(enable);
-       firstheaderNoContentsCB->setEnabled(enable);
-       form_->changed();
-}
+               set(Tabular::UNSET_ROTATE_CELL);
+
+       // 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::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;
+       }
 
-void GuiTabularDialog::ltHeaderBorderAbove_clicked()
-{
+       // Longtabular
+       if (longTabularCB->isChecked())
+               set(Tabular::SET_LONGTABULAR);
+       else
+               set(Tabular::UNSET_LONGTABULAR);
+
+       if (headerStatusCB->isChecked())
+               set(Tabular::SET_LTHEAD, "");
+       else
+               set(Tabular::UNSET_LTHEAD, "");
+       
        if (headerBorderAboveCB->isChecked())
-               form_->controller().set(Tabular::SET_LTHEAD, "dl_above");
+               set(Tabular::SET_LTHEAD, "dl_above");
        else
-               form_->controller().set(Tabular::UNSET_LTHEAD, "dl_above");
-       form_->changed();
-}
+               set(Tabular::UNSET_LTHEAD, "dl_above");
 
+       if (headerBorderAboveCB->isChecked())
+               set(Tabular::SET_LTHEAD, "dl_above");
+       else
+               set(Tabular::UNSET_LTHEAD, "dl_above");
 
-void GuiTabularDialog::ltHeaderBorderBelow_clicked()
-{
        if (headerBorderBelowCB->isChecked())
-               form_->controller().set(Tabular::SET_LTHEAD, "dl_below");
+               set(Tabular::SET_LTHEAD, "dl_below");
        else
-               form_->controller().set(Tabular::UNSET_LTHEAD, "dl_below");
-       form_->changed();
-}
+               set(Tabular::UNSET_LTHEAD, "dl_below");
 
-
-void GuiTabularDialog::ltFirstHeaderBorderAbove_clicked()
-{
        if (firstheaderBorderAboveCB->isChecked())
-               form_->controller().set(Tabular::SET_LTFIRSTHEAD, "dl_above");
+               set(Tabular::SET_LTFIRSTHEAD, "dl_above");
        else
-               form_->controller().set(Tabular::UNSET_LTFIRSTHEAD, "dl_above");
-       form_->changed();
-}
+               set(Tabular::UNSET_LTFIRSTHEAD, "dl_above");
 
-
-void GuiTabularDialog::ltFirstHeaderBorderBelow_clicked()
-{
        if (firstheaderBorderBelowCB->isChecked())
-               form_->controller().set(Tabular::SET_LTFIRSTHEAD, "dl_below");
+               set(Tabular::SET_LTFIRSTHEAD, "dl_below");
        else
-               form_->controller().set(Tabular::UNSET_LTFIRSTHEAD, "dl_below");
-       form_->changed();
-}
-
+               set(Tabular::UNSET_LTFIRSTHEAD, "dl_below");
 
-void GuiTabularDialog::ltFirstHeaderStatus_clicked()
-{
-       bool enable(firstheaderStatusCB->isChecked());
-       if (enable)
-               form_->controller().set(Tabular::SET_LTFIRSTHEAD, "");
+       if (firstheaderStatusCB->isChecked())
+               set(Tabular::SET_LTFIRSTHEAD, "");
        else
-               form_->controller().set(Tabular::UNSET_LTFIRSTHEAD, "");
-       firstheaderBorderAboveCB->setEnabled(enable);
-       firstheaderBorderBelowCB->setEnabled(enable);
-       form_->changed();
-}
+               set(Tabular::UNSET_LTFIRSTHEAD, "");
 
-
-void GuiTabularDialog::ltFirstHeaderEmpty_clicked()
-{
-       bool enable(firstheaderNoContentsCB->isChecked());
-       if (enable)
-               form_->controller().set(Tabular::SET_LTFIRSTHEAD, "empty");
+       if (firstheaderNoContentsCB->isChecked())
+               set(Tabular::SET_LTFIRSTHEAD, "empty");
        else
-               form_->controller().set(Tabular::UNSET_LTFIRSTHEAD, "empty");
-       firstheaderStatusCB->setEnabled(!enable);
-       firstheaderBorderAboveCB->setEnabled(!enable);
-       firstheaderBorderBelowCB->setEnabled(!enable);
-       form_->changed();
-}
-
+               set(Tabular::UNSET_LTFIRSTHEAD, "empty");
 
-void GuiTabularDialog::ltFooterStatus_clicked()
-{
-       bool enable(footerStatusCB->isChecked());
-       if (enable)
-               form_->controller().set(Tabular::SET_LTFOOT, "");
+       if (footerStatusCB->isChecked())
+               set(Tabular::SET_LTFOOT, "");
        else
-               form_->controller().set(Tabular::UNSET_LTFOOT, "");
-       footerBorderAboveCB->setEnabled(enable);
-       footerBorderBelowCB->setEnabled(enable);
-       lastfooterNoContentsCB->setEnabled(enable);
-       form_->changed();
-}
+               set(Tabular::UNSET_LTFOOT, "");
 
-
-void GuiTabularDialog::ltFooterBorderAbove_clicked()
-{
        if (footerBorderAboveCB->isChecked())
-               form_->controller().set(Tabular::SET_LTFOOT, "dl_above");
+               set(Tabular::SET_LTFOOT, "dl_above");
        else
-               form_->controller().set(Tabular::UNSET_LTFOOT, "dl_above");
-       form_->changed();
-}
+               set(Tabular::UNSET_LTFOOT, "dl_above");
 
-
-void GuiTabularDialog::ltFooterBorderBelow_clicked()
-{
        if (footerBorderBelowCB->isChecked())
-               form_->controller().set(Tabular::SET_LTFOOT, "dl_below");
+               set(Tabular::SET_LTFOOT, "dl_below");
        else
-               form_->controller().set(Tabular::UNSET_LTFOOT, "dl_below");
-       form_->changed();
-}
-
+               set(Tabular::UNSET_LTFOOT, "dl_below");
 
-void GuiTabularDialog::ltLastFooterStatus_clicked()
-{
-       bool enable(lastfooterStatusCB->isChecked());
-       if (enable)
-               form_->controller().set(Tabular::SET_LTLASTFOOT, "");
+       if (lastfooterStatusCB->isChecked())
+               set(Tabular::SET_LTLASTFOOT, "");
        else
-               form_->controller().set(Tabular::UNSET_LTLASTFOOT, "");
-       lastfooterBorderAboveCB->setEnabled(enable);
-       lastfooterBorderBelowCB->setEnabled(enable);
-       form_->changed();
-}
+               set(Tabular::UNSET_LTLASTFOOT, "");
 
-
-void GuiTabularDialog::ltLastFooterBorderAbove_clicked()
-{
        if (lastfooterBorderAboveCB->isChecked())
-               form_->controller().set(Tabular::SET_LTLASTFOOT, "dl_above");
+               set(Tabular::SET_LTLASTFOOT, "dl_above");
        else
-               form_->controller().set(Tabular::UNSET_LTLASTFOOT, "dl_above");
-       form_->changed();
-}
-
+               set(Tabular::UNSET_LTLASTFOOT, "dl_above");
 
-void GuiTabularDialog::ltLastFooterBorderBelow_clicked()
-{
        if (lastfooterBorderBelowCB->isChecked())
-               form_->controller().set(Tabular::SET_LTLASTFOOT, "dl_below");
+               set(Tabular::SET_LTLASTFOOT, "dl_below");
        else
-               form_->controller().set(Tabular::UNSET_LTLASTFOOT, "dl_below");
-       form_->changed();
-}
+               set(Tabular::UNSET_LTLASTFOOT, "dl_below");
 
-
-void GuiTabularDialog::ltLastFooterEmpty_clicked()
-{
-       bool enable(lastfooterNoContentsCB->isChecked());
-       if (enable)
-               form_->controller().set(Tabular::SET_LTLASTFOOT, "empty");
+       if (lastfooterNoContentsCB->isChecked())
+               set(Tabular::SET_LTLASTFOOT, "empty");
        else
-               form_->controller().set(Tabular::UNSET_LTLASTFOOT, "empty");
-       lastfooterStatusCB->setEnabled(!enable);
-       lastfooterBorderAboveCB->setEnabled(!enable);
-       lastfooterBorderBelowCB->setEnabled(!enable);
-       form_->changed();
-}
+               set(Tabular::UNSET_LTLASTFOOT, "empty");
 
+       if (newpageCB->isChecked() != tabular_.getLTNewPage(row))
+               set(Tabular::SET_LTNEWPAGE);
 
-/////////////////////////////////////////////////////////////////////
-//
-// GuiTabular
-//
-/////////////////////////////////////////////////////////////////////
+       if (captionStatusCB->isChecked() != tabular_.ltCaption(row))
+               set(Tabular::TOGGLE_LTCAPTION);
 
+       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);
 
-GuiTabular::GuiTabular(GuiDialog & parent)
-       : GuiView<GuiTabularDialog>(parent, _("Table Settings"))
-{
-}
-
-
-void GuiTabular::build_dialog()
-{
-       dialog_.reset(new GuiTabularDialog(this));
-
-       bc().setCancel(dialog_->closePB);
-
-       bc().addReadOnly(dialog_->topspaceED);
-       bc().addReadOnly(dialog_->topspaceUnit);
-       bc().addReadOnly(dialog_->topspaceCO);
-       bc().addReadOnly(dialog_->bottomspaceED);
-       bc().addReadOnly(dialog_->bottomspaceUnit);
-       bc().addReadOnly(dialog_->bottomspaceCO);
-       bc().addReadOnly(dialog_->interlinespaceED);
-       bc().addReadOnly(dialog_->interlinespaceUnit);
-       bc().addReadOnly(dialog_->interlinespaceCO);
-       bc().addReadOnly(dialog_->borderDefaultRB);
-       bc().addReadOnly(dialog_->booktabsRB);
-
-       bc().addReadOnly(dialog_->multicolumnCB);
-       bc().addReadOnly(dialog_->rotateCellCB);
-       bc().addReadOnly(dialog_->rotateTabularCB);
-       bc().addReadOnly(dialog_->specialAlignmentED);
-       bc().addReadOnly(dialog_->widthED);
-       bc().addReadOnly(dialog_->widthUnit);
-       bc().addReadOnly(dialog_->hAlignCB);
-       bc().addReadOnly(dialog_->vAlignCB);
-       bc().addReadOnly(dialog_->borderSetPB);
-       bc().addReadOnly(dialog_->borderUnsetPB);
-       bc().addReadOnly(dialog_->borders);
-       bc().addReadOnly(dialog_->longTabularCB);
-       bc().addReadOnly(dialog_->headerStatusCB);
-       bc().addReadOnly(dialog_->headerBorderAboveCB);
-       bc().addReadOnly(dialog_->headerBorderBelowCB);
-       bc().addReadOnly(dialog_->firstheaderStatusCB);
-       bc().addReadOnly(dialog_->firstheaderBorderAboveCB);
-       bc().addReadOnly(dialog_->firstheaderBorderBelowCB);
-       bc().addReadOnly(dialog_->firstheaderNoContentsCB);
-       bc().addReadOnly(dialog_->footerStatusCB);
-       bc().addReadOnly(dialog_->footerBorderAboveCB);
-       bc().addReadOnly(dialog_->footerBorderBelowCB);
-       bc().addReadOnly(dialog_->lastfooterStatusCB);
-       bc().addReadOnly(dialog_->lastfooterBorderAboveCB);
-       bc().addReadOnly(dialog_->lastfooterBorderBelowCB);
-       bc().addReadOnly(dialog_->lastfooterNoContentsCB);
-       bc().addReadOnly(dialog_->newpageCB);
-
-       // initialize the length validator
-       bc().addCheckedLineEdit(dialog_->widthED, dialog_->fixedWidthColLA);
-       bc().addCheckedLineEdit(dialog_->topspaceED, dialog_->topspaceLA);
-       bc().addCheckedLineEdit(dialog_->bottomspaceED, dialog_->bottomspaceLA);
-       bc().addCheckedLineEdit(dialog_->interlinespaceED, dialog_->interlinespaceLA);
+       applying_ = false;
 }
 
 
-bool GuiTabular::isValid()
+void GuiTabular::updateContents()
 {
-       return true;
-}
-
-
-void GuiTabular::update_borders()
-{
-       Tabular const & tabular = controller().tabular();
-       Tabular::idx_type const cell = controller().getActiveCell();
-       bool const isMulticolumnCell = tabular.isMultiColumn(cell);
-
-       if (!isMulticolumnCell) {
-               dialog_->borders->setLeftEnabled(true);
-               dialog_->borders->setRightEnabled(true);
-               dialog_->borders->setTop(tabular.topLine(cell, true));
-               dialog_->borders->setBottom(tabular.bottomLine(cell, true));
-               dialog_->borders->setLeft(tabular.leftLine(cell, true));
-               dialog_->borders->setRight(tabular.rightLine(cell, true));
-               // repaint the setborder widget
-               dialog_->borders->update();
+       if (applying_)
                return;
-       }
 
-       dialog_->borders->setTop(tabular.topLine(cell));
-       dialog_->borders->setBottom(tabular.bottomLine(cell));
-       // pay attention to left/right lines: they are only allowed
-       // to set if we are in first/last cell of row or if the left/right
-       // cell is also a multicolumn.
-       if (tabular.isFirstCellInRow(cell) || tabular.isMultiColumn(cell - 1)) {
-               dialog_->borders->setLeftEnabled(true);
-               dialog_->borders->setLeft(tabular.leftLine(cell));
-       } else {
-               dialog_->borders->setLeft(false);
-               dialog_->borders->setLeftEnabled(false);
-       }
-       if (tabular.isLastCellInRow(cell) || tabular.isMultiColumn(cell + 1)) {
-               dialog_->borders->setRightEnabled(true);
-               dialog_->borders->setRight(tabular.rightLine(cell));
-       } else {
-               dialog_->borders->setRight(false);
-               dialog_->borders->setRightEnabled(false);
-       }
-       // repaint the setborder widget
-       dialog_->borders->update();
-}
-
-
-void GuiTabular::update_contents()
-{
-       controller().initialiseParams(string());
+       initialiseParams(string());
 
-       Tabular const & tabular(controller().tabular());
-       Tabular::idx_type const cell = controller().getActiveCell();
+       Tabular::idx_type const cell = getActiveCell();
 
-       Tabular::row_type const row = tabular.cellRow(cell);
-       Tabular::col_type const col = tabular.cellColumn(cell);
+       Tabular::row_type const row = tabular_.cellRow(cell);
+       Tabular::col_type const col = tabular_.cellColumn(cell);
 
-       dialog_->tabularRowED->setText(toqstr(convert<string>(row + 1)));
-       dialog_->tabularColumnED->setText(toqstr(convert<string>(col + 1)));
+       tabularRowED->setText(QString::number(row + 1));
+       tabularColumnED->setText(QString::number(col + 1));
 
-       bool const multicol(tabular.isMultiColumn(cell));
+       bool const multicol(tabular_.isMultiColumn(cell));
 
-       dialog_->multicolumnCB->setChecked(multicol);
+       multicolumnCB->setChecked(multicol);
 
-       dialog_->rotateCellCB->setChecked(tabular.getRotateCell(cell));
-       dialog_->rotateTabularCB->setChecked(tabular.getRotateTabular());
+       rotateCellCB->setChecked(tabular_.getRotateCell(cell));
+       rotateTabularCB->setChecked(tabular_.rotate);
 
-       dialog_->longTabularCB->setChecked(tabular.isLongTabular());
+       longTabularCB->setChecked(tabular_.is_long_tabular);
 
        update_borders();
 
@@ -648,96 +663,99 @@ void GuiTabular::update_contents()
        docstring special;
 
        if (multicol) {
-               special = tabular.getAlignSpecial(cell, Tabular::SET_SPECIAL_MULTI);
-               pwidth = tabular.getMColumnPWidth(cell);
+               special = getAlignSpecial(tabular_, cell,
+                       Tabular::SET_SPECIAL_MULTI);
+               pwidth = getMColumnPWidth(tabular_, cell);
        } else {
-               special = tabular.getAlignSpecial(cell, Tabular::SET_SPECIAL_COLUMN);
-               pwidth = tabular.getColumnPWidth(cell);
+               special = getAlignSpecial(tabular_, cell,
+                       Tabular::SET_SPECIAL_COLUMN);
+               pwidth = getColumnPWidth(tabular_, cell);
        }
 
-       dialog_->specialAlignmentED->setText(toqstr(special));
+       specialAlignmentED->setText(toqstr(special));
 
        bool const isReadonly = bc().policy().isReadOnly();
-       dialog_->specialAlignmentED->setEnabled(!isReadonly);
+       specialAlignmentED->setEnabled(!isReadonly);
 
-       Length::UNIT default_unit =
-               controller().useMetricUnits() ? Length::CM : Length::IN;
+       Length::UNIT const default_unit = Length::defaultUnit();
 
-       dialog_->borderDefaultRB->setChecked(!tabular.useBookTabs());
-       dialog_->booktabsRB->setChecked(tabular.useBookTabs());
+       borderDefaultRB->setChecked(!tabular_.use_booktabs);
+       booktabsRB->setChecked(tabular_.use_booktabs);
 
-       if (tabular.row_info[row].top_space.empty()
-           && !tabular.row_info[row].top_space_default) {
-               dialog_->topspaceCO->setCurrentIndex(0);
-       } else if (tabular.row_info[row].top_space_default) {
-               dialog_->topspaceCO->setCurrentIndex(1);
+       if (tabular_.row_info[row].top_space.empty()
+           && !tabular_.row_info[row].top_space_default) {
+               topspaceCO->setCurrentIndex(0);
+       } else if (tabular_.row_info[row].top_space_default) {
+               topspaceCO->setCurrentIndex(1);
        } else {
-               dialog_->topspaceCO->setCurrentIndex(2);
-               lengthToWidgets(dialog_->topspaceED,
-                               dialog_->topspaceUnit,
-                               tabular.row_info[row].top_space.asString(),
+               topspaceCO->setCurrentIndex(2);
+               lengthToWidgets(topspaceED,
+                               topspaceUnit,
+                               tabular_.row_info[row].top_space.asString(),
                                default_unit);
        }
-       dialog_->topspaceED->setEnabled(!isReadonly
-               && (dialog_->topspaceCO->currentIndex() == 2));
-       dialog_->topspaceUnit->setEnabled(!isReadonly
-               && (dialog_->topspaceCO->currentIndex() == 2));
-       dialog_->topspaceCO->setEnabled(!isReadonly);
-
-       if (tabular.row_info[row].bottom_space.empty()
-           && !tabular.row_info[row].bottom_space_default) {
-               dialog_->bottomspaceCO->setCurrentIndex(0);
-       } else if (tabular.row_info[row].bottom_space_default) {
-               dialog_->bottomspaceCO->setCurrentIndex(1);
+       topspaceED->setEnabled(!isReadonly
+               && (topspaceCO->currentIndex() == 2));
+       topspaceUnit->setEnabled(!isReadonly
+               && (topspaceCO->currentIndex() == 2));
+       topspaceCO->setEnabled(!isReadonly);
+
+       if (tabular_.row_info[row].bottom_space.empty()
+           && !tabular_.row_info[row].bottom_space_default) {
+               bottomspaceCO->setCurrentIndex(0);
+       } else if (tabular_.row_info[row].bottom_space_default) {
+               bottomspaceCO->setCurrentIndex(1);
        } else {
-               dialog_->bottomspaceCO->setCurrentIndex(2);
-               lengthToWidgets(dialog_->bottomspaceED,
-                               dialog_->bottomspaceUnit,
-                               tabular.row_info[row].bottom_space.asString(),
+               bottomspaceCO->setCurrentIndex(2);
+               lengthToWidgets(bottomspaceED,
+                               bottomspaceUnit,
+                               tabular_.row_info[row].bottom_space.asString(),
                                default_unit);
        }
-       dialog_->bottomspaceED->setEnabled(!isReadonly
-               && (dialog_->bottomspaceCO->currentIndex() == 2));
-       dialog_->bottomspaceUnit->setEnabled(!isReadonly
-               && (dialog_->bottomspaceCO->currentIndex() == 2));
-       dialog_->bottomspaceCO->setEnabled(!isReadonly);
-
-       if (tabular.row_info[row].interline_space.empty()
-           && !tabular.row_info[row].interline_space_default) {
-               dialog_->interlinespaceCO->setCurrentIndex(0);
-       } else if (tabular.row_info[row].interline_space_default) {
-               dialog_->interlinespaceCO->setCurrentIndex(1);
+       bottomspaceED->setEnabled(!isReadonly
+               && (bottomspaceCO->currentIndex() == 2));
+       bottomspaceUnit->setEnabled(!isReadonly
+               && (bottomspaceCO->currentIndex() == 2));
+       bottomspaceCO->setEnabled(!isReadonly);
+
+       if (tabular_.row_info[row].interline_space.empty()
+           && !tabular_.row_info[row].interline_space_default) {
+               interlinespaceCO->setCurrentIndex(0);
+       } else if (tabular_.row_info[row].interline_space_default) {
+               interlinespaceCO->setCurrentIndex(1);
        } else {
-               dialog_->interlinespaceCO->setCurrentIndex(2);
-               lengthToWidgets(dialog_->interlinespaceED,
-                               dialog_->interlinespaceUnit,
-                               tabular.row_info[row].interline_space.asString(),
+               interlinespaceCO->setCurrentIndex(2);
+               lengthToWidgets(interlinespaceED,
+                               interlinespaceUnit,
+                               tabular_.row_info[row].interline_space.asString(),
                                default_unit);
        }
-       dialog_->interlinespaceED->setEnabled(!isReadonly
-               && (dialog_->interlinespaceCO->currentIndex() == 2));
-       dialog_->interlinespaceUnit->setEnabled(!isReadonly
-               && (dialog_->interlinespaceCO->currentIndex() == 2));
-       dialog_->interlinespaceCO->setEnabled(!isReadonly);
+       interlinespaceED->setEnabled(!isReadonly
+               && (interlinespaceCO->currentIndex() == 2));
+       interlinespaceUnit->setEnabled(!isReadonly
+               && (interlinespaceCO->currentIndex() == 2));
+       interlinespaceCO->setEnabled(!isReadonly);
 
        string colwidth;
-       if (!pwidth.zero())
+       if (!pwidth.zero()) {
                colwidth = pwidth.asString();
-       lengthToWidgets(dialog_->widthED, dialog_->widthUnit,
-               colwidth, default_unit);
 
-       dialog_->widthED->setEnabled(!isReadonly);
-       dialog_->widthUnit->setEnabled(!isReadonly);
+               lengthToWidgets(widthED, widthUnitCB,
+                       colwidth, default_unit);
+       }
+
+       widthED->setEnabled(!isReadonly);
+       widthUnitCB->setEnabled(!isReadonly);
 
-       dialog_->hAlignCB->clear();
-       dialog_->hAlignCB->addItem(qt_("Left"));
-       dialog_->hAlignCB->addItem(qt_("Center"));
-       dialog_->hAlignCB->addItem(qt_("Right"));
+       hAlignCB->clear();
+       hAlignCB->addItem(qt_("Left"));
+       hAlignCB->addItem(qt_("Center"));
+       hAlignCB->addItem(qt_("Right"));
        if (!multicol && !pwidth.zero())
-               dialog_->hAlignCB->addItem(qt_("Justified"));
+               hAlignCB->addItem(qt_("Justified"));
 
        int align = 0;
-       switch (tabular.getAlignment(cell)) {
+       switch (tabular_.getAlignment(cell)) {
        case LYX_ALIGN_LEFT:
                align = 0;
                break;
@@ -757,10 +775,10 @@ void GuiTabular::update_contents()
                align = 0;
                break;
        }
-       dialog_->hAlignCB->setCurrentIndex(align);
+       hAlignCB->setCurrentIndex(align);
 
        int valign = 0;
-       switch (tabular.getVAlignment(cell)) {
+       switch (tabular_.getVAlignment(cell)) {
        case Tabular::LYX_VALIGN_TOP:
                valign = 0;
                break;
@@ -771,200 +789,259 @@ void GuiTabular::update_contents()
                valign = 2;
                break;
        default:
-               valign = 1;
+               valign = 0;
                break;
        }
        if (pwidth.zero())
-               valign = 1;
-       dialog_->vAlignCB->setCurrentIndex(valign);
-
-       dialog_->hAlignCB->setEnabled(true);
-       dialog_->vAlignCB->setEnabled(!pwidth.zero());
-
-       if (!tabular.isLongTabular()) {
-               dialog_->headerStatusCB->setChecked(false);
-               dialog_->headerBorderAboveCB->setChecked(false);
-               dialog_->headerBorderBelowCB->setChecked(false);
-               dialog_->firstheaderStatusCB->setChecked(false);
-               dialog_->firstheaderBorderAboveCB->setChecked(false);
-               dialog_->firstheaderBorderBelowCB->setChecked(false);
-               dialog_->firstheaderNoContentsCB->setChecked(false);
-               dialog_->footerStatusCB->setChecked(false);
-               dialog_->footerBorderAboveCB->setChecked(false);
-               dialog_->footerBorderBelowCB->setChecked(false);
-               dialog_->lastfooterStatusCB->setChecked(false);
-               dialog_->lastfooterBorderAboveCB->setChecked(false);
-               dialog_->lastfooterBorderBelowCB->setChecked(false);
-               dialog_->lastfooterNoContentsCB->setChecked(false);
-               dialog_->newpageCB->setChecked(false);
-               dialog_->newpageCB->setEnabled(false);
+               valign = 0;
+       vAlignCB->setCurrentIndex(valign);
+
+       hAlignCB->setEnabled(true);
+       vAlignCB->setEnabled(!pwidth.zero());
+
+       int tableValign = 1;
+       switch (tabular_.tabular_valignment) {
+       case Tabular::LYX_VALIGN_TOP:
+               tableValign = 0;
+               break;
+       case Tabular::LYX_VALIGN_MIDDLE:
+               tableValign = 1;
+               break;
+       case Tabular::LYX_VALIGN_BOTTOM:
+               tableValign = 2;
+               break;
+       default:
+               tableValign = 0;
+               break;
+       }
+       TableAlignCB->setCurrentIndex(tableValign);
+
+       if (!tabular_.is_long_tabular) {
+               headerStatusCB->setChecked(false);
+               headerBorderAboveCB->setChecked(false);
+               headerBorderBelowCB->setChecked(false);
+               firstheaderStatusCB->setChecked(false);
+               firstheaderBorderAboveCB->setChecked(false);
+               firstheaderBorderBelowCB->setChecked(false);
+               firstheaderNoContentsCB->setChecked(false);
+               footerStatusCB->setChecked(false);
+               footerBorderAboveCB->setChecked(false);
+               footerBorderBelowCB->setChecked(false);
+               lastfooterStatusCB->setChecked(false);
+               lastfooterBorderAboveCB->setChecked(false);
+               lastfooterBorderBelowCB->setChecked(false);
+               lastfooterNoContentsCB->setChecked(false);
+               newpageCB->setChecked(false);
+               newpageCB->setEnabled(false);
+               captionStatusCB->blockSignals(true);
+               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:
+               leftRB->setChecked(true);
+               break;
+       case Tabular::LYX_LONGTABULAR_ALIGN_CENTER:
+               centerRB->setChecked(true);
+               break;
+       case Tabular::LYX_LONGTABULAR_ALIGN_RIGHT:
+               rightRB->setChecked(true);
+               break;
+       default:
+               centerRB->setChecked(true);
+               break;
        }
+       captionStatusCB->blockSignals(true);
+       captionStatusCB->setChecked(tabular_.ltCaption(row));
+       captionStatusCB->blockSignals(false);
+
+       // FIXME: shouldn't this be handled by GuiDialog?
+       // FIXME: Some of them should be handled directly in TabularUI.ui
+       firstheaderBorderAboveCB->setEnabled(
+               funcEnabled(Tabular::SET_LTFIRSTHEAD));
+       firstheaderBorderBelowCB->setEnabled(
+               funcEnabled(Tabular::SET_LTFIRSTHEAD));
+       // first header can only be suppressed when there is a header
+       firstheaderNoContentsCB->setEnabled(tabular_.haveLTHead()
+               && !tabular_.haveLTFirstHead());
+
+       //firstheaderStatusCB->setEnabled(
+       //      !firstheaderNoContentsCB->isChecked());
+       headerBorderAboveCB->setEnabled(funcEnabled(Tabular::SET_LTHEAD));
+       headerBorderBelowCB->setEnabled(funcEnabled(Tabular::SET_LTHEAD));
+       headerStatusCB->setEnabled(funcEnabled(Tabular::SET_LTHEAD));
+
+       footerBorderAboveCB->setEnabled(funcEnabled(Tabular::SET_LTFOOT));
+       footerBorderBelowCB->setEnabled(funcEnabled(Tabular::SET_LTFOOT));
+       footerStatusCB->setEnabled(funcEnabled(Tabular::SET_LTFOOT));
+
+       lastfooterBorderAboveCB->setEnabled(
+               funcEnabled(Tabular::SET_LTLASTFOOT));
+       lastfooterBorderBelowCB->setEnabled(
+               funcEnabled(Tabular::SET_LTLASTFOOT));
+       // last footer can only be suppressed when there is a footer
+       lastfooterNoContentsCB->setEnabled(tabular_.haveLTFoot()
+               && !tabular_.haveLTLastFoot());
+
+       captionStatusCB->setEnabled(
+               funcEnabled(Tabular::TOGGLE_LTCAPTION));
+       // When a row is set as longtable caption, it must not be allowed
+       // to unset that this row is a multicolumn.
+       multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN));
 
        Tabular::ltType ltt;
        bool use_empty;
-       bool row_set = tabular.getRowOfLTHead(row, ltt);
-       dialog_->headerStatusCB->setChecked(row_set);
+       bool row_set = tabular_.getRowOfLTHead(row, ltt);
+       headerStatusCB->setChecked(row_set);
        if (ltt.set) {
-               dialog_->headerBorderAboveCB->setChecked(ltt.topDL);
-               dialog_->headerBorderBelowCB->setChecked(ltt.bottomDL);
+               headerBorderAboveCB->setChecked(ltt.topDL);
+               headerBorderBelowCB->setChecked(ltt.bottomDL);
                use_empty = true;
        } else {
-               dialog_->headerBorderAboveCB->setChecked(false);
-               dialog_->headerBorderBelowCB->setChecked(false);
-               dialog_->headerBorderAboveCB->setEnabled(false);
-               dialog_->headerBorderBelowCB->setEnabled(false);
-               dialog_->firstheaderNoContentsCB->setChecked(false);
-               dialog_->firstheaderNoContentsCB->setEnabled(false);
+               headerBorderAboveCB->setChecked(false);
+               headerBorderBelowCB->setChecked(false);
+               headerBorderAboveCB->setEnabled(false);
+               headerBorderBelowCB->setEnabled(false);
+               firstheaderNoContentsCB->setChecked(false);
+               firstheaderNoContentsCB->setEnabled(false);
                use_empty = false;
        }
 
-       row_set = tabular.getRowOfLTFirstHead(row, ltt);
-       dialog_->firstheaderStatusCB->setChecked(row_set);
+       row_set = tabular_.getRowOfLTFirstHead(row, ltt);
+       // check if setting a first header is allowed
+       // additionally check firstheaderNoContentsCB because when this is
+       // the case a first header makes no sense
+       firstheaderStatusCB->setEnabled(
+               funcEnabled(Tabular::SET_LTFIRSTHEAD)
+               && !firstheaderNoContentsCB->isChecked());
+       firstheaderStatusCB->setChecked(row_set);
        if (ltt.set && (!ltt.empty || !use_empty)) {
-               dialog_->firstheaderBorderAboveCB->setChecked(ltt.topDL);
-               dialog_->firstheaderBorderBelowCB->setChecked(ltt.bottomDL);
+               firstheaderBorderAboveCB->setChecked(ltt.topDL);
+               firstheaderBorderBelowCB->setChecked(ltt.bottomDL);
        } else {
-               dialog_->firstheaderBorderAboveCB->setEnabled(false);
-               dialog_->firstheaderBorderBelowCB->setEnabled(false);
-               dialog_->firstheaderBorderAboveCB->setChecked(false);
-               dialog_->firstheaderBorderBelowCB->setChecked(false);
+               firstheaderBorderAboveCB->setEnabled(false);
+               firstheaderBorderBelowCB->setEnabled(false);
+               firstheaderBorderAboveCB->setChecked(false);
+               firstheaderBorderBelowCB->setChecked(false);
                if (use_empty) {
-                       dialog_->firstheaderNoContentsCB->setChecked(ltt.empty);
                        if (ltt.empty)
-                               dialog_->firstheaderStatusCB->setEnabled(false);
+                               firstheaderStatusCB->setEnabled(false);
                }
        }
 
-       row_set = tabular.getRowOfLTFoot(row, ltt);
-       dialog_->footerStatusCB->setChecked(row_set);
+       row_set = tabular_.getRowOfLTFoot(row, ltt);
+       footerStatusCB->setChecked(row_set);
        if (ltt.set) {
-               dialog_->footerBorderAboveCB->setChecked(ltt.topDL);
-               dialog_->footerBorderBelowCB->setChecked(ltt.bottomDL);
+               footerBorderAboveCB->setChecked(ltt.topDL);
+               footerBorderBelowCB->setChecked(ltt.bottomDL);
                use_empty = true;
        } else {
-               dialog_->footerBorderAboveCB->setChecked(false);
-               dialog_->footerBorderBelowCB->setChecked(false);
-               dialog_->footerBorderAboveCB->setEnabled(false);
-               dialog_->footerBorderBelowCB->setEnabled(false);
-               dialog_->lastfooterNoContentsCB->setChecked(false);
-               dialog_->lastfooterNoContentsCB->setEnabled(false);
+               footerBorderAboveCB->setChecked(false);
+               footerBorderBelowCB->setChecked(false);
+               footerBorderAboveCB->setEnabled(false);
+               footerBorderBelowCB->setEnabled(false);
+               lastfooterNoContentsCB->setChecked(false);
+               lastfooterNoContentsCB->setEnabled(false);
                use_empty = false;
        }
 
-       row_set = tabular.getRowOfLTLastFoot(row, ltt);
-               dialog_->lastfooterStatusCB->setChecked(row_set);
+       row_set = tabular_.getRowOfLTLastFoot(row, ltt);
+       // check if setting a last footer is allowed
+       // additionally check lastfooterNoContentsCB because when this is
+       // the case a last footer makes no sense
+       lastfooterStatusCB->setEnabled(
+               funcEnabled(Tabular::SET_LTLASTFOOT)
+               && !lastfooterNoContentsCB->isChecked());
+       lastfooterStatusCB->setChecked(row_set);
        if (ltt.set && (!ltt.empty || !use_empty)) {
-               dialog_->lastfooterBorderAboveCB->setChecked(ltt.topDL);
-               dialog_->lastfooterBorderBelowCB->setChecked(ltt.bottomDL);
+               lastfooterBorderAboveCB->setChecked(ltt.topDL);
+               lastfooterBorderBelowCB->setChecked(ltt.bottomDL);
        } else {
-               dialog_->lastfooterBorderAboveCB->setEnabled(false);
-               dialog_->lastfooterBorderBelowCB->setEnabled(false);
-               dialog_->lastfooterBorderAboveCB->setChecked(false);
-               dialog_->lastfooterBorderBelowCB->setChecked(false);
+               lastfooterBorderAboveCB->setEnabled(false);
+               lastfooterBorderBelowCB->setEnabled(false);
+               lastfooterBorderAboveCB->setChecked(false);
+               lastfooterBorderBelowCB->setChecked(false);
                if (use_empty) {
-                       dialog_->lastfooterNoContentsCB->setChecked(ltt.empty);
                        if (ltt.empty)
-                               dialog_->lastfooterStatusCB->setEnabled(false);
+                               lastfooterStatusCB->setEnabled(false);
                }
        }
-       dialog_->newpageCB->setChecked(tabular.getLTNewPage(row));
+       newpageCB->setChecked(tabular_.getLTNewPage(row));
 }
 
 
-void GuiTabular::closeGUI()
+bool GuiTabular::initialiseParams(string const & data)
 {
-       // 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 controller().tabular()
-       Tabular const & tabular(controller().tabular());
+       // try to get the current cell
+       BufferView const * const bv = bufferview();
+       InsetTabular const * current_inset = 0;
+       if (bv) {
+               Cursor const & cur = bv->cursor();
+               // get the innermost tabular inset;
+               // assume that it is "ours"
+               for (int i = cur.depth() - 1; i >= 0; --i)
+                       if (cur[i].inset().lyxCode() == TABULAR_CODE) {
+                               current_inset =
+                                       static_cast<InsetTabular const *>(&cur[i].inset());
+                               active_cell_ = cur[i].idx();
+                               break;
+                       }
+       }
 
-       // apply the fixed width values
-       Tabular::idx_type const cell = controller().getActiveCell();
-       bool const multicol = tabular.isMultiColumn(cell);
-       string width = widgetsToLength(dialog_->widthED, dialog_->widthUnit);
-       string width2;
+       if (current_inset && data.empty()) {
+               tabular_ = Tabular(current_inset->tabular);
+               return true;
+       }
 
-       Length llen = tabular.getColumnPWidth(cell);
-       Length llenMulti = tabular.getMColumnPWidth(cell);
+       InsetTabular tmp(const_cast<Buffer *>(&buffer()));
+       InsetTabular::string2params(data, tmp);
+       tabular_ = Tabular(tmp.tabular);
+       return true;
+}
 
-       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(dialog_->specialAlignmentED->text());
-       docstring sa2;
+void GuiTabular::clearParams()
+{
+       // This function is also called when LyX is closing and the dialog
+       // is still open. At that time, the buffer might not be available
+       // anymore.
+       if (isBufferAvailable()) {
+               InsetTabular tmp(const_cast<Buffer *>(&buffer()));
+               tabular_ = tmp.tabular;
+       }
+       active_cell_ = Tabular::npos;
+}
 
-       if (multicol)
-               sa2 = tabular.getAlignSpecial(cell, Tabular::SET_SPECIAL_MULTI);
-       else
-               sa2 = tabular.getAlignSpecial(cell, Tabular::SET_SPECIAL_COLUMN);
 
-       if (sa1 != sa2) {
-               if (multicol)
-                       controller().set(Tabular::SET_SPECIAL_MULTI, to_utf8(sa1));
-               else
-                       controller().set(Tabular::SET_SPECIAL_COLUMN, to_utf8(sa1));
-       }
+Tabular::idx_type GuiTabular::getActiveCell() const
+{
+       return active_cell_;
+}
 
-       if (width != width2) {
-               if (multicol)
-                       controller().set(Tabular::SET_MPWIDTH, width);
-               else
-                       controller().set(Tabular::SET_PWIDTH, width);
-       }
 
-       /* DO WE NEED THIS?
-       switch (dialog_->topspaceCO->currentIndex()) {
-               case 0:
-                       controller().set(Tabular::SET_TOP_SPACE, "");
-                       break;
-               case 1:
-                       controller().set(Tabular::SET_TOP_SPACE, "default");
-                       break;
-               case 2:
-                       controller().set(Tabular::SET_TOP_SPACE,
-                               widgetsToLength(dialog_->topspaceED,
-                                       dialog_->topspaceUnit));
-                       break;
-       }
+void GuiTabular::set(Tabular::Feature f, string const & arg)
+{
+       string const data = featureAsString(f) + ' ' + arg;
+       dispatch(FuncRequest(getLfun(), data));
+}
 
-       switch (dialog_->bottomspaceCO->currentIndex()) {
-               case 0:
-                       controller().set(Tabular::SET_BOTTOM_SPACE, "");
-                       break;
-               case 1:
-                       controller().set(Tabular::SET_BOTTOM_SPACE, "default");
-                       break;
-               case 2:
-                       controller().set(Tabular::SET_BOTTOM_SPACE,
-                               widgetsToLength(dialog_->bottomspaceED,
-                                       dialog_->bottomspaceUnit));
-                       break;
-       }
 
-       switch (dialog_->interlinespaceCO->currentIndex()) {
-               case 0:
-                       controller().set(Tabular::SET_INTERLINE_SPACE, "");
-                       break;
-               case 1:
-                       controller().set(Tabular::SET_INTERLINE_SPACE, "default");
-                       break;
-               case 2:
-                       controller().set(Tabular::SET_INTERLINE_SPACE,
-                               widgetsToLength(dialog_->interlinespaceED,
-                                       dialog_->interlinespaceUnit));
-                       break;
-       }
-*/
+// to get the status of the longtable row settings
+bool GuiTabular::funcEnabled(Tabular::Feature f) const
+{
+       return getStatus(
+               FuncRequest(getLfun(), featureAsString(f))).enabled();
 }
 
+
+Dialog * createGuiTabular(GuiView & lv) { return new GuiTabular(lv); }
+
+
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiTabular_moc.cpp"
+#include "moc_GuiTabular.cpp"