diff view/View.h @ 804:5c4a405a70fc tony_integration

Merge from branch "tonioni"

--- a/view/View.h	Tue Jun 17 12:55:10 2014 +0100
+++ b/view/View.h	Tue Jun 17 12:55:18 2014 +0100
@@ -29,6 +29,8 @@
 class Layer;
 class ViewPropertyContainer;
 
+class QPushButton;
+
 #include <map>
 #include <set>
 
@@ -309,6 +311,8 @@
     virtual void overlayModeChanged();
     virtual void zoomWheelsEnabledChanged();
 
+    virtual void cancelClicked();
+
     virtual void progressCheckStalledTimerElapsed();
 
 protected:
@@ -352,6 +356,7 @@
     bool                m_followPan;
     bool                m_followZoom;
     PlaybackFollowMode  m_followPlay;
+    bool                m_followPlayIsDetached;
     size_t              m_playPointerFrame;
     bool                m_lightBackground;
     bool                m_showProgress;
@@ -372,16 +377,8 @@
     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;