new tabular dialog + new widget. more bullet stuff (not finished yet though).

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

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 9e1b1bfe07e39992c4f971a2c950e251467a6072..78792ef46278e72532b847874f96779d611291c0 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,17 @@
+2002-11-07  Edwin Leuven  <leuven@fee.uva.nl>
+
+       * ControlDocument.[Ch]: Remove unused method
+
+2002-11-07  leeming  <leeming@e182182.fee.uva.nl>
+
+       * ChangeLog, biblio.C: * Add RegEx to the compiled boost files.
+       * clean-up the search code in biblio.C.
+
+2002-11-07  levon  <levon@e182182.fee.uva.nl>
+
+       * ControlGraphics.C:
+       QGraphics fixes
+
 2002-11-07  Juergen Spitzmueller <j.spitzmueller@gmx.de>
 
        * ControlDocument.C: (SaveAsDefault) make it work.

diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index 8af1b90e8d6afd83f508904a4f1564da35262ca8..9c261828c60053800c44d392a26069f58c1cb426 100644 (file)
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -45,11 +45,6 @@ ControlDocument::~ControlDocument()
 {}
 
 
-void ControlDocument::showPreamble()
-{
-}
-
-
 BufferParams & ControlDocument::params()
 {
        lyx::Assert(bp_.get());

diff --git a/src/frontends/controllers/ControlDocument.h b/src/frontends/controllers/ControlDocument.h
index fc36386bb63f2598d2a033b698c759e6e885cc2b..2f2ba87b05813e80aa91b95849b2744e18f1674c 100644 (file)
--- a/src/frontends/controllers/ControlDocument.h
+++ b/src/frontends/controllers/ControlDocument.h
@@ -34,8 +34,6 @@ public:
        ControlDocument(LyXView &, Dialogs &);
        ///
        ~ControlDocument();
-       /// show latex preamble
-       void showPreamble();
        ///
        void setLanguage();
        ///

diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C
index 5822e4cf66b66907859b480f7fb2178361786ef1..5ae8ebe961dbc9e127fc3a720441972380467b64 100644 (file)
--- a/src/frontends/qt2/BulletsModule.C
+++ b/src/frontends/qt2/BulletsModule.C
@@ -21,33 +21,67 @@
 #include "BulletsModule.h"
 #include "ui/BulletsModuleBase.h"
 #include "QBrowseBox.h"
+#include "support/filetools.h"
 
 
 BulletsModule::BulletsModule(QWidget * parent,  char const * name, WFlags fl)
        : BulletsModuleBase(parent, name, fl)
 {
-       standard = new QBrowseBox(6, 6);
-       standard->insertItem(QPixmap("standard.xpm"));
-
-       maths = new QBrowseBox(6, 6);
-       maths->insertItem(QPixmap("amssymb.xpm"));
-
-       QPopupMenu * pm = new QPopupMenu;
 
+       QPopupMenu * pm = new QPopupMenu(this);
+       
        QPopupMenu * pm1 = new QPopupMenu(pm);
-       pm1->insertItem(standard);
-
        QPopupMenu * pm2 = new QPopupMenu(pm);
+       QPopupMenu * pm3 = new QPopupMenu(pm);
+       QPopupMenu * pm4 = new QPopupMenu(pm);
+       QPopupMenu * pm5 = new QPopupMenu(pm);
+       QPopupMenu * pm6 = new QPopupMenu(pm);
+
+       standard = new QBrowseBox(6, 6, pm1);
+       maths = new QBrowseBox(6, 6, pm2);
+       ding1 = new QBrowseBox(6, 6, pm3);
+       ding2 = new QBrowseBox(6, 6, pm4);
+       ding3 = new QBrowseBox(6, 6, pm5);
+       ding4 = new QBrowseBox(6, 6, pm6);
+
+       pm1->insertItem(standard);
        pm2->insertItem(maths);
+       pm3->insertItem(ding1);
+       pm4->insertItem(ding2);
+       pm5->insertItem(ding3);
+       pm6->insertItem(ding4);
 
        pm->insertItem("Standard", pm1);
        pm->insertItem("Maths", pm2);
-       pm->insertItem("Ding 1");
-       pm->insertItem("Ding 2");
-       pm->insertItem("Ding 3");
-       pm->insertItem("Ding 4");
+       pm->insertItem("Ding 1",pm3);
+       pm->insertItem("Ding 2",pm4);
+       pm->insertItem("Ding 3",pm5);
+       pm->insertItem("Ding 4",pm6);
 
        setbullet1TB->setPopup(pm);
+       setbullet2TB->setPopup(pm);
+       setbullet3TB->setPopup(pm);
+       setbullet4TB->setPopup(pm);
+
+       // insert pixmaps
+       string bmfile;
+       bmfile = LibFileSearch("images", "standard", "xpm");
+       standard->insertItem(QPixmap(bmfile.c_str()));
+       
+       bmfile = LibFileSearch("images", "amssymb", "xpm");
+       maths->insertItem(QPixmap(bmfile.c_str()));
+
+       bmfile = LibFileSearch("images", "psnfss1", "xpm");
+       ding1->insertItem(QPixmap(bmfile.c_str()));
+
+       bmfile = LibFileSearch("images", "psnfss2", "xpm");
+       ding2->insertItem(QPixmap(bmfile.c_str()));
+
+       bmfile = LibFileSearch("images", "psnfss3", "xpm");
+       ding3->insertItem(QPixmap(bmfile.c_str()));
+
+       bmfile = LibFileSearch("images", "psnfss4", "xpm");
+       ding4->insertItem(QPixmap(bmfile.c_str()));
 
        connect(standard, SIGNAL(selected(int, int)),
                this, SLOT(checkThis(int, int)));
@@ -57,8 +91,6 @@ BulletsModule::BulletsModule(QWidget * parent,  char const * name, WFlags fl)
 
 BulletsModule::~BulletsModule()
 {
-       delete standard;
-       delete maths;
 }
 
 

diff --git a/src/frontends/qt2/BulletsModule.h b/src/frontends/qt2/BulletsModule.h
index 1e42fea016e78fd8630a324728be54a389a4fc1d..e6108d41276c74a1f0ffaeea5b4e8041da416632 100644 (file)
--- a/src/frontends/qt2/BulletsModule.h
+++ b/src/frontends/qt2/BulletsModule.h
@@ -27,9 +27,11 @@ public:
        BulletsModule(QWidget* parent = 0, const char* name = 0,
                      WFlags fl = 0);
        ~BulletsModule();
+       
 public slots:
-   void checkThis(int,int);
-   void setLevel1();
+       void checkThis(int,int);
+       void setLevel1();
+       
 private:
        QBrowseBox * standard;
        QBrowseBox * maths;

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 77ce125df95f9f3ac9f78280f3e43f1f22b32c69..4aa46275d380b217a77d9567632dae1ec614bd47 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-08  Edwin Leuven <leuven@fee.uva.nl>
+
+       * QDocument.[Ch]: Remove unused methods
+       * QBrowseBox.[Ch]: Capture mouse, new methods, etc
+       * BulletsModule.[Ch]: Further improvements
+       * QDocumentDialog.[Ch]: more bullet stuff
+       * ui/BulletsModuleBase.ui: idem
+       * ui/QTabularDialog.ui: new tabular dialog
+       * qsetborder.[Ch]: new small qt widget to set table borders
+       
 2002-11-08  Dekel Tsur  <dekelts@tau.ac.il>
 
        * lyx_gui.C:

diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt2/QBrowseBox.C
index 533da0e6da88906457b8bb9ae1202e1a68f79a98..eafa8123ca0366dd42cbf77bb4ccccfa510fea75 100644 (file)
--- a/src/frontends/qt2/QBrowseBox.C
+++ b/src/frontends/qt2/QBrowseBox.C
@@ -2,9 +2,8 @@
  * \file QBrowseBox.C
  *
  * Original file taken from klyx 0.10 sources:
- * $Id: QBrowseBox.C,v 1.6 2002/10/20 01:48:27 larsbj Exp $
  *
- * \author Kalle Dalheimer ?
+ * \author Kalle Dalheimer
  *
  * Full author contact details are available in file CREDITS
  */
@@ -26,8 +25,8 @@
 #include <cmath>
 
 
-QBrowseBox::QBrowseBox(int rows, int cols)
-       : QGridView()
+QBrowseBox::QBrowseBox(int rows, int cols, QWidget* parent, const char* name, WFlags f)
+       : QGridView(parent,name,f)
 {
        setNumRows(rows);
        setNumCols(cols);
@@ -37,10 +36,8 @@ QBrowseBox::QBrowseBox(int rows, int cols)
        texts_   = new QString[rows * cols];
        pixmaps_ = new QPixmap[rows * cols];
 
-       activecell_.setX(0);
-       activecell_.setY(0);
-       updateCell(0, 0);
-       setMouseTracking(true);
+       activecell_.setX(-1);
+       activecell_.setY(-1);
 
        if (style().inherits("QWindowsStyle"))
                setFrameStyle(QFrame::WinPanel | QFrame::Raised);
@@ -48,6 +45,10 @@ QBrowseBox::QBrowseBox(int rows, int cols)
                setFrameStyle(QFrame::Panel | QFrame::Raised);
 
        setFocusPolicy(QWidget::StrongFocus);
+       // setMouseTracking must be called after setFocusPolicy
+       setMouseTracking(true);
+       inloop=false;
+       
 }
 
 
@@ -73,9 +74,9 @@ void QBrowseBox::insertItem(QString const & text, int row, int col)
 }
 
 
-void QBrowseBox::insertItem(char const * text, int x, int y)
+void QBrowseBox::insertItem(char const * text, int row, int col)
 {
-       insertItem(QString(text), x, y);
+       insertItem(QString(text), row, col);
 }
 
 
@@ -124,7 +125,6 @@ QString QBrowseBox::text(int row, int col)
        return texts_[coordsToIndex(row, col)];
 }
 
