r16008 by jghali - xyz tab uification

scribus-commit scribus-commit at lists.scribus.net
Sat Nov 27 01:53:50 CET 2010


Author: jghali
Date: Sat Nov 27 00:53:49 2010
New Revision: 16008

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16008
Log:
xyz tab uification

Added:
    branches/ScribusOIF/scribus/ui/propertiespalette_xyzbase.ui
Modified:
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16008&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Sat Nov 27 00:53:49 2010
@@ -123,6 +123,7 @@
   ui/prefs_documentitemattributesbase.ui
   ui/printdialogbase.ui
   ui/propertiespalette_textbase.ui
+  ui/propertiespalette_xyzbase.ui
   ui/replacecolors.ui
   ui/replaceonecolor.ui
   ui/selectobjects.ui

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16008&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Sat Nov 27 00:53:49 2010
@@ -2887,7 +2887,7 @@
 		break;
 	}
 	doc->CurrentSel = SelectedType;
-	propertiesPalette->xyzPal->RotationGroup->setCheckedId(doc->RotMode());
+	propertiesPalette->xyzPal->basePointWidget->setCheckedId(doc->RotMode());
 	if (docSelectionCount > 1)
 	{
 		if (!doc->m_Selection->itemsAreSameType())

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16008&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp Sat Nov 27 00:53:49 2010
@@ -76,6 +76,8 @@
 	m_lineMode = false;
 	m_oldRotation = 0;
 	m_unitRatio = 1.0;
+
+	setupUi(this);
 	setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
 
 	_userActionOn = false;
@@ -83,181 +85,90 @@
 	connect(userActionSniffer, SIGNAL(actionStart()), this, SLOT(spinboxStartUserAction()));
 	connect(userActionSniffer, SIGNAL(actionEnd()), this, SLOT(spinboxFinishUserAction()));
 
-	pageLayout = new QVBoxLayout( this );
-	pageLayout->setMargin(0);
-	pageLayout->setSpacing(5);
-
-	NameGroup = new QGroupBox( this );
-	NameGroupLayout = new QHBoxLayout( NameGroup );
-	NameGroupLayout->setMargin(5);
-	NameGroupLayout->setSpacing(4);
-	NameGroupLayout->setAlignment( Qt::AlignTop );
-	NameEdit = new NameWidget(NameGroup);
-	NameEdit->setFocusPolicy(Qt::ClickFocus);
-	NameGroupLayout->addWidget( NameEdit );
-	pageLayout->addWidget( NameGroup );
-
-	GeoGroup = new QGroupBox(this);
-	GeoGroupLayout = new QGridLayout( GeoGroup );
-	GeoGroupLayout->setMargin(5);
-	GeoGroupLayout->setSpacing(4);
-	GeoGroupLayout->setAlignment( Qt::AlignTop );
-
-	Xpos = new ScrSpinBox( -3000, 3000, GeoGroup, 0 );
-	installSniffer(Xpos);
-	GeoGroupLayout->addWidget( Xpos, 0, 1 );
-	Ypos = new ScrSpinBox( -3000, 3000, GeoGroup, 0 );
-	installSniffer(Ypos);
-	GeoGroupLayout->addWidget( Ypos, 1, 1 );
-	Width = new ScrSpinBox( GeoGroup, 0 );
-	installSniffer(Width);
-	GeoGroupLayout->addWidget( Width, 2, 1 );
-	Height = new ScrSpinBox( GeoGroup, 0 );
-	installSniffer(Height);
-	GeoGroupLayout->addWidget( Height, 3, 1 );
-
-	xposLabel = new QLabel( "&X-Pos:", GeoGroup );
-	xposLabel->setBuddy(Xpos);
-	GeoGroupLayout->addWidget( xposLabel, 0, 0 );
-	yposLabel = new QLabel( "&Y-Pos:", GeoGroup );
-	yposLabel->setBuddy(Ypos);
-	GeoGroupLayout->addWidget( yposLabel, 1, 0 );
-	widthLabel = new QLabel( "&Width:", GeoGroup );
-	widthLabel->setBuddy(Width);
-	GeoGroupLayout->addWidget( widthLabel, 2, 0 );
-	heightLabel = new QLabel( "&Height:", GeoGroup );
-	heightLabel->setBuddy(Height);
-	GeoGroupLayout->addWidget( heightLabel, 3, 0 );
-
-	keepFrameWHRatioButton = new LinkButton( GeoGroup );
+	nameEdit->setFocusPolicy(Qt::ClickFocus);
+
+	installSniffer(xposSpin);
+	installSniffer(yposSpin);
+	installSniffer(widthSpin);
+	installSniffer(heightSpin);
+
+	xposLabel->setBuddy(xposSpin);
+	yposLabel->setBuddy(yposSpin);
+	widthLabel->setBuddy(widthSpin);
+	heightLabel->setBuddy(heightSpin);
+
 	keepFrameWHRatioButton->setCheckable( true );
 	keepFrameWHRatioButton->setAutoRaise( true );
 	keepFrameWHRatioButton->setMaximumSize( QSize( 15, 32767 ) );
 	keepFrameWHRatioButton->setChecked(false);
-	GeoGroupLayout->addWidget( keepFrameWHRatioButton, 2, 2, 2, 1 );
-	Rotation = new ScrSpinBox( GeoGroup, 6);
-	Rotation->setWrapping( true );
-	installSniffer(Rotation);
-	rotationLabel = new QLabel( "&Rotation:", GeoGroup );
-	rotationLabel->setBuddy(Rotation);
-	GeoGroupLayout->addWidget( rotationLabel, 4, 0 );
-	GeoGroupLayout->addWidget( Rotation, 4, 1 );
-	basepointLabel = new QLabel( "Basepoint:", GeoGroup );
-	GeoGroupLayout->addWidget( basepointLabel, 5, 0 );
-	RotationGroup = new BasePointWidget(GeoGroup, 0);
-	GeoGroupLayout->addWidget( RotationGroup, 5, 1, 1, 1, Qt::AlignLeft);
-	pageLayout->addWidget( GeoGroup );
-
-	layout60 = new QHBoxLayout;
-	layout60->setMargin(0);
-	layout60->setSpacing(5);
-
-	LevelGroup = new QGroupBox( "Level", this );
-	LevelGroupLayout = new QGridLayout( LevelGroup );
-	LevelGroupLayout->setSpacing( 4 );
-	LevelGroupLayout->setMargin( 5 );
-	LevelGroupLayout->setAlignment( Qt::AlignTop );
-	levelUp = new QToolButton( LevelGroup );
-	levelUp->setMaximumSize( QSize( 22, 22 ) );
+	rotationSpin->setWrapping( true );
+	installSniffer(rotationSpin);
+
+	rotationLabel->setBuddy(rotationSpin);
+
 	levelUp->setIcon(QIcon(loadIcon("16/go-up.png")));
-	LevelGroupLayout->addWidget( levelUp, 0, 0 );
-	levelDown = new QToolButton( LevelGroup );
-	levelDown->setMaximumSize( QSize( 22, 22 ) );
 	levelDown->setIcon(QIcon(loadIcon("16/go-down.png")));
-	LevelGroupLayout->addWidget( levelDown, 1, 0 );
-	levelTop = new QToolButton( LevelGroup );
-	levelTop->setMaximumSize( QSize( 22, 22 ) );
 	levelTop->setIcon(QIcon(loadIcon("16/go-top.png")));
-	LevelGroupLayout->addWidget( levelTop, 0, 1 );
-	levelBottom = new QToolButton( LevelGroup );
-	levelBottom->setMaximumSize( QSize( 22, 22 ) );
 	levelBottom->setIcon(QIcon(loadIcon("16/go-bottom.png")));
-	LevelGroupLayout->addWidget( levelBottom, 1, 1 );
-	levelLabel = new QLabel( "  ", LevelGroup );
 	levelLabel->setAlignment( Qt::AlignCenter );
-	LevelGroupLayout->addWidget( levelLabel, 0, 2, 2, 1 );
-
-	layout60->addWidget( LevelGroup );
-	QSpacerItem* spacer2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-	layout60->addItem( spacer2 );
-
-	Layout44 = new QGridLayout;
-	Layout44->setSpacing( 4 );
-	Layout44->setMargin( 5 );
-
-	DoGroup = new QToolButton( this );
-	DoGroup->setIcon(QIcon(loadIcon("group.png")));
-	Layout44->addWidget( DoGroup, 0, 0 );
-	DoUnGroup = new QToolButton( this );
-	DoUnGroup->setIcon(QIcon(loadIcon("ungroup.png")));
-	Layout44->addWidget( DoUnGroup, 1, 0 );
-
-	FlipH = new QToolButton( this );
-	FlipH->setIcon(QIcon(loadIcon("16/flip-object-horizontal.png")));
-	FlipH->setCheckable( true );
-	Layout44->addWidget( FlipH, 0, 1 );
-	FlipV = new QToolButton( this );
-	FlipV->setIcon(QIcon(loadIcon("16/flip-object-vertical.png")));
-	FlipV->setCheckable( true );
-	Layout44->addWidget( FlipV, 1, 1 );
-	Locked = new QToolButton( this );
-	Locked->setCheckable( true );
+
+
+	doGroup->setIcon(QIcon(loadIcon("group.png")));
+	doUnGroup->setIcon(QIcon(loadIcon("ungroup.png")));
+
+	flipH->setIcon(QIcon(loadIcon("16/flip-object-horizontal.png")));
+	flipH->setCheckable( true );
+	flipV->setIcon(QIcon(loadIcon("16/flip-object-vertical.png")));
+	flipV->setCheckable( true );
+	
+	doLock->setCheckable( true );
 	QIcon a = QIcon();
 	a.addPixmap(loadIcon("16/lock.png"), QIcon::Normal, QIcon::On);
 	a.addPixmap(loadIcon("16/lock-unlocked.png"), QIcon::Normal, QIcon::Off);
-	Locked->setIcon(a);
-	Layout44->addWidget( Locked, 0, 2 );
-	NoPrint = new QToolButton( this );
-	NoPrint->setCheckable( true );
+	doLock->setIcon(a);
+
+	noPrint->setCheckable( true );
 	QIcon a2 = QIcon();
-	a2.addPixmap(loadIcon("NoPrint.png"), QIcon::Normal, QIcon::On);
+	a2.addPixmap(loadIcon("noPrint.png"), QIcon::Normal, QIcon::On);
 	a2.addPixmap(loadIcon("16/document-print.png"), QIcon::Normal, QIcon::Off);
-	NoPrint->setIcon(a2);
-	Layout44->addWidget( NoPrint, 1, 2 );
-	NoResize = new QToolButton( this );
-	NoResize->setCheckable( true );
+	noPrint->setIcon(a2);
+
+	noResize->setCheckable( true );
 	QIcon a3 = QIcon();
 	a3.addPixmap(loadIcon("framenoresize.png"), QIcon::Normal, QIcon::On);
 	a3.addPixmap(loadIcon("frameresize.png"), QIcon::Normal, QIcon::Off);
-	NoResize->setIcon(a3);
-	Layout44->addWidget( NoResize, 0, 3 );
-	layout60->addLayout( Layout44 );
-
-	pageLayout->addLayout( layout60 );
-
-	QSpacerItem* spacer13 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
-	pageLayout->addItem( spacer13 );
+	noResize->setIcon(a3);
 
 	m_lineMode = false;
 
 	languageChange();
 
-	connect(Xpos, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
-	connect(Ypos, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
-	connect(Width, SIGNAL(valueChanged(double)), this, SLOT(handleNewW()));
-	connect(Height, SIGNAL(valueChanged(double)), this, SLOT(handleNewH()));
-	connect(Rotation, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()));
-	connect(FlipH, SIGNAL(clicked()), this, SLOT(handleFlipH()));
-	connect(FlipV, SIGNAL(clicked()), this, SLOT(handleFlipV()));
+	connect(xposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
+	connect(yposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
+	connect(widthSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewW()));
+	connect(heightSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewH()));
+	connect(rotationSpin, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()));
+	connect(flipH, SIGNAL(clicked()), this, SLOT(handleFlipH()));
+	connect(flipV, SIGNAL(clicked()), this, SLOT(handleFlipV()));
 	connect(levelUp, SIGNAL(clicked()), this, SLOT(handleRaise()));
 	connect(levelDown, SIGNAL(clicked()), this, SLOT(handleLower()));
 	connect(levelTop, SIGNAL(clicked()), this, SLOT(handleFront()));
 	connect(levelBottom, SIGNAL(clicked()), this, SLOT(handleBack()));
-	connect(RotationGroup, SIGNAL(buttonClicked(int)), this, SLOT(handleBasePoint(int)));
-
-	connect(NameEdit , SIGNAL(Leaved()) , this, SLOT(handleNewName()));
-	connect(Locked   , SIGNAL(clicked()), this, SLOT(handleLock()));
-	connect(NoPrint  , SIGNAL(clicked()), this, SLOT(handlePrint()));
-	connect(NoResize , SIGNAL(clicked()), this, SLOT(handleLockSize()));
-	connect(DoGroup  , SIGNAL(clicked()), this, SLOT(handleGrouping()) );
-	connect(DoUnGroup, SIGNAL(clicked()), this, SLOT(handleUngrouping()) );
+	connect(basePointWidget, SIGNAL(buttonClicked(int)), this, SLOT(handleBasePoint(int)));
+
+	connect(nameEdit , SIGNAL(Leaved()) , this, SLOT(handleNewName()));
+	connect(doLock   , SIGNAL(clicked()), this, SLOT(handleLock()));
+	connect(noPrint  , SIGNAL(clicked()), this, SLOT(handlePrint()));
+	connect(noResize , SIGNAL(clicked()), this, SLOT(handleLockSize()));
+	connect(doGroup  , SIGNAL(clicked()), this, SLOT(handleGrouping()) );
+	connect(doUnGroup, SIGNAL(clicked()), this, SLOT(handleUngrouping()) );
 
 	m_haveItem = false;
-	Xpos->showValue(0);
-	Ypos->showValue(0);
-	Width->showValue(0);
-	Height->showValue(0);
-	Rotation->showValue(0);
+	xposSpin->showValue(0);
+	yposSpin->showValue(0);
+	widthSpin->showValue(0);
+	heightSpin->showValue(0);
+	rotationSpin->showValue(0);
 }
 
 void PropertiesPalette_XYZ::setMainWindow(ScribusMainWindow* mw)
