X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivesettingsdialog.h;h=6ffa99b9937979ba3f436cf6b020f27b14c54db1;hb=12c52e2d2e97f703714b83dfd385db2de5f03f18;hp=a0da7569823a84c9b4de2c84fbeb9cbbfdf60ffe;hpb=9472299b931b35891fb78bc18ec06d921bf59a33;p=kdenlive

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index a0da7569..6ffa99b9 100644
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -23,29 +23,33 @@
 
 #include <QDialog>
 
+#include <QMap>
 #include <KConfigDialog>
 #include <KProcess>
 
 #include "ui_configmisc_ui.h"
 #include "ui_configenv_ui.h"
-#include "ui_configdisplay_ui.h"
+#include "ui_configtimeline_ui.h"
 #include "ui_configcapture_ui.h"
 #include "ui_configjogshuttle_ui.h"
 #include "ui_configsdl_ui.h"
+#include "ui_configtranscode_ui.h"
+#include "ui_configproject_ui.h"
 
 class KdenliveSettingsDialog : public KConfigDialog
 {
     Q_OBJECT
 
 public:
-    KdenliveSettingsDialog(QWidget * parent = 0);
+    KdenliveSettingsDialog(const QMap<QString, QString>& mappable_actions, QWidget * parent = 0);
     ~KdenliveSettingsDialog();
     void showPage(int page, int option);
     void checkProfile();
 
 protected slots:
     void updateSettings();
-
+    void updateWidgets();
+    virtual bool hasChanged();
 
 private slots:
     void slotUpdateDisplay();
@@ -60,6 +64,13 @@ private slots:
     void slotReadAudioDevices();
     void slotUpdateRmdRegionStatus();
     void slotCheckAlsaDriver();
+    void slotAddTranscode();
+    void slotDeleteTranscode();
+    void slotShuttleModified();
+    void slotDialogModified();
+    void slotEnableCaptureFolder();
+    void slotUpdateHDMIModes();
+    void slotUpdatev4lDevice();
 
 private:
     KPageWidgetItem *m_page1;
@@ -68,22 +79,32 @@ private:
     KPageWidgetItem *m_page4;
     KPageWidgetItem *m_page5;
     KPageWidgetItem *m_page6;
+    KPageWidgetItem *m_page7;
+    KPageWidgetItem *m_page8;
     Ui::ConfigEnv_UI m_configEnv;
     Ui::ConfigMisc_UI m_configMisc;
-    Ui::ConfigDisplay_UI m_configDisplay;
+    Ui::ConfigTimeline_UI m_configTimeline;
     Ui::ConfigCapture_UI m_configCapture;
     Ui::ConfigJogShuttle_UI m_configShuttle;
     Ui::ConfigSdl_UI m_configSdl;
+    Ui::ConfigTranscode_UI m_configTranscode;
+    Ui::ConfigProject_UI m_configProject;
     QString m_defaultProfile;
     QString m_defaultPath;
     KProcess m_readProcess;
+    bool m_modified;
+    bool m_shuttleModified;
+    QMap<QString, QString> m_mappable_actions;
+    QVector<KComboBox*> m_shuttle_buttons;
     void initDevices();
+    void loadTranscodeProfiles();
+    void saveTranscodeProfiles();
 
 signals:
     void customChanged();
     void doResetProfile();
-    void updatePreviewSettings();
     void updateCaptureFolder();
+    void updateProxySettings();
 };