-
 QPixmap QBrowseBox::pixmap(int row, int col)
 {
        if (col < 0 || col >= numCols() || row < 0 || row >= numRows())
@@ -132,7 +132,49 @@ QPixmap QBrowseBox::pixmap(int row, int col)
        return pixmaps_[coordsToIndex(row, col)];
 }
 
+int QBrowseBox::exec(const QPoint& pos)
+{
+       return exec(pos.x(),pos.y());
+}
+
+int QBrowseBox::exec(const QWidget* trigger)
+{
+       QPoint globalpos = trigger->parentWidget()->mapToGlobal( trigger->pos());
+       // is there enough space to put the box below the trigger?
+       if ( globalpos.y() + trigger->height()+height()+1<
+            QApplication::desktop()->height()) {
+               // is there enough space to set the box left-justified with the trigger
+               if (globalpos.x()+width()<QApplication::desktop()->width())
+                       return exec(globalpos.x(),
+                                   globalpos.y()+trigger->height()+1);
+               else
+                       return exec(globalpos.x()-width()-1,
+                                   globalpos.y()+trigger->height()+1);
+       } else {
+               if (globalpos.x()+width()<QApplication::desktop()->width())
+                       return exec(globalpos.x(),
+                                   globalpos.y()-height()-1);
+               else
+                       return exec(globalpos.x()-width()-1,
+                                   globalpos.y()-height()-1);
+       }
+}
 
+int QBrowseBox::exec(int x,int y)
+{
+       firstrelease_ = true;
+       move(x,y);
+       show();
+       repaint();
+       qApp->enter_loop();
+       inloop = true;
+       
+       if (activecell_.x()!=-1 && activecell_.y()!=-1 )
+               return coordsToIndex( activecell_.x(),activecell_.y());
+       else
+               return -1;
+}
+               
 void QBrowseBox::keyPressEvent(QKeyEvent * e)
 {
        switch(e->key()) {
@@ -150,25 +192,41 @@ void QBrowseBox::keyPressEvent(QKeyEvent * e)
                break;
        case Key_Return:
                emit selected(activecell_.x(), activecell_.y());
+               if ( isVisible() && parentWidget() &&
+                    parentWidget()->inherits("QPopupMenu") )
+                       parentWidget()->close();
+               else
+                       close();
                break;
+       case Key_Escape:
+               if (inloop)
+                       qApp->exit_loop();
+               if ( isVisible() && parentWidget() &&
+                    parentWidget()->inherits("QPopupMenu") )
+                       parentWidget()->close();
        default:
                e->ignore();
        }
 }
 
-
 void QBrowseBox::mouseReleaseEvent(QMouseEvent *)
 {
-       qWarning("mouse release");
-       emit selected( activecell_.x(), activecell_.y());
-}
 
+       if (firstrelease_)
+               firstrelease_ = false;
+       else {
+               emit selected( activecell_.x(), activecell_.y());
+               if ( isVisible() && parentWidget() &&
+                    parentWidget()->inherits("QPopupMenu") )
+                       parentWidget()->close();
+       }
+}
 