@@ -291,16 +202,16 @@
 	m_haveItem = false;
 
 	QMap<QString, double>* docConstants = m_doc? &m_doc->constants()  : NULL;
-	Xpos->setValues( minXYVal, maxXYWHVal, precision, minXYVal);
-	Xpos->setConstants(docConstants);
-	Ypos->setValues( minXYVal, maxXYWHVal, precision, minXYVal);
-	Ypos->setConstants(docConstants);
-	Width->setValues( m_unitRatio, maxXYWHVal, precision, m_unitRatio);
-	Width->setConstants(docConstants);
-	Height->setValues( m_unitRatio, maxXYWHVal, precision, m_unitRatio);
-	Height->setConstants(docConstants);
-
-	Rotation->setValues( 0, 359.99, 1, 0);
+	xposSpin->setValues( minXYVal, maxXYWHVal, precision, minXYVal);
+	xposSpin->setConstants(docConstants);
+	yposSpin->setValues( minXYVal, maxXYWHVal, precision, minXYVal);
+	yposSpin->setConstants(docConstants);
+	widthSpin->setValues( m_unitRatio, maxXYWHVal, precision, m_unitRatio);
+	widthSpin->setConstants(docConstants);
+	heightSpin->setValues( m_unitRatio, maxXYWHVal, precision, m_unitRatio);
+	heightSpin->setConstants(docConstants);
+
+	rotationSpin->setValues( 0, 359.99, 1, 0);
 
 	updateSpinBoxConstants();
 
