updated source to opie-reader 0.7g

1 files changed, 10 insertions, 19 deletions

diff --git a/noncore/apps/opie-reader/GraphicWin.h b/noncore/apps/opie-reader/GraphicWin.h
index 31811d2..70d5f7e 100644
--- a/noncore/apps/opie-reader/GraphicWin.h
+++ b/noncore/apps/opie-reader/GraphicWin.h
@@ -2,10 +2,12 @@
 #define __GRAPHICWIN_H
 
 #include <qscrollview.h>
 #include <qpixmap.h>
+#include <qimage.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
+#include <qwmatrix.h>
 
 class GraphicScroll : public QScrollView
 {
     Q_OBJECT
@@ -26,40 +28,29 @@ class GraphicScroll : public QScrollView
         {
             m_picture->setFixedSize(pm.size());
             m_picture->setBackgroundPixmap(pm);
         }
-/*
- private slots:
-     void graphicClose() { emit Close(); }
- signals:
- void Close(); 
-*/
- 
 };
 
 
 class GraphicWin : public QWidget
 {
     Q_OBJECT
     
         GraphicScroll* m_scroll;
+  QImage m_im;
+  QImage resizeimage(int w, int h);
+  void resetpm();
+  bool m_isFitted, m_isRotated;
  signals:
     void Closed();
  private slots:
      void slotClosed() { emit Closed(); }
-    
+  void slotFit();
+  void slotRotate();
  public:
- 
      void setPixmap(QPixmap& pm) { m_scroll->setPixmap(pm); }
-     GraphicWin( QWidget *parent=0, const char *name=0, WFlags f = 0)
-         : QWidget(parent, name, f)
-         {
-             QVBoxLayout* grid = new QVBoxLayout(this);
-             m_scroll = new GraphicScroll(this);
-             QPushButton* exitButton = new QPushButton("Close", this);
-             connect(exitButton, SIGNAL( released() ), this, SLOT( slotClosed() ) );
-             grid->addWidget(m_scroll,1);
-             grid->addWidget(exitButton);
-         }
+  void setImage(QImage& im);
+  GraphicWin( QWidget *parent=0, const char *name=0, WFlags f = 0);
 };
 
 #endif