-//void QBrowseBox::closeEvent(QCloseEvent * e)
-//{
-//     e->accept();
-//     qApp->exit_loop();
-//}
+void QBrowseBox::closeEvent(QCloseEvent * e)
+{
+       e->accept();
+       qApp->exit_loop();
+}
 
 void QBrowseBox::paintCell(QPainter * painter, int row, int col)
 {
@@ -194,7 +252,7 @@ void QBrowseBox::paintCell(QPainter * painter, int row, int col)
 
        if (!texts_[coordsToIndex(row, col)].isEmpty()) {
                painter->drawText(0, 0, cellWidth(),
-                                 cellHeight(), AlignLeft,
+                                 cellHeight(), AlignCenter,
                                  texts_[coordsToIndex(row, col)]);
        }
        painter->setClipping(false);
@@ -223,15 +281,11 @@ void QBrowseBox::mouseMoveEvent(QMouseEvent * e)
                cellx = -1;
                celly = -1;
        } else {
-#ifdef WITH_WARNINGS
-#warning Is the switch of x and y intended here? (Andre)
-#endif
                celly = (int)floor( ((double)x) / ((double)cellWidth()) );
                cellx = (int)floor( ((double)y) / ((double)cellHeight()) );
        }
 
        if (activecell_.x() != cellx || activecell_.y() != celly) {
-               qWarning("update");
                // mouse has been moved to another cell
                int oldactivecellx = activecell_.x();
                int oldactivecelly = activecell_.y();
@@ -251,6 +305,8 @@ void QBrowseBox::moveLeft()
 
        if (y>0)
                activecell_.setY(y - 1);
+       else if (parentWidget())
+               QWidget::focusNextPrevChild(false);
 
        updateCell(activecell_.x(), y);
        updateCell(activecell_.x(), activecell_.y());
@@ -275,6 +331,8 @@ void QBrowseBox::moveUp()
 
        if (x > 0)
                activecell_.setX(x - 1);
+       else if (parentWidget())
+               QWidget::focusNextPrevChild(false);
 
        updateCell(x, activecell_.y());
        updateCell(activecell_.x(), activecell_.y());

diff --git a/src/frontends/qt2/QBrowseBox.h b/src/frontends/qt2/QBrowseBox.h
index 83cb745b69199eac820e340114c4535366237f34..601cdff05b9f8d15a48583b065c489160b4b96f2 100644 (file)
--- a/src/frontends/qt2/QBrowseBox.h
+++ b/src/frontends/qt2/QBrowseBox.h
@@ -3,9 +3,8 @@
  * \file QBrowseBox.h
  *
  * Original file taken from klyx 0.10 sources:
- * $Id: QBrowseBox.h,v 1.4 2002/10/20 01:48:27 larsbj Exp $
  *
- * \author Kalle Dalheimer ?
+ * \author Kalle Dalheimer
  *
  * Full author contact details are available in file CREDITS
  */
@@ -27,22 +26,22 @@ class QBrowseBox : public QGridView
 {
        Q_OBJECT
 public:
-       QBrowseBox(int rows, int cols);
+       QBrowseBox(int rows, int cols, QWidget* parent=0, char const * name=0, WFlags f=0);
        ~QBrowseBox();
        
-       void insertItem(QString const & text, int x, int y);
-       void insertItem(char const * text, int x, int y);
-       void insertItem(QPixmap pixmap, int x, int y);
+       void insertItem(QString const & text, int row, int col);
+       void insertItem(char const * text, int row, int col);
+       void insertItem(QPixmap pixmap, int row, int col);
        void insertItem(QPixmap pixmap);
-       void removeItem(int x, int y);
+       void removeItem(int row, int col);
        void clear();
        
-       QString text(int x, int y);
-       QPixmap pixmap(int x, int y);
+       QString text(int row, int col);
+       QPixmap pixmap(int row, int col);
        
-       //  int exec(QPoint const & pos);
-       //  int exec(int x, int y);
-       //  int exec(QWidget * trigger);
+       int exec(QPoint const & pos);
+       int exec(int x, int y);
+       int exec(QWidget const * trigger);
        
 signals:
         void selected(int, int);
@@ -51,9 +50,9 @@ protected:
        virtual void keyPressEvent(QKeyEvent * e);
        virtual void resizeEvent(QResizeEvent * e);
        virtual void mouseReleaseEvent(QMouseEvent * e);
-       //  virtual void closeEvent(QCloseEvent * e);
+       virtual void closeEvent(QCloseEvent * e);
        virtual void mouseMoveEvent(QMouseEvent * e);
-       virtual void paintCell(QPainter *, int x, int y);
+       virtual void paintCell(QPainter *, int row, int col);
        
 private:
        // make sure the automatically generated one is not used
@@ -64,10 +63,13 @@ private:
        void moveUp();
        void moveDown();
        
-       int coordsToIndex(int x, int y);
+       int coordsToIndex(int row, int col);
        
        QString * texts_;
        QPixmap* pixmaps_;
        QPoint activecell_;
+       bool firstrelease_;
+       bool inloop;
+       
 };
 #endif

diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 6c40fb9fe3657a9e467723f962f863be244c1027..3e756d8d1106bddd97592a0eaafe63b9e42697c2 100644 (file)
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -42,6 +42,8 @@
 #include <qstringlist.h>
 #include "lengthcombo.h"
 
+#include "QBrowseBox.h"
+
 #include <vector>
 
 using std::vector;
@@ -140,9 +142,6 @@ void QDocument::build_dialog()
        // margins
        dialog_->setMargins(0);
 
-       string const bmtablefile = LibFileSearch("images", "standard", "xpm");
-       QString s = bmtablefile.c_str();
-
        // Manage the restore, ok, apply, restore and cancel/close buttons
        bc().setOK(dialog_->okPB);
        bc().setApply(dialog_->applyPB);
@@ -204,6 +203,12 @@ void QDocument::apply()
        params.tocdepth =
                dialog_->numberingModule->sectionnrDepthSB->value();
 
+       // bullets
+       //BufferParams & param = lv_.buffer()->params;
+       //param.temp_bullets[current_bullet_depth].
+       //      setText(getString(bullets_->input_bullet_latex));
+       
+
        // packages
        switch (dialog_->packagesModule->lspacingCO->currentItem()) {
        case 0:
@@ -422,6 +427,31 @@ void QDocument::update_contents()
        dialog_->numberingModule->sectionnrDepthSB->setValue(
                params.tocdepth);
 
+       // bullets
+       QString s = params.user_defined_bullets[0].getText().c_str();
+       dialog_->bulletsModule->bullet1LE->setText(s);
+       
+       s = params.user_defined_bullets[1].getText().c_str();
+       dialog_->bulletsModule->bullet2LE->setText(s);
+       
+       s = params.user_defined_bullets[2].getText().c_str();
+       dialog_->bulletsModule->bullet3LE->setText(s);
+       
+       s = params.user_defined_bullets[3].getText().c_str();
+       dialog_->bulletsModule->bullet4LE->setText(s);
+       
+       dialog_->bulletsModule->bulletsize1CO->setCurrentItem(
+               params.user_defined_bullets[0].getSize() + 1);
+       
+       dialog_->bulletsModule->bulletsize2CO->setCurrentItem(
+               params.user_defined_bullets[1].getSize() + 1);
+       
+       dialog_->bulletsModule->bulletsize3CO->setCurrentItem(
+               params.user_defined_bullets[2].getSize() + 1);
+       
+       dialog_->bulletsModule->bulletsize4CO->setCurrentItem(
+               params.user_defined_bullets[3].getSize() + 1);
+       
        // packages
        QStringList enc;
        enc <<  "default" << "auto" << "latin1" << "latin2" << "latin3" <<

diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index 3c07a514ce4e10e487207d28a4e72bdb28c39c70..396ccd8dcd1972f1c493680a9578b09e37172acb 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -105,6 +105,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
        moduleStack->addWidget(preambleModule,PREAMBLE);
 
        moduleStack->raiseWidget(LAYOUT);
+       
 
        //QPixmap image("standard.xpm");
        //bulletsModule->bulletsBB->insertItem(image);
@@ -252,14 +253,6 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
 }
 
 
-void QDocumentDialog::showPreamble()
-{
-       moduleStack->raiseWidget(PREAMBLE);
-       setTitle(PREAMBLE);
-       QDocumentDialogBase::show();
-}
-
-
 /*
  *  Destroys the object and frees any allocated resources
  */
@@ -316,15 +309,6 @@ void QDocumentDialog::saveDefaultClicked()
 }
 
 
-/*
- * public slot
- */
-void QDocumentDialog::restore()
-{
-    qWarning( "DocumentDialog::restore() not yet implemented!" );
-}
-
-
 /*
  * public slot
  */

diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h
index 772f4360137efa1a2dda6c2bf60798049d782fb1..f58be9703e454fe6747a86440041e8ea3ddb9517 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.h
+++ b/src/frontends/qt2/QDocumentDialog.h
@@ -39,19 +39,14 @@ public:
        friend class QDocument;
 
        QDocumentDialog(QDocument *);
-
        ~QDocumentDialog();
 
-       void showPreamble();
-
        void updateFontsize(string const & , string const &);
-
        void updatePagestyle(string const & , string const &);
 public slots:
        void setTitle(int);
        void change_adaptor();
        void saveDefaultClicked();
-       void restore();
        void useDefaultsClicked();
 protected slots:
        void setLSpacing(int);

