X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.h;h=8b631dab44c8a145460c9e0ef353ac4ddb62c0d5;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=2324af53e7efc067747ce8c3cf04e869895f23a9;hpb=71d67240d4760746acdaafa102c016069e7daf82;p=kdenlive diff --git a/src/mainwindow.h b/src/mainwindow.h index 2324af53..8b631dab 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -48,7 +48,7 @@ #include "statusbarmessagelabel.h" #include "dvdwizard.h" #include "stopmotion/stopmotion.h" -#include "noteswidget.h" +#include "widgets/noteswidget.h" #include "ui_backupdialog_ui.h" class KdenliveDoc; @@ -78,6 +78,7 @@ class KActionCollection; class AudioSignal; class AudioSpectrum; class Spectrogram; +class QGLWidget; class MainWindow : public KXmlGuiWindow { @@ -141,6 +142,8 @@ protected: virtual void readProperties(const KConfigGroup &config); private: + QGLWidget* m_glContext; + KTabWidget* m_timelineArea; QProgressBar *m_statusProgressBar; @@ -428,10 +431,10 @@ private slots: void slotShowClipProperties(const QList &cliplist, const QMap &commonproperties); void slotTimelineClipSelected(ClipItem* item, bool raise = true); void slotTrackSelected(int index, const TrackInfo &info, bool raise = true); - void slotActivateTransitionView(Transition *); + void slotActivateTransitionView(Transition *transition); void slotChangeTool(QAction * action); void slotChangeEdit(QAction * action); - void slotSetTool(PROJECTTOOL tool); + void slotSetTool(ProjectTool tool); void slotSnapForward(); void slotSnapRewind(); void slotClipStart(); @@ -563,7 +566,7 @@ private slots: /** @brief Save current timeline clip as mlt playlist. */ void slotSaveTimelineClip(); /** @brief Process keyframe data sent from a clip to effect / transition stack. */ - void slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data, int maximum); + void slotProcessImportKeyframes(GraphicsRectItem type, const QString& data, int maximum); /** @brief Move playhead to mouse curser position if defined key is pressed */ void slotAlignPlayheadToMousePos(); /** @brief Set MLT's consumer deinterlace method */