Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / mainwindow.h

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9b9d2067c943ff8ca7a8b2b79adcaba183505e5f..4b5851367e4cf9af8cd0b414a6869fac76a10e45 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -54,6 +54,7 @@ class MonitorManager;
 class ProjectList;
 class EffectsListView;
 class EffectStackView;
+class EffectStackView2;
 class TransitionSettings;
 class Monitor;
 class RecMonitor;
@@ -157,7 +158,7 @@ private:
     NotesWidget *m_notesWidget;
 
     QDockWidget *m_effectStackDock;
-    EffectStackView *m_effectStack;
+    EffectStackView2 *m_effectStack;
 
     QDockWidget *m_transitionConfigDock;
     TransitionSettings *m_transitionConfig;
@@ -310,6 +311,9 @@ private:
 
     StopmotionWidget *m_stopmotion;
     QTime m_timer;
+    
+    /** @brief Update statusbar stylesheet (in case of color theme change). */
+    void setStatusBarStyleSheet(const QPalette &p);
 
 public slots:
     /** @brief Prepares opening @param url.
@@ -547,6 +551,8 @@ private slots:
     void slotElapsedTime();
     /** @brief Open the online services search dialog. */
     void slotDownloadResources();
+    
+    void slotChangePalette();
 
 signals:
     Q_SCRIPTABLE void abortRenderJob(const QString &url);