diff --git a/src/frontends/qt2/qsetborder.C b/src/frontends/qt2/qsetborder.C
new file mode 100644 (file)
index 0000000..4d251ea
--- /dev/null
+++ b/src/frontends/qt2/qsetborder.C
@@ -0,0 +1,176 @@
+/**
+ * \file QSetBorder.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Edwin Leuven
+ *
+ * Full author contact details are available in file CREDITS
+ */
+
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qimage.h>
+#include "qsetborder.h"
+
+
+QSetBorder::QSetBorder( QWidget* parent,  const char* name, WFlags fl )
+       : QWidget( parent, name, fl ),
+         left_(false), right_(false), top_(false), bottom_(false), buffer(75,75)
+{
+       /* length of corner line */
+       l = buffer.width()/10;
+       /* margin */
+       m = buffer.height()/10;
+       
+       w = buffer.width();
+       h = buffer.height();
+
+       init();
+       
+       setMinimumSize(w,h);
+       setMaximumSize(w,h);
+}
+
+void QSetBorder::paintEvent( QPaintEvent *e )
+{
+       QWidget::paintEvent( e );
+       bitBlt( this, 0, 0, &buffer, 0, 0, width(), height() );
+}
+
+void QSetBorder::init()
+{
+       buffer.fill();
+       QPainter paint;
+       paint.begin( &buffer );
+       paint.setPen( Qt::black );
+       
+       paint.drawLine(   m+l ,m,   m+l ,m+l);
+       paint.drawLine(w-(m+l),m,w-(m+l),m+l);
+
+       paint.drawLine(m,   m+l ,m+l,   m+l);
+       paint.drawLine(m,h-(m+l),m+l,h-(m+l));
+
+       paint.drawLine(   m+l , h-m,   m+l ,h-(m+l));
+       paint.drawLine(w-(m+l),h-m,w-(m+l),h-(m+l));
+
+       paint.drawLine(h-m,   m+l ,h-(m+l),   m+l);
+       paint.drawLine(h-m,h-(m+l),h-(m+l),h-(m+l));
+
+       paint.end();
+}
+void QSetBorder::mousePressEvent( QMouseEvent *e)
+{
+       if ( e->y() > e->x()) {
+               if (e->y() < height() - e->x() ) {
+                       drawLeft(!left_);
+                       left_ = !left_;
+                       emit leftSet(left_);
+               } else {
+                       drawBottom(!bottom_);
+                       bottom_ = !bottom_;
+                       emit bottomSet(bottom_);
+               }
+       } else {
+               if ( e->y() < height() - e->x() ) {
+                       drawTop(!top_);
+                       top_ = !top_;
+                       emit topSet(top_);
+               } else {
+                       drawRight(!right_);
+                       right_ = !right_;
+                       emit rightSet(right_);
+               }
+       }
+       update();
+}
+
+void QSetBorder::drawLeft(bool draw)
+{
+       QPainter paint;
+       paint.begin( &buffer );
+       QPen p = paint.pen();
+       p.setWidth(2);
+       p.setColor( draw ? Qt::black : Qt::white );
+       paint.setPen(p);
+       paint.drawLine(m+l,m+l+2,m+l,h-m-l-1);
+       paint.end();
+}
+
+void QSetBorder::drawRight(bool draw)
+{
+       QPainter paint;
+       paint.begin( &buffer );
+       QPen p = paint.pen();
+       p.setWidth(2);
+       p.setColor( draw ? Qt::black : Qt::white );
+       paint.setPen(p);
+       paint.drawLine(h-m-l+1,m+l+2,h-m-l+1,h-m-l-1);
+       paint.end();
+}
+
+void QSetBorder::drawTop(bool draw)
+{
+       QPainter paint;
+       paint.begin( &buffer );
+       QPen p = paint.pen();
+       p.setWidth(2);
+       p.setColor( draw ? Qt::black : Qt::white );
+       paint.setPen(p);
+       paint.drawLine(m+l+2,m+l,w-m-l-1,m+l);
+       paint.end();
+}
+
+void QSetBorder::drawBottom(bool draw)
+{
+       QPainter paint;
+       paint.begin( &buffer );
+       QPen p = paint.pen();
+       p.setWidth(2);
+       p.setColor( draw ? Qt::black : Qt::white );
+       paint.setPen(p);
+       paint.drawLine(m+l+2,w-m-l+1,w-m-l-1,w-m-l+1);
+       paint.end();
+}
+
+void QSetBorder::setLeft(bool border)
+{
+       left_ = border;
+}
+
+void QSetBorder::setRight(bool border)
+{
+       right_ = border;
+}
+
+void QSetBorder::setTop(bool border)
+{
+       top_ = border;
+}
+
+void QSetBorder::setBottom(bool border)
+{
+       bottom_ = border;
+}
+
+bool QSetBorder::getLeft()
+{
+       return left_;
+}
+
+bool QSetBorder::getRight()
+{
+       return right_;
+}
+
+bool QSetBorder::getTop()
+{
+       return top_;
+}
+
+bool QSetBorder::getBottom()
+{
+       return bottom_;
+}
+
+

