k3b/Add-forceCheck-for-ManualCheckSystem.patch

59 lines
2.2 KiB
Diff
Raw Normal View History

From 762fc98addfc5a83e80aa1c7d83384a512c48f33 Mon Sep 17 00:00:00 2001
From: Leslie Zhai <lesliezhai@llvm.org.cn>
Date: Wed, 2 Aug 2017 14:44:29 +0800
Subject: Add forceCheck for ManualCheckSystem.
CCBUG: 381368
---
src/k3b.cpp | 2 +-
src/k3bsystemproblemdialog.cpp | 4 ++--
src/k3bsystemproblemdialog.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Index: k3b-17.08.2/src/k3b.cpp
===================================================================
--- k3b-17.08.2.orig/src/k3b.cpp
+++ k3b-17.08.2/src/k3b.cpp
@@ -1422,7 +1422,7 @@ void K3b::MainWindow::slotCheckSystem()
void K3b::MainWindow::slotManualCheckSystem()
{
- K3b::SystemProblemDialog::checkSystem( this, K3b::SystemProblemDialog::AlwaysNotify );
+ K3b::SystemProblemDialog::checkSystem(this, K3b::SystemProblemDialog::AlwaysNotify, true/* forceCheck */);
}
Index: k3b-17.08.2/src/k3bsystemproblemdialog.cpp
===================================================================
--- k3b-17.08.2.orig/src/k3bsystemproblemdialog.cpp
+++ k3b-17.08.2/src/k3bsystemproblemdialog.cpp
@@ -169,13 +169,13 @@ void K3b::SystemProblemDialog::done(int
}
-void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel level )
+void K3b::SystemProblemDialog::checkSystem(QWidget* parent, NotificationLevel level, bool forceCheck)
{
QList<K3b::SystemProblem> problems;
bool showDeviceSettingsButton = false;
bool showBinSettingsButton = false;
- if (!readCheckSystemConfig())
+ if (!forceCheck && !readCheckSystemConfig())
return;
if( k3bcore->deviceManager()->allDevices().isEmpty() ) {
Index: k3b-17.08.2/src/k3bsystemproblemdialog.h
===================================================================
--- k3b-17.08.2.orig/src/k3bsystemproblemdialog.h
+++ k3b-17.08.2/src/k3bsystemproblemdialog.h
@@ -78,7 +78,7 @@ namespace K3b {
* or K3b is started for the first time.
*/
static bool readCheckSystemConfig();
- static void checkSystem( QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors );
+ static void checkSystem(QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors, bool forceCheck = false);
protected:
void done(int) Q_DECL_OVERRIDE;