| -rw-r--r-- | core/apps/calibrate/calibrate.cpp | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index 8647957..7b60e64 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp @@ -42,6 +42,6 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : if ( desk.height() < 250 ) { - int w = desk.height()/3; - logo.convertFromImage(Resource::loadImage("launcher/opielogo").smoothScale(w,w)); + int w = desk.height()/3; + logo.convertFromImage(Resource::loadImage("launcher/opielogo").smoothScale(w,w)); } else { - logo = Resource::loadPixmap( "launcher/launcher/opielogo" ); + logo = Resource::loadPixmap( "launcher/opielogo" ); } @@ -80,3 +80,3 @@ void Calibrate::hide() if ( isVisible() ) - store(); + store(); QDialog::hide(); @@ -94,3 +94,3 @@ QPoint Calibrate::fromDevice( const QPoint &p ) return qt_screen->mapFromDevice( p, - QSize(qt_screen->deviceWidth(), qt_screen->deviceHeight()) ); + QSize(qt_screen->deviceWidth(), qt_screen->deviceHeight()) ); } @@ -109,3 +109,3 @@ bool Calibrate::sanityCheck() if ( diff > avg / 20 ) // 5% leeway - return FALSE; + return FALSE; @@ -116,3 +116,3 @@ bool Calibrate::sanityCheck() if ( diff > avg / 20 ) // 5% leeway - return FALSE; + return FALSE; @@ -146,4 +146,4 @@ void Calibrate::paintEvent( QPaintEvent * ) if ( !logo.isNull() ) { - y = height() / 2 - logo.height() - 15; - p.drawPixmap( (width() - logo.width())/2, y, logo ); + y = height() / 2 - logo.height() - 15; + p.drawPixmap( (width() - logo.width())/2, y, logo ); } @@ -153,3 +153,3 @@ void Calibrate::paintEvent( QPaintEvent * ) p.drawText( 0, y+height()/8, width(), height() - y, AlignHCenter, - tr("Touch the crosshairs firmly and\n" + tr("Touch the crosshairs firmly and\n" "accurately to calibrate your screen.") ); @@ -159,3 +159,3 @@ void Calibrate::paintEvent( QPaintEvent * ) p.drawText( 0, y, width(), height() - y, AlignHCenter|WordBreak, - tr("Welcome to Opie") ); + tr("Welcome to Opie") ); @@ -163,3 +163,3 @@ void Calibrate::paintEvent( QPaintEvent * ) saveUnder = QPixmap::grabWindow( winId(), crossPos.x()-8, crossPos.y()-8, - 16, 16 ); + 16, 16 ); moveCrosshair( crossPos ); @@ -167,6 +167,6 @@ void Calibrate::paintEvent( QPaintEvent * ) if ( showCross ) { - p.drawRect( crossPos.x()-1, crossPos.y()-8, 2, 7 ); - p.drawRect( crossPos.x()-1, crossPos.y()+1, 2, 7 ); - p.drawRect( crossPos.x()-8, crossPos.y()-1, 7, 2 ); - p.drawRect( crossPos.x()+1, crossPos.y()-1, 7, 2 ); + p.drawRect( crossPos.x()-1, crossPos.y()-8, 2, 7 ); + p.drawRect( crossPos.x()-1, crossPos.y()+1, 2, 7 ); + p.drawRect( crossPos.x()-8, crossPos.y()-1, 7, 2 ); + p.drawRect( crossPos.x()+1, crossPos.y()-1, 7, 2 ); } @@ -178,8 +178,8 @@ void Calibrate::mousePressEvent( QMouseEvent *e ) QPoint devPos = qt_screen->mapToDevice( e->pos(), - QSize(qt_screen->width(), qt_screen->height()) ); + QSize(qt_screen->width(), qt_screen->height()) ); if ( penPos.isNull() ) - penPos = devPos; + penPos = devPos; else - penPos = QPoint( (penPos.x() + devPos.x())/2, - (penPos.y() + devPos.y())/2 ); + penPos = QPoint( (penPos.x() + devPos.x())/2, + (penPos.y() + devPos.y())/2 ); } @@ -189,3 +189,3 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * ) if ( timer->isActive() ) - return; + return; @@ -195,20 +195,20 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * ) if ( location < QWSPointerCalibrationData::LastLocation ) { - location = (QWSPointerCalibrationData::Location)((int)location + 1); + location = (QWSPointerCalibrationData::Location)((int)location + 1); } else { - if ( sanityCheck() ) { - reset(); - goodcd = cd; - hide(); - emit accept(); - doMove = FALSE; - } else { - location = QWSPointerCalibrationData::TopLeft; - } + if ( sanityCheck() ) { + reset(); + goodcd = cd; + hide(); + emit accept(); + doMove = FALSE; + } else { + location = QWSPointerCalibrationData::TopLeft; + } } - + if ( doMove ) { - QPoint target = fromDevice( cd.screenPoints[location] ); - dx = (target.x() - crossPos.x())/10; - dy = (target.y() - crossPos.y())/10; - timer->start( 30 ); + QPoint target = fromDevice( cd.screenPoints[location] ); + dx = (target.x() - crossPos.x())/10; + dy = (target.y() - crossPos.y())/10; + timer->start( 30 ); } @@ -225,4 +225,4 @@ void Calibrate::timeout() if ( QABS(crossPos.x() - target.x()) <= QABS(dx) ) { - newPos.setX( target.x() ); - doneX = TRUE; + newPos.setX( target.x() ); + doneX = TRUE; } @@ -230,4 +230,4 @@ void Calibrate::timeout() if ( QABS(crossPos.y() - target.y()) <= QABS(dy) ) { - newPos.setY(target.y()); - doneY = TRUE; + newPos.setY(target.y()); + doneY = TRUE; } @@ -235,4 +235,4 @@ void Calibrate::timeout() if ( doneX && doneY ) { - penPos = QPoint(); - timer->stop(); + penPos = QPoint(); + timer->stop(); } |