If we are in a closeEvent, we don't want to close all buffers, because these may...

[lyx.git] / src / frontends / qt4 / GuiTabular.h

diff --git a/src/frontends/qt4/GuiTabular.h b/src/frontends/qt4/GuiTabular.h
index 8b32715b26182a2cbee81003dc6cd271a9529ae5..158a0ad6f1434842904c5f32203a4fde510f7773 100644 (file)
--- a/src/frontends/qt4/GuiTabular.h
+++ b/src/frontends/qt4/GuiTabular.h
@@ -6,8 +6,8 @@
  *
  * \author John Levon
  * \author Kalle Dalheimer
- * \author Jürgen Spitzmüller
- * \author Herbert Voß
+ * \author Jürgen Spitzmüller
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -22,12 +22,12 @@
 namespace lyx {
 namespace frontend {
 
-class GuiTabular : public GuiDialog, public Ui::TabularUi, public Controller
+class GuiTabular : public GuiDialog, public Ui::TabularUi
 {
        Q_OBJECT
 
 public:
-       GuiTabular(LyXView & lv);
+       GuiTabular(GuiView & lv);
        ~GuiTabular();
 
 private Q_SLOTS:
@@ -49,6 +49,7 @@ private Q_SLOTS:
        void rotateCell();
        void hAlign_changed(int align);
        void vAlign_changed(int align);
+       void tableAlignment_changed(int align);
        void specialAlignment_changed();
        void width_changed();
        void longTabular();
@@ -67,12 +68,10 @@ private Q_SLOTS:
        void ltLastFooterBorderAbove_clicked();
        void ltLastFooterBorderBelow_clicked();
        void ltLastFooterEmpty_clicked();
+       void ltAlignment_clicked();
+       void on_captionStatusCB_toggled();
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
-       /// parent controller
-       Controller & controller() { return *this; }
        ///
        bool isValid() { return true; }
        /// update borders
@@ -90,21 +89,13 @@ private:
        ///
        bool isBufferDependent() const { return true; }
        ///
-       kb_action getLfun() const { return LFUN_TABULAR_FEATURE; }
+       FuncCode getLfun() const { return LFUN_TABULAR_FEATURE; }
 
        ///
        Tabular::idx_type getActiveCell() const;
-       /// return true if units should default to metric
-       bool useMetricUnits() const;
        /// set a parameter
        void set(Tabular::Feature, std::string const & arg = std::string());
 
-       /// borders
-       void toggleTopLine();
-       void toggleBottomLine();
-       void toggleLeftLine();
-       void toggleRightLine();
-
        void setSpecial(std::string const & special);
 
        void setWidth(std::string const & width);
@@ -126,6 +117,8 @@ private:
 
        void longTabular(bool yes);
 
+       bool funcEnabled(Tabular::Feature f) const;
+
        ///
        Tabular::idx_type active_cell_;
        ///