| -rw-r--r-- | core/apps/calibrate/calibrate.cpp | 62 | ||||
| -rw-r--r-- | core/apps/calibrate/calibrate.h | 3 | ||||
| -rw-r--r-- | core/apps/calibrate/main.cpp | 4 |
3 files changed, 33 insertions, 36 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index e079195..5f52bdc 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp @@ -27,6 +27,6 @@ #include <qapplication.h> -//#if defined(Q_WS_QWS) || defined(_WS_QWS_) - +#include <qpixmap.h> +#include <qimage.h> #include <qpainter.h> #include <qtimer.h> @@ -43,11 +43,9 @@ Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) : QRect desk = qApp->desktop() ->geometry(); setGeometry( 0, 0, desk.width(), desk.height() ); - if ( desk.height() < 250 ) { - int w = desk.height() / 3; - logo.convertFromImage( Resource::loadImage( "logo/opielogo" ).smoothScale( w, w ) ); - } - else { - logo = Resource::loadPixmap( "logo/opielogo" ); - } + crosshair.convertFromImage( Resource::loadImage("launcher/crosshair") ); + + splash.convertFromImage( Resource::loadImage("launcher/firstuse").smoothScale( width(), height() ) ); + setBackgroundPixmap( splash ); + cd.screenPoints[ QWSPointerCalibrationData::TopLeft ] = QPoint( offset, offset ); cd.screenPoints[ QWSPointerCalibrationData::BottomLeft ] = QPoint( offset, qt_screen->deviceHeight() - offset ); @@ -87,5 +85,5 @@ void Calibrate::store() void Calibrate::hide() { - if ( isVisible ( )) { + if ( isVisible()) { store(); @@ -127,5 +125,5 @@ bool Calibrate::sanityCheck() // not needed anywhere .. just calculate it, so it's there - cd. devPoints [QWSPointerCalibrationData::Center] = QRect ( tl, br ). normalize ( ). center ( ); + cd.devPoints[QWSPointerCalibrationData::Center] = QRect( tl, br ).normalize().center(); int dlx = QABS( bl. x ( ) - tl. x ( )); @@ -169,8 +167,8 @@ void Calibrate::moveCrosshair( QPoint pt ) { showCross = FALSE; - repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 ); + repaint( crossPos.x() - 14, crossPos.y() - 14, 28, 28 ); showCross = TRUE; crossPos = pt; - repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 ); + repaint( crossPos.x() - 14, crossPos.y() - 14, 28, 28 ); } @@ -178,13 +176,5 @@ void Calibrate::paintEvent( QPaintEvent * ) { QPainter p( this ); - - int y; - - if ( !logo.isNull() ) { - y = height() / 2 - logo.height() - 15; - p.drawPixmap( ( width() - logo.width() ) / 2, y, logo ); - } - - y = height() / 2 + 15; + int y = height() / 3; p.drawText( 0, y + height() / 8, width(), height() - y, AlignHCenter, @@ -192,16 +182,22 @@ void Calibrate::paintEvent( QPaintEvent * ) "accurately to calibrate your screen." ) ); - QFont f = p.font(); - f.setBold( TRUE ); - p.setFont( f ); - p.drawText( 0, y, width(), height() - y, AlignHCenter | WordBreak, - tr( "Welcome to Opie" ) ); - - 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 ); + if ( !showCross ) return; + +#if 0 + if ( crosshair.isNull() ) { +#endif + p.setPen( QColor( 0, 0, 155 ) ); + p.drawEllipse( crossPos.x()-8, crossPos.y()-8, 16, 16 ); + p.setPen( QColor( 250, 220, 220 ) ); + p.drawRoundRect( crossPos.x()-12, crossPos.y()-12, 24, 24, 75, 75 ); + p.setPen( QColor( 0, 0, 120 ) ); + p.drawRect( crossPos.x() - 1, crossPos.y() - 14, 2, 13 ); + p.drawRect( crossPos.x() - 1, crossPos.y() + 1, 2, 13 ); + p.drawRect( crossPos.x() - 14, crossPos.y() - 1, 13, 2 ); + p.drawRect( crossPos.x() + 1, crossPos.y() - 1, 13, 2 ); +#if 0 } + else p.drawPixmap( crossPos.x(), crossPos.y(), crosshair ); +#endif } diff --git a/core/apps/calibrate/calibrate.h b/core/apps/calibrate/calibrate.h index 06aa0c9..c1b990a 100644 --- a/core/apps/calibrate/calibrate.h +++ b/core/apps/calibrate/calibrate.h @@ -52,5 +52,6 @@ private: void store(); void reset(); - QPixmap logo; + QPixmap splash; + QPixmap crosshair; #ifdef QWS QWSPointerCalibrationData goodcd,cd; diff --git a/core/apps/calibrate/main.cpp b/core/apps/calibrate/main.cpp index 0da0fe0..d9d98f5 100644 --- a/core/apps/calibrate/main.cpp +++ b/core/apps/calibrate/main.cpp @@ -32,5 +32,5 @@ int main( int argc, char ** argv ) int retval = 0; -#ifdef QWS +#if !defined(QT_DEBUG) && defined(QWS) if ( QWSServer::mouseHandler() && QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { @@ -41,5 +41,5 @@ int main( int argc, char ** argv ) a.showMainWidget(&cal); return a.exec(); -#ifdef QWS +#if !defined(QT_DEBUG) && defined(QWS) } #endif |