r13810 by pierre - Revert accidental commit of experimental stuff

[scribus-commit]

Revision: 13810
Author: pierre
Date: 2009-08-04T20:24:43.255655Z
Commit message: Revert accidental commit of experimental stuff

Changeset: 
M  /trunk/Scribus/scribus/ui/propertiespalette.h

Diffs:
Index: scribus/ui/propertiespalette.h
===================================================================
--- scribus/ui/propertiespalette.h	(revision 13809)
+++ scribus/ui/propertiespalette.h	(revision 13810)
@@ -32,9 +32,7 @@
 class QVBoxLayout;
 class QWidget;
 
-class OpenPaletteView;
 
-
 #include "scribusapi.h"
 #include "scrpalettebase.h"
 #include "scrspinbox.h"
@@ -62,8 +60,6 @@
 class DashEditor;
 class Selection;
 class BasePointWidget;
-class PageItemPositionSetter;
-class PageItemRotationSetter;
 
 
 struct SCRIBUS_API LineFormatValue
@@ -164,8 +160,6 @@
 	Autoforms* SCustom2;
 	ParaStyleComboBox *paraStyleCombo;
 	CharStyleComboBox *charStyleCombo;
-	QPushButton *paraStyleDumpButton;
-	QPushButton *charStyleDumpButton;
 	FontComboH* Fonts;
 	ArrowChooser* startArrow;
 	ArrowChooser* endArrow;
@@ -193,9 +187,9 @@
 	void SetCurItem(PageItem *i);
 	void unitChange();
 	void setLevel(uint l);
-//	void setXY(double x, double y);
-//	void setBH(double x, double y);
-//	void setR(double r);
+	void setXY(double x, double y);
+	void setBH(double x, double y);
+	void setR(double r);
 	void setRR(double r);
 	void setCols(int r, double g);
 // 	void setLspMode(QAction *);
@@ -254,11 +248,11 @@
 
 private slots:
 	void SelTab(int t);
-//	void NewX();
-//	void NewY();
-//	void NewW();
-//	void NewH();
-//	void setRotation();
+	void NewX();
+	void NewY();
+	void NewW();
+	void NewH();
+	void setRotation();
 	void NewCornerRadius();
 	void NewLineSpacing();
 	void HandleGapSwitch();
@@ -325,15 +319,12 @@
 	void doGrouping();
 	void dashChange();
 	void flop(int);
-	void createCStyleFromCurrrent();
-	void createPStyleFromCurrent();
-	void newOpenPalette();
 
 protected slots:
 	//virtual void reject();
 	void spinboxStartUserAction();
 	void spinboxFinishUserAction();
-//	void updateSpinBoxConstants();
+	void updateSpinBoxConstants();
 
 signals:
 	void DocChanged();
@@ -397,7 +388,6 @@
 	QHBoxLayout* glyphExtensionHLayout;
 	QGridLayout* flopLayout;
 	QVBoxLayout* OptMarginsLayout;
-	QVBoxLayout* PalettePageLayout;
 	
 	NameWidget* NameEdit;
 	
@@ -413,14 +403,12 @@
 	QWidget* page_5b;
 	QWidget* page_6;
 	QWidget* page_group;
-	QWidget* page_palette;
-	PageItemPositionSetter * experimentalPIPS;
-	PageItemRotationSetter * experimentalPIRS;
-//	QLabel* xposLabel;
-//	QLabel* widthLabel;
-//	QLabel* yposLabel;
-//	QLabel* heightLabel;
-//	QLabel* rotationLabel;
+	
+	QLabel* xposLabel;
+	QLabel* widthLabel;
+	QLabel* yposLabel;
+	QLabel* heightLabel;
+	QLabel* rotationLabel;
 	QLabel* basepointLabel;
 	QLabel* LevelTxt;
 	QLabel* SRect;
@@ -472,16 +460,13 @@
 	QLabel* minGlyphExtensionLabel;
 	QLabel* maxGlyphExtensionLabel;
 
-	QPushButton *openPaletteButton;
-	OpenPaletteView *openPaletteView;
-
 //	LabelButton* colgapLabel;
 	ScComboBox* colgapLabel;
 	StyleSelect* SeStyle;
 	AlignSelect* GroupAlign;
 
 	LinkButton* keepImageWHRatioButton;
-//	LinkButton* keepFrameWHRatioButton;
+	LinkButton* keepFrameWHRatioButton;
 	LinkButton* keepImageDPIRatioButton;
 	LineCombo* LStyle;
 
@@ -560,11 +545,11 @@
 
 	QListWidget* StyledLine;
 
-//	ScrSpinBox* Width;
-//	ScrSpinBox* Xpos;
-//	ScrSpinBox* Ypos;
-//	ScrSpinBox* Height;
-//	ScrSpinBox* Rotation;
+	ScrSpinBox* Width;
+	ScrSpinBox* Xpos;
+	ScrSpinBox* Ypos;
+	ScrSpinBox* Height;
+	ScrSpinBox* Rotation;
 	ScrSpinBox* RoundRect;
 	ScrSpinBox* dGap;
 	ScrSpinBox* DTop;