@@ -320,23 +231,23 @@
 	m_haveItem = false;
 	m_doc   = NULL;
 	m_item  = NULL;
-	Xpos->setConstants(NULL);
-	Ypos->setConstants(NULL);
-	Width->setConstants(NULL);
-	Height->setConstants(NULL);
-	DoGroup->setEnabled(false);
-	DoUnGroup->setEnabled(false);
-	FlipH->setEnabled(false);
-	FlipV->setEnabled(false);
+	xposSpin->setConstants(NULL);
+	yposSpin->setConstants(NULL);
+	widthSpin->setConstants(NULL);
+	heightSpin->setConstants(NULL);
+	doGroup->setEnabled(false);
+	doUnGroup->setEnabled(false);
+	flipH->setEnabled(false);
+	flipV->setEnabled(false);
 	xposLabel->setText( tr( "&X-Pos:" ) );
-	widthLabel->setText( tr( "&Width:" ) );
+	widthLabel->setText( tr( "&Width" ) );
 	yposLabel->setText( tr( "&Y-Pos:" ) );
 	heightLabel->setText( tr( "&Height:" ) );
-	Xpos->showValue(0);
-	Ypos->showValue(0);
-	Width->showValue(0);
-	Height->showValue(0);
-	Rotation->showValue(0);
+	xposSpin->showValue(0);
+	yposSpin->showValue(0);
+	widthSpin->showValue(0);
+	heightSpin->showValue(0);
+	rotationSpin->showValue(0);
 	setEnabled(false);
 }
 
@@ -352,11 +263,11 @@
 	if (lineMode == 0)
 	{
 		xposLabel->setText( tr( "&X-Pos:" ) );
-		widthLabel->setText( tr( "&Width:" ) );
+		widthLabel->setText( tr( "&Width" ) );
 		yposLabel->setText( tr( "&Y-Pos:" ) );
 		heightLabel->setText( tr( "&Height:" ) );
-		Rotation->setEnabled(true);
-		Height->setEnabled(false);
+		rotationSpin->setEnabled(true);
+		heightSpin->setEnabled(false);
 		m_lineMode = false;
 	}
 	else
@@ -365,8 +276,8 @@
 		widthLabel->setText( tr( "X&2:" ) );
 		yposLabel->setText( tr( "Y&1:" ) );
 		heightLabel->setText( tr( "&Y2:" ) );
-		Rotation->setEnabled(false);
-		Height->setEnabled(true);
+		rotationSpin->setEnabled(false);
+		heightSpin->setEnabled(true);
 		m_lineMode = true;
 	}
 }
@@ -410,28 +321,28 @@
 	if (!m_doc)
 		setDoc(i->doc());
 
-	disconnect(NameEdit, SIGNAL(Leaved()), this, SLOT(handleNewName()));
+	disconnect(nameEdit, SIGNAL(Leaved()), this, SLOT(handleNewName()));
 
 	m_haveItem = false;
 	m_item = i;
 
-	NameEdit->setText(m_item->itemName());
+	nameEdit->setText(m_item->itemName());
 	QString tm;
 	levelLabel->setText(tm.setNum(m_item->ItemNr + 1));
 
-	connect(NameEdit, SIGNAL(Leaved()), this, SLOT(handleNewName()));
+	connect(nameEdit, SIGNAL(Leaved()), this, SLOT(handleNewName()));
 
 //CB replaces old emits from PageItem::emitAllToGUI()
