diff view/Pane.h @ 827:ea098f7565eb

Merge from branch tonioni

--- a/view/Pane.h	Thu Jul 17 14:50:31 2014 +0100
+++ b/view/Pane.h	Fri Jul 18 15:38:21 2014 +0100
@@ -62,6 +62,12 @@
 
     static void registerShortcuts(KeyReference &kr);
 
+    enum PaneType {
+        Normal = 0,
+        TonyMain = 1,
+        TonySelection = 2
+    };
+
 signals:
     void paneInteractedWith();
     void rightButtonMenuRequested(QPoint position);
@@ -107,6 +113,10 @@
     virtual void dragEnterEvent(QDragEnterEvent *e);
     virtual void dropEvent(QDropEvent *e);
 
+    void wheelVertical(int sign, Qt::KeyboardModifiers);
+    void wheelHorizontal(int sign, Qt::KeyboardModifiers);
+    void wheelHorizontalFine(int pixels, Qt::KeyboardModifiers);
+
     void drawVerticalScale(QRect r, Layer *, QPainter &);
     void drawFeatureDescription(Layer *, QPainter &);
     void drawCentreLine(int, QPainter &, bool omitLine);
@@ -165,6 +175,8 @@
     int m_editingSelectionEdge;
     mutable int m_scaleWidth;
 
+    int m_pendingWheelAngle;
+
     enum DragMode {
         UnresolvedDrag,
         VerticalDrag,