show backdrop, make crosshair a bit more prominent, enable calibration test when QT_DEBUG is set

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
@@ -28,4 +28,4 @@
 
-//#if defined(Q_WS_QWS) || defined(_WS_QWS_)
-
+#include <qpixmap.h>
+#include <qimage.h>
 #include <qpainter.h>
@@ -44,9 +44,7 @@ Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) :
 	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 );
@@ -88,3 +86,3 @@ void Calibrate::hide()
 {
-	if ( isVisible ( )) {
+	if ( isVisible()) {
 		store();
@@ -128,3 +126,3 @@ 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();
 
@@ -170,6 +168,6 @@ 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 );
 }
@@ -179,11 +177,3 @@ 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;
 
@@ -193,14 +183,20 @@ void Calibrate::paintEvent( QPaintEvent * )
 
-	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
@@ -53,3 +53,4 @@ private:
     void reset();
-    QPixmap logo;
+    QPixmap splash;
+    QPixmap crosshair;
 #ifdef QWS
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
@@ -33,3 +33,3 @@ int main( int argc, char ** argv )
 
-#ifdef QWS
+#if !defined(QT_DEBUG) && defined(QWS)
     if ( QWSServer::mouseHandler() &&
@@ -42,3 +42,3 @@ int main( int argc, char ** argv )
 	return a.exec();
-#ifdef QWS
+#if !defined(QT_DEBUG) && defined(QWS)
     }