/trunk/Scribus/scribus/canvasmode.cpp |
---|
834,7 → 834,7 |
bool CanvasMode::commonMouseMove(QMouseEvent *m) |
{ |
//m_mousePointDoc = m_canvas->globalToCanvas(m->globalPos()); |
if ((m_canvas->m_viewMode.m_MouseButtonPressed && (m->buttons() & Qt::RightButton) && (m->modifiers() & Qt::ControlModifier)) || ((!(m->modifiers() & Qt::ControlModifier)) && (m->buttons() & Qt::MidButton))) |
if ((m_canvas->m_viewMode.m_MouseButtonPressed && (m->buttons() & Qt::RightButton) && (m->modifiers() & Qt::ControlModifier)) || ((!(m->modifiers() & Qt::ControlModifier)) && (m->buttons() & Qt::MiddleButton))) |
{ |
if (!m_panGesture) |
{ |
/trunk/Scribus/scribus/canvasmode_copyproperties.cpp |
---|
147,7 → 147,7 |
Mxp = qRound(Rxp); |
double Ryp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).y(); |
Myp = qRound(Ryp); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_create.cpp |
---|
365,7 → 365,7 |
m_doc->ApplyGuides(&Rxp, &Ryp,true); |
createObjectPos.setXY(Rxp, Ryp); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_drawbezier.cpp |
---|
313,7 → 313,7 |
Ryp = m_doc->ApplyGridF(FPoint(m_xp, m_yp)).y(); |
Rypd = m_yp - Ryp; |
m_yp = qRound(Ryp); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp |
---|
202,7 → 202,7 |
m_xp = qRound(Rxp); |
Ryp = m_doc->ApplyGridF(FPoint(m_xp, m_yp)).y(); |
m_yp = qRound(Ryp); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp |
---|
186,7 → 186,7 |
m_xp = qRound(Rxp); |
Ryp = m_doc->ApplyGridF(FPoint(m_xp, m_yp)).y(); |
m_yp = qRound(Ryp); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_edit.cpp |
---|
564,7 → 564,7 |
// mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale())); |
SeRx = Mxp; |
SeRy = Myp; |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
680,7 → 680,7 |
currItem->HasSel = false; |
} |
currItem->emitAllToGUI(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_canvas->m_viewMode.m_MouseButtonPressed = false; |
m_view->MidButt = false; |
/trunk/Scribus/scribus/canvasmode_editarc.cpp |
---|
297,17 → 297,17 |
// QTransform itemMatrix = currItem->getTransform(); |
// m_doc->regionsChanged()->update(itemMatrix.mapRect(QRectF(0, 0, currItem->width(), currItem->height())).adjusted(-currItem->width() / 2.0, -currItem->height() / 2.0, currItem->width(), currItem->height())); |
} |
void CanvasMode_EditArc::keyPressEvent(QKeyEvent *e) |
{ |
commonkeyPressEvent_Default(e); |
} |
void CanvasMode_EditArc::keyReleaseEvent(QKeyEvent *e) |
{ |
commonkeyReleaseEvent(e); |
void CanvasMode_EditArc::keyPressEvent(QKeyEvent *e) |
{ |
commonkeyPressEvent_Default(e); |
} |
void CanvasMode_EditArc::keyReleaseEvent(QKeyEvent *e) |
{ |
commonkeyReleaseEvent(e); |
} |
void CanvasMode_EditArc::mouseDoubleClickEvent(QMouseEvent *m) |
{ |
m->accept(); |
391,7 → 391,7 |
m_view->registerMousePress(m->globalPos()); |
m_Mxp = mousePointDoc.x(); //m->x(); |
m_Myp = mousePointDoc.y(); //m->y(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_editgradient.cpp |
---|
729,7 → 729,7 |
m_gradientPoint = noPointDefined; |
m_Mxp = mousePointDoc.x(); //m->x(); |
m_Myp = mousePointDoc.y(); //m->y(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp |
---|
643,7 → 643,7 |
m_view->registerMousePress(m->globalPos()); |
m_Mxp = mousePointDoc.x(); //m->x(); |
m_Myp = mousePointDoc.y(); //m->y(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp |
---|
747,7 → 747,7 |
m_view->registerMousePress(m->globalPos()); |
m_Mxp = mousePointDoc.x(); //m->x(); |
m_Myp = mousePointDoc.y(); //m->y(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_editpolygon.cpp |
---|
418,7 → 418,7 |
m_view->registerMousePress(m->globalPos()); |
m_Mxp = mousePointDoc.x(); //m->x(); |
m_Myp = mousePointDoc.y(); //m->y(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_editspiral.cpp |
---|
351,7 → 351,7 |
m_view->registerMousePress(m->globalPos()); |
m_Mxp = mousePointDoc.x(); //m->x(); |
m_Myp = mousePointDoc.y(); //m->y(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_editweldpoint.cpp |
---|
396,7 → 396,7 |
m_view->registerMousePress(m->globalPos()); |
m_Mxp = mousePointDoc.x(); //m->x(); |
m_Myp = mousePointDoc.y(); //m->y(); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_framelinks.cpp |
---|
187,7 → 187,7 |
m_Mxp = qRound(Rxp); |
Ryp = m_doc->ApplyGridF(FPoint(m_Mxp, m_Myp)).y(); |
m_Myp = qRound(Ryp); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_imageimport.cpp |
---|
201,7 → 201,7 |
else |
view()->ImageAfterDraw = true; |
} |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_magnifier.cpp |
---|
154,7 → 154,7 |
m_Myp = qRound(Ryp); |
m_SeRx = m_Mxp; |
m_SeRy = m_Myp; |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_nodeedit.cpp |
---|
358,7 → 358,7 |
m_Mxp = m->x(); |
m_Myp = m->y(); |
if (((m->buttons() & Qt::RightButton) && (m->modifiers() & Qt::ControlModifier)) || ((!(m->modifiers() & Qt::ControlModifier)) && (m->buttons() & Qt::MidButton))) |
if (((m->buttons() & Qt::RightButton) && (m->modifiers() & Qt::ControlModifier)) || ((!(m->modifiers() & Qt::ControlModifier)) && (m->buttons() & Qt::MiddleButton))) |
{ |
if (!m_panGesture) |
{ |
/trunk/Scribus/scribus/canvasmode_normal.cpp |
---|
830,7 → 830,7 |
m->accept(); |
m_view->registerMousePress(m->globalPos()); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
918,7 → 918,7 |
m_canvas->setRenderModeFillBuffer(); |
} |
} |
/* if (m->button() == MidButton) |
/* if (m->button() == MiddleButton) |
{ |
MidButt = true; |
if (m_doc->m_Selection->count() != 0) |
/trunk/Scribus/scribus/canvasmode_objimport.cpp |
---|
161,7 → 161,7 |
m_Mxp = qRound(Rxp); |
double Ryp = m_doc->ApplyGridF(FPoint(m_Mxp, m_Myp)).y(); |
m_Myp = qRound(Ryp); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/canvasmode_rotate.cpp |
---|
213,7 → 213,7 |
m_canvasPressCoord.setX( qRound(Rxp) ); |
double Ryp = m_doc->ApplyGridF(m_canvasPressCoord).y(); |
m_canvasPressCoord.setY( qRound(Ryp) ); |
if (m->button() == Qt::MidButton) |
if (m->button() == Qt::MiddleButton) |
{ |
m_view->MidButt = true; |
if (m->modifiers() & Qt::ControlModifier) |
/trunk/Scribus/scribus/plugins/picbrowser/iview.cpp |
---|
58,7 → 58,7 |
if ( !scene() ) |
return; |
// if ( e->button() == Qt::MidButton ) |
// if ( e->button() == Qt::MiddleButton ) |
{ |
mouseStartPoint = e->pos() ; |
isPanning = true; |
/trunk/Scribus/scribus/ui/AdapterWidget.cpp |
---|
64,7 → 64,7 |
qApp->setOverrideCursor(QCursor(Qt::OpenHandCursor)); |
button = 1; |
break; |
case Qt::MidButton: |
case Qt::MiddleButton: |
qApp->setOverrideCursor(QCursor(Qt::SizeAllCursor)); |
button = 2; |
break; |
89,7 → 89,7 |
switch ( event->button() ) |
{ |
case ( Qt::LeftButton ) : button = 1; break; |
case ( Qt::MidButton ) : button = 2; break; |
case ( Qt::MiddleButton ) : button = 2; break; |
case ( Qt::RightButton ) : button = 3; break; |
case ( Qt::NoButton ) : button = 0; break; |
default: button = 0; break; |