-	disconnect(Xpos, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
-	disconnect(Ypos, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
-	disconnect(Width, SIGNAL(valueChanged(double)), this, SLOT(handleNewW()));
-	disconnect(Height, SIGNAL(valueChanged(double)), this, SLOT(handleNewH()));
-	disconnect(Locked, SIGNAL(clicked()), this, SLOT(handleLock()));
-	disconnect(NoPrint, SIGNAL(clicked()), this, SLOT(handlePrint()));
-	disconnect(NoResize, SIGNAL(clicked()), this, SLOT(handleLockSize()));
-	disconnect(FlipH, SIGNAL(clicked()), this, SLOT(handleFlipH()));
-	disconnect(FlipV, SIGNAL(clicked()), this, SLOT(handleFlipV()));
-	disconnect(Rotation, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()));
+	disconnect(xposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
+	disconnect(yposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
+	disconnect(widthSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewW()));
+	disconnect(heightSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewH()));
+	disconnect(doLock, SIGNAL(clicked()), this, SLOT(handleLock()));
+	disconnect(noPrint, SIGNAL(clicked()), this, SLOT(handlePrint()));
+	disconnect(noResize, SIGNAL(clicked()), this, SLOT(handleLockSize()));
+	disconnect(flipH, SIGNAL(clicked()), this, SLOT(handleFlipH()));
+	disconnect(flipV, SIGNAL(clicked()), this, SLOT(handleFlipV()));
+	disconnect(rotationSpin, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()));
 
 	double selX = m_item->xPos();
 	double selY = m_item->yPos();
@@ -441,7 +352,7 @@
 		m_doc->m_Selection->getGroupRect(&selX, &selY, &selW, &selH);
 	displayXY(selX, selY);
 	displayWH(selW, selH);
-	NoPrint->setChecked(!i->printEnabled());
+	noPrint->setChecked(!i->printEnabled());
 	displayLocked(i->locked());
 	displaySizeLocked(i->sizeLocked());
 	displayFlippedH(i->imageFlippedH());
@@ -450,29 +361,29 @@
 	double rr = i->rotation();
 	if (i->rotation() > 0)
 		rr = 360 - rr;
-	Rotation->setValue(fabs(rr));
+	rotationSpin->setValue(fabs(rr));
 
 //CB TODO reconnect PP signals from here
-	connect(Xpos    , SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
-	connect(Ypos    , SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
-	connect(Width   , SIGNAL(valueChanged(double)), this, SLOT(handleNewW()));
-	connect(Height  , SIGNAL(valueChanged(double)), this, SLOT(handleNewH()));
-	connect(Locked  , SIGNAL(clicked()), this, SLOT(handleLock()));
-	connect(NoPrint , SIGNAL(clicked()), this, SLOT(handlePrint()));
-	connect(NoResize, SIGNAL(clicked()), this, SLOT(handleLockSize()));
-	connect(FlipH   , SIGNAL(clicked()), this, SLOT(handleFlipH()));
-	connect(FlipV   , SIGNAL(clicked()), this, SLOT(handleFlipV()));
-	connect(Rotation, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()));
+	connect(xposSpin    , SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
+	connect(yposSpin    , SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
+	connect(widthSpin   , SIGNAL(valueChanged(double)), this, SLOT(handleNewW()));
+	connect(heightSpin  , SIGNAL(valueChanged(double)), this, SLOT(handleNewH()));
+	connect(doLock  , SIGNAL(clicked()), this, SLOT(handleLock()));
+	connect(noPrint , SIGNAL(clicked()), this, SLOT(handlePrint()));
+	connect(noResize, SIGNAL(clicked()), this, SLOT(handleLockSize()));
+	connect(flipH   , SIGNAL(clicked()), this, SLOT(handleFlipH()));
+	connect(flipV   , SIGNAL(clicked()), this, SLOT(handleFlipV()));
+	connect(rotationSpin, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()));
 
 	bool setter = false;
 	if ((m_item->isTableItem) && (m_item->isSingleSel))
 	{
 		setter = true;
-		Rotation->setEnabled(false);
-	}
-	Xpos->setEnabled(!setter);
-	Ypos->setEnabled(!setter);
-	LevelGroup->setEnabled(!setter);
+		rotationSpin->setEnabled(false);
+	}
+	xposSpin->setEnabled(!setter);
+	yposSpin->setEnabled(!setter);
+	levelGroup->setEnabled(!setter);
 	if ((m_item->isGroupControl) || ((m_item->Groups.count() != 0) && (!m_item->isSingleSel)))
 	{
 		setEnabled(true);
@@ -483,25 +394,25 @@
 		widthLabel->setText( tr( "X&2:" ) );
 		yposLabel->setText( tr( "Y&1:" ) );
 		heightLabel->setText( tr( "&Y2:" ) );
-		Rotation->setEnabled(false);
+		rotationSpin->setEnabled(false);
 	}
 	else
 	{
 		xposLabel->setText( tr( "&X-Pos:" ) );
-		widthLabel->setText( tr( "&Width:" ) );
+		widthLabel->setText( tr( "&Width" ) );
 		yposLabel->setText( tr( "&Y-Pos:" ) );
 		heightLabel->setText( tr( "&Height:" ) );
-		Rotation->setEnabled(!((m_item->isTableItem) && (m_item->isSingleSel)));
+		rotationSpin->setEnabled(!((m_item->isTableItem) && (m_item->isSingleSel)));
 	}
 	m_haveItem = true;
 	if (m_item->asLine())
 	{
 		keepFrameWHRatioButton->setEnabled(false);
-		Height->setEnabled(m_lineMode && !m_item->locked());
+		heightSpin->setEnabled(m_lineMode && !m_item->locked());
 	}
 	else
 	{
-		Height->setEnabled(true);
+		heightSpin->setEnabled(true);
 		keepFrameWHRatioButton->setEnabled(true);
 	}
 	displayXY(selX, selY);
@@ -510,8 +421,8 @@
 	if (i->imageRotation() > 0)
 		rrR = 360 - rrR;
 
-	DoGroup->setEnabled(false);
-	DoUnGroup->setEnabled(false);
+	doGroup->setEnabled(false);
+	doUnGroup->setEnabled(false);
 	if (m_doc->m_Selection->count() > 1)
 	{
 		bool isGroup = true;
@@ -529,19 +440,19 @@
 				isGroup = false;
 		}
 		if (!isGroup)
-			DoGroup->setEnabled(true);
+			doGroup->setEnabled(true);
 		else
 		{
 			if (m_item->isGroupControl)
-				NameEdit->setEnabled(true);
+				nameEdit->setEnabled(true);
 		}
 		if ((m_item->Groups.count() != 0) && (isGroup))
-			DoUnGroup->setEnabled(true);
+			doUnGroup->setEnabled(true);
 	}
 	if (m_item->asOSGFrame())
 	{
 		setEnabled(true);
-		Rotation->setEnabled(false);
+		rotationSpin->setEnabled(false);
 	}
 	if (m_item->asSymbolFrame())
 	{
@@ -555,7 +466,7 @@
 	if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;
 
-	NameEdit->setEnabled(m_doc->m_Selection->count() == 1);
+	nameEdit->setEnabled(m_doc->m_Selection->count() == 1);
 
 	PageItem* currItem = currentItemFromSelection();
 	if (m_doc->m_Selection->count() > 1)
@@ -563,7 +474,7 @@
 		m_oldRotation = 0;
 		double gx, gy, gh, gw;
 		m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
-		int bp = RotationGroup->checkedId();
+		int bp = basePointWidget->checkedId();
 		if (bp == 0)
 			m_ScMW->view->RCenter = FPoint(gx, gy);
 		else if (bp == 1)
@@ -579,26 +490,26 @@
 		yposLabel->setText( tr( "&Y-Pos:" ) );
 		heightLabel->setText( tr( "&Height:" ) );
 
-		Xpos->showValue(gx);
-		Ypos->showValue(gy);
-		Width->showValue(gw);
-		Height->showValue(gh);
-		Rotation->showValue(0);
-
-		Xpos->setEnabled(true);
-		Ypos->setEnabled(true);
-		Width->setEnabled(true);
-		Height->setEnabled(true);
-		Rotation->setEnabled(true);
-
-		NameEdit->setEnabled(false);
-		FlipH->setCheckable( false );
-		FlipV->setCheckable( false );
-		FlipH->setChecked(false);
-		FlipV->setChecked(false);
-
-		FlipH->setEnabled(true);
-		FlipV->setEnabled(true);
+		xposSpin->showValue(gx);
+		yposSpin->showValue(gy);
+		widthSpin->showValue(gw);
+		heightSpin->showValue(gh);
+		rotationSpin->showValue(0);
+
+		xposSpin->setEnabled(true);
+		yposSpin->setEnabled(true);
+		widthSpin->setEnabled(true);
+		heightSpin->setEnabled(true);
+		rotationSpin->setEnabled(true);
+
+		nameEdit->setEnabled(false);
+		flipH->setCheckable( false );
+		flipV->setCheckable( false );
+		flipH->setChecked(false);
+		flipV->setChecked(false);
+
+		flipH->setEnabled(true);
+		flipV->setEnabled(true);
 
 		setEnabled(true);
 	}
