Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 16818 → Rev 16820

/trunk/Scribus/scribus/canvasmode_editspiral.h
70,8 → 70,6
 
double Mxp, Myp;
ScribusMainWindow* m_ScMW;
bool m_cursorVisible;
bool m_lastPosWasOverGuide;
QPointF startPoint;
QPointF endPoint;
double startAngle;
/trunk/Scribus/scribus/canvasmode_drawbezier.h
52,14 → 52,9
void selectPage(QMouseEvent *m);
 
UndoTransaction* m_createTransaction;
int Cp, oldCp;
bool inItemCreation, shiftSelItems, FirstPoly;
bool m_MouseButtonPressed;
int frameResizeHandle;
int RotMode;
int dragConstrainInitPtX, dragConstrainInitPtY;
double Mxp, Myp, Dxp, Dyp;
int GxM, GyM;
double SeRx, SeRy;
bool MoveGX, MoveGY;
FPointArray RecordP;
/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
59,13 → 59,9
 
BezierMode::BezierMode(ScribusView* view) : CanvasMode(view)
{
GxM = GyM = -1;
Mxp = Myp = -1;
Dxp = Dyp = -1;
MoveGX = MoveGY = false;
oldCp = Cp = -1;
frameResizeHandle = -1;
RotMode = 0;
inItemCreation = false;
shiftSelItems = false;
FirstPoly = true;
140,13 → 136,9
void BezierMode::activate(bool flag)
{
// qDebug() << "DrawBezierMode::activate" << flag;
GxM = GyM = -1;
Mxp = Myp = -1;
Dxp = Dyp = -1;
MoveGX = MoveGY = false;
oldCp = Cp = -1;
frameResizeHandle = -1;
RotMode = 0;
inItemCreation = false;
shiftSelItems = false;
FirstPoly = true;
248,7 → 240,7
}
else
{
if ((m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton) && (GyM == -1) && (GxM == -1))
if ((m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton))
{
newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x());
newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y());
/trunk/Scribus/scribus/canvasmode_editpolygon.h
73,8 → 73,6
 
double Mxp, Myp;
ScribusMainWindow* m_ScMW;
bool m_cursorVisible;
bool m_lastPosWasOverGuide;
QPointF startPoint;
QPointF endPoint;
QPointF centerPoint;
/trunk/Scribus/scribus/canvasmode_editmeshgradient.h
69,10 → 69,6
 
double Mxp, Myp;
ScribusMainWindow* m_ScMW;
bool m_cursorVisible;
bool m_lastPosWasOverGuide;
int arrayX;
int arrayY;
eMGradientPoint m_gradientPoint;
QList<QPair<int, int> > selectedMeshPoints;
};
/trunk/Scribus/scribus/canvasmode_editgradient.h
69,8 → 69,6
 
double Mxp, Myp;
ScribusMainWindow* m_ScMW;
bool m_cursorVisible;
bool m_lastPosWasOverGuide;
eGradientPoint m_gradientPoint;
};