Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 22833 → Rev 22834

/trunk/Scribus/scribus/pageitem_osgframe.cpp
45,8 → 45,8
: PageItem_ImageFrame(pa, x, y, w, h, w2, fill, outline)
{
setUPixmap(Um::ILatexFrame);
AnName = tr("OSG") + QString::number(m_Doc->TotalItems);
setUName(AnName);
m_itemName = tr("OSG") + QString::number(m_Doc->TotalItems);
setUName(m_itemName);
struct viewDefinition defaultView;
defaultView.trackerCenter = osg::Vec3d();
defaultView.cameraPosition = osg::Vec3d();
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
465,21 → 465,21
currItem->isBookmark = Buffer->isBookmark;
currItem->setIsAnnotation(Buffer->m_isAnnotation);
currItem->setAnnotation(Buffer->m_annotation);
if (!Buffer->AnName.isEmpty())
if (!Buffer->itemName.isEmpty())
{
if (!drag)
{
if (currItem->itemName() == Buffer->AnName)
if (currItem->itemName() == Buffer->itemName)
currItem->AutoName = true;
else
{
currItem->setItemName(Buffer->AnName);
currItem->setItemName(Buffer->itemName);
currItem->AutoName = false;
}
}
else
{
currItem->setItemName(Buffer->AnName);
currItem->setItemName(Buffer->itemName);
currItem->AutoName = false;
}
}
1550,7 → 1550,7
OB->m_annotation.setExtern(efp.absoluteFilePath());
}
OB->m_annotation.setZiel(obj->attribute("ANZIEL", "0").toInt());
OB->AnName=obj->attribute("ANNAME","");
OB->itemName=obj->attribute("ANNAME","");
OB->m_annotation.setToolTip(obj->attribute("ANTOOLTIP",""));
OB->m_annotation.setRollOver(obj->attribute("ANROLL",""));
OB->m_annotation.setDown(obj->attribute("ANDOWN",""));
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
192,7 → 192,7
bool isBookmark;
bool m_isAnnotation;
Annotation m_annotation;
QString AnName;
QString itemName;
double Extra;
double TExtra;
double BExtra;
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
2802,13 → 2802,13
currItem->setPrintEnabled( attrs.valueAsInt("PRINTABLE"));
currItem->setIsAnnotation( attrs.valueAsInt("ANNOTATION", 0));
currItem->annotation().setType( attrs.valueAsInt("ANTYPE", 0));
QString AnName = attrs.valueAsString("ANNAME","");
if (!AnName.isEmpty())
QString itemName = attrs.valueAsString("ANNAME","");
if (!itemName.isEmpty())
{
if (currItem->itemName() == AnName)
if (currItem->itemName() == itemName)
currItem->AutoName = true;
else
currItem->setItemName(AnName);
currItem->setItemName(itemName);
}
currItem->annotation().setAction( attrs.valueAsString("ANACTION","") );
currItem->annotation().setE_act ( attrs.valueAsString("ANEACT","") );
/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
1761,13 → 1761,13
currItem->setPrintEnabled(obj->attribute("PRINTABLE").toInt());
currItem->setIsAnnotation(obj->attribute("ANNOTATION", "0").toInt());
currItem->annotation().setType(obj->attribute("ANTYPE", "0").toInt());
QString AnName = obj->attribute("ANNAME","");
if (!AnName.isEmpty())
QString itemName = obj->attribute("ANNAME","");
if (!itemName.isEmpty())
{
if (currItem->itemName() == AnName)
if (currItem->itemName() == itemName)
currItem->AutoName = true;
else
currItem->setItemName(AnName);
currItem->setItemName(itemName);
}
 
currItem->annotation().setAction(obj->attribute("ANACTION",""));
/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
5158,14 → 5158,14
currItem->setPrintEnabled( attrs.valueAsInt("PRINTABLE", 1));
currItem->setIsAnnotation( attrs.valueAsInt("ANNOTATION", 0));
currItem->annotation().setType( attrs.valueAsInt("ANTYPE", 0));
QString AnName = attrs.valueAsString("ANNAME","");
if (!AnName.isEmpty())
QString itemName = attrs.valueAsString("ANNAME","");
if (!itemName.isEmpty())
{
if (currItem->itemName() == AnName)
if (currItem->itemName() == itemName)
currItem->AutoName = true;
else
{
currItem->setItemName(AnName);
currItem->setItemName(itemName);
currItem->AutoName = false;
}
}
/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
72,16 → 72,16
 
