summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-14 19:00:02 (UTC)
committer alwin <alwin>2004-04-14 19:00:02 (UTC)
commit26e89198404dba70a3bea2b337f6677e6b177bb2 (patch) (side-by-side diff)
treec55849b61ff27c121fc3cc8e6954d1179323af38
parentb3156cadba8f4a397ac7d65947cdb7a33b5c3b72 (diff)
downloadopie-26e89198404dba70a3bea2b337f6677e6b177bb2.zip
opie-26e89198404dba70a3bea2b337f6677e6b177bb2.tar.gz
opie-26e89198404dba70a3bea2b337f6677e6b177bb2.tar.bz2
mostly all basics done
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imagescrollview.cpp208
-rw-r--r--noncore/graphics/opie-eye/gui/imagescrollview.h65
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp3
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h3
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp2
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h3
-rw-r--r--noncore/graphics/opie-eye/lib/oimagezoomer.cpp18
-rw-r--r--noncore/graphics/opie-eye/lib/oimagezoomer.h13
8 files changed, 219 insertions, 96 deletions
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
index d034ee0..3bb07a7 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
@@ -1,60 +1,93 @@
#include "imagescrollview.h"
+#include "lib/oimagezoomer.h"
+
#include <opie2/odebug.h>
#include <opie2/oapplication.h>
#include <opie2/owait.h>
-using namespace Opie::Core;
-
#include <qimage.h>
#include <qlayout.h>
#include <qpe/qcopenvelope_qws.h>
-ImageScrollView::ImageScrollView( QWidget* parent, const char* name, WFlags f )
- :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),scale_to_fit(true),
- rotate_to_fit(true),show_zoomer(true),first_resize_done(false),m_lastName("")
-{
+/* for usage with the bitset */
+#define AUTO_SCALE 0
+#define AUTO_ROTATE 1
+#define SHOW_ZOOMER 2
+#define FIRST_RESIZE_DONE 3
+#define IMAGE_IS_JPEG 4
+#define IMAGE_SCALED_LOADED 5
+
+#define SCROLLVIEW_BITSET_SIZE 6
+
+namespace Opie {
+namespace MM {
+OImageScrollView::OImageScrollView( QWidget* parent, const char* name, WFlags f )
+ :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),
+ m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
+{
+ _zoomer = 0;
+ m_states[AUTO_SCALE]=true;
+ m_states[AUTO_ROTATE]=true;
+ m_states[FIRST_RESIZE_DONE]=false;
+ m_states[IMAGE_IS_JPEG]=false;
+ m_states[IMAGE_SCALED_LOADED]=false;
+ m_states[SHOW_ZOOMER]=true;
init();
}
-ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
- :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale),
- rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("")
+OImageScrollView::OImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
+ :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),
+ m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
{
+ _zoomer = 0;
+ m_states[AUTO_SCALE]=always_scale;
+ m_states[AUTO_ROTATE]=rfit;
+ m_states[FIRST_RESIZE_DONE]=false;
+ m_states[IMAGE_IS_JPEG]=false;
+ m_states[IMAGE_SCALED_LOADED]=false;
+ m_states[SHOW_ZOOMER]=true;
_original_data.convertDepth(QPixmap::defaultDepth());
_original_data.setAlphaBuffer(false);
init();
}
-ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
- :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),scale_to_fit(always_scale),
- rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("")
+OImageScrollView::OImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
+ :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
{
+ _zoomer = 0;
+ m_states.resize(SCROLLVIEW_BITSET_SIZE);
+ m_states[AUTO_SCALE]=always_scale;
+ m_states[AUTO_ROTATE]=rfit;
+ m_states[FIRST_RESIZE_DONE]=false;
+ m_states[IMAGE_IS_JPEG]=false;
+ m_states[IMAGE_SCALED_LOADED]=false;
+ m_states[SHOW_ZOOMER]=true;
init();
setImage(img);
}
-void ImageScrollView::setImage(const QImage&img)
+void OImageScrollView::setImage(const QImage&img)
{
_image_data = QImage();
_original_data=img;
_original_data.convertDepth(QPixmap::defaultDepth());
_original_data.setAlphaBuffer(false);
m_lastName = "";
- image_is_jpeg = false;
- image_scaled_loaded = false;
- if (first_resize_done) {
+ setImageIsJpeg(false);
+ setImageScaledLoaded(false);
+ if (FirstResizeDone()) {
generateImage();
}
}
-void ImageScrollView::loadJpeg(bool interncall)
+void OImageScrollView::loadJpeg(bool interncall)
{
if (m_lastName.isEmpty()) return;
QImageIO iio( m_lastName, 0l );
QString param;
bool real_load = false;
- if (scale_to_fit) {
+ if (AutoScale()) {
if (!interncall) {
int wid, hei;
wid = QApplication::desktop()->width();
@@ -67,15 +100,15 @@ void ImageScrollView::loadJpeg(bool interncall)
param = QString( "Fast Shrink( 7 ) Scale( %1, %2, ScaleFree)" ).arg( wid ).arg( hei );
odebug << "Load jpeg scaled \"" << param << "\"" << oendl;
iio.setParameters(param.latin1());
- image_scaled_loaded = true;
+ setImageScaledLoaded(true);
real_load = true;
}
} else {
- if (image_scaled_loaded||!interncall) {
+ if (ImageScaledLoaded()||!interncall) {
odebug << "Load jpeg unscaled" << oendl;
real_load = true;
}
- image_scaled_loaded = false;
+ setImageScaledLoaded(false);
}
if (real_load) {
{
@@ -89,20 +122,20 @@ void ImageScrollView::loadJpeg(bool interncall)
}
}
-void ImageScrollView::setImage( const QString& path ) {
+void OImageScrollView::setImage( const QString& path ) {
odebug << "load new image " << oendl;
if (m_lastName == path) return;
m_lastName = path;
QString itype = QImage::imageFormat(m_lastName);
odebug << "Image type = " << itype << oendl;
if (itype == "JPEG") {
- image_is_jpeg = true;
+ setImageIsJpeg(true);
loadJpeg();
} else {
{
QCopEnvelope( "QPE/System", "busy()" );
}
- image_is_jpeg = false;
+ setImageIsJpeg(false);
_original_data.load(path);
_original_data.convertDepth(QPixmap::defaultDepth());
_original_data.setAlphaBuffer(false);
@@ -112,13 +145,13 @@ void ImageScrollView::setImage( const QString& path ) {
}
}
_image_data = QImage();
- if (first_resize_done) {
+ if (FirstResizeDone()) {
generateImage();
}
}
/* should be called every time the QImage changed it content */
-void ImageScrollView::init()
+void OImageScrollView::init()
{
odebug << "init " << oendl;
@@ -129,6 +162,8 @@ void ImageScrollView::init()
_zoomer = new Opie::MM::OImageZoomer( this, "The Zoomer" );
connect(_zoomer, SIGNAL( zoomAreaRel(int,int)),
this, SLOT(scrollBy(int,int)) );
+ connect(_zoomer, SIGNAL( zoomArea(int,int)),
+ this, SLOT(center(int,int)) );
connect(this,SIGNAL(contentsMoving(int,int)),
_zoomer, (SLOT(setVisiblePoint(int,int))) );
connect(this,SIGNAL(imageSizeChanged(const QSize&)),
@@ -138,45 +173,55 @@ void ImageScrollView::init()
viewport()->setBackgroundColor(white);
setFocusPolicy(QWidget::StrongFocus);
- image_scaled_loaded = false;
- image_is_jpeg = false;
- if (first_resize_done) {
- last_rot = Rotate0;
+ setImageScaledLoaded(false);
+ setImageIsJpeg(false);
+ if (FirstResizeDone()) {
+ m_last_rot = Rotate0;
generateImage();
} else if (_original_data.size().isValid()) {
- if (image_fit_into(_original_data.size()) || !show_zoomer) _zoomer->hide();
+ if (image_fit_into(_original_data.size()) || !ShowZoomer()) _zoomer->hide();
resizeContents(_original_data.width(),_original_data.height());
}
}
-void ImageScrollView::setAutoRotate(bool how)
+void OImageScrollView::setAutoRotate(bool how)
{
/* to avoid double repaints */
- if (rotate_to_fit != how) {
- rotate_to_fit = how;
+ if (AutoRotate() != how) {
+ m_states.setBit(AUTO_ROTATE,how);
_image_data = QImage();
generateImage();
}
}
-void ImageScrollView::setAutoScale(bool how)
+bool OImageScrollView::AutoRotate()const
{
- scale_to_fit = how;
+ return m_states.testBit(AUTO_ROTATE);
+}
+
+void OImageScrollView::setAutoScale(bool how)
+{
+ m_states.setBit(AUTO_SCALE,how);
if (!how) {
- rotate_to_fit = false;
+ setAutoRotate(false);
}
_image_data = QImage();
- if (image_is_jpeg && how == false && image_scaled_loaded==true) {
+ if (ImageIsJpeg() && how == false && ImageScaledLoaded()==true) {
loadJpeg(true);
}
generateImage();
}
-ImageScrollView::~ImageScrollView()
+bool OImageScrollView::AutoScale()const
+{
+ return m_states.testBit(AUTO_SCALE);
+}
+
+OImageScrollView::~OImageScrollView()
{
}
-void ImageScrollView::rescaleImage(int w, int h)
+void OImageScrollView::rescaleImage(int w, int h)
{
if (_image_data.width()==w && _image_data.height()==h) {
return;
@@ -189,7 +234,7 @@ void ImageScrollView::rescaleImage(int w, int h)
_image_data = _image_data.smoothScale(smoothW,smoothH);
}
-void ImageScrollView::rotate_into_data(Rotation r)
+void OImageScrollView::rotate_into_data(Rotation r)
{
/* realy - we must do this that way, 'cause when acting direct on _image_data the app will
segfault :( */
@@ -303,19 +348,20 @@ void ImageScrollView::rotate_into_data(Rotation r)
_image_data = dest;
}
-void ImageScrollView::generateImage()
+void OImageScrollView::generateImage()
{
Rotation r = Rotate0;
+ if (_original_data.isNull()) return;
{
QCopEnvelope( "QPE/System", "busy()" );
}
if (width()>height()&&_original_data.width()<_original_data.height() ||
width()<height()&&_original_data.width()>_original_data.height()) {
- if (rotate_to_fit) r = Rotate90;
+ if (AutoRotate()) r = Rotate90;
}
odebug << " r = " << r << oendl;
- if (scale_to_fit) {
+ if (AutoScale()) {
if (!_image_data.size().isValid()||width()>_image_data.width()||height()>_image_data.height()) {
odebug << "Rescaling data" << oendl;
if (r==Rotate0) {
@@ -326,13 +372,13 @@ void ImageScrollView::generateImage()
}
rescaleImage(width(),height());
resizeContents(_image_data.width(),_image_data.height());
- } else if (!first_resize_done||r!=last_rot||_image_data.width()==0) {
+ } else if (!FirstResizeDone()||r!=m_last_rot||_image_data.width()==0) {
if (r==Rotate0) {
_image_data = _original_data;
} else {
rotate_into_data(r);
}
- last_rot = r;
+ m_last_rot = r;
resizeContents(_image_data.width(),_image_data.height());
}
_pdata.convertFromImage(_image_data);
@@ -347,10 +393,11 @@ void ImageScrollView::generateImage()
/*
* move scrollbar
*/
+ if (_zoomer) {
_zoomer->setGeometry( viewport()->width()-_image_data.width()/2, viewport()->height()-_image_data.height()/2,
_image_data.width()/2, _image_data.height()/2 );
-
_zoomer->setImage( _image_data );
+ }
/*
* invalidate
*/
@@ -361,17 +408,17 @@ void ImageScrollView::generateImage()
}
}
-void ImageScrollView::resizeEvent(QResizeEvent * e)
+void OImageScrollView::resizeEvent(QResizeEvent * e)
{
- odebug << "ImageScrollView resizeEvent" << oendl;
+ odebug << "OImageScrollView resizeEvent" << oendl;
QScrollView::resizeEvent(e);
generateImage();
- first_resize_done = true;
+ setFirstResizeDone(true);
emit viewportSizeChanged( viewport()->size() );
}
-void ImageScrollView::keyPressEvent(QKeyEvent * e)
+void OImageScrollView::keyPressEvent(QKeyEvent * e)
{
if (!e) return;
int dx = horizontalScrollBar()->lineStep();
@@ -394,7 +441,7 @@ void ImageScrollView::keyPressEvent(QKeyEvent * e)
QScrollView::keyPressEvent(e);
}
-void ImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph)
+void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph)
{
int w = clipw;
int h = cliph;
@@ -427,7 +474,7 @@ void ImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw
}
/* using the real geometry points and not the translated points is wanted! */
-void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
+void OImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
{
odebug << "Move X and Y " << e->x() << " " << e->y() << oendl;
int mx, my;
@@ -456,7 +503,7 @@ void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
_mouseStartPosY=my;
}
-void ImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
+void OImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
{
odebug << " X and Y " << e->x() << " " << e->y() << oendl;
/* this marks the beginning of a possible mouse move. Due internal reasons of QT
@@ -468,7 +515,7 @@ void ImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
_mouseStartPosY = -1;
}
-void ImageScrollView::setDestructiveClose() {
+void OImageScrollView::setDestructiveClose() {
WFlags fl = getWFlags();
/* clear it just in case */
fl &= ~WDestructiveClose;
@@ -476,7 +523,7 @@ void ImageScrollView::setDestructiveClose() {
setWFlags( fl );
}
-bool ImageScrollView::image_fit_into(const QSize&s )
+bool OImageScrollView::image_fit_into(const QSize&s )
{
if (s.width()>width()||s.height()>height()) {
return false;
@@ -484,17 +531,56 @@ bool ImageScrollView::image_fit_into(const QSize&s )
return true;
}
-void ImageScrollView::setShowZoomer(bool how)
+void OImageScrollView::setShowZoomer(bool how)
{
- show_zoomer = how;
+ m_states.setBit(SHOW_ZOOMER,how);
check_zoomer();
}
-void ImageScrollView::check_zoomer()
+bool OImageScrollView::ShowZoomer()const
+{
+ return m_states.testBit(SHOW_ZOOMER);
+}
+
+void OImageScrollView::check_zoomer()
{
- if ( (!show_zoomer||image_fit_into(_pdata.size()) ) && _zoomer->isVisible()) {
+ if (!_zoomer) return;
+ if ( (!ShowZoomer()||image_fit_into(_pdata.size()) ) && _zoomer->isVisible()) {
_zoomer->hide();
- } else if ( show_zoomer && !image_fit_into(_pdata.size()) && _zoomer->isHidden()){
+ } else if ( ShowZoomer() && !image_fit_into(_pdata.size()) && _zoomer->isHidden()){
_zoomer->show();
}
}
+
+bool OImageScrollView::FirstResizeDone()const
+{
+ return m_states.testBit(FIRST_RESIZE_DONE);
+}
+
+void OImageScrollView::setFirstResizeDone(bool how)
+{
+ m_states.setBit(FIRST_RESIZE_DONE,how);
+}
+
+bool OImageScrollView::ImageIsJpeg()const
+{
+ return m_states.testBit(IMAGE_IS_JPEG);
+}
+
+void OImageScrollView::setImageIsJpeg(bool how)
+{
+ m_states.setBit(IMAGE_IS_JPEG,how);
+}
+
+bool OImageScrollView::ImageScaledLoaded()const
+{
+ return m_states.testBit(IMAGE_SCALED_LOADED);
+}
+
+void OImageScrollView::setImageScaledLoaded(bool how)
+{
+ m_states.setBit(IMAGE_SCALED_LOADED,how);
+}
+
+} // namespace MM
+} // namespace Opie
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.h b/noncore/graphics/opie-eye/gui/imagescrollview.h
index f6e187d..3d2ea38 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.h
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.h
@@ -1,44 +1,53 @@
#ifndef _IMAGE_SCROLL_VIEW_H
#define _IMAGE_SCROLL_VIEW_H
-#include <lib/oimagezoomer.h>
-
#include <qscrollview.h>
#include <qimage.h>
#include <qpixmap.h>
#include <qstring.h>
#include <qdialog.h>
-
+#include <qbitarray.h>
class QPainter;
-class ImageScrollView:public QScrollView
+namespace Opie { namespace MM {
+
+ class OImageZoomer;
+
+class OImageScrollView:public QScrollView
{
Q_OBJECT
public:
- ImageScrollView( QWidget* parent, const char* name = 0, WFlags fl = 0 );
- ImageScrollView (const QImage&, QWidget * parent=0, const char * name=0, WFlags f=0,bool always_scale=false,bool rfit=false );
- ImageScrollView (const QString&, QWidget * parent=0, const char * name=0, WFlags f=0,bool always_scale=false,bool rfit=false );
- virtual ~ImageScrollView();
+ enum Rotation {
+ Rotate0,
+ Rotate90,
+ Rotate180,
+ Rotate270
+ };
+
+ OImageScrollView( QWidget* parent, const char* name = 0, WFlags fl = 0 );
+ OImageScrollView (const QImage&, QWidget * parent=0, const char * name=0, WFlags f=0,bool always_scale=false,bool rfit=false );
+ OImageScrollView (const QString&, QWidget * parent=0, const char * name=0, WFlags f=0,bool always_scale=false,bool rfit=false );
+ virtual ~OImageScrollView();
+
- virtual void setImage(const QImage&);
- virtual void setImage( const QString& path );
virtual void setDestructiveClose();
virtual void setAutoRotate(bool);
virtual void setAutoScale(bool);
virtual void setShowZoomer(bool);
- enum Rotation {
- Rotate0,
- Rotate90,
- Rotate180,
- Rotate270
- };
+ virtual bool AutoRotate()const;
+ virtual bool AutoScale()const;
+ virtual bool ShowZoomer()const;
+
+public slots:
+ virtual void setImage(const QImage&);
+ virtual void setImage( const QString& path );
+
signals:
- void sig_return();
void imageSizeChanged( const QSize& );
void viewportSizeChanged( const QSize& );
@@ -53,13 +62,9 @@ protected:
int _mouseStartPosX,_mouseStartPosY;
- bool scale_to_fit;
- bool rotate_to_fit;
- bool show_zoomer;
- bool first_resize_done;
- bool image_is_jpeg;
- bool image_scaled_loaded;
- Rotation last_rot;
+ QBitArray m_states;
+
+ Rotation m_last_rot;
QString m_lastName;
virtual void rescaleImage(int w, int h);
@@ -69,10 +74,22 @@ protected:
bool image_fit_into(const QSize&s);
void check_zoomer();
+ /* internal bitset manipulation */
+ virtual bool ImageIsJpeg()const;
+ virtual void setImageIsJpeg(bool how);
+ virtual bool ImageScaledLoaded()const;
+ virtual void setImageScaledLoaded(bool how);
+ virtual bool FirstResizeDone()const;
+ virtual void setFirstResizeDone(bool how);
+
protected slots:
virtual void viewportMouseMoveEvent(QMouseEvent* e);
virtual void contentsMousePressEvent ( QMouseEvent * e);
virtual void resizeEvent(QResizeEvent * e);
virtual void keyPressEvent(QKeyEvent * e);
};
+
+}
+}
+
#endif
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 2078b19..db3ae74 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -9,7 +9,7 @@
using namespace Opie::Core;
ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name, WFlags fl )
- : ImageScrollView(parent,name,fl)
+ : Opie::MM::OImageScrollView(parent,name,fl)
{
m_viewManager = 0;
m_cfg = cfg;
@@ -43,7 +43,6 @@ void ImageView::initKeys()
lst.append( Opie::Core::OKeyPair::downArrowKey() );
lst.append( Opie::Core::OKeyPair::leftArrowKey() );
lst.append( Opie::Core::OKeyPair::rightArrowKey() );
- lst.append( Opie::Core::OKeyPair::returnKey() );
m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
lst, false,this, "image_view_keys" );
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 87e2b32..e4f899a 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -11,7 +11,7 @@ namespace Opie {
}
}
-class ImageView:public ImageScrollView
+class ImageView:public Opie::MM::OImageScrollView
{
Q_OBJECT
@@ -26,7 +26,6 @@ public:
signals:
void dispImageInfo(const QString&);
- void sig_return();
protected:
Opie::Core::OConfig * m_cfg;
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index e5921d8..09f562a 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -3,11 +3,11 @@
* No WArranty...
*/
#include "mainwindow.h"
+#include "imageview.h"
#include "iconview.h"
#include "filesystem.h"
#include "imageinfoui.h"
-#include "imageview.h"
#include "viewmodebutton.h"
#include <iface/ifaceinfo.h>
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index e9b16d0..adb5dc2 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -21,9 +21,10 @@ namespace Core{
}
}
+class ImageView;
class PIconView;
class imageinfo;
-class ImageView;
+
class PMainWindow : public QMainWindow {
Q_OBJECT
enum Views { IconView, ImageInfo, ImageDisplay };
diff --git a/noncore/graphics/opie-eye/lib/oimagezoomer.cpp b/noncore/graphics/opie-eye/lib/oimagezoomer.cpp
index 00b93e2..d1eec67 100644
--- a/noncore/graphics/opie-eye/lib/oimagezoomer.cpp
+++ b/noncore/graphics/opie-eye/lib/oimagezoomer.cpp
@@ -1,5 +1,7 @@
#include "oimagezoomer.h"
+#include <opie2/odebug.h>
+
#include <qimage.h>
#include <qpixmap.h>
#include <qpainter.h>
@@ -86,6 +88,7 @@ OImageZoomer::~OImageZoomer() {
}
void OImageZoomer::init() {
+ m_mevent = false;
setFrameStyle( Panel | Sunken );
}
@@ -195,8 +198,19 @@ void OImageZoomer::drawContents( QPainter* p ) {
p->drawRect( x, y, w, h );
}
-void OImageZoomer::mousePressEvent( QMouseEvent* ) {
+void OImageZoomer::mousePressEvent( QMouseEvent*ev) {
m_mouseX = m_mouseY = -1;
+ m_mevent = true;
+}
+
+void OImageZoomer::mouseReleaseEvent( QMouseEvent*ev) {
+ if (!m_mevent) return;
+ int mx, my;
+ mx = ev->x();
+ my = ev->y();
+ int diffx = (mx) * m_imgSize.width() / width();
+ int diffy = (my) * m_imgSize.height() / height();
+ emit zoomArea(diffx,diffy);
}
void OImageZoomer::mouseMoveEvent( QMouseEvent* ev ) {
@@ -205,10 +219,10 @@ void OImageZoomer::mouseMoveEvent( QMouseEvent* ev ) {
my = ev->y();
if ( m_mouseX != -1 && m_mouseY != -1 ) {
+ m_mevent = false;
int diffx = ( mx - m_mouseX ) * m_imgSize.width() / width();
int diffy = ( my - m_mouseY ) * m_imgSize.height() / height();
emit zoomAreaRel( diffx, diffy );
- emit zoomArea(m_visPt.x()+diffx, m_visPt.y()+diffy );
}
m_mouseX = mx;
m_mouseY = my;
diff --git a/noncore/graphics/opie-eye/lib/oimagezoomer.h b/noncore/graphics/opie-eye/lib/oimagezoomer.h
index 2516c61..0b356c9 100644
--- a/noncore/graphics/opie-eye/lib/oimagezoomer.h
+++ b/noncore/graphics/opie-eye/lib/oimagezoomer.h
@@ -71,7 +71,8 @@ signals:
/**
* Here you get absolute coordinates.
- * This slot will be emitted from within the mouseMoveEvent of this widget.
+ * This slot will be emitted from within the mouseReleaseEvent of this widget.
+ * if no mouse move where done.
* So you may not delete this widget
*
* @param x The absolute X Coordinate to scroll to.
@@ -98,12 +99,17 @@ protected:
* make sure to call these if you reimplememt
* @internal
*/
- void mousePressEvent( QMouseEvent* ev );
+ virtual void mousePressEvent( QMouseEvent* ev );
/**
* make sure to call these if you reimplement
* @internal
*/
- void mouseMoveEvent( QMouseEvent* ev );
+ virtual void mouseMoveEvent( QMouseEvent* ev );
+ /**
+ * make sure to call these if you reimplement
+ * @internal
+ */
+ virtual void mouseReleaseEvent( QMouseEvent* ev );
private:
/**
@@ -114,6 +120,7 @@ private:
QSize m_imgSize, m_visSize;
QPoint m_visPt;
int m_mouseX, m_mouseY;
+ bool m_mevent;
};
/**