author | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
commit | e6d3c651634eee7ff54675cc060ae94bd3ef41bd (patch) (side-by-side diff) | |
tree | e11c8c4f4728dc3d93a2439cf92aa8972c6d9d4e /core/apps/calibrate | |
parent | 0a553fa7c46beb00d2a852ecf61233569b5a5e4e (diff) | |
download | opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.zip opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.gz opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.bz2 |
Fixing package conflicts.
-rw-r--r-- | core/apps/calibrate/calibrate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index c0ec933..945749b 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp @@ -1,94 +1,94 @@ /********************************************************************** ** 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 "calibrate.h" #include <qpe/resource.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("opielogo").smoothScale(w,w)); + logo.convertFromImage(Resource::loadImage("launcher/launcher/opielogo").smoothScale(w,w)); } else { - logo = Resource::loadPixmap( "opielogo" ); + logo = Resource::loadPixmap( "launcher/launcher/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(); 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, |