[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive/Applications/18.04] src: Don't display Wizard on every AppImage startup
From: Jean-Baptiste Mardelle <null () kde ! org>
Date: 2018-05-31 22:43:46
Message-ID: E1fOWIM-0006B5-KW () code ! kde ! org
[Download RAW message or body]
Git commit bcfff134ad5cff3e1e1115c7012e2a5d330d418b by Jean-Baptiste Mardelle.
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 = new QLabel(this);
lab->setText(i18n("Startup error or warning, check our <a href='#'>online \
manual</a>."));
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 = nullptr);
+ explicit Wizard(bool autoClose, bool appImageCheck, QWidget *parent = nullptr);
void installExtraMimes(const QString &baseName, const QStringList &globs);
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<Wizard> w = new Wizard(true);
+ QPointer<Wizard> w = new Wizard(true, false);
if (w->exec() == 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<Wizard> w = new Wizard(true);
+ QPointer<Wizard> w = new Wizard(true, \
config->name().contains(QLatin1String("appimage"))); if (w->exec() == \
QDialog::Accepted && w->isOk()) { w->adjustSettings();
}
@@ -1666,7 +1666,7 @@ bool MainWindow::readOptions()
void MainWindow::slotRunWizard()
{
- QPointer<Wizard> w = new Wizard(false, this);
+ QPointer<Wizard> w = new Wizard(false, false, this);
if (w->exec() == QDialog::Accepted && w->isOk()) {
w->adjustSettings();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic