? doc/en/tutorials/Makefile
? doc/en/tutorials/Makefile.in
? doc/en/tutorials/freedomyug/Makefile
? doc/en/tutorials/freedomyug/Makefile.in
? icons/Makefile
? icons/Makefile.in
? plugins/Makefile
? plugins/Makefile.in
? plugins/libchar/.deps
? plugins/libchar/.libs
? plugins/libchar/Makefile
? plugins/libchar/Makefile.in
? plugins/libchar/charselect.lo
? plugins/libchar/charselect.moc
? plugins/libchar/libcharselect.la
? plugins/scriptplugin/diffs
? plugins/scriptplugin/samples/Makefile
? plugins/scriptplugin/samples/Makefile.in
? plugins/scriptplugin/scripts/Makefile
? plugins/scriptplugin/scripts/Makefile.in
Index: mpalette.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/mpalette.cpp,v
retrieving revision 1.110.2.22
diff -u -r1.110.2.22 mpalette.cpp
--- mpalette.cpp	1 Feb 2005 10:38:38 -0000	1.110.2.22
+++ mpalette.cpp	2 Feb 2005 10:14:18 -0000
@@ -1104,8 +1104,8 @@
 	connect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3()));
 	disconnect(FlipH, SIGNAL(clicked()), this, SLOT(DoFlipH()));
 	disconnect(FlipV, SIGNAL(clicked()), this, SLOT(DoFlipV()));
-	FlipH->setOn((i->flippedH % 2 != 0));
-	FlipV->setOn((i->flippedV % 2 != 0));
+	FlipH->setOn(i->imageFlippedH());
+	FlipV->setOn(i->imageFlippedV());
 	connect(FlipH, SIGNAL(clicked()), this, SLOT(DoFlipH()));
 	connect(FlipV, SIGNAL(clicked()), this, SLOT(DoFlipV()));
 	ToggleFlow();
@@ -1130,7 +1130,7 @@
 	connect(startArrow, SIGNAL(activated(int)), this, SLOT(setStartArrow(int )));
 	connect(endArrow, SIGNAL(activated(int)), this, SLOT(setEndArrow(int )));
 	NoPrint->setOn(!i->isPrintable);
-	setter = i->Locked;
+	setter = i->locked();
 	Kette2->setOn(false);
 	Width->setReadOnly(setter);
 	Height->setReadOnly(setter);
@@ -1154,14 +1154,14 @@
 	Xpos->setReadOnly(setter);
 	Ypos->setReadOnly(setter);
 	Rot->setReadOnly(setter);
-	setter = i->LockRes;
+	setter = i->sizeLocked();
 	NoResize->setOn(setter);
-	if (!i->Locked)
+	if (!i->locked())
 	{
 		Width->setReadOnly(setter);
 		Height->setReadOnly(setter);
 	}
