adapted to new logo dir

1 files changed, 2 insertions, 2 deletions

diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index 6d498bc..a5f8792 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -1,145 +1,145 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <math.h>
 
 #include "calibrate.h"
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qapplication.h>
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 #include <qgfx_qws.h>
 
 
 Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) :
 		QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop )
 {
 	showCross = TRUE;
 	const int offset = 30;
 	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( "launcher/opielogo" ).smoothScale( w, w ) );
+		logo.convertFromImage( Resource::loadImage( "logo/opielogo" ).smoothScale( w, w ) );
 	}
 	else {
-		logo = Resource::loadPixmap( "launcher/opielogo" );
+		logo = Resource::loadPixmap( "logo/opielogo" );
 	}
 	cd.screenPoints[ QWSPointerCalibrationData::TopLeft ] = QPoint( offset, offset );
 	cd.screenPoints[ QWSPointerCalibrationData::BottomLeft ] = QPoint( offset, qt_screen->deviceHeight() - offset );
 	cd.screenPoints[ QWSPointerCalibrationData::BottomRight ] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset );
 	cd.screenPoints[ QWSPointerCalibrationData::TopRight ] = QPoint( qt_screen->deviceWidth() - offset, offset );
 	cd.screenPoints[ QWSPointerCalibrationData::Center ] = QPoint( qt_screen->deviceWidth() / 2, qt_screen->deviceHeight() / 2 );
 	goodcd = cd;
 	reset();
 
 	timer = new QTimer( this );
 	connect( timer, SIGNAL( timeout() ), this, SLOT( timeout() ) );
 }
 
 Calibrate::~Calibrate()
 {
 	store();
 }
 
 void Calibrate::show()
 {
 	grabMouse();
 	QWSServer::mouseHandler() ->getCalibration( &goodcd );
 	QWSServer::mouseHandler() ->clearCalibration();
 	QDialog::show();
 }
 
 void Calibrate::store()
 {
 	QWSServer::mouseHandler() ->calibrate( &goodcd );
 }
 
 void Calibrate::hide()
 {
 	if ( isVisible ( )) {
 		store();
 
 		// hack - calibrate is a launcher dialog, but treated like a standalone app
 		{
 			QCopEnvelope e( "QPE/System", "closing(QString)" );
 			e << QString ( "calibrate" );
 		}                        
 	}
 	QDialog::hide();
 }
 
 void Calibrate::reset()
 {
 	penPos = QPoint();
 	location = QWSPointerCalibrationData::TopLeft;
 	crossPos = fromDevice( cd.screenPoints[ location ] );
 }
 
 QPoint Calibrate::fromDevice( const QPoint &p )
 {
 	return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) );
 }
 
 bool Calibrate::sanityCheck()
 {
 	QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft];
 	QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight];
 	QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft];
 	QPoint br = cd.devPoints[QWSPointerCalibrationData::BottomRight];
 
 	// not needed anywhere .. just calculate it, so it's there
 	cd. devPoints [QWSPointerCalibrationData::Center] = QRect ( tl, br ). normalize ( ). center ( );
 
 	int dlx = QABS( bl. x ( ) - tl. x ( ));
 	int dly = QABS( bl. y ( ) - tl. y ( ));
 	int drx = QABS( br. x ( ) - tr. x ( ));
 	int dry = QABS( br. y ( ) - tr. y ( ));
 	int dtx = QABS( tr. x ( ) - tl. x ( ));
 	int dty = QABS( tr. y ( ) - tl. y ( ));
 	int dbx = QABS( br. x ( ) - bl. x ( ));
 	int dby = QABS( br. y ( ) - bl. y ( ));
 
 	int dl = (int) ::sqrt (( dlx * dlx ) + ( dly * dly )); // calculate vector lengths for all sides
 	int dr = (int) ::sqrt (( drx * drx ) + ( dry * dry ));
 	int dt = (int) ::sqrt (( dtx * dtx ) + ( dty * dty ));
 	int db = (int) ::sqrt (( dbx * dbx ) + ( dby * dby ));
     
 	// Calculate leeway for x/y (we do not care if diff1/diff2 is for x or y here !)	
 	int diff1 = QABS( dl - dr );
 	int avg1  = ( dl + dr ) / 2;
 	int diff2 = QABS( dt - db );
 	int avg2 = ( dt + db ) / 2;
 
 	// Calculate leeway for "real" vector length against "manhattan" vector length
 	// This is a check, if the rect is rotated (other then 0/90/180/270)
 	// It needs to be performed only for the triange (bl, tl, tr)
 	int diff3 = QABS(( dlx + dly + dtx + dty ) - ( dl + dt )); 
 	int avg3 = (( dlx + dly + dtx + dty ) + ( dl + dt )) / 2;
 
 	if (( diff1 > ( avg1 / 20 )) || // 5% leeway
 	    ( diff2 > ( avg2 / 20 )) ||
 	    ( diff3 > ( avg3 / 20 )))