SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

When there are multiple triggers on the simple trigger mode, prompt the user

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-06-17 20:45:52 +08:00
parent 5204bdfcbb
commit 2460bb4f25
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DSView/pv/config/appconfig.cpp
View File

@@ -123,6 +123,8 @@ static void _loadApp(AppOptions &o, QSettings &st)
getFiled("swapBackBufferAlways", st, o.swapBackBufferAlways, false);
getFiled("fontSize", st, o.fontSize, 9.0);
o.warnofMultiTrig = true;
QString fmt;
getFiled("protocalFormats", st, fmt, "");
if (fmt != ""){

6
DSView/pv/dock/triggerdock.cpp
View File

@@ -966,7 +966,8 @@ void TriggerDock::try_commit_trigger()
}
}
if (app.appOptions.warnofMultiTrig && num > 1) {
if (app.appOptions.warnofMultiTrig && num > 1)
{
dialogs::DSMessageBox msg(this);
msg.mBox()->setText(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_TRIGGER), "Trigger"));
msg.mBox()->setInformativeText(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_SET_TRI_MULTI_CHANNEL),
@@ -991,8 +992,7 @@ void TriggerDock::try_commit_trigger()
if (msg.mBox()->clickedButton() == noMoreButton)
{
app.appOptions.warnofMultiTrig = false;
app.SaveApp();
app.appOptions.warnofMultiTrig = false;
}
}
}