| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | core/apps/calibrate/calibrate.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
@@ -36,65 +36,66 @@ * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker) * #1666 - Opie-IRC does not allow to add !channels in config as autojoin ones (skyhusker) * #1667 - Opie-IRC does not show messages from !channel (skyhusker) * #1679 - Security PIN plugin is QVGA sized (hrw) * #1682 - Properly resize tab control in OTabWidget (drw) * n.a. - always show volume and wireless applet popups inside visible screen (deller) * n.a. - scale O-Menu-Applets appropriately (mickeyl) * n.a. - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker) * n.a. - Wellenreiter: relax WE version matching test a bit (mickeyl) * n.a. - scale BluezApplet appropriately and use larger icons (mickeyl) * n.a. - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham) * n.a. - networksettings: ignore hostap control interfaces wifi* (mickeyl) * n.a. - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw) * n.a. - remove hardcoded font size from netsystemtime (hrw) * n.a. - remove hardcoded font size from checkbook graphs (hrw) * n.a. - Dagger - fixes for Sword 1.5.8, morph tag x-refs, closing last tab crash (drw) Internal -------- * Make BluezApplet use OTaskbarApplet (mickeyl) * libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl) * libopiecore: add ODirNotification - recursive directory notifications (mickeyl) * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl) * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl) * libopienet: Miscellaneous API cleanups (mickeyl) * libopiecore: Add linux pcmcia system abstraction classes (mickeyl) * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl) * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl) * libopiecore: Add support for the new Linux Inputsystem Switches type [necessary for auto rotation in 2.6.13] (mickeyl) * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl) * Fix / Optimize number of scanned directories (ljp) - + * Use five point mouse calibration to make calibrated mouse drivers work on newer Zaurii (rp,mickeyl) + 2005-03-25 Opie 1.2.0 Fixed Bugs ---------- * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) * n.a. - make qpeglobal.h include qglobal.h (zecke) 2005-03-20 Opie 1.2.0-rc1 New Features ------------ * Launcher: Support a static background pixmap (mickeyl) * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) * PackageManager supports the 'lists_dir' ipkg configuration option (drw) * Added hi-res inline images for large resolution devices (drw) * Improved launcher icons for consistency (ar) * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin) Fixed Bugs ---------- * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) * #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw) * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp) * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke) * #1482 - Fix double '/' in paths (zecke) * #1536 - Autosave of custom locations in opie backup (ar) * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) * #1540 - Implemented deletion of DocLnks in opie-eye (zecke) diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index 5f52bdc..53388f1 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp @@ -95,164 +95,164 @@ void Calibrate::hide() } QDialog::hide(); } void Calibrate::reset() { #ifdef QWS penPos = QPoint(); location = QWSPointerCalibrationData::TopLeft; crossPos = fromDevice( cd.screenPoints[ location ] ); #endif } QPoint Calibrate::fromDevice( const QPoint &p ) { #ifdef QWS return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) ); #else return QPoint(); #endif } bool Calibrate::sanityCheck() { #ifdef QWS 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(); + //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 ))) return false; else return true; #else return true; #endif } void Calibrate::moveCrosshair( QPoint pt ) { showCross = FALSE; repaint( crossPos.x() - 14, crossPos.y() - 14, 28, 28 ); showCross = TRUE; crossPos = pt; repaint( crossPos.x() - 14, crossPos.y() - 14, 28, 28 ); } void Calibrate::paintEvent( QPaintEvent * ) { QPainter p( this ); - int y = height() / 3; + int y = height() / 2; p.drawText( 0, y + height() / 8, width(), height() - y, AlignHCenter, tr( "Touch the crosshairs firmly and\n" "accurately to calibrate your screen." ) ); 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 } void Calibrate::mousePressEvent( QMouseEvent *e ) { #ifdef QWS // map to device coordinates QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) ); if ( penPos.isNull() ) penPos = devPos; else penPos = QPoint( ( penPos.x() + devPos.x() ) / 2, ( penPos.y() + devPos.y() ) / 2 ); #endif } void Calibrate::mouseReleaseEvent( QMouseEvent * ) { #ifdef QWS if ( timer->isActive() ) return ; bool doMove = TRUE; cd.devPoints[ location ] = penPos; - if ( location < QWSPointerCalibrationData::TopRight ) { + if ( location < QWSPointerCalibrationData::Center ) { location = (QWSPointerCalibrationData::Location) ( int( location ) + 1 ); } else { 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 ); } #endif } void Calibrate::timeout() { #ifdef QWS QPoint target = fromDevice( cd.screenPoints[ location ] ); bool doneX = FALSE; bool doneY = FALSE; QPoint newPos( crossPos.x() + dx, crossPos.y() + dy ); |