X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fwizard.h;h=da2a551329df064093124830e3b7c33d49b02761;hb=93720831f547d37e5075262008c6af6e5a32aaf5;hp=3f742aa6f20905aae3d4d79a6e48083001e816b9;hpb=bb5aa137893d15aca179e51241ca6a16dd6b8000;p=kdenlive diff --git a/src/wizard.h b/src/wizard.h index 3f742aa6..da2a5513 100644 --- a/src/wizard.h +++ b/src/wizard.h @@ -26,14 +26,17 @@ #include #include +#include #include #include "ui_wizardstandard_ui.h" #include "ui_wizardextra_ui.h" #include "ui_wizardcheck_ui.h" #include "ui_wizardmltcheck_ui.h" +#include "ui_wizardcapture_ui.h" -class WizardDelegate: public QItemDelegate { +class WizardDelegate: public QItemDelegate +{ public: WizardDelegate(QAbstractItemView* parent = 0): QItemDelegate(parent) { } @@ -46,7 +49,7 @@ public: painter->setPen(option.palette.color(QPalette::HighlightedText)); QColor backgroundColor = option.palette.color(QPalette::Highlight); painter->setBrush(QBrush(backgroundColor)); - painter->fillRect(r1, QBrush(backgroundColor)); + painter->fillRect(r1, backgroundColor); } QFont font = painter->font(); font.setBold(true); @@ -69,10 +72,11 @@ public: }; -class Wizard : public QWizard { +class Wizard : public QWizard +{ Q_OBJECT public: - Wizard(QWidget * parent = 0); + Wizard(bool upgrade, QWidget * parent = 0); void installExtraMimes(QString baseName, QStringList globs); void runUpdateMimeDatabase(); void adjustSettings(); @@ -82,21 +86,26 @@ private: Ui::WizardStandard_UI m_standard; Ui::WizardExtra_UI m_extra; Ui::WizardMltCheck_UI m_mltCheck; + Ui::WizardCapture_UI m_capture; Ui::WizardCheck_UI m_check; QVBoxLayout *m_startLayout; bool m_systemCheckIsOk; - QStringList m_dvProfiles; - QStringList m_hdvProfiles; - QStringList m_otherProfiles; - QMap m_profilesInfo; + QMap m_dvProfiles; + QMap m_hdvProfiles; + QMap m_otherProfiles; void slotCheckPrograms(); void checkMltComponents(); + KIcon m_okIcon; + KIcon m_badIcon; private slots: void slotCheckThumbs(); void slotCheckStandard(); void slotCheckSelectedItem(); void slotCheckMlt(); + void slotShowWebInfos(); + void slotDetectWebcam(); + void slotUpdateCaptureParameters(); }; #endif