X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiTabular.h;h=e546e831ab10868a0f3a0d5c227a2e6a31b326ab;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=23a976a3c70fbdfc429c43f5b4a9d6dc4b987938;hpb=6f3cdf8da80a6b3889f2a3b8b53f44590152d600;p=lyx.git

diff --git a/src/frontends/qt4/GuiTabular.h b/src/frontends/qt4/GuiTabular.h
index 23a976a3c7..e546e831ab 100644
--- 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.
  */
@@ -27,7 +27,7 @@ class GuiTabular : public GuiDialog, public Ui::TabularUi
 	Q_OBJECT
 
 public:
-	GuiTabular(LyXView & lv);
+	GuiTabular(GuiView & lv);
 	~GuiTabular();
 
 private Q_SLOTS:
@@ -37,48 +37,18 @@ private Q_SLOTS:
 	void bottomspace_changed();
 	void interlinespace_changed();
 	void booktabsChanged(bool);
-	void close_clicked();
 	void borderSet_clicked();
 	void borderUnset_clicked();
-	void leftBorder_changed();
-	void rightBorder_changed();
-	void topBorder_changed();
-	void bottomBorder_changed();
-	void multicolumn_clicked();
-	void rotateTabular();
-	void rotateCell();
-	void hAlign_changed(int align);
-	void vAlign_changed(int align);
-	void specialAlignment_changed();
-	void width_changed();
-	void longTabular();
-	void ltNewpage_clicked();
-	void ltHeaderStatus_clicked();
-	void ltHeaderBorderAbove_clicked();
-	void ltHeaderBorderBelow_clicked();
-	void ltFirstHeaderStatus_clicked();
-	void ltFirstHeaderBorderAbove_clicked();
-	void ltFirstHeaderBorderBelow_clicked();
-	void ltFirstHeaderEmpty_clicked();
-	void ltFooterStatus_clicked();
-	void ltFooterBorderAbove_clicked();
-	void ltFooterBorderBelow_clicked();
-	void ltLastFooterStatus_clicked();
-	void ltLastFooterBorderAbove_clicked();
-	void ltLastFooterBorderBelow_clicked();
-	void ltLastFooterEmpty_clicked();
 
 private:
-	///
-	void closeEvent(QCloseEvent * e);
 	///
 	bool isValid() { return true; }
 	/// update borders
 	void update_borders();
+	///
+	void applyView();
 	/// update
 	void updateContents();
-	/// save some values before closing the gui
-	void closeGUI();
 	///
 	bool initialiseParams(std::string const & data);
 	/// clean-up on hide.
@@ -88,46 +58,21 @@ 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);
-
-	void toggleMultiColumn();
-
-	void rotateTabular(bool yes);
-	void rotateCell(bool yes);
-
-	enum HALIGN { LEFT, RIGHT, CENTER, BLOCK };
-
-	void halign(HALIGN h);
-
-	enum VALIGN { TOP, MIDDLE, BOTTOM };
-
-	void valign(VALIGN h);
-
-	void booktabs(bool yes);
-
-	void longTabular(bool yes);
+	bool funcEnabled(Tabular::Feature f) const;
 
 	///
 	Tabular::idx_type active_cell_;
 	///
 	Tabular tabular_;
+	///
+	bool applying_;
 };
 
 } // namespace frontend