-	if (i->Locked)
+	if (i->locked())
 	{
 		HaveItem = true;
 		return;
@@ -2863,12 +2863,12 @@
 	{
 		if (Revert->isOn())
 		{
-			CurItem->flippedH = 1;
+			CurItem->setImageFlippedH(true);
 			CurItem->Reverse = true;
 		}
 		else
 		{
-			CurItem->flippedH = 0;
+			CurItem->setImageFlippedV(false);
 			CurItem->Reverse = false;
 		}
 		ScApp->view->RefreshItem(CurItem);
@@ -3133,7 +3133,7 @@
 	{
 		if (ScApp->view->SelItem.count() > 1)
 		{
-			if (ScApp->view->SelItem.at(0)->Locked)
+			if (ScApp->view->SelItem.at(0)->locked())
 				ScApp->view->undoManager->beginTransaction(Um::SelectionGroup,
 											  Um::IGroup, Um::UnLock, 0, Um::IUnLock);
 			else
@@ -3179,7 +3179,7 @@
 	{
 		if (ScApp->view->SelItem.count() > 1)
 		{
-			if (ScApp->view->SelItem.at(0)->LockRes)
+			if (ScApp->view->SelItem.at(0)->sizeLocked())
 				ScApp->view->undoManager->beginTransaction(Um::SelectionGroup,
 											  Um::IGroup, Um::SizeUnLock, 0, Um::IUnLock);
 			else
Index: pageitem.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/pageitem.cpp,v
retrieving revision 1.121.2.45
diff -u -r1.121.2.45 pageitem.cpp
--- pageitem.cpp	2 Feb 2005 09:20:07 -0000	1.121.2.45
+++ pageitem.cpp	2 Feb 2005 10:14:18 -0000
@@ -134,8 +134,8 @@
 	dpiY = 72.0;
 	LocalX = 0;
 	LocalY = 0;
-	flippedH = 0;
-	flippedV = 0;
+	imageIsFlippedH = 0;
+	imageIsFlippedV = 0;
 	BBoxX = 0;
 	BBoxH = 0;
 	RadRect = 0;
@@ -448,12 +448,12 @@
 					p->setupPolygon(&PoLine);
 					p->setClipPath();
 					p->save();
-					if (flippedH % 2 != 0)
+					if (imageFlippedH())
 					{
 						p->translate(Width * sc, 0);
 						p->scale(-1, 1);
 					}
-					if (flippedV % 2 != 0)
+					if (imageFlippedV())
 					{
 						p->translate(0, Height * sc);
 						p->scale(1, -1);
@@ -667,12 +667,12 @@
 			}
 			if ((itemText.count() != 0) && (Dirty))
 			{
-				if (flippedH % 2 != 0)
+				if (imageFlippedH())
 				{
 					p->translate(Width * sc, 0);
 					p->scale(-1, 1);
 				}
-				if (flippedV % 2 != 0)
+				if (imageFlippedV())
 				{
 					p->translate(0, Height * sc);
 					p->scale(1, -1);
@@ -807,14 +807,14 @@
 						}
 					}
 				}
-				if (flippedH % 2 != 0)
+				if (imageFlippedH())
 				{
 					p->translate(Width * sc, 0);
 					p->scale(-1, 1);
 					pf2.translate(Width, 0);
 					pf2.scale(-1, 1);
 				}
-				if (flippedV % 2 != 0)
+				if (imageFlippedV())
 				{
 					p->translate(0, Height * sc);
 					p->scale(1, -1);
@@ -2392,6 +2392,17 @@
 	TranspStroke = newTransparency;
 }
 
+bool PageItem::imageFlippedH() const
+{
+	return imageIsFlippedH;
+}
+
+void PageItem::setImageFlippedH(bool flipped)
+{
+	if (flipped != imageIsFlippedH)
+		flipImageH();
+}
+
 void PageItem::flipImageH()
 {
 	if (UndoManager::undoEnabled())
@@ -2400,7 +2411,18 @@
 		ss->set("IMAGEFLIPH", "imagefliph");
 		undoManager->action(this, ss);
 	}
-	flippedH += 1;
+	imageIsFlippedH = !imageIsFlippedH;
+}
+
+bool PageItem::imageFlippedV() const
+{
+	return imageIsFlippedV;
+}
+
+void PageItem::setImageFlippedV(bool flipped)
+{
+	if (flipped != imageIsFlippedV)
+		flipImageV();
 }
 
 void PageItem::flipImageV()
@@ -2411,7 +2433,7 @@
 		ss->set("IMAGEFLIPV", "imageflipv");
 		undoManager->action(this, ss);
 	}
-	flippedV += 1;
+	imageIsFlippedV = !imageIsFlippedV;
 }
 
 void PageItem::toggleLock()
Index: pageitem.h
===================================================================
RCS file: /cvs/Scribus/scribus/pageitem.h,v
retrieving revision 1.26.2.22
diff -u -r1.26.2.22 pageitem.h
--- pageitem.h	2 Feb 2005 09:20:08 -0000	1.26.2.22
+++ pageitem.h	2 Feb 2005 10:14:18 -0000
@@ -49,6 +49,8 @@
 	Q_PROPERTY(double lineTransparency READ lineTransparency WRITE setLineTransparency DESIGNABLE false)
 	Q_PROPERTY(bool locked READ locked WRITE setLocked DESIGNABLE false)
 	Q_PROPERTY(bool sizeLocked READ sizeLocked WRITE setSizeLocked DESIGNABLE false)
+	Q_PROPERTY(bool imageFlippedV READ imageFlippedV WRITE setImageFlippedV DESIGNABLE false)
+	Q_PROPERTY(bool imageFlippedH READ imageFlippedH WRITE setImageFlippedH DESIGNABLE false)
 public: 
 	PageItem(ScribusDoc *pa, int art, double x, double y, double w, double h, double w2, QString fill, QString outline);
 	~PageItem() {};
@@ -76,8 +78,6 @@
 	void DrawZeichenS(ScPainter *p, struct ZZ *hl);
 	void DrawPolyL(QPainter *p, QPointArray pts);
 	QString ExpandToken(uint base);
-	bool Locked;
-	bool LockRes;
 	bool Reverse;
   /** X-Position auf der Seite */
 	double Xpos;
@@ -183,10 +183,6 @@
 	int OrigH;
 	double dpiX;
 	double dpiY;
-  /** Anzahl horizontaler Spiegelungen */
-	int flippedH;
-  /** Anzahl vertikaler Spiegelungen */
-	int flippedV;
   /** BoundigBox-X */
 	double BBoxX;
   /** BoundingBox-H */
@@ -379,8 +375,17 @@
 	 */
 	void setLineTransparency(double newTransparency);
 
+	/** @brief Is the image flipped horizontally? */
+	bool imageFlippedH() const;
+	/** @brief Horizontally flip / unflip the image */
+	void setImageFlippedH(bool flipped);
 	/** @brief Flip an image horizontally. */
 	void flipImageH();
+
+	/** @brief Is the image flipped vertically? */
+	bool imageFlippedV() const;
+	/** @brief Vertically flip / unflip the image */
+	void setImageFlippedV(bool flipped);
 	/** @brief Flip an image vertically */
 	void flipImageV();
 
@@ -454,10 +459,35 @@
 
 	/**
 	 * @brief Item name. Unicode. User visible (outline, property palette, etc).
-	 *
-	 * See PageItem::itemName(), PageItem::setItemName()
-	 * */
+	 * @sa PageItem::itemName(), PageItem::setItemName()
+	 */
 	QString AnName;
+
+	/**
+	 * @brief Is the image in this image item flipped horizontally?
+	 * @sa PageItem::isImageFlippedH(), PageItem::setImageFlippedH(),
+	 *     PageItem::flipImageH(), PageItem::flippedV
+	 */
+	bool imageIsFlippedH;
+
+	/**
+	 * @brief Is the image in this image item flipped vertically?
+	 * @sa PageItem::isImageFlippedV(), PageItem::setImageFlippedV(),
+	 *     PageItem::flipImageV(), PageItem::flippedH
+	 */
+	bool imageIsFlippedV;
+
+	/**
+	 * @brief Is the item locked (cannot be moved, resized, etc)?
+	 * @sa PageItem::locked(), PageItem::setLocked(), PageItem::toggleLock()
+	 */
+	bool Locked;
+
+	/**
+	 * @brief Is the item's size locked?
+	 * @sa PageItem::sizeLocked(), PageItem::setSizeLocked(), PageItem::toggleSizeLock()
+	 */
+	bool LockRes;
 };
 
 #endif
Index: scribus.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribus.cpp,v
retrieving revision 1.228.2.144
diff -u -r1.228.2.144 scribus.cpp
--- scribus.cpp	2 Feb 2005 00:03:04 -0000	1.228.2.144
+++ scribus.cpp	2 Feb 2005 10:14:19 -0000
@@ -2002,15 +2002,15 @@
 						view->DeleteItem();
 					break;
 				case Key_Prior:
-					if (!b->Locked)
+					if (!b->locked())
 						view->RaiseItem();
 					break;
 				case Key_Next:
-					if (!b->Locked)
+					if (!b->locked())
 						view->LowerItem();
 					break;
 				case Key_Left:
-					if (!b->Locked)
+					if (!b->locked())
 					{
 						if ( buttonState & ShiftButton )
 							view->moveGroup(-10, 0);
@@ -2021,7 +2021,7 @@
 					}
 					break;
 				case Key_Right:
-					if (!b->Locked)
+					if (!b->locked())
 					{
 						if ( buttonState & ShiftButton )
 							view->moveGroup(10, 0);
@@ -2032,7 +2032,7 @@
 					}
 					break;
 				case Key_Up:
-					if (!b->Locked)
+					if (!b->locked())
 					{
 						if ( buttonState & ShiftButton )
 							view->moveGroup(0, -10);
@@ -2043,7 +2043,7 @@
 					}
 					break;
 				case Key_Down:
-					if (!b->Locked)
+					if (!b->locked())
 					{
 						if ( buttonState & ShiftButton )
 							view->moveGroup(0, 10);
@@ -2087,7 +2087,7 @@
 					switch (kk)
 					{
 						case Key_Left:
-							if (!b->Locked)
+							if (!b->locked())
 							{
 								if ( buttonState & ShiftButton )
 									view->MoveItemI(-10, 0, b->ItemNr, true);
@@ -2098,7 +2098,7 @@
 							}
 							break;
 						case Key_Right:
-							if (!b->Locked)
+							if (!b->locked())
 							{
 								if ( buttonState & ShiftButton )
 									view->MoveItemI(10, 0, b->ItemNr, true);
@@ -2109,7 +2109,7 @@
 							}
 							break;
 						case Key_Up:
-							if (!b->Locked)
+							if (!b->locked())
 							{
 								if ( buttonState & ShiftButton )
 									view->MoveItemI(0, -10, b->ItemNr, true);
@@ -2120,7 +2120,7 @@
 							}
 							break;
 						case Key_Down:
-							if (!b->Locked)
+							if (!b->locked())
 							{
 								if ( buttonState & ShiftButton )
 									view->MoveItemI(0, 10, b->ItemNr, true);
@@ -3872,7 +3872,7 @@
 			view->HR->RExtra = b->RExtra;
 			view->HR->First = doc->docParagraphStyles[doc->currentParaStyle].First;
 			view->HR->Indent = doc->docParagraphStyles[doc->currentParaStyle].Indent;
-			if ((b->flippedH % 2 != 0) || (b->Reverse))
+			if (b->imageFlippedH() || (b->Reverse))
 				view->HR->Revers = true;
 			else
 				view->HR->Revers = false;
@@ -4028,7 +4028,7 @@
 			scrActions["itemUngroup"]->setEnabled(false);
 			scrActions["itemSplitPolygons"]->setEnabled( (b->PType == 6) && (b->Segments.count() != 0) );
 		}
-		if (b->Locked)
+		if (b->locked())
 		{
 			scrMenuMgr->setMenuEnabled("ItemShapes", false);
 			scrActions["itemAlignDist"]->setEnabled(false);			
@@ -4109,7 +4109,7 @@
 	if (view->SelItem.count() != 0)
 	{
 		PageItem* b = view->SelItem.at(0);
-		scrActions["itemLock"]->setOn(b->Locked);
+		scrActions["itemLock"]->setOn(b->locked());
 	}
 }
 
@@ -7544,7 +7544,7 @@
 	slotEditPaste();
 	for (uint b=0; b<view->SelItem.count(); ++b)
 	{
-		view->SelItem.at(b)->Locked = false;
+		view->SelItem.at(b)->setLocked(false);
 		view->MoveItem(DispX, DispY, view->SelItem.at(b));
 	}
 }
@@ -7571,7 +7571,7 @@
 				slotEditPaste();
 				for (uint b=0; b<view->SelItem.count(); ++b)
 				{
-					view->SelItem.at(b)->Locked = false;
+					view->SelItem.at(b)->setLocked(false);
 					view->MoveItem(dH2, dV2, view->SelItem.at(b), true);
 				}
 				dH2 += dH;
@@ -8913,7 +8913,7 @@
 		{
 			for (uint a=0; a<view->SelItem.count(); ++a)
 			{
-				if (t == -1 && view->SelItem.at(a)->Locked)
+				if (t == -1 && view->SelItem.at(a)->locked())
 					t = QMessageBox::warning(this, tr("Warning"),
 											 tr("Some Objects are locked."),
 											 tr("&Cancel"),
@@ -8928,7 +8928,7 @@
 			for (uint a=0; a<view->SelItem.count(); ++a)
 			{
 				b = view->SelItem.at(a);
-				if (b->Locked)
+				if (b->locked())
 				{
 					for (uint c=0; c<view->SelItem.count(); ++c)
 					{
@@ -9680,7 +9680,7 @@
 			if (dl)
 			{
 				view->SelItem.append(doc->MasterItems.at(b));
-				doc->DocItems.at(b)->Locked = false;
+				doc->DocItems.at(b)->setLocked(false);
 			}
 			else
 				doc->MasterItems.at(b)->LayerNr = 0;
@@ -9696,7 +9696,7 @@
 			if (dl)
 			{
 				view->SelItem.append(doc->DocItems.at(b));
-				doc->DocItems.at(b)->Locked = false;
+				doc->DocItems.at(b)->setLocked(false);
 			}
 			else
 				doc->DocItems.at(b)->LayerNr = 0;
Index: scribusXml.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribusXml.cpp,v
retrieving revision 1.83.2.42
diff -u -r1.83.2.42 scribusXml.cpp
--- scribusXml.cpp	1 Feb 2005 10:38:38 -0000	1.83.2.42
+++ scribusXml.cpp	2 Feb 2005 10:14:20 -0000
@@ -222,8 +222,8 @@
 	ob->setAttribute("PICART", item->PicArt ? 1 : 0);
 	ob->setAttribute("PLTSHOW", item->PoShow ? 1 : 0);
 	ob->setAttribute("BASEOF", item->BaseOffs);
-	ob->setAttribute("FLIPPEDH",item->flippedH);
-	ob->setAttribute("FLIPPEDV",item->flippedV);
+	ob->setAttribute("FLIPPEDH", item->imageFlippedH());
+	ob->setAttribute("FLIPPEDV", item->imageFlippedV());
 	ob->setAttribute("BBOXX",item->BBoxX);
 	ob->setAttribute("BBOXH",item->BBoxH);
 	ob->setAttribute("IFONT",item->IFont);
@@ -298,8 +298,8 @@
 	ob->setAttribute("EPROF", item->EmProfile);
 	ob->setAttribute("IRENDER",item->IRender);
 	ob->setAttribute("EMBEDDED", item->UseEmbedded ? 1 : 0);
-	ob->setAttribute("LOCK", item->Locked ? 1 : 0);
-	ob->setAttribute("LOCKR", item->LockRes ? 1 : 0);
+	ob->setAttribute("LOCK", item->locked() ? 1 : 0);
+	ob->setAttribute("LOCKR", item->sizeLocked() ? 1 : 0);
 	ob->setAttribute("REVERS", item->Reverse ? 1 : 0);
 	ob->setAttribute("INVERS", item->InvPict ? 1 : 0);
 	ob->setAttribute("TransValue", item->Transparency);
Index: scribusstructs.h
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/scribusstructs.h,v
retrieving revision 1.1.2.15
diff -u -r1.1.2.15 scribusstructs.h
--- scribusstructs.h	29 Jan 2005 16:44:00 -0000	1.1.2.15
+++ scribusstructs.h	2 Feb 2005 10:14:20 -0000
@@ -83,8 +83,8 @@
 	double LocalX;
 	double LocalY;
 	bool PicArt;
-	int flippedH;
-	int flippedV;
+	bool flippedH;
+	bool flippedV;
 	double BBoxX;
 	double BBoxH;
 	bool isPrintable;
Index: scribusview.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribusview.cpp,v
retrieving revision 1.76.2.83
diff -u -r1.76.2.83 scribusview.cpp
--- scribusview.cpp	1 Feb 2005 16:24:52 -0000	1.76.2.83
+++ scribusview.cpp	2 Feb 2005 10:14:21 -0000
@@ -633,7 +633,7 @@
 							HR->RExtra = b->RExtra;
 							HR->First = Doc->docParagraphStyles[Doc->currentParaStyle].First;
 							HR->Indent = Doc->docParagraphStyles[Doc->currentParaStyle].Indent;
-							if ((b->flippedH % 2 != 0) || (b->Reverse))
+							if (b->imageFlippedH() || (b->Reverse))
 								HR->Revers = true;
 							else
 								HR->Revers = false;
@@ -1151,7 +1151,7 @@
 	{
 		if ((b->PType == 6) || (b->PType == 7) || (b->PType == 2) || (b->PType == 8))
 		{
-			if ((b->Locked) || (!b->ScaleType))
+			if ((b->locked()) || (!b->ScaleType))
 			{
 				contentsMousePressEvent(m);
 				return;
@@ -1640,11 +1640,11 @@
 			}
 			if (b->PType == 8)
 				pmen->insertItem( tr("Edit Text..."), this, SIGNAL(EditText()));
-			if (!b->Locked)
+			if (!b->locked())
 				pmen->insertItem( tr("&Lock"), this, SLOT(ToggleLock()));
 			else
 				pmen->insertItem( tr("Un&lock"), this, SLOT(ToggleLock()));
-			if (!b->LockRes)
+			if (!b->sizeLocked())
 				pmen->insertItem( tr("Lock Object &Size"), this, SLOT(ToggleResize()));
 			else
 				pmen->insertItem( tr("Unlock Object &Size"), this, SLOT(ToggleResize()));
@@ -1665,7 +1665,7 @@
 			}
 			if (b->PType == 4)
 				pmen->insertItem( tr("&Insert Sample Text"), this, SLOT(LoremIpsum()));
-			if (!b->Locked)
+			if (!b->locked())
 			{
 				if (SelItem.count() > 1)
 				{
@@ -1723,13 +1723,13 @@
 				pmen->insertItem( tr("Conve&rt to"), pmen2);
 			}
 			pmen->insertSeparator();
-			if (!b->Locked && !(b->isTableItem && b->isSingleSel))
+			if (!b->locked() && !(b->isTableItem && b->isSingleSel))
 				ScApp->scrActions["editCut"]->addTo(pmen);
 			if (!(b->isTableItem && b->isSingleSel))
 				ScApp->scrActions["editCopy"]->addTo(pmen);
 			if ((Doc->appMode == EditMode) && (ScApp->Buffer2.startsWith("<SCRIBUSTEXT")) && (b->PType == 4))
 				ScApp->scrActions["editPaste"]->addTo(pmen);
-			if (!b->Locked && (Doc->appMode != 7) && (!(b->isTableItem && b->isSingleSel)))
+			if (!b->locked() && (Doc->appMode != 7) && (!(b->isTableItem && b->isSingleSel)))
 				pmen->insertItem( tr("&Delete"), this, SLOT(DeleteItem()));
 			if ((b->PType == 2) || (b->PType == 4))
 				pmen->insertItem( tr("C&lear Contents"), this, SLOT(ClearItem()));
@@ -1974,9 +1974,9 @@
 								if (bb != b)
 									MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr);
 							}
-							if (b->flippedH % 2 != 0)
+							if (b->imageFlippedH())
 								MoveItemI(-(b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
-							if (b->flippedV % 2 != 0)
+							if (b->imageFlippedV())
 								MoveItemI(0, -(b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 						}
 						else
@@ -2058,9 +2058,9 @@
 							else
 								MoveSizeItem(npx, npx, b->ItemNr);
 							b->Sizing = false;
-							if (b->flippedH % 2 == 0)
+							if (!b->imageFlippedH())
 								MoveItemI((b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr);
-							if (b->flippedV % 2 == 0)
+							if (!b->imageFlippedV())
 								MoveItemI(0, (b->Height - b->OldH2)/b->LocalScY, b->ItemNr);
 						}
 						else
@@ -2147,9 +2147,9 @@
 						else
 							MoveSizeItem(FPoint(0, npx.y()), FPoint(b->Width - npx.x(), npx.y()), b->ItemNr);
 						b->Sizing = false;
-						if (b->flippedH % 2 != 0)
+						if (b->imageFlippedH())
 							MoveItemI(-(b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
-						if (b->flippedV % 2 == 0)
+						if (!b->imageFlippedV())
 							MoveItemI(0, (b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 						break;
 					case 4:
@@ -2207,9 +2207,9 @@
 						else
 							MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), b->Height - npx.y()), b->ItemNr);
 						b->Sizing = false;
-						if (b->flippedH % 2 == 0)
+						if (!b->imageFlippedH())
 							MoveItemI((b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
-						if (b->flippedV % 2 != 0)
+						if (b->imageFlippedV())
 							MoveItemI(0, -(b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 						break;
 					case 5:
@@ -2243,7 +2243,7 @@
 						}
 						else
 							MoveSizeItem(FPoint(0, 0), FPoint(0, b->Height - npx.y()), b->ItemNr);
-						if (b->flippedV % 2 != 0)
+						if (b->imageFlippedV())
 							MoveItemI(0, -(b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 						b->Sizing = false;
 						break;
@@ -2278,7 +2278,7 @@
 						}
 						else
 							MoveSizeItem(FPoint(0, 0), FPoint(b->Width - npx.x(), 0), b->ItemNr);
-						if (b->flippedH % 2 != 0)
+						if (b->imageFlippedH())
 							MoveItemI(-(b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
 						b->Sizing = false;
 						break;
@@ -2313,9 +2313,9 @@
 						else
 							MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), 0), b->ItemNr);
 						b->Sizing = false;
-						if (b->flippedH % 2 == 0)
+						if (!b->imageFlippedH())
 							MoveItemI((b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
-						if (b->flippedV % 2 != 0)
+						if (b->imageFlippedV())
 							MoveItemI(0, -(b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 						break;
 					case 8:
@@ -2349,9 +2349,9 @@
 						else
 							MoveSizeItem(FPoint(0, npx.y()), FPoint(0, npx.y()), b->ItemNr);
 						b->Sizing = false;
-						if (b->flippedH % 2 != 0)
+						if (b->imageFlippedH())
 							MoveItemI(-(b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
-						if (b->flippedV % 2 == 0)
+						if (!b->imageFlippedV())
 							MoveItemI(0, (b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 						break;
 					}
@@ -2827,7 +2827,7 @@
 	{
 		newX = static_cast<int>(m->x()/sc);
 		newY = static_cast<int>(m->y()/sc);
-		if ((Mpressed) && (m->state() == RightButton) && (!Doc->DragP) && (Doc->appMode == NormalMode) && (!b->Locked) && (!(b->isTableItem && b->isSingleSel)))
+		if ((Mpressed) && (m->state() == RightButton) && (!Doc->DragP) && (Doc->appMode == NormalMode) && (!b->locked()) && (!(b->isTableItem && b->isSingleSel)))
 		{
 			if ((abs(Dxp - newX) > 10) || (abs(Dyp - newY) > 10))
 			{
@@ -2991,7 +2991,7 @@
 				emit b->HasSel ? HasTextSel() : HasNoTextSel();
 			}
 		}
-		if (Mpressed && (m->state() & LeftButton) && ((Doc->appMode == NormalMode) || ((Doc->appMode == EditMode) && HanMove)) && (!b->Locked))
+		if (Mpressed && (m->state() & LeftButton) && ((Doc->appMode == NormalMode) || ((Doc->appMode == EditMode) && HanMove)) && (!b->locked()))
 		{
 			if (Doc->EditClip)
 			{
@@ -3432,7 +3432,7 @@
 			for (a = 0; a < SelItem.count(); ++a)
 			{
 				b = SelItem.at(a);
-				if (b->Locked)
+				if (b->locked())
 					break;
 				p.begin(viewport());
 				Transform(b, &p);
@@ -3495,7 +3495,7 @@
 				if (QRegion(p.xForm(QPointArray(QRect(-3, -3, static_cast<int>(b->Width+6), static_cast<int>(b->Height+6))))).contains(mpo))
 				{
 					tx = p.xForm(QRect(0, 0, static_cast<int>(b->Width), static_cast<int>(b->Height)));
-					if ((tx.intersects(mpo)) && (!b->Locked))
+					if ((tx.intersects(mpo)) && (!b->locked()))
 					{
 						qApp->setOverrideCursor(QCursor(SizeAllCursor), true);
 						if (Doc->appMode == Rotation)
@@ -3507,7 +3507,7 @@
 							if (b->PType == 2)
 								qApp->setOverrideCursor(QCursor(loadIcon("HandC.xpm")), true);
 						}
-						if (!b->LockRes)
+						if (!b->sizeLocked())
 							HandleCurs(&p, b, mpo);
 					}
 					else
@@ -3933,7 +3933,7 @@
 									break;
 							}
 						}
-						if (b->LockRes)
+						if (b->sizeLocked())
 						{
 							qApp->setOverrideCursor(QCursor(SizeAllCursor), true);
 							HowTo = 0;
@@ -3952,7 +3952,7 @@
 						b = SelItem.at(0);
 						p.begin(viewport());
 						Transform(b, &p);
-						if (!b->Locked)
+						if (!b->locked())
 						{
 							HandleSizer(&p, b, mpo, m);
 							if (HowTo != 0)
@@ -4037,7 +4037,7 @@
 			slotDoCurs(false);
 			if (GetItem(&b))
 			{
-				if (!b->Locked)
+				if (!b->locked())
 				{
 					p.begin(viewport());
 					Transform(b, &p);
@@ -4736,7 +4736,7 @@
 
 bool ScribusView::MoveItem(double newX, double newY, PageItem* b, bool fromMP)
 {
-	if (b->Locked)
+	if (b->locked())
 		return false;
 	bool retw = false;
 	double oldx = b->Xpos;
@@ -4778,13 +4778,13 @@
 void ScribusView::MoveItemI(double newX, double newY, int ite, bool redraw)
 {
 	PageItem *b = Doc->Items.at(ite);
-	if ((b->Locked) || (!b->ScaleType))
+	if ((b->locked()) || (!b->ScaleType))
 		return;
-	if (b->flippedH % 2 != 0)
+	if (b->imageFlippedH())
 		b->LocalX -= newX;
 	else
 		b->LocalX += newX;
-	if (b->flippedV % 2 != 0)
+	if (b->imageFlippedV())
 		b->LocalY -= newY;
 	else
 		b->LocalY += newY;
@@ -5390,7 +5390,7 @@
 			else
 				MoveItem(np.x(), 0, b);
 			Clip.translate(-np.x(), 0);
-			if (b->flippedH % 2 == 0)
+			if (!b->imageFlippedH())
 				MoveItemI(-np.x()/b->LocalScX, 0, b->ItemNr, false);
 			np.setX(0);
 		}
@@ -5405,7 +5405,7 @@
 			else
 				MoveItem(0, np.y(), b);
 			Clip.translate(0, -np.y());
-			if (b->flippedV % 2 == 0)
+			if (!b->imageFlippedV())
 				MoveItemI(0, -np.y()/b->LocalScY, b->ItemNr, false);
 			np.setY(0);
 		}
@@ -5517,7 +5517,7 @@
 bool ScribusView::SizeItem(double newX, double newY, PageItem *pi, bool fromMP, bool DoUpdateClip, bool redraw)
 {
 	PageItem *b = pi;
-	if (b->Locked)
+	if (b->locked())
 		return false;
 	QPainter p;
 	QRect oldR = getRedrawBounding(b);
@@ -5603,16 +5603,16 @@
 	{
 		if (fromMP)
 		{
-			if (b->flippedH % 2 != 0)
+			if (b->imageFlippedH())
 				MoveItemI(-(b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
-			if (b->flippedV % 2 != 0)
+			if (b->imageFlippedV())
 				MoveItemI(0, -(b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 		}
 		else
 		{
-			if (b->flippedH % 2 == 0)
+			if (!b->imageFlippedH())
 				MoveItemI((b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr, false);
-			if (b->flippedV % 2 == 0)
+			if (!b->imageFlippedV())
 				MoveItemI(0, (b->Height - b->OldH2)/b->LocalScY, b->ItemNr, false);
 		}
 		UpdateClip(b);
@@ -5823,7 +5823,7 @@
 	for (uint a = 0; a < SelItem.count(); ++a)
 	{
 		bb = SelItem.at(a);
-		if ((bb->Locked) || (bb->LockRes))
+		if ((bb->locked()) || (bb->sizeLocked()))
 			continue;
 		bb->OldB = bb->Width;
 		bb->OldH = bb->Height;
@@ -5927,7 +5927,7 @@
 {
 	PageItem *b;
 	b = pi;
-	if (b->Locked)
+	if (b->locked())
 		return;
 	FPoint n;
 	QRect oldR = getRedrawBounding(b);
@@ -5992,14 +5992,14 @@
 	}
 	else
 		MoveItem(tp2.x(), tp2.y(), b, true);
-	if (b->flippedH % 2 == 0)
+	if (!b->imageFlippedH())
 		MoveItemI(-tp2.x()/b->LocalScX, 0, b->ItemNr, false);
-	if (b->flippedV % 2 == 0)
+	if (!b->imageFlippedV())
 		MoveItemI(0, -tp2.y()/b->LocalScY, b->ItemNr, false);
 	FPoint tp = getMaxClipF(&Clip);
-	if (b->flippedH % 2 != 0)
+	if (b->imageFlippedH())
 		MoveItemI((b->Width - tp.x())/b->LocalScX, 0, b->ItemNr, false);
-	if (b->flippedV % 2 != 0)
+	if (b->imageFlippedV())
 		MoveItemI(0, (b->Height - tp.y())/b->LocalScY, b->ItemNr, false);
 	SizeItem(tp.x(), tp.y(), b->ItemNr, true, false);
 	b->ClipEdited = true;
@@ -7096,7 +7096,7 @@
 	b->OldB2 = b->Width;
 	b->OldH2 = b->Height;
 	HowTo = 0;
-	if (b->LockRes)
+	if (b->sizeLocked())
 		return;
 	QRect ne = QRect();
 	PaintSizeRect(p, ne);
@@ -7317,12 +7317,12 @@
 		PageItem *b = Doc->Items.at(a);
 		if ((b->PicAvail) && (b->Pfile == name))
 		{
-			int fho = b->flippedH;
-			int fvo = b->flippedV;
+			bool fho = b->imageFlippedH();
+			bool fvo = b->imageFlippedV();
 			b->pixmOrg = QImage();
 			LoadPict(b->Pfile, b->ItemNr, true);
-			b->flippedH = fho;
-			b->flippedV = fvo;
+			b->setImageFlippedH(fho);
+			b->setImageFlippedV(fvo);
 			AdjustPictScale(b);
 			AdjustPreview(b, false);
 		}
@@ -7332,12 +7332,12 @@
 		PageItem *b = Doc->MasterItems.at(a);
 		if ((b->PicAvail) && (b->Pfile == name))
 		{
-			int fho = b->flippedH;
-			int fvo = b->flippedV;
+			bool fho = b->imageFlippedH();
+			bool fvo = b->imageFlippedV();
 			b->pixmOrg = QImage();
 			LoadPict(b->Pfile, b->ItemNr, true);
-			b->flippedH = fho;
-			b->flippedV = fvo;
+			b->setImageFlippedH(fho);
+			b->setImageFlippedV(fvo);
 			AdjustPictScale(b);
 			AdjustPreview(b, false);
 		}
@@ -7381,12 +7381,12 @@
 		PageItem *b = SelItem.at(0);
 		if (b->PicAvail)
 		{
-			int fho = b->flippedH;
-			int fvo = b->flippedV;
+			int fho = b->imageFlippedH();
+			int fvo = b->imageFlippedV();
 			b->pixmOrg = QImage();
 			LoadPict(b->Pfile, b->ItemNr, true);
-			b->flippedH = fho;
-			b->flippedV = fvo;
+			b->setImageFlippedH(fho);
+			b->setImageFlippedV(fvo);
 			AdjustPictScale(b);
 			AdjustPreview(b, false);
 			updateContents();
@@ -7473,7 +7473,7 @@
 	{
 		if (SelItem.count() > 1)
 		{
-			if (SelItem.at(0)->Locked)
+			if (SelItem.at(0)->locked())
 				undoManager->beginTransaction(Um::SelectionGroup,
 											  Um::IGroup, Um::UnLock, 0, Um::IUnLock);
 			else
@@ -7498,7 +7498,7 @@
 	{
 		if (SelItem.count() > 1)
 		{
-			if (SelItem.at(0)->LockRes)
+			if (SelItem.at(0)->sizeLocked())
 				undoManager->beginTransaction(Um::SelectionGroup,
 											  Um::IGroup, Um::SizeUnLock, 0, Um::IUnLock);
 			else
@@ -7882,8 +7882,8 @@
 				b->dpiY = 72.0;
 				b->LocalX = 0;
 				b->LocalY = 0;
-				b->flippedH = 0;
-				b->flippedV = 0;
+				b->setImageFlippedH(false);
+				b->setImageFlippedV(false);
 				b->textAlignment = 0;
 				b->EmProfile = "";
 				b->ScaleType = true;
@@ -7912,7 +7912,7 @@
 		for (uint de = 0; de < anz; ++de)
 		{
 			b = SelItem.at(offs);
-			if ((b->isTableItem && b->isSingleSel) || (b->Locked))
+			if ((b->isTableItem && b->isSingleSel) || (b->locked()))
 			{
 				offs++;
 				continue;
@@ -8900,12 +8900,12 @@
 
 void ScribusView::TransformM(PageItem *b, QPainter *p)
 {
-	if (b->flippedH % 2 != 0)
+	if (b->imageFlippedH())
 	{
 		p->translate(b->Width, 0);
 		p->scale(-1, 1);
 	}
-	if (b->flippedV % 2 != 0)
+	if (b->imageFlippedV())
 	{
 		p->translate(0, b->Height);
 		p->scale(1, -1);
@@ -10423,8 +10423,8 @@
 			Item->PicArt = false;
 		}
 	}
-	Item->flippedH = 0;
-	Item->flippedV = 0;
+	Item->setImageFlippedH(false);
+	Item->setImageFlippedV(false);
 	if (!Doc->loading)
 	{
 		emit RasterPic(Item->isRaster);
@@ -10435,16 +10435,16 @@
 
 void ScribusView::AdjustPreview(PageItem *b, bool reload)
 {
-	int neww, newh, fho, fvo;
-	bool savF;
+	int neww, newh;
+	bool savF, fho, fvo;
 	if ((b->LocalViewX < 1.0) || (b->LocalViewY < 1.0))
 	{
 		if ((b->Pfile != "") && (b->PicAvail))
 		{
 			if (!b->Sizing)
 			{
-				fho = b->flippedH;
-				fvo = b->flippedV;
+				fho = b->imageFlippedH();
+				fvo = b->imageFlippedV();
 				savF = b->PicArt;
 				if ( !b->pixmOrg.isNull() )
 				{
@@ -10463,8 +10463,8 @@
 				}
 				else
 					LoadPict(b->Pfile, b->ItemNr, true);
-				b->flippedH = fho;
-				b->flippedV = fvo;
+				b->setImageFlippedH(fho);
+				b->setImageFlippedV(fvo);
 				b->PicArt = savF;
 			}
 			neww = qRound(b->pixm.width() * b->LocalViewX);
@@ -10489,7 +10489,8 @@
 	double ys = b->Height / static_cast<double>(b->OrigH);
 	if (!b->Sizing)
 	{
-		int fho = b->flippedH, fvo = b->flippedV;
+		bool fho = b->imageFlippedH();
+		bool fvo = b->imageFlippedV();
 		savF = b->PicArt;
 		if (!b->pixmOrg.isNull())
 		{
@@ -10508,8 +10509,8 @@
 			}
 		else // jjsa end
 			LoadPict(b->Pfile, b->ItemNr, true);
-		b->flippedH = fho;
-		b->flippedV = fvo;
+		b->setImageFlippedH(fho);
+		b->setImageFlippedV(fvo);
 		b->PicArt = savF;
 	}
 	if (b->AspectRatio)
@@ -10659,8 +10660,8 @@
 		break;
 	}
 	PageItem* b = Doc->Items.at(z);
-	b->flippedH = Buffer->flippedH;
-	b->flippedV = Buffer->flippedV;
+	b->setImageFlippedH(Buffer->flippedH);
+	b->setImageFlippedV(Buffer->flippedV);
 	b->RadRect = Buffer->RadRect;
 	b->FrameType = Buffer->FrameType;
 	b->ClipEdited = Buffer->ClipEdited;
@@ -10773,8 +10774,8 @@
 	b->TabValues = Buffer->TabValues;
 	b->DashValues = Buffer->DashValues;
 	b->DashOffset = Buffer->DashOffset;
-	b->Locked = Buffer->Locked;
-	b->LockRes = Buffer->LockRes;
+	b->setLocked(Buffer->Locked);
+	b->setSizeLocked(Buffer->LockRes);
 	b->Transparency = Buffer->Transparency;
 	b->TranspStroke = Buffer->TranspStroke;
 	b->Reverse = Buffer->Reverse;
@@ -11233,17 +11234,17 @@
 			chma.scale(b->itemText.at(a)->cscale / 100.0, 1);
 			pts.map(chma);
 			chma = QWMatrix();
-			if ((b->flippedH % 2 != 0) && (!b->Reverse))
+			if (b->imageFlippedH() && (!b->Reverse))
 				chma.scale(-1, 1);
-			if (b->flippedV % 2 != 0)
+			if (b->imageFlippedV())
 				chma.scale(1, -1);
 			pts.map(chma);
 			uint z = PaintPoly(b->Xpos, b->Ypos, b->Width, b->Height, b->Pwidth, b->Pcolor2, b->Pcolor);
 			bb = Doc->Items.at(z);
 			bb->Textflow = b->Textflow;
 			bb->Textflow2 = b->Textflow2;
-			bb->LockRes = b->LockRes;
-			bb->Locked = b->Locked;
+			bb->setSizeLocked(b->sizeLocked());
+			bb->setLocked(b->locked());
 			bb->NamedLStyle = b->NamedLStyle;
 			bb->setItemName(b->itemName()+"+"+ccounter.setNum(a));
 			bb->AutoName = false;
@@ -11276,9 +11277,9 @@
 				wide = Cwidth(Doc, b->itemText.at(a)->cfont, chx, b->itemText.at(a)->csize, b->itemText.at(a+1)->ch);
 			else
 				wide = Cwidth(Doc, b->itemText.at(a)->cfont, chx, b->itemText.at(a)->csize);
-			if (b->flippedH % 2 != 0)
+			if (b->imageFlippedH())
 				textX = b->Width - textX - wide;
-			if (b->flippedV % 2 != 0)
+			if (b->imageFlippedV())
 				textY = b->Height - textY+ y - (bb->Height - y);
 			npo = transformPoint(FPoint(textX+x, textY-y), 0.0, 0.0, b->Rot, 1.0, 1.0);
 			bb->Xpos = b->Xpos+npo.x();
Index: util.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/util.cpp,v
retrieving revision 1.52.2.16
diff -u -r1.52.2.16 util.cpp
--- util.cpp	1 Feb 2005 10:38:38 -0000	1.52.2.16
+++ util.cpp	2 Feb 2005 10:14:21 -0000
@@ -1816,8 +1816,8 @@
 	Buffer->LocalX = b->LocalX;
 	Buffer->LocalY = b->LocalY;
 	Buffer->PicArt = b->PicArt;
-	Buffer->flippedH = b->flippedH;
-	Buffer->flippedV = b->flippedV;
+	Buffer->flippedH = b->imageFlippedH();
+	Buffer->flippedV = b->imageFlippedV();
 	Buffer->BBoxX = b->BBoxX;
 	Buffer->BBoxH = b->BBoxH;
 	Buffer->isPrintable = b->isPrintable;
@@ -1912,8 +1912,8 @@
 	Buffer->LayerNr = b->LayerNr;
 	Buffer->ScaleType = b->ScaleType;
 	Buffer->AspectRatio = b->AspectRatio;
-	Buffer->Locked = b->Locked;
-	Buffer->LockRes = b->LockRes;
+	Buffer->Locked = b->locked();
+	Buffer->LockRes = b->sizeLocked();
 	Buffer->Transparency = b->Transparency;
 	Buffer->TranspStroke = b->TranspStroke;
 	Buffer->Reverse = b->Reverse;
@@ -2133,8 +2133,8 @@
 	OB->LocalX=QStodouble(obj->attribute("LOCALX"));
 	OB->LocalY=QStodouble(obj->attribute("LOCALY"));
 	OB->PicArt=QStoInt(obj->attribute("PICART"));
-	OB->flippedH=QStoInt(obj->attribute("FLIPPEDH"));
-	OB->flippedV=QStoInt(obj->attribute("FLIPPEDV"));
+	OB->flippedH = QStoInt(obj->attribute("FLIPPEDH"));
+	OB->flippedV = QStoInt(obj->attribute("FLIPPEDV"));
 	OB->BBoxX=QStodouble(obj->attribute("BBOXX"));
 	OB->BBoxH=QStodouble(obj->attribute("BBOXH"));
 	OB->ScaleType = QStoInt(obj->attribute("SCALETYPE","1"));
Index: libpdf/pdflib.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/libpdf/pdflib.cpp,v
retrieving revision 1.78.2.22
diff -u -r1.78.2.22 pdflib.cpp
--- libpdf/pdflib.cpp	1 Feb 2005 10:39:32 -0000	1.78.2.22
+++ libpdf/pdflib.cpp	2 Feb 2005 10:14:22 -0000
@@ -1056,9 +1056,9 @@
 						PutPage("q\n");
 						PutPage(SetClipPath(ite));
 						PutPage("h\nW*\nn\n");
-						if ((ite->flippedH % 2) != 0)
+						if (ite->imageFlippedH())
 							PutPage("-1 0 0 1 "+FToStr(ite->Width)+" 0 cm\n");
-						if ((ite->flippedV % 2) != 0)
+						if (ite->imageFlippedV())
 							PutPage("1 0 0 -1 0 "+FToStr(-ite->Height)+" cm\n");
 						if ((ite->PicAvail) && (ite->Pfile != ""))
 							PDF_Image(ite->InvPict, ite->Pfile, ite->LocalScX,
@@ -1793,9 +1793,9 @@
 								}
 							}
 							PutPage("q\n");
-							if ((ite->flippedH % 2) != 0)
+							if (ite->imageFlippedH())
 								PutPage("-1 0 0 1 "+FToStr(ite->Width)+" 0 cm\n");
-							if ((ite->flippedV % 2) != 0)
+							if (ite->imageFlippedV())
 								PutPage("1 0 0 -1 0 "+FToStr(-ite->Height)+" cm\n");
 							PutPage(setTextSt(ite, PNr));
 							PutPage("Q\n");
@@ -2133,9 +2133,9 @@
 						PutPage("q\n");
 						PutPage(SetClipPath(ite));
 						PutPage("h\nW*\nn\n");
-						if ((ite->flippedH % 2) != 0)
+						if (ite->imageFlippedH())
 							PutPage("-1 0 0 1 "+FToStr(ite->Width)+" 0 cm\n");
-						if ((ite->flippedV % 2) != 0)
+						if (ite->imageFlippedV())
 							PutPage("1 0 0 -1 0 "+FToStr(-ite->Height)+" cm\n");
 						if ((ite->PicAvail) && (ite->Pfile != ""))
 							PDF_Image(ite->InvPict, ite->Pfile, ite->LocalScX,
@@ -2179,9 +2179,9 @@
 							}
 						}
 						PutPage("q\n");
-						if ((ite->flippedH % 2) != 0)
+						if (ite->imageFlippedH())
 							PutPage("-1 0 0 1 "+FToStr(ite->Width)+" 0 cm\n");
-						if ((ite->flippedV % 2) != 0)
+						if (ite->imageFlippedV())
 							PutPage("1 0 0 -1 0 "+FToStr(-ite->Height)+" cm\n");
 						PutPage(setTextSt(ite, PNr));
 						PutPage("Q\n");
Index: libpostscript/pslib.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/libpostscript/pslib.cpp,v
retrieving revision 1.24.2.15
diff -u -r1.24.2.15 pslib.cpp
--- libpostscript/pslib.cpp	1 Feb 2005 10:40:07 -0000	1.24.2.15
+++ libpostscript/pslib.cpp	2 Feb 2005 10:14:22 -0000
@@ -1166,12 +1166,12 @@
 								PS_closepath();
 								PS_clip(false);
 								PS_save();
-								if ((ite->flippedH % 2) != 0)
+								if (ite->imageFlippedH())
 								{
 									PS_translate(ite->Width, 0);
 									PS_scale(-1, 1);
 								}
-								if ((ite->flippedV % 2) != 0)
+								if (ite->imageFlippedV())
 								{
 									PS_translate(0, -ite->Height);
 									PS_scale(1, -1);
@@ -1243,12 +1243,12 @@
 									PS_closepath();
 									PS_fill();
 								}
-								if ((ite->flippedH % 2) != 0)
+								if (ite->imageFlippedH())
 								{
 									PS_translate(ite->Width, 0);
 									PS_scale(-1, 1);
 								}
-								if ((ite->flippedV % 2) != 0)
+								if (ite->imageFlippedV())
 								{
 									PS_translate(0, -ite->Height);
 									PS_scale(1, -1);
@@ -1642,12 +1642,12 @@
 			SetClipPath(&c->PoLine);
 			PS_closepath();
 			PS_clip(true);
-			if ((c->flippedH % 2) != 0)
+			if (c->imageFlippedH())
 			{
 				PS_translate(c->Width, 0);
 				PS_scale(-1, 1);
 			}
-			if ((c->flippedV % 2) != 0)
+			if (c->imageFlippedV())
 			{
 				PS_translate(0, -c->Height);
 				PS_scale(1, -1);
@@ -1726,12 +1726,12 @@
 				else
 					PS_fill();
 			}
-			if ((c->flippedH % 2) != 0)
+			if (c->imageFlippedH())
 			{
 				PS_translate(c->Width, 0);
 				PS_scale(-1, 1);
 			}
-			if ((c->flippedV % 2) != 0)
+			if (c->imageFlippedV())
 			{
 				PS_translate(0, -c->Height);
 				PS_scale(1, -1);
Index: plugins/scriptplugin/cmdmani.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp,v
retrieving revision 1.7.2.17
diff -u -r1.7.2.17 cmdmani.cpp
--- plugins/scriptplugin/cmdmani.cpp	2 Feb 2005 09:20:07 -0000	1.7.2.17
+++ plugins/scriptplugin/cmdmani.cpp	2 Feb 2005 10:14:22 -0000
@@ -276,8 +276,8 @@
 	PageItem *item = GetUniqueItem(QString::fromUtf8(name));
 	if (item == NULL)
 		return NULL;
-	item->Locked = !item->Locked;
-	if (item->Locked)
+	item->toggleLock();
+	if (item->locked())
 		return PyInt_FromLong(1);
 	return PyInt_FromLong(0);
 }
@@ -294,7 +294,7 @@
 	PageItem *item = GetUniqueItem(QString::fromUtf8(name));
 	if (item == NULL)
 		return NULL;
-	if (item->Locked)
+	if (item->locked())
 		return PyBool_FromLong(1);
 	return PyBool_FromLong(0);
 }
