Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3231 → Rev 3232

/branches/Version13x/Scribus/scribus/fileloader.cpp
1899,7 → 1899,7
switch (pt)
{
// OBSOLETE CR 2005-02-06
case PageItem::FrameType1:
case PageItem::ItemType1:
z = view->PaintEllipse(x, y, w, h, pw, Pcolor, Pcolor2);
currItem = doc->Items.at(z);
break;
1952,7 → 1952,7
currItem->Pwidth = pw;
break;
// OBSOLETE CR 2005-02-06
case PageItem::FrameType3:
case PageItem::ItemType3:
z = view->PaintRect(x, y, w, h, pw, Pcolor, Pcolor2);
currItem = doc->Items.at(z);
break;
/branches/Version13x/Scribus/scribus/pdflib.cpp
1248,8 → 1248,8
PutPage("h\nf*\n");
}
break;
case PageItem::FrameType1:
case PageItem::FrameType3:
case PageItem::ItemType1:
case PageItem::ItemType3:
case PageItem::Polygon:
if (ite->GrType != 0)
PutPage(PDF_Gradient(ite));
2318,8 → 2318,8
tmp += "h\nf*\n";
}
break;
case PageItem::FrameType1:
case PageItem::FrameType3:
case PageItem::ItemType1:
case PageItem::ItemType3:
case PageItem::Polygon:
if (ite->GrType != 0)
tmp += PDF_Gradient(ite);
/branches/Version13x/Scribus/scribus/pageitem.h
90,7 → 90,7
// when testing out the pageitem refactoring work. Setting it is unlikely
// to currently have the desired effect.
/**
* @brief Frame type.
* @brief Item type.
* @warning Do not set this property except for testing and debug purposes.
*/
Q_ENUMS(ItemType)
99,16 → 99,16
public:
// Enumerator definitions
 
/** @brief Frame Type
/** @brief Item Type
*
* Later, frame type will probably go away in favour of using
* Later, item type will probably go away in favour of using
* subclasses and checking types using more conventional methods
* and using Qt's MetaObject introspection.
*/
enum ItemType {
FrameType1 = 1,
ItemType1 = 1,
ImageFrame = 2,
FrameType3 = 3,
ItemType3 = 3,
TextFrame = 4,
Line = 5,
Polygon = 6,
115,6 → 115,15
PolyLine = 7,
PathText = 8
};
/** @brief Frame Type
*
*
*/
enum FrameType {
FrameType0 = 0,
Ellipse = 1,
FrameType2 = 2
};
 
struct TabRecord
{
/branches/Version13x/Scribus/scribus/scribusview.cpp
11346,7 → 11346,7
switch (Buffer->PType)
{
// OBSOLETE CR 2005-02-06
case PageItem::FrameType1:
case PageItem::ItemType1:
z = PaintEllipse(x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2);
break;
//
11373,7 → 11373,7
Doc->Items.at(z)->Pwidth = Buffer->Pwidth;
break;
// OBSOLETE CR 2005-02-06
case PageItem::FrameType3:
case PageItem::ItemType3:
z = PaintRect(x, y, w, h, pw, Buffer->Pcolor, Buffer->Pcolor2);
break;
//
11626,7 → 11626,7
if (currItem->itemType() != PageItem::Line)
{
// OBSOLETE CR 2005-02-06
if ((currItem->PoLine.size() == 0) && (currItem->itemType() != PageItem::FrameType1))
if ((currItem->PoLine.size() == 0) && (currItem->itemType() != PageItem::ItemType1))
ConvertClip(currItem);
else
//
11643,10 → 11643,10
currItem->Height = 1;
}
// OBSOLETE CR 2005-02-06
if (currItem->itemType() == PageItem::FrameType1)
if (currItem->itemType() == PageItem::ItemType1)
SetOvalFrame(currItem);
// OBSOLETE CR 2005-02-06
if (currItem->itemType() == PageItem::FrameType3)
if (currItem->itemType() == PageItem::ItemType3)
{
if (currItem->RadRect != 0)
SetFrameRound(currItem);
/branches/Version13x/Scribus/scribus/scpreview.cpp
650,8 → 650,8
case 1:
case 3:
*/
case PageItem::FrameType1:
case PageItem::FrameType3:
case PageItem::ItemType1:
case PageItem::ItemType3:
case PageItem::Polygon:
pS->setupPolygon(&OB.PoLine);
pS->drawPolygon();
/branches/Version13x/Scribus/scribus/pslib.cpp
1536,8 → 1536,8
case 1:
case 3:
*/
case PageItem::FrameType1:
case PageItem::FrameType3:
case PageItem::ItemType1:
case PageItem::ItemType3:
case PageItem::Polygon:
if ((c->fillColor() != "None") || (c->GrType != 0))
{