Git commit bcfff134ad5cff3e1e1115c7012e2a5d330d418b by Jean-Baptiste Mardel=
le.
Committed on 31/05/2018 at 22:43.
Pushed by mardelle into branch 'Applications/18.04'.
Don't display Wizard on every AppImage startup
M +2 -2 src/dialogs/wizard.cpp
M +1 -1 src/dialogs/wizard.h
M +3 -3 src/mainwindow.cpp
https://commits.kde.org/kdenlive/bcfff134ad5cff3e1e1115c7012e2a5d330d418b
diff --git a/src/dialogs/wizard.cpp b/src/dialogs/wizard.cpp
index 2191b94a9..8fce5f548 100644
--- a/src/dialogs/wizard.cpp
+++ b/src/dialogs/wizard.cpp
@@ -69,7 +69,7 @@ bool MyWizardPage::isComplete() const
return m_isComplete;
}
=
-Wizard::Wizard(bool autoClose, QWidget *parent) :
+Wizard::Wizard(bool autoClose, bool appImageCheck, QWidget *parent) :
QWizard(parent),
m_systemCheckIsOk(false),
m_brokenModule(false)
@@ -98,7 +98,7 @@ Wizard::Wizard(bool autoClose, QWidget *parent) :
setButtonText(QWizard::FinishButton, i18n("OK"));
=
slotCheckMlt();
- if (!m_errors.isEmpty() || !m_warnings.isEmpty() || !m_infos.isEmpty()=
) {
+ if (!m_errors.isEmpty() || !m_warnings.isEmpty() || (!m_infos.isEmpty(=
) && !appImageCheck)) {
QLabel *lab =3D new QLabel(this);
lab->setText(i18n("Startup error or warning, check our online manual."));
connect(lab, &QLabel::linkActivated, this, &Wizard::slotOpenManual=
);
diff --git a/src/dialogs/wizard.h b/src/dialogs/wizard.h
index e4e36814e..3c1017d3a 100644
--- a/src/dialogs/wizard.h
+++ b/src/dialogs/wizard.h
@@ -45,7 +45,7 @@ class Wizard : public QWizard
{
Q_OBJECT
public:
- explicit Wizard(bool autoClose, QWidget *parent =3D nullptr);
+ explicit Wizard(bool autoClose, bool appImageCheck, QWidget *parent =
=3D nullptr);
void installExtraMimes(const QString &baseName, const QStringList &glo=
bs);
void runUpdateMimeDatabase();
void adjustSettings();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 74095b400..eb389c89d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1644,7 +1644,7 @@ bool MainWindow::readOptions()
// Check color theme
ThemeManager::instance()->initDarkTheme();
// this is our first run, show Wizard
- QPointer w =3D new Wizard(true);
+ QPointer w =3D new Wizard(true, false);
if (w->exec() =3D=3D QDialog::Accepted && w->isOk()) {
w->adjustSettings();
delete w;
@@ -1654,7 +1654,7 @@ bool MainWindow::readOptions()
}
} else if (!KdenliveSettings::ffmpegpath().isEmpty() && !QFile::exists=
(KdenliveSettings::ffmpegpath())) {
// Invalid entry for FFmpeg, check system
- QPointer w =3D new Wizard(true);
+ QPointer w =3D new Wizard(true, config->name().contains(QL=
atin1String("appimage")));
if (w->exec() =3D=3D QDialog::Accepted && w->isOk()) {
w->adjustSettings();
}
@@ -1666,7 +1666,7 @@ bool MainWindow::readOptions()
=
void MainWindow::slotRunWizard()
{
- QPointer w =3D new Wizard(false, this);
+ QPointer w =3D new Wizard(false, false, this);
if (w->exec() =3D=3D QDialog::Accepted && w->isOk()) {
w->adjustSettings();
}