X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.h;h=8b631dab44c8a145460c9e0ef353ac4ddb62c0d5;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=af94b763b663d2d31e45dd347853125cc828312a;hpb=9f9a125d2a21119f55ba744b027d9372b5a95f08;p=kdenlive diff --git a/src/mainwindow.h b/src/mainwindow.h index af94b763..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; @@ -279,7 +282,7 @@ private: void connectDocumentInfo(KdenliveDoc *doc); void findAhead(); void doOpenFile(const KUrl &url, KAutoSaveFile *stale); - void recoverFiles(QList staleFiles, const KUrl &originUrl); + void recoverFiles(const QList &staleFiles, const KUrl &originUrl); /** @brief Loads static and dynamic plugins. * @@ -422,16 +425,16 @@ private slots: void slotSelectAddTimelineTransition(); void slotAddVideoEffect(QAction *result); void slotAddTransition(QAction *result); - void slotAddProjectClip(KUrl url, stringMap data = stringMap()); - void slotAddProjectClipList(KUrl::List urls); + void slotAddProjectClip(const KUrl &url, const stringMap &data = stringMap()); + void slotAddProjectClipList(const KUrl::List &urls); void slotShowClipProperties(DocClipBase *clip); void slotShowClipProperties(const QList &cliplist, const QMap &commonproperties); void slotTimelineClipSelected(ClipItem* item, bool raise = true); - void slotTrackSelected(int index, TrackInfo info, bool raise = true); - void slotActivateTransitionView(Transition *); + void slotTrackSelected(int index, const TrackInfo &info, bool raise = true); + 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(); @@ -531,7 +534,7 @@ private slots: void slotUpdateCaptureFolder(); /** @brief Apply new properties to a clip */ - void slotApplyNewClipProperties(const QString id, QMap props, QMap newprops, bool refresh, bool reload); + void slotApplyNewClipProperties(const QString &id, const QMap &props, const QMap &newprops, bool refresh, bool reload); /** @brief Delete a clip from current project */ void slotDeleteClip(const QString &id); @@ -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 */