@@ -609,11 +520,11 @@
 		m_haveItem = (itemType!=-1);
 		if (itemType == -1)
 		{
-			DoGroup->setEnabled(false);
-			DoUnGroup->setEnabled(false);
-		}
-		NameEdit->setEnabled(true);
-		RotationGroup->setEnabled(true);
+			doGroup->setEnabled(false);
+			doUnGroup->setEnabled(false);
+		}
+		nameEdit->setEnabled(true);
+		basePointWidget->setEnabled(true);
 
 		setEnabled(true);
 
@@ -621,18 +532,18 @@
 		//It then gets reset below for items where its valid
 		if ((itemType > 4) && (itemType < 9))
 		{
-			FlipH->setCheckable(true);
-			FlipV->setCheckable(true);
-			FlipH->setChecked(false);
-			FlipV->setChecked(false);
-		}
-		FlipH->setCheckable((itemType >= 0) && (itemType < 5));
-		FlipV->setCheckable((itemType >= 0) && (itemType < 5));
+			flipH->setCheckable(true);
+			flipV->setCheckable(true);
+			flipH->setChecked(false);
+			flipV->setChecked(false);
+		}
+		flipH->setCheckable((itemType >= 0) && (itemType < 5));
+		flipV->setCheckable((itemType >= 0) && (itemType < 5));
 		//CB Why cant we do this for lines?
-//		FlipH->setEnabled((itemType !=-1) && (itemType !=5));
-//		FlipV->setEnabled((itemType !=-1) && (itemType !=5));
-		FlipH->setEnabled(itemType !=-1);
-		FlipV->setEnabled(itemType !=-1);
+//		flipH->setEnabled((itemType !=-1) && (itemType !=5));
+//		flipV->setEnabled((itemType !=-1) && (itemType !=5));
+		flipH->setEnabled(itemType !=-1);
+		flipV->setEnabled(itemType !=-1);
 		switch (itemType)
 		{
 		case -1:
@@ -641,11 +552,11 @@
 			yposLabel->setText( tr( "&Y-Pos:" ) );
 			heightLabel->setText( tr( "&Height:" ) );
 
-			Xpos->showValue(0);
-			Ypos->showValue(0);
-			Width->showValue(0);
-			Height->showValue(0);
-			Rotation->showValue(0);
+			xposSpin->showValue(0);
+			yposSpin->showValue(0);
+			widthSpin->showValue(0);
+			heightSpin->showValue(0);
+			rotationSpin->showValue(0);
 			levelLabel->setText("  ");
 			setEnabled(false);
 			break;
@@ -656,12 +567,12 @@
 			if (currItem->asOSGFrame())
 			{
 				setEnabled(true);
-				Rotation->setEnabled(false);
+				rotationSpin->setEnabled(false);
 			}
 #endif
 			break;
 		case PageItem::Line:
-			RotationGroup->setEnabled(false);
+			basePointWidget->setEnabled(false);
 			break;
 		}
 	}
@@ -682,10 +593,10 @@
 	double oldRatio = m_unitRatio;
 	m_unitRatio = m_doc->unitRatio();
 	m_unitIndex = m_doc->unitIndex();
-	Xpos->setNewUnit( m_unitIndex );
-	Ypos->setNewUnit( m_unitIndex );
-	Width->setNewUnit( m_unitIndex );
-	Height->setNewUnit( m_unitIndex );
+	xposSpin->setNewUnit( m_unitIndex );
+	yposSpin->setNewUnit( m_unitIndex );
+	widthSpin->setNewUnit( m_unitIndex );
+	heightSpin->setNewUnit( m_unitIndex );
 	m_haveItem = tmp;
 }
 