languageChange();
 
connect(lineWidth , SIGNAL(valueChanged(double)), this, SLOT(handleLineWidth()));
connect(lineType , SIGNAL(activated(int)) , this, SLOT(handleLineStyle()));
connect(lineJoinStyle, SIGNAL(activated(int)) , this, SLOT(handleLineJoin()));
connect(lineEndStyle , SIGNAL(activated(int)) , this, SLOT(handleLineEnd()));
connect(lineMode , SIGNAL(activated(int)) , this, SLOT(handleLineMode()));
connect(dashEditor, SIGNAL(dashChanged()) , this, SLOT(handleDashChange()));
connect(startArrow, SIGNAL(activated(int)) , this, SLOT(handleStartArrow(int )));
connect(endArrow , SIGNAL(activated(int)) , this, SLOT(handleEndArrow(int )));
connect(lineWidth, SIGNAL(valueChanged(double)), this, SLOT(handleLineWidth()));
connect(lineType, SIGNAL(activated(int)), this, SLOT(handleLineStyle()));
connect(lineJoinStyle, SIGNAL(activated(int)), this, SLOT(handleLineJoin()));
connect(lineEndStyle, SIGNAL(activated(int)), this, SLOT(handleLineEnd()));
connect(lineMode, SIGNAL(activated(int)), this, SLOT(handleLineMode()));
connect(dashEditor, SIGNAL(dashChanged()), this, SLOT(handleDashChange()));
connect(startArrow, SIGNAL(activated(int)), this, SLOT(handleStartArrow(int )));
connect(endArrow, SIGNAL(activated(int)), this, SLOT(handleEndArrow(int )));
connect(startArrowScale, SIGNAL(valueChanged(double)), this, SLOT(handleStartArrowScale(double )));
connect(endArrowScale , SIGNAL(valueChanged(double)), this, SLOT(handleEndArrowScale(double )));
connect(endArrowScale, SIGNAL(valueChanged(double)), this, SLOT(handleEndArrowScale(double )));
connect(lineStyles, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(handleLineStyle(QListWidgetItem*)));
}
 
118,7 → 118,7
{
m_ScMW = mw;
 
connect(m_ScMW, SIGNAL(UpdateRequest(int)), this , SLOT(handleUpdateRequest(int)));
connect(m_ScMW, SIGNAL(UpdateRequest(int)), this, SLOT(handleUpdateRequest(int)));
}
 
void PropertiesPalette_Line::setDoc(ScribusDoc *d)
129,7 → 129,7
if (m_doc)
{
disconnect(m_doc->m_Selection, SIGNAL(selectionChanged()), this, SLOT(handleSelectionChanged()));
disconnect(m_doc , SIGNAL(docChanged()) , this, SLOT(handleSelectionChanged()));
disconnect(m_doc, SIGNAL(docChanged()), this, SLOT(handleSelectionChanged()));
}
 
m_doc = d;
148,7 → 148,7
endArrow->rebuildList(&m_doc->arrowStyles());
 
connect(m_doc->m_Selection, SIGNAL(selectionChanged()), this, SLOT(handleSelectionChanged()));
connect(m_doc , SIGNAL(docChanged()) , this, SLOT(handleSelectionChanged()));
connect(m_doc, SIGNAL(docChanged()), this, SLOT(handleSelectionChanged()));
}
 
void PropertiesPalette_Line::unsetDoc()
156,7 → 156,7
if (m_doc)
{
disconnect(m_doc->m_Selection, SIGNAL(selectionChanged()), this, SLOT(handleSelectionChanged()));
disconnect(m_doc , SIGNAL(docChanged()) , this, SLOT(handleSelectionChanged()));
disconnect(m_doc, SIGNAL(docChanged()), this, SLOT(handleSelectionChanged()));
}
 
m_haveDoc = false;