diff --git a/src/frontends/qt2/qsetborder.h b/src/frontends/qt2/qsetborder.h
new file mode 100644 (file)
index 0000000..ece502e
--- /dev/null
+++ b/src/frontends/qt2/qsetborder.h
@@ -0,0 +1,69 @@
+// -*- C++ -*-
+/**
+ * \file QSetBorder.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Edwin Leuven
+ *
+ * Full author contact details are available in file CREDITS
+ */
+#ifndef QSETBORDER_H
+#define QSETBORDER_H
+
+#include <qwidget.h>
+#include <qpixmap.h>
+
+class QMouseEvent;
+class QResizeEvent;
+class QPaintEvent;
+
+class QSetBorder : public QWidget
+{
+       Q_OBJECT
+public:
+       QSetBorder(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+
+       bool getLeft();
+       bool getRight();
+       bool getTop();
+       bool getBottom();
+
+signals:
+       void rightSet(bool);
+       void leftSet(bool);
+       void topSet(bool);
+       void bottomSet(bool);
+       
+public slots:
+       void setLeft(bool);
+       void setRight(bool);
+       void setTop(bool);
+       void setBottom(bool);
+
+protected:
+
+       void mousePressEvent( QMouseEvent *e );
+       void paintEvent( QPaintEvent *e );
+       
+private:
+       void init();
+
+       void drawLeft(bool);
+       void drawRight(bool);
+       void drawTop(bool);
+       void drawBottom(bool);
+
+       bool left_;
+       bool right_;
+       bool top_;
+       bool bottom_;
+
+       int m;
+       int l;
+       int w;
+       int h;
+       
+       QPixmap buffer;
+};
+#endif // QSETBORDER_H

diff --git a/src/frontends/qt2/ui/BulletsModuleBase.ui b/src/frontends/qt2/ui/BulletsModuleBase.ui
index cf4f110f8dc54cefad34f664f0bc9ae3c4091c02..9230d57d7b709aa73e6792dec5cbc27ea805fb4c 100644 (file)
--- a/src/frontends/qt2/ui/BulletsModuleBase.ui
+++ b/src/frontends/qt2/ui/BulletsModuleBase.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>311</width>
-            <height>210</height>
+            <width>291</width>
+            <height>176</height>
         </rect>
     </property>
     <property stdset="1">
@@ -34,13 +34,6 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="1"  column="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>bulletsize1CO</cstring>
-            </property>
-        </widget>
         <widget row="1"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
@@ -98,13 +91,6 @@
                 </size>
             </property>
         </spacer>
-        <widget row="3"  column="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>bulletsize3CO</cstring>
-            </property>
-        </widget>
         <widget row="3"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
@@ -112,13 +98,6 @@
                 <cstring>bullet3LE</cstring>
             </property>
         </widget>
-        <widget row="4"  column="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>bulletsize4CO</cstring>
-            </property>
-        </widget>
         <widget row="4"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
@@ -126,27 +105,6 @@
                 <cstring>bullet4LE</cstring>
             </property>
         </widget>
-        <widget row="5"  column="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>bulletsize5CO</cstring>
-            </property>
-        </widget>
-        <widget row="5"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>bullet5LE</cstring>
-            </property>
-        </widget>
-        <widget row="2"  column="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>bulletsize2CO</cstring>
-            </property>
-        </widget>
         <widget row="2"  column="1" >
             <class>QLineEdit</class>
             <property stdset="1">
@@ -162,11 +120,11 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Set Level 2:</string>
+                <string>Set Level 2</string>
             </property>
             <property stdset="1">
                 <name>popupDelay</name>
-                <number>0</number>
+                <number>1</number>
             </property>
         </widget>
         <widget row="3"  column="0" >
@@ -177,11 +135,11 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Set Level 3:</string>
+                <string>Set Level 3</string>
             </property>
             <property stdset="1">
                 <name>popupDelay</name>
-                <number>0</number>
+                <number>1</number>
             </property>
         </widget>
         <widget row="4"  column="0" >
@@ -192,37 +150,318 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Set Level 4:</string>
+                <string>Set Level 4</string>
             </property>
             <property stdset="1">
                 <name>popupDelay</name>
                 <number>1</number>
             </property>
         </widget>
-        <widget row="5"  column="0" >
+        <widget row="1"  column="0" >
             <class>QToolButton</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>setbullet5TB</cstring>
+                <cstring>setbullet1TB</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Set Level 5:</string>
+                <string>Set Level 1</string>
+            </property>
+            <property stdset="1">
+                <name>popupDelay</name>
+                <number>1</number>
             </property>
         </widget>
-        <widget row="1"  column="0" >
-            <class>QToolButton</class>
+        <widget row="1"  column="2" >
+            <class>QComboBox</class>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>default</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>tiny</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>script</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>footnote</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>small</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>normal</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>LARGE</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>huge</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Huge</string>
+                </property>
+            </item>
             <property stdset="1">
                 <name>name</name>
-                <cstring>setbullet1TB</cstring>
+                <cstring>bulletsize1CO</cstring>
             </property>
+        </widget>
+        <widget row="2"  column="2" >
+            <class>QComboBox</class>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>default</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>tiny</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>script</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>footnote</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>small</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>normal</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>LARGE</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>huge</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Huge</string>
+                </property>
+            </item>
             <property stdset="1">
-                <name>text</name>
-                <string>Set Level 1:</string>
+                <name>name</name>
+                <cstring>bulletsize2CO</cstring>
             </property>
+        </widget>
+        <widget row="3"  column="2" >
+            <class>QComboBox</class>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>default</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>tiny</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>script</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>footnote</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>small</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>normal</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>LARGE</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>huge</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Huge</string>
+                </property>
+            </item>
             <property stdset="1">
-                <name>popupDelay</name>
-                <number>0</number>
+                <name>name</name>
+                <cstring>bulletsize3CO</cstring>
+            </property>
+        </widget>
+        <widget row="4"  column="2" >
+            <class>QComboBox</class>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>default</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>tiny</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>script</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>footnote</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>small</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>normal</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Large</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>LARGE</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>huge</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>Huge</string>
+                </property>
+            </item>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>bulletsize4CO</cstring>
             </property>
         </widget>
     </grid>

diff --git a/src/frontends/qt2/ui/QTabularDialog.ui b/src/frontends/qt2/ui/QTabularDialog.ui
index 8ed8d638b4714c9ae21527b2c970e00c4876d386..4031e1e0e467886bba61c7673781c7f46522d1ab 100644 (file)
--- a/src/frontends/qt2/ui/QTabularDialog.ui
+++ b/src/frontends/qt2/ui/QTabularDialog.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>497</width>
-            <height>338</height>
+            <width>434</width>
+            <height>334</height>
         </rect>
     </property>
     <property stdset="1">
@@ -34,836 +34,106 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="0"  column="0" >
-            <class>QTabWidget</class>
+        <widget row="1"  column="0" >
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TabWidget</cstring>
-            </property>
-            <property stdset="1">
-                <name>tabPosition</name>
-                <enum>Top</enum>
-            </property>
-            <property stdset="1">
-                <name>tabShape</name>
-                <enum>Rounded</enum>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string></string>
+                <cstring>Layout7</cstring>
             </property>
-            <widget>
-                <class>QWidget</class>
+            <hbox>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
+                    <name>margin</name>
+                    <number>0</number>
                 </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Ta&amp;ble</string>
-                </attribute>
-                <grid>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLineEdit</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
+                        <name>name</name>
+                        <cstring>tabularRowED</cstring>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Current row position</string>
                     </property>
+                </widget>
+                <widget>
+                    <class>QLineEdit</class>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
+                        <name>name</name>
+                        <cstring>tabularColumnED</cstring>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Current column position</string>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer1</cstring>
                     </property>
-                    <spacer row="0"  column="0" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer2</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="3"  column="3" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer8</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="1"  column="3" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer6</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="3"  column="0" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer7</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="1"  column="0" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer5</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget row="0"  column="2" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>columnDeletePB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Delete column</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Delete current column</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="2" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>rowDeletePB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Dele&amp;te row</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Delete this row</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>rowAppendPB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Appe&amp;nd row</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Append row (below)</string>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>borderSetPB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Set borders</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Set all borders</string>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="2" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>borderUnsetPB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Unset borders</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Unset all borders</string>
-                        </property>
-                    </widget>
-                    <widget row="5"  column="0"  rowspan="1"  colspan="4" >
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>rotateTabularCB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Rotate table &amp;90°</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Rotate the table by 90°</string>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>columnAppendPB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>A&amp;ppend column</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Append column (right)</string>
-                        </property>
-                    </widget>
-                    <spacer row="0"  column="3" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer3</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="6"  column="1" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer10</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="2"  column="0"  rowspan="1"  colspan="4" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer11</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="4"  column="0"  rowspan="1"  colspan="4" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer12</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>&amp;Columns/Rows</string>
-                </attribute>
-                <grid>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
                     </property>
-                    <widget row="1"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>hAlignCO</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Horizontal alignment:</string>
-                        </property>
-                        <property>
-                            <name>buddy</name>
-                            <cstring>hAlignCB</cstring>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>specialAlignmentLA</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>LaTe&amp;X argument:</string>
-                        </property>
-                        <property>
-                            <name>buddy</name>
-                            <cstring>specialAlignmentED</cstring>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QGroupBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>GroupBox33</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>title</name>
-                            <string>Borders</string>
-                        </property>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>11</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget row="3"  column="1"  rowspan="1"  colspan="2" >
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>borderBottomPB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Bottom</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Toggle border below (whole row)</string>
-                                </property>
-                            </widget>
-                            <widget row="2"  column="0"  rowspan="1"  colspan="2" >
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>borderLeftPB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Le&amp;ft</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Toggle border left (whole column)</string>
-                                </property>
-                            </widget>
-                            <widget row="2"  column="2"  rowspan="1"  colspan="2" >
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>borderRightPB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Right</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Toggle border right (whole column)</string>
-                                </property>
-                            </widget>
-                            <widget row="1"  column="1"  rowspan="1"  colspan="2" >
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>borderTopPB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Top</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Toggle border above (whole row)</string>
-                                </property>
-                            </widget>
-                            <spacer row="4"  column="1"  rowspan="1"  colspan="2" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer83</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Vertical</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="0"  column="1"  rowspan="1"  colspan="2" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer86</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Vertical</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="1"  column="3" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer87</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="3"  column="0" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer88</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </grid>
-                    </widget>
-                    <widget row="0"  column="2"  rowspan="1"  colspan="2" >
-                        <class>QGroupBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>GroupBox12</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>title</name>
-                            <string>Fixed width</string>
-                        </property>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>11</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget row="0"  column="0" >
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>fixedWidthColLA</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Width:</string>
-                                </property>
-                                <property>
-                                    <name>buddy</name>
-                                    <cstring>widthED</cstring>
-                                </property>
-                            </widget>
-                            <widget row="2"  column="0"  rowspan="1"  colspan="2" >
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>vAlignCO</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Vertical alignment:</string>
-                                </property>
-                                <property>
-                                    <name>buddy</name>
-                                    <cstring>vAlignCB</cstring>
-                                </property>
-                            </widget>
-                            <widget row="1"  column="0" >
-                                <class>QLineEdit</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>widthED</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string></string>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Fixed with of the column</string>
-                                </property>
-                            </widget>
-                            <widget row="1"  column="1"  rowspan="1"  colspan="2" >
-                                <class>LengthCombo</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>widthUnit</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>minimumSize</name>
-                                    <size>
-                                        <width>50</width>
-                                        <height>0</height>
-                                    </size>
-                                </property>
-                                <property stdset="1">
-                                    <name>focusPolicy</name>
-                                    <enum>StrongFocus</enum>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Width unit</string>
-                                </property>
-                            </widget>
-                            <widget row="3"  column="0"  rowspan="1"  colspan="2" >
-                                <class>QComboBox</class>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Top</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Center</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Bottom</string>
-                                    </property>
-                                </item>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>vAlignCB</cstring>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Vertical alignment for fixed width columns</string>
-                                </property>
-                            </widget>
-                            <spacer row="1"  column="3" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer212</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="3"  column="2"  rowspan="1"  colspan="2" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer108</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </grid>
-                    </widget>
-                    <widget row="1"  column="1"  rowspan="1"  colspan="2" >
-                        <class>QComboBox</class>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>Left</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>Center</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>Right</string>
-                            </property>
-                        </item>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>hAlignCB</cstring>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Horizontal alignment in column</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="1"  rowspan="1"  colspan="3" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>specialAlignmentED</cstring>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Custom column format (LaTeX)</string>
-                        </property>
-                    </widget>
-                    <spacer row="1"  column="3" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer23</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="3"  column="0"  rowspan="1"  colspan="4" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer24</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>275</width>
+                            <height>26</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>closePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Close</string>
+                    </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="0"  column="0" >
+            <class>QTabWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>TabWidget</cstring>
+            </property>
+            <property stdset="1">
+                <name>tabPosition</name>
+                <enum>Top</enum>
+            </property>
+            <property stdset="1">
+                <name>tabShape</name>
+                <enum>Rounded</enum>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string></string>
+            </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
@@ -872,7 +142,7 @@
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>Ce&amp;ll</string>
+                    <string>&amp;Table Settings</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
@@ -883,58 +153,11 @@
                         <name>spacing</name>
                         <number>6</number>
                     </property>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout28</cstring>
-                        </property>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget row="0"  column="0" >
-                                <class>QCheckBox</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>MulticolumnCB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Multicolumn</string>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Merge cells</string>
-                                </property>
-                            </widget>
-                            <widget row="0"  column="1" >
-                                <class>QCheckBox</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>rotateCellCB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Rotate cell &amp;90°</string>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Rotate this cell by 90°</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget row="2"  column="0" >
+                    <widget row="0"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>hAlignCellCO</cstring>
+                            <cstring>hAlignCO</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
@@ -945,33 +168,22 @@
                             <cstring>hAlignCB</cstring>
                         </property>
                     </widget>
-                    <widget row="3"  column="0" >
-                        <class>QLabel</class>
+                    <widget row="0"  column="3" >
+                        <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>specialAlignmentCellLA</cstring>
+                            <cstring>MulticolumnCB</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>LaTe&amp;X argument:</string>
-                        </property>
-                        <property>
-                            <name>buddy</name>
-                            <cstring>specialAlignmentCellED</cstring>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="1"  rowspan="1"  colspan="2" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>specialAlignmentCellED</cstring>
+                            <string>&amp;Multicolumn</string>
                         </property>
                         <property>
                             <name>toolTip</name>
-                            <string>Custom column format (LaTeX)</string>
+                            <string>Merge cells</string>
                         </property>
                     </widget>
-                    <widget row="2"  column="1" >
+                    <widget row="0"  column="1" >
                         <class>QComboBox</class>
                         <item>
                             <property>
@@ -993,17 +205,17 @@
                         </item>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>hAlignCellCB</cstring>
+                            <cstring>hAlignCB</cstring>
                         </property>
                         <property>
                             <name>toolTip</name>
-                            <string>Horizontal alignment of the multicolumn cell</string>
+                            <string>Horizontal alignment in column</string>
                         </property>
                     </widget>
-                    <spacer row="2"  column="2" >
+                    <spacer row="0"  column="2" >
                         <property>
                             <name>name</name>
-                            <cstring>Spacer25</cstring>
+                            <cstring>Spacer75</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
@@ -1021,15 +233,15 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+                    <widget row="3"  column="2"  rowspan="1"  colspan="2" >
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>GroupBox33_2</cstring>
+                            <cstring>GroupBox38</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
-                            <string>Borders</string>
+                            <string>Column</string>
                         </property>
                         <grid>
                             <property stdset="1">
@@ -1040,235 +252,98 @@
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
-                            <widget row="2"  column="1"  rowspan="1"  colspan="2" >
+                            <widget row="0"  column="0" >
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>borderLeftCellPB</cstring>
+                                    <cstring>columnAppendPB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Le&amp;ft</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>A&amp;dd</string>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Toggle left border</string>
+                                    <string>Append column (right)</string>
                                 </property>
                             </widget>
-                            <widget row="2"  column="3"  rowspan="1"  colspan="2" >
+                            <widget row="0"  column="1" >
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>borderRightCellPB</cstring>
+                                    <cstring>columnDeletePB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Right</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>De&amp;lete</string>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Toggle right border</string>
+                                    <string>Delete current column</string>
                                 </property>
                             </widget>
-                            <widget row="3"  column="2"  rowspan="1"  colspan="2" >
+                        </grid>
+                    </widget>
+                    <widget row="3"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>GroupBox39</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Row</string>
+                        </property>
+                        <hbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>borderBottomCellPB</cstring>
+                                    <cstring>rowAppendPB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Bottom</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>&amp;Add</string>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Toggle border below</string>
+                                    <string>Append row (below)</string>
                                 </property>
                             </widget>
-                            <widget row="1"  column="2"  rowspan="1"  colspan="2" >
+                            <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>borderTopCellPB</cstring>
+                                    <cstring>rowDeletePB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Top</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>Dele&amp;te</string>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Toggle border above</string>
+                                    <string>Delete this row</string>
                                 </property>
                             </widget>
-                            <spacer row="4"  column="2"  rowspan="1"  colspan="2" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer179</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Vertical</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="2"  column="5" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer182</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="0"  column="2"  rowspan="1"  colspan="2" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer178</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Vertical</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="1"  column="4"  rowspan="1"  colspan="2" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer180</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="2"  column="0" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer183</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <spacer row="3"  column="0"  rowspan="1"  colspan="2" >
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer181</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </grid>
+                        </hbox>
                     </widget>
-                    <widget row="1"  column="2" >
+                    <widget row="2"  column="0"  rowspan="1"  colspan="3" >
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>GroupBox12_2</cstring>
+                            <cstring>GroupBox12</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
-                            <string>Fixed width</string>
+                            <string>Column Width</string>
                         </property>
                         <grid>
                             <property stdset="1">
@@ -1279,67 +354,82 @@
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
-                            <widget row="0"  column="0" >
+                            <widget row="1"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>fixedWidthCellLA</cstring>
+                                    <cstring>vAlignCO</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Width:</string>
+                                    <string>&amp;Vertical alignment:</string>
                                 </property>
                                 <property>
                                     <name>buddy</name>
-                                    <cstring>widthCellED</cstring>
+                                    <cstring>vAlignCB</cstring>
                                 </property>
                             </widget>
-                            <widget row="1"  column="0" >
-                                <class>QLineEdit</class>
+                            <widget row="0"  column="2" >
+                                <class>LengthCombo</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>widthCellED</cstring>
+                                    <cstring>widthUnit</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>true</bool>
                                 </property>
                                 <property stdset="1">
-                                    <name>text</name>
-                                    <string></string>
+                                    <name>minimumSize</name>
+                                    <size>
+                                        <width>50</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property stdset="1">
+                                    <name>focusPolicy</name>
+                                    <enum>StrongFocus</enum>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Fixed with of the multicolumn cell</string>
+                                    <string>Width unit</string>
                                 </property>
                             </widget>
-                            <widget row="1"  column="1" >
-                                <class>LengthCombo</class>
+                            <widget row="0"  column="1" >
+                                <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>widthCellUnit</cstring>
+                                    <cstring>widthED</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>true</bool>
                                 </property>
                                 <property stdset="1">
-                                    <name>minimumSize</name>
-                                    <size>
-                                        <width>50</width>
-                                        <height>0</height>
-                                    </size>
+                                    <name>text</name>
+                                    <string></string>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Fixed with of the column</string>
                                 </property>
+                            </widget>
+                            <widget row="0"  column="0" >
+                                <class>QLabel</class>
                                 <property stdset="1">
-                                    <name>focusPolicy</name>
-                                    <enum>StrongFocus</enum>
+                                    <name>name</name>
+                                    <cstring>fixedWidthColLA</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>&amp;Width:</string>
                                 </property>
                                 <property>
-                                    <name>toolTip</name>
-                                    <string>Width unit</string>
+                                    <name>buddy</name>
+                                    <cstring>widthED</cstring>
                                 </property>
                             </widget>
-                            <widget row="3"  column="0" >
+                            <widget row="1"  column="1" >
                                 <class>QComboBox</class>
                                 <item>
                                     <property>
@@ -1361,72 +451,501 @@
                                 </item>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>vAlignCellCB</cstring>
+                                    <cstring>vAlignCB</cstring>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
                                     <string>Vertical alignment for fixed width columns</string>
                                 </property>
                             </widget>
-                            <widget row="2"  column="0"  rowspan="1"  colspan="2" >
-                                <class>QLabel</class>
+                        </grid>
+                    </widget>
+                    <widget row="2"  column="3" >
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>GroupBox21</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Rotate 90°</string>
+                        </property>
+                        <vbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>vAlignCellCO</cstring>
+                                    <cstring>rotateTabularCB</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>true</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Vertical alignment:</string>
+                                    <string>&amp;Rotate Table</string>
                                 </property>
                                 <property>
-                                    <name>buddy</name>
-                                    <cstring>vAlignCellCB</cstring>
+                                    <name>toolTip</name>
+                                    <string>Rotate the table by 90°</string>
                                 </property>
                             </widget>
-                            <spacer row="1"  column="2" >
-                                <property>
+                            <widget>
+                                <class>QCheckBox</class>
+                                <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Spacer184</cstring>
+                                    <cstring>rotateCellCB</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
+                                    <name>text</name>
+                                    <string>Rotate &amp;Cell</string>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Rotate this cell by 90°</string>
                                 </property>
+                            </widget>
+                        </vbox>
+                    </widget>
+                    <widget row="1"  column="1"  rowspan="1"  colspan="3" >
+                        <class>QLineEdit</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>specialAlignmentED</cstring>
+                        </property>
+                        <property>
+                            <name>toolTip</name>
+                            <string>Custom column format (LaTeX)</string>
+                        </property>
+                    </widget>
+                    <widget row="1"  column="0" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>specialAlignmentLA</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>LaTe&amp;X argument:</string>
+                        </property>
+                        <property>
+                            <name>buddy</name>
+                            <cstring>specialAlignmentED</cstring>
+                        </property>
+                    </widget>
+                </grid>
+            </widget>
+            <widget>
+                <class>QWidget</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>tab</cstring>
+                </property>
+                <attribute>
+                    <name>title</name>
+                    <string>&amp;Borders</string>
+                </attribute>
+                <grid>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>11</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>6</number>
+                    </property>
+                    <widget row="0"  column="0" >
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>setBordersGB</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Set Borders</string>
+                        </property>
+                        <grid>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget row="0"  column="0" >
+                                <class>QFrame</class>
                                 <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
+                                    <name>name</name>
+                                    <cstring>Frame3_2</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizePolicy</name>
+                                    <sizepolicy>
+                                        <hsizetype>5</hsizetype>
+                                        <vsizetype>5</vsizetype>
+                                    </sizepolicy>
+                                </property>
+                                <property stdset="1">
+                                    <name>palette</name>
+                                    <palette>
+                                        <active>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>230</red>
+                                                <green>240</green>
+                                                <blue>249</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>242</red>
+                                                <green>247</green>
+                                                <blue>252</blue>
+                                            </color>
+                                            <color>
+                                                <red>115</red>
+                                                <green>120</green>
+                                                <blue>124</blue>
+                                            </color>
+                                            <color>
+                                                <red>154</red>
+                                                <green>160</green>
+                                                <blue>166</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>16</red>
+                                                <green>145</green>
+                                                <blue>210</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                        </active>
+                                        <disabled>
+                                            <color>
+                                                <red>128</red>
+                                                <green>128</green>
+                                                <blue>128</blue>
+                                            </color>
+                                            <color>
+                                                <red>230</red>
+                                                <green>240</green>
+                                                <blue>249</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>115</red>
+                                                <green>120</green>
+                                                <blue>124</blue>
+                                            </color>
+                                            <color>
+                                                <red>154</red>
+                                                <green>160</green>
+                                                <blue>166</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>128</red>
+                                                <green>128</green>
+                                                <blue>128</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>16</red>
+                                                <green>145</green>
+                                                <blue>210</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                        </disabled>
+                                        <inactive>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>230</red>
+                                                <green>240</green>
+                                                <blue>249</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>115</red>
+                                                <green>120</green>
+                                                <blue>124</blue>
+                                            </color>
+                                            <color>
+                                                <red>154</red>
+                                                <green>160</green>
+                                                <blue>166</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                            <color>
+                                                <red>0</red>
+                                                <green>0</green>
+                                                <blue>0</blue>
+                                            </color>
+                                            <color>
+                                                <red>16</red>
+                                                <green>145</green>
+                                                <blue>210</blue>
+                                            </color>
+                                            <color>
+                                                <red>255</red>
+                                                <green>255</green>
+                                                <blue>255</blue>
+                                            </color>
+                                        </inactive>
+                                    </palette>
+                                </property>
+                                <property stdset="1">
+                                    <name>frameShape</name>
+                                    <enum>StyledPanel</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>frameShadow</name>
+                                    <enum>Sunken</enum>
                                 </property>
                                 <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
+                                    <name>layoutMargin</name>
                                 </property>
-                            </spacer>
-                            <spacer row="3"  column="1"  rowspan="1"  colspan="2" >
-                                <property>
+                                <grid>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>3</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <widget row="0"  column="0" >
+                                        <class>QSetBorder</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>borders</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>1</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget row="0"  column="1" >
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>GroupBox33_2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>All Borders</string>
+                        </property>
+                        <grid>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget row="0"  column="0" >
+                                <class>QPushButton</class>
+                                <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Spacer185</cstring>
+                                    <cstring>borderSetPB</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>&amp;Default</string>
                                 </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Set all borders</string>
+                                </property>
+                            </widget>
+                            <widget row="1"  column="0" >
+                                <class>QPushButton</class>
                                 <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
+                                    <name>name</name>
+                                    <cstring>borderUnsetPB</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
+                                    <name>text</name>
+                                    <string>C&amp;lear</string>
                                 </property>
                                 <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
+                                    <name>toolTip</name>
+                                    <string>Unset all borders</string>
                                 </property>
-                            </spacer>
+                            </widget>
                         </grid>
                     </widget>
+                    <spacer row="0"  column="2" >
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer6</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <spacer row="1"  column="0" >
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer7</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
                 </grid>
             </widget>
             <widget>
@@ -1437,7 +956,7 @@
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>L&amp;ong table</string>
+                    <string>&amp;Longtable</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
@@ -1448,21 +967,6 @@
                         <name>spacing</name>
                         <number>6</number>
                     </property>
-                    <widget row="1"  column="0" >
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>LTnewpageCB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Page &amp;break on current row</string>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Set a page break on the current row</string>
-                        </property>
-                    </widget>
                     <widget row="0"  column="0" >
                         <class>QCheckBox</class>
                         <property stdset="1">
@@ -1478,12 +982,16 @@
                             <string>Select for tables that span multiple pages</string>
                         </property>
                     </widget>
-                    <widget row="2"  column="0" >
+                    <widget row="1"  column="0" >
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>GroupBox6</cstring>
                         </property>
+                        <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Settings</string>
@@ -1511,69 +1019,12 @@
                             <widget row="1"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>HeaderLA</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Header:</string>
-                                </property>
-                            </widget>
-                            <widget row="2"  column="1" >
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>firstHeaderStatusPB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Header on</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                            </widget>
-                            <widget row="3"  column="1" >
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>footerStatusPB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Header on</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                            </widget>
-                            <widget row="4"  column="1" >
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>firstHeaderStatusPB_3</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Header on</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>name</name>
+                                    <cstring>HeaderLA</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>text</name>
+                                    <string>Header:</string>
                                 </property>
                             </widget>
                             <widget row="3"  column="0" >
@@ -1609,339 +1060,217 @@
                                     <string>Last footer:</string>
                                 </property>
                             </widget>
-                            <widget row="1"  column="1" >
-                                <class>QPushButton</class>
+                            <widget row="0"  column="4" >
+                                <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>headerStatusPB</cstring>
+                                    <cstring>ContentsLA</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Header on</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string></string>
+                                    <string>Contents</string>
                                 </property>
                             </widget>
-                            <widget row="1"  column="2" >
-                                <class>QPushButton</class>
+                            <widget row="0"  column="2" >
+                                <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>headerDoubleAbovePB</cstring>
+                                    <cstring>BorderAboveLA</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>Border above</string>
                                 </property>
                             </widget>
-                            <widget row="2"  column="2" >
-                                <class>QPushButton</class>
+                            <widget row="0"  column="3" >
+                                <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>firstHeaderDoubleAbovePB</cstring>
+                                    <cstring>BorderBelowLA</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>Border below</string>
                                 </property>
                             </widget>
-                            <widget row="3"  column="2" >
-                                <class>QPushButton</class>
+                            <widget row="1"  column="1" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>footerDoubleAbovePB</cstring>
+                                    <cstring>CheckBox46</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>on</string>
                                 </property>
                             </widget>
-                            <widget row="4"  column="2" >
-                                <class>QPushButton</class>
+                            <widget row="2"  column="1" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>firstHeaderDoubleAbovePB_3</cstring>
+                                    <cstring>CheckBox46_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>on</string>
                                 </property>
                             </widget>
-                            <widget row="1"  column="3" >
-                                <class>QPushButton</class>
+                            <widget row="3"  column="1" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>headerDoubleBelowPB</cstring>
+                                    <cstring>CheckBox46_3</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
+                                    <string>on</string>
                                 </property>
+                            </widget>
+                            <widget row="4"  column="1" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>name</name>
+                                    <cstring>CheckBox46_4</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>text</name>
+                                    <string>on</string>
                                 </property>
                             </widget>
-                            <widget row="2"  column="3" >
-                                <class>QPushButton</class>
+                            <widget row="1"  column="2" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>firstHeaderDoubleBelowPB</cstring>
+                                    <cstring>CheckBox46_5</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
+                                    <string>double</string>
                                 </property>
+                            </widget>
+                            <widget row="2"  column="2" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>name</name>
+                                    <cstring>CheckBox46_5_2</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>text</name>
+                                    <string>double</string>
                                 </property>
                             </widget>
-                            <widget row="3"  column="3" >
-                                <class>QPushButton</class>
+                            <widget row="3"  column="2" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>footerDoubleBelowPB</cstring>
+                                    <cstring>CheckBox46_5_3</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
+                                    <string>double</string>
                                 </property>
+                            </widget>
+                            <widget row="4"  column="2" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>name</name>
+                                    <cstring>CheckBox46_5_4</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <name>text</name>
+                                    <string>double</string>
                                 </property>
                             </widget>
                             <widget row="4"  column="3" >
-                                <class>QPushButton</class>
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>firstHeaderDoubleBelowPB_3</cstring>
+                                    <cstring>CheckBox46_5_7</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Double</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>double</string>
                                 </property>
                             </widget>
-                            <widget row="2"  column="4" >
-                                <class>QPushButton</class>
+                            <widget row="3"  column="3" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>firstHeaderEmptyPB</cstring>
+                                    <cstring>CheckBox46_5_6</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Empty</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>double</string>
                                 </property>
                             </widget>
-                            <widget row="4"  column="4" >
-                                <class>QPushButton</class>
+                            <widget row="2"  column="3" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>firstHeaderEmptyPB_3</cstring>
+                                    <cstring>CheckBox46_5_6</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Empty</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>toggleButton</name>
-                                    <bool>true</bool>
+                                    <string>double</string>
                                 </property>
                             </widget>
-                            <widget row="0"  column="4" >
-                                <class>QLabel</class>
+                            <widget row="1"  column="3" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>ContentsLA</cstring>
+                                    <cstring>CheckBox46_5_5</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Contents</string>
+                                    <string>double</string>
                                 </property>
                             </widget>
-                            <widget row="0"  column="2" >
-                                <class>QLabel</class>
+                            <widget row="4"  column="4" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>BorderAboveLA</cstring>
+                                    <cstring>CheckBox46_5_8</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Border above</string>
+                                    <string>is empty</string>
                                 </property>
                             </widget>
-                            <widget row="0"  column="3" >
-                                <class>QLabel</class>
+                            <widget row="2"  column="4" >
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>BorderBelowLA</cstring>
+                                    <cstring>CheckBox46_5_9</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Border below</string>
+                                    <string>is empty</string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
+                    <widget row="2"  column="0" >
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>LTnewpageCB</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Page &amp;break on current row</string>
+                        </property>
+                        <property>
+                            <name>toolTip</name>
+                            <string>Set a page break on the current row</string>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
         </widget>
-        <widget row="1"  column="0" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout3</cstring>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="0"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>tabularColumnED</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Current column position</string>
-                    </property>
-                </widget>
-                <widget row="0"  column="3" >
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>closePB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>1</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Close</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoDefault</name>
-                        <bool>false</bool>
-                    </property>
-                </widget>
-                <spacer row="0"  column="2" >
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Fixed</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>275</width>
-                            <height>26</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget row="0"  column="0" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>tabularRowED</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Current row position</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
     </grid>
 </widget>
 <customwidgets>
@@ -1960,6 +1289,20 @@
         <pixmap>image0</pixmap>
         <signal>selectionChanged(LyXLength::UNIT)</signal>
     </customwidget>
+    <customwidget>
+        <class>QSetBorder</class>
+        <header location="local">qsetborder.h</header>
+        <sizehint>
+            <width>50</width>
+            <height>50</height>
+        </sizehint>
+        <container>0</container>
+        <sizepolicy>
+            <hordata>5</hordata>
+            <verdata>5</verdata>
+        </sizepolicy>
+        <pixmap>image0</pixmap>
+    </customwidget>
 </customwidgets>
 <images>
     <image>
@@ -2011,28 +1354,16 @@
         <slot>rotateTabular_checked()</slot>
     </connection>
     <connection>
-        <sender>borderBottomPB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>QTabularDialogBase</receiver>
-        <slot>border_toggled()</slot>
-    </connection>
-    <connection>
-        <sender>borderTopPB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>QTabularDialogBase</receiver>
-        <slot>border_toggled()</slot>
-    </connection>
-    <connection>
-        <sender>borderLeftPB</sender>
+        <sender>LongtabularCB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>QTabularDialogBase</receiver>
-        <slot>border_toggled()</slot>
+        <receiver>GroupBox6</receiver>
+        <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>borderRightPB</sender>
+        <sender>LongtabularCB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>QTabularDialogBase</receiver>
-        <slot>border_toggled()</slot>
+        <receiver>LTnewpageCB</receiver>
+        <slot>setEnabled(bool)</slot>
     </connection>
     <slot access="protected">columnDelete_clicked()</slot>
     <slot access="protected">change_adaptor()</slot>