revert unintended commit parts.

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

src/frontends/qt4/GuiSetBorder.cpp

@@ -119,7 +119,7 @@ void GuiSetBorder::drawLeft(bool draw)
 {
 	QColor col(draw ? Qt::black : Qt::white);
 	if (!left_.enabled)
-		col = QColor(Qt::lightGray);
+		col = QColor("grey");
 	drawLine(col, m + l, m + l + 2, m + l, h - m - l - 1);
 }
 
@@ -128,7 +128,7 @@ void GuiSetBorder::drawRight(bool draw)
 {
 	QColor col(draw ? Qt::black : Qt::white);
 	if (!right_.enabled)
-		col = QColor(Qt::lightGray);
+		col = QColor("grey");
 	drawLine(col, h - m - l + 1, m + l + 2, h - m - l + 1, h - m - l - 1);
 }
 
@@ -137,7 +137,7 @@ void GuiSetBorder::drawTop(bool draw)
 {
 	QColor col(draw ? Qt::black : Qt::white);
 	if (!top_.enabled)
-		col = QColor(Qt::lightGray);
+		col = QColor("grey");
 	drawLine(col, m + l + 2, m + l, w - m - l - 1, m + l);
 }
 
@@ -146,7 +146,7 @@ void GuiSetBorder::drawBottom(bool draw)
 {
 	QColor col(draw ? Qt::black : Qt::white);
 	if (!bottom_.enabled)
-		col = QColor(Qt::lightGray);
+		col = QColor("grey");
 	drawLine(col, m + l + 2, w - m - l + 1, w - m - l - 1, w - m - l + 1);
 }
 

src/frontends/qt4/GuiTabular.h

@@ -37,18 +37,49 @@ 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 tableAlignment_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();
+	void ltAlignment_clicked();
+	void on_captionStatusCB_toggled();
 
 private:
 	///
 	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.
@@ -65,14 +96,33 @@ private:
 	/// set a parameter
 	void set(Tabular::Feature, std::string const & arg = std::string());
 
+	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