comparison view/View.h @ 808:40c6c9344ff6 warnfix_no_size_t

Merge from branch tony_integration

 
 // #define DEBUG_VIEW_WIDGET_PAINT 1
 
 class Layer;
 class ViewPropertyContainer;
+
+class QPushButton;
 
 #include <map>
 #include <set>
 
 /**

     virtual void selectionChanged();
     virtual void toolModeChanged();
     virtual void overlayModeChanged();
     virtual void zoomWheelsEnabledChanged();
 
+    virtual void cancelClicked();
+
     virtual void progressCheckStalledTimerElapsed();
 
 protected:
     View(QWidget *, bool showProgress);
     virtual void paintEvent(QPaintEvent *e);

     int              m_centreFrame;
     int                 m_zoomLevel;
     bool                m_followPan;
     bool                m_followZoom;
     PlaybackFollowMode  m_followPlay;
-    int              m_playPointerFrame;
+    bool                m_followPlayIsDetached;
+    int                 m_playPointerFrame;
     bool                m_lightBackground;
     bool                m_showProgress;
 
     QPixmap            *m_cache;
     int                 m_cacheCentreFrame;

 
     // caches for use in getScrollableBackLayers, getNonScrollableFrontLayers
     mutable LayerList m_lastScrollableBackLayers;
     mutable LayerList m_lastNonScrollableBackLayers;
 
-    class LayerProgressBar : public QProgressBar {
-    public:
-	LayerProgressBar(QWidget *parent);
-	virtual QString text() const { return m_text; }
-	virtual void setText(QString text) { m_text = text; }
-    protected:
-	QString m_text;
-    };
-
     struct ProgressBarRec {
+        QPushButton *cancel;
         QProgressBar *bar;
         int lastCheck;
         QTimer *checkTimer;
     };
     typedef std::map<Layer *, ProgressBarRec> ProgressMap;