@@ -699,8 +610,8 @@
 {
 	if (!m_ScMW || m_ScMW->scriptIsRunning())
 		return;
-	disconnect(Xpos, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
-	disconnect(Ypos, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
+	disconnect(xposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
+	disconnect(yposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
 	bool useLineMode = false;
 	bool tmp = m_haveItem;
 	double inX, inY, b, h, r, dummy1, dummy2;
@@ -732,7 +643,7 @@
 	}
 	m_haveItem = false;
 	ma.rotate(r);
-	int bp = RotationGroup->checkedId();
+	int bp = basePointWidget->checkedId();
 	// #8890 : basepoint is meaningless when lines use "end points" mode
 	if (bp == 0 || useLineMode)
 		n = FPoint(0.0, 0.0);
@@ -756,13 +667,13 @@
 			inY -= m_doc->currentPage()->yOffset();
 		}
 	}
-	Xpos->setValue(inX*m_unitRatio);
-	Ypos->setValue(inY*m_unitRatio);
+	xposSpin->setValue(inX*m_unitRatio);
+	yposSpin->setValue(inY*m_unitRatio);
 	if (useLineMode)
 		displayWH(m_item->width(), m_item->height());
 	m_haveItem = tmp;
-	connect(Xpos, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
-	connect(Ypos, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
+	connect(xposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
+	connect(yposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
 }
 
 void PropertiesPalette_XYZ::displayWH(double x, double y)
@@ -775,17 +686,17 @@
 	QPoint dp;
 	if ((m_lineMode) && (m_item->asLine()))
 	{
-		ma.translate(static_cast<double>(Xpos->value()) / m_unitRatio, static_cast<double>(Ypos->value()) / m_unitRatio);
-		ma.rotate(static_cast<double>(Rotation->value())*(-1));
+		ma.translate(static_cast<double>(xposSpin->value()) / m_unitRatio, static_cast<double>(yposSpin->value()) / m_unitRatio);
+		ma.rotate(static_cast<double>(rotationSpin->value())*(-1));
 		// Qt4 dp = ma * QPoint(static_cast<int>(x), static_cast<int>(y));
 		dp = QPoint(static_cast<int>(x), static_cast<int>(y)) * ma;
-		Width->setValue(dp.x()*m_unitRatio);
-		Height->setValue(dp.y()*m_unitRatio);
+		widthSpin->setValue(dp.x()*m_unitRatio);
+		heightSpin->setValue(dp.y()*m_unitRatio);
 	}
 	else
 	{
-		Width->setValue(x*m_unitRatio);
-		Height->setValue(y*m_unitRatio);
+		widthSpin->setValue(x*m_unitRatio);
+		heightSpin->setValue(y*m_unitRatio);
 	}
 	m_haveItem = tmp;
 }
@@ -799,7 +710,7 @@
 	if (r > 0)
 		rr = 360 - rr;
 	m_haveItem = false;
-	Rotation->setValue(fabs(rr));
+	rotationSpin->setValue(fabs(rr));
 	m_haveItem = tmp;
 }
 
@@ -811,10 +722,10 @@
 	{
 		double x,y,w,h, gx, gy, gh, gw, base;
 		QTransform ma;
-		x = Xpos->value() / m_unitRatio;
-		y = Ypos->value() / m_unitRatio;
-		w = Width->value() / m_unitRatio;
-		h = Height->value() / m_unitRatio;
+		x = xposSpin->value() / m_unitRatio;
+		y = yposSpin->value() / m_unitRatio;
+		w = widthSpin->value() / m_unitRatio;
+		h = heightSpin->value() / m_unitRatio;
 		base = 0;
 		x += m_doc->rulerXoffset;
 		y += m_doc->rulerYoffset;
@@ -826,7 +737,7 @@
 		if (m_doc->m_Selection->isMultipleSelection())
 		{
 			m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
-			int bp = RotationGroup->checkedId();
+			int bp = basePointWidget->checkedId();
 			if ((bp == 0) || (bp == 3))
 				base = gx;
 			else if (bp == 2)
@@ -864,7 +775,7 @@
 			{
 				ma.translate(m_item->xPos(), m_item->yPos());
 				ma.rotate(m_item->rotation());
-				int bp = RotationGroup->checkedId();
+				int bp = basePointWidget->checkedId();
 				if (bp == 0)
 					base = m_item->xPos();
 				else if (bp == 2)
@@ -890,10 +801,10 @@
 
 	double x,y,w,h, gx, gy, gh, gw, base;
 	QTransform ma;
-	x = Xpos->value() / m_unitRatio;
-	y = Ypos->value() / m_unitRatio;
-	w = Width->value() / m_unitRatio;
-	h = Height->value() / m_unitRatio;
+	x = xposSpin->value() / m_unitRatio;
+	y = yposSpin->value() / m_unitRatio;
+	w = widthSpin->value() / m_unitRatio;
+	h = heightSpin->value() / m_unitRatio;
 	base = 0;
 	x += m_doc->rulerXoffset;
 	y += m_doc->rulerYoffset;
@@ -905,7 +816,7 @@
 	if (m_doc->m_Selection->isMultipleSelection())
 	{
 		m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
-		int bp = RotationGroup->checkedId();
+		int bp = basePointWidget->checkedId();
 		if ((bp == 0) || (bp == 1))
 			base = gy;
 		else if (bp == 2)
@@ -945,7 +856,7 @@
 		{
 			ma.translate(m_item->xPos(), m_item->yPos());
 			ma.rotate(m_item->rotation());
-			int bp = RotationGroup->checkedId();
+			int bp = basePointWidget->checkedId();
 			if (bp == 0)
 				base = m_item->yPos();
 			else if (bp == 2)
@@ -969,10 +880,10 @@
 		return;
 	
 	double x,y,w,h, gx, gy, gh, gw;
-	x = Xpos->value() / m_unitRatio;
-	y = Ypos->value() / m_unitRatio;
-	w = Width->value() / m_unitRatio;
-	h = Height->value() / m_unitRatio;
+	x = xposSpin->value() / m_unitRatio;
+	y = yposSpin->value() / m_unitRatio;
+	w = widthSpin->value() / m_unitRatio;
+	h = heightSpin->value() / m_unitRatio;
 	if (m_doc->m_Selection->isMultipleSelection())
 	{
 		if (!_userActionOn)
@@ -1075,10 +986,10 @@
 	if ((m_haveDoc) && (m_haveItem))
 	{
 		double x,y,w,h, gx, gy, gh, gw;
-		x = Xpos->value() / m_unitRatio;
-		y = Ypos->value() / m_unitRatio;
-		w = Width->value() / m_unitRatio;
-		h = Height->value() / m_unitRatio;
+		x = xposSpin->value() / m_unitRatio;
+		y = yposSpin->value() / m_unitRatio;
+		w = widthSpin->value() / m_unitRatio;
+		h = heightSpin->value() / m_unitRatio;
 		if (m_doc->m_Selection->isMultipleSelection())
 		{
 			if (!_userActionOn)
@@ -1186,12 +1097,12 @@
 			m_ScMW->view->startGroupTransaction(Um::Rotate, "", Um::IRotate);
 		if (m_doc->m_Selection->isMultipleSelection())
 		{
-			m_doc->rotateGroup((Rotation->value() - m_oldRotation)*(-1), m_ScMW->view->RCenter);
+			m_doc->rotateGroup((rotationSpin->value() - m_oldRotation)*(-1), m_ScMW->view->RCenter);
 			m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
 			displayXY(gx, gy);
 		}
 		else
-			m_doc->RotateItem(Rotation->value()*(-1), m_item->ItemNr);
+			m_doc->RotateItem(rotationSpin->value()*(-1), m_item->ItemNr);
 		if (!_userActionOn)
 		{
 			for (int i = 0; i < m_doc->m_Selection->count(); ++i)
@@ -1200,7 +1111,7 @@
 		}
 		emit DocChanged();
 		m_doc->regionsChanged()->update(QRect());
-		m_oldRotation = Rotation->value();
+		m_oldRotation = rotationSpin->value();
 	}
 }
 
@@ -1284,8 +1195,8 @@
 				inX -= m_doc->currentPage()->xOffset();
 				inY -= m_doc->currentPage()->yOffset();
 			}
-			Xpos->setValue(inX*m_unitRatio);
-			Ypos->setValue(inY*m_unitRatio);
+			xposSpin->setValue(inX*m_unitRatio);
+			yposSpin->setValue(inY*m_unitRatio);
 		}
 		else
 		{
@@ -1297,7 +1208,7 @@
 			r = m_item->rotation();
 			ma.translate(m_item->xPos(), m_item->yPos());
 			ma.rotate(r);
-			int bp = RotationGroup->checkedId();
+			int bp = basePointWidget->checkedId();
 			if (bp == 0)
 				n = FPoint(0.0, 0.0);
 			else if (bp == 1)
@@ -1317,8 +1228,8 @@
 				inX -= m_doc->currentPage()->xOffset();
 				inY -= m_doc->currentPage()->yOffset();
 			}
-			Xpos->setValue(inX*m_unitRatio);
-			Ypos->setValue(inY*m_unitRatio);
+			xposSpin->setValue(inX*m_unitRatio);
+			yposSpin->setValue(inY*m_unitRatio);
 		}
 		if (m_item->itemType() == PageItem::ImageFrame)
 		{
@@ -1374,10 +1285,10 @@
 	if (m_ScMW->scriptIsRunning() || !m_haveDoc || !m_haveItem)
 		return;
 	QString NameOld = m_item->itemName();
-	QString NameNew = NameEdit->text();
+	QString NameNew = nameEdit->text();
 	if (NameNew.isEmpty())
 	{
-		NameEdit->setText(NameOld);
+		nameEdit->setText(NameOld);
 		return;
 	}
 	bool found = false;
@@ -1392,14 +1303,14 @@
 	if (found)
 	{
 		QMessageBox::warning(this, CommonStrings::trWarning, "<qt>"+ tr("Name \"%1\" isn't unique.<br/>Please choose another.").arg(NameNew)+"</qt>", CommonStrings::tr_OK);
-		NameEdit->setText(NameOld);
-		NameEdit->setFocus();
+		nameEdit->setText(NameOld);
+		nameEdit->setFocus();
 	}
 	else
 	{
-		if (m_item->itemName() != NameEdit->text())
-		{
-			m_item->setItemName(NameEdit->text());
+		if (m_item->itemName() != nameEdit->text())
+		{
+			m_item->setItemName(nameEdit->text());
 			m_item->AutoName = false;
 			emit DocChanged();
 		}
@@ -1457,44 +1368,44 @@
 {
 	setWindowTitle( tr("Properties"));
 
-	NameGroup->setTitle( tr("Name"));
-	GeoGroup->setTitle( tr("Geometry"));
+	nameGroup->setTitle( tr("Name"));
+	geoGroup->setTitle( tr("Geometry"));
 	xposLabel->setText( tr("&X-Pos:"));
 	yposLabel->setText( tr("&Y-Pos:"));
 	widthLabel->setText( tr("&Width:"));
 	heightLabel->setText( tr("&Height:"));
 	rotationLabel->setText( tr("&Rotation:"));
 	basepointLabel->setText( tr("Basepoint:"));
-	LevelGroup->setTitle( tr("Level"));
+	levelGroup->setTitle( tr("Level"));
 	
 	QString ptSuffix = tr(" pt");
 
 	QString ein = (m_haveDoc) ? unitGetSuffixFromIndex(m_doc->unitIndex()) : ptSuffix;
 
-	Xpos->setSuffix(ein);
-	Ypos->setSuffix(ein);
-	Width->setSuffix(ein);
-	Height->setSuffix(ein);
-
-	NameEdit->setToolTip( tr("Name of selected object"));
-	Xpos->setToolTip( tr("Horizontal position of current basepoint"));
-	Ypos->setToolTip( tr("Vertical position of current basepoint"));
-	Width->setToolTip( tr("Width"));
-	Height->setToolTip( tr("Height"));
-	Rotation->setToolTip( tr("Rotation of object at current basepoint"));
+	xposSpin->setSuffix(ein);
+	yposSpin->setSuffix(ein);
+	widthSpin->setSuffix(ein);
+	heightSpin->setSuffix(ein);
+
+	nameEdit->setToolTip( tr("Name of selected object"));
+	xposSpin->setToolTip( tr("Horizontal position of current basepoint"));
+	yposSpin->setToolTip( tr("Vertical position of current basepoint"));
+	widthSpin->setToolTip( tr("Width"));
+	heightSpin->setToolTip( tr("Height"));
+	rotationSpin->setToolTip( tr("Rotation of object at current basepoint"));
 	basepointLabel->setToolTip( tr("Point from which measurements or rotation angles are referenced"));
-	DoGroup->setToolTip( tr("Group the selected objects"));
-	DoUnGroup->setToolTip( tr("Ungroup the selected group"));
-	FlipH->setToolTip( tr("Flip Horizontal"));
-	FlipV->setToolTip( tr("Flip Vertical"));
+	doGroup->setToolTip( tr("Group the selected objects"));
+	doUnGroup->setToolTip( tr("Ungroup the selected group"));
+	flipH->setToolTip( tr("Flip Horizontal"));
+	flipV->setToolTip( tr("Flip Vertical"));
 	levelUp->setToolTip( tr("Move one level up"));
 	levelDown->setToolTip( tr("Move one level down"));
 	levelTop->setToolTip( tr("Move to front"));
 	levelBottom->setToolTip( tr("Move to back"));
 	levelLabel->setToolTip( tr("Indicates the level the object is on, 0 means the object is at the bottom"));
-	Locked->setToolTip( tr("Lock or unlock the object"));
-	NoResize->setToolTip( tr("Lock or unlock the size of the object"));
-	NoPrint->setToolTip( tr("Enable or disable exporting of the object"));
+	doLock->setToolTip( tr("Lock or unlock the object"));
+	noResize->setToolTip( tr("Lock or unlock the size of the object"));
+	noPrint->setToolTip( tr("Enable or disable exporting of the object"));
 
 	keepFrameWHRatioButton->setToolTip( tr("Keep the aspect ratio"));
 }
@@ -1505,32 +1416,32 @@
 		return;
 	if(m_doc->m_Selection->count()==0)
 		return;
-	Width->setConstants(&m_doc->constants());
-	Height->setConstants(&m_doc->constants());
-	Xpos->setConstants(&m_doc->constants());
-	Ypos->setConstants(&m_doc->constants());
+	widthSpin->setConstants(&m_doc->constants());
+	heightSpin->setConstants(&m_doc->constants());
+	xposSpin->setConstants(&m_doc->constants());
+	yposSpin->setConstants(&m_doc->constants());
 
 }
 
 void PropertiesPalette_XYZ::displayLocked(bool isLocked)
 {
-	Xpos->setReadOnly(isLocked);
-	Ypos->setReadOnly(isLocked);
-	Width->setReadOnly(isLocked);
-	Height->setReadOnly(isLocked);
-	Rotation->setReadOnly(isLocked);
+	xposSpin->setReadOnly(isLocked);
+	yposSpin->setReadOnly(isLocked);
+	widthSpin->setReadOnly(isLocked);
+	heightSpin->setReadOnly(isLocked);
+	rotationSpin->setReadOnly(isLocked);
 	QPalette pal(qApp->palette());
 	if (isLocked)
 		pal.setCurrentColorGroup(QPalette::Disabled);
 
-	Xpos->setPalette(pal);
-	Ypos->setPalette(pal);
-	Width->setPalette(pal);
-	Height->setPalette(pal);
-	Rotation->setPalette(pal);
-
-	LevelGroup->setEnabled(!isLocked);
-	Locked->setChecked(isLocked);
+	xposSpin->setPalette(pal);
+	yposSpin->setPalette(pal);
+	widthSpin->setPalette(pal);
+	heightSpin->setPalette(pal);
+	rotationSpin->setPalette(pal);
+
+	levelGroup->setEnabled(!isLocked);
+	doLock->setChecked(isLocked);
 }
 
 void PropertiesPalette_XYZ::displaySizeLocked(bool isSizeLocked)
@@ -1538,38 +1449,38 @@
 	bool b=isSizeLocked;
 	if (m_haveItem && m_item->locked())
 		b=true;
-	Width->setReadOnly(b);
-	Height->setReadOnly(b);
+	widthSpin->setReadOnly(b);
+	heightSpin->setReadOnly(b);
 	QPalette pal(qApp->palette());
 	
 	if (b)
 		pal.setCurrentColorGroup(QPalette::Disabled);
 
-	Width->setPalette(pal);
-	Height->setPalette(pal);
-	NoResize->setChecked(isSizeLocked);
+	widthSpin->setPalette(pal);
+	heightSpin->setPalette(pal);
+	noResize->setChecked(isSizeLocked);
 }
 
 void PropertiesPalette_XYZ::displayPrintingEnabled(bool isPrintingEnabled)
 {
-	NoPrint->setChecked(!isPrintingEnabled);
+	noPrint->setChecked(!isPrintingEnabled);
 }
 
 void PropertiesPalette_XYZ::displayFlippedH(bool isFlippedH)
 {
-	FlipH->setChecked(isFlippedH);
+	flipH->setChecked(isFlippedH);
 }
 
 void PropertiesPalette_XYZ::displayFlippedV(bool isFlippedV)
 {
-	FlipV->setChecked(isFlippedV);
+	flipV->setChecked(isFlippedV);
 }
 
 void PropertiesPalette_XYZ::handleGrouping()
 {
 	m_ScMW->GroupObj();
-	DoGroup->setEnabled(false);
-	DoUnGroup->setEnabled(true);
+	doGroup->setEnabled(false);
+	doUnGroup->setEnabled(true);
 	handleSelectionChanged();
 	//FIXME
 	//TabStack->setItemEnabled(idShapeItem, false);

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16008&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h Sat Nov 27 00:53:49 2010
@@ -32,6 +32,7 @@
 class QToolBox;
 class QVBoxLayout;
 
+#include "ui_propertiespalette_xyzbase.h"
 
 #include "scribusapi.h"
 #include "scrspinbox.h"
@@ -52,7 +53,7 @@
 class ScribusMainWindow;
 class UserActionSniffer;
 
-class SCRIBUS_API PropertiesPalette_XYZ : public QWidget
+class SCRIBUS_API PropertiesPalette_XYZ : public QWidget, public Ui::PropertiesPalette_XYZBase
 {
 	Q_OBJECT
 
@@ -67,8 +68,6 @@
                          // When user releases the mouse button or arrow key, changes must be checked
                          // and if in ScribusView a groupTransaction has been started it must be also
                          // commmited
-
-	BasePointWidget* RotationGroup;
 
 	void setLineMode(int lineMode);
 
@@ -131,28 +130,6 @@
 protected:
 	ScribusMainWindow *m_ScMW;
 
-	QVBoxLayout* pageLayout;
-	QHBoxLayout* layout60;
-	QGridLayout* Layout44;
-	QHBoxLayout* Layout13;
-	QHBoxLayout* NameGroupLayout;
-	QGridLayout* GeoGroupLayout;
-	QGridLayout* LevelGroupLayout;
-	QVBoxLayout* page_group_layout;
-	
-	NameWidget* NameEdit;
-	
-	QLabel* xposLabel;
-	QLabel* widthLabel;
-	QLabel* yposLabel;
-	QLabel* heightLabel;
-	QLabel* rotationLabel;
-	QLabel* basepointLabel;
-	QLabel* levelLabel;
-	QLabel* langLabel;
-
-	LinkButton* keepFrameWHRatioButton;
-
 	bool      m_haveDoc;
 	bool      m_haveItem;
 	bool      m_lineMode;
@@ -163,29 +140,6 @@
 	
 	double    m_oldRotation;
 
-	QToolButton* levelUp;
-	QToolButton* levelDown;
-	QToolButton* levelTop;
-	QToolButton* levelBottom;
-
-	QGroupBox* NameGroup;
-	QGroupBox* GeoGroup;
-	QGroupBox* LevelGroup;
-
-	ScrSpinBox* Width;
-	ScrSpinBox* Xpos;
-	ScrSpinBox* Ypos;
-	ScrSpinBox* Height;
-	ScrSpinBox* Rotation;
-
-	QToolButton* DoGroup;
-	QToolButton* DoUnGroup;
-	QToolButton* FlipH;
-	QToolButton* FlipV;
-	QToolButton* Locked;
-	QToolButton* NoPrint;
-	QToolButton* NoResize;
-
 	bool _userActionOn;
 	UserActionSniffer *userActionSniffer;
 	void installSniffer(ScrSpinBox *spinBox);

Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16008&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Sat Nov 27 00:53:49 2010
@@ -11761,6 +11761,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\ui_propertiespalette_xyzbase.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\ui_replacecolors.h"
 				>
 			</File>
@@ -13083,6 +13087,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\propertiespalette_xyzbase.ui"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\replacecolors.ui"
 				>
 			</File>




More information about the scribus-commit mailing list