aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2024-05-03 19:40:27 +0000
committersaturneric <[email protected]>2024-05-03 19:40:33 +0000
commita092a8122165d3c2af641bf8ffa9afd785ff0169 (patch)
tree8ce079c07dd2ca6c7ab582f487ffe3681f4dc0cf
parentfix: continue to solve safe issues (diff)
downloadGpgFrontend-a092a8122165d3c2af641bf8ffa9afd785ff0169.tar.gz
GpgFrontend-a092a8122165d3c2af641bf8ffa9afd785ff0169.zip
fix: solve a build issue and add a tip for integrated module
-rw-r--r--src/module/sdk/GFSDKBasic.cpp2
-rw-r--r--src/ui/dialog/controller/ModuleControllerDialog.cpp3
-rw-r--r--ui/ModuleControllerDialog.ui17
3 files changed, 21 insertions, 1 deletions
diff --git a/src/module/sdk/GFSDKBasic.cpp b/src/module/sdk/GFSDKBasic.cpp
index bea0dc5b..4d8af6c8 100644
--- a/src/module/sdk/GFSDKBasic.cpp
+++ b/src/module/sdk/GFSDKBasic.cpp
@@ -56,7 +56,7 @@ void GFExecuteCommandSync(const char* cmd, int32_t argc, const char** argv,
args.append(GpgFrontend::GFUnStrDup(argv[i]));
}
- GpgFrontend::GpgCommandExecutor::ExecuteContext context{
+ GpgFrontend::GpgCommandExecutor::ExecuteContext const context{
cmd, args, [=](int exit_code, const QString& out, const QString& err) {
cb(data, exit_code, out.toUtf8(), err.toUtf8());
}};
diff --git a/src/ui/dialog/controller/ModuleControllerDialog.cpp b/src/ui/dialog/controller/ModuleControllerDialog.cpp
index 8c04d728..9648f2d3 100644
--- a/src/ui/dialog/controller/ModuleControllerDialog.cpp
+++ b/src/ui/dialog/controller/ModuleControllerDialog.cpp
@@ -54,6 +54,9 @@ ModuleControllerDialog::ModuleControllerDialog(QWidget* parent)
ui_->tabWidget->setTabText(1, tr("Global Register Table"));
ui_->tabWidget->setTabText(2, tr("Debugger"));
+ ui_->tipsLabel->setText(
+ tr("Tips: Module name front with \"*\" stands for integrated module."));
+
this->setWindowTitle(tr("Module Controller"));
connect(ui_->moduleListView, &ModuleListView::SignalSelectModule, this,
diff --git a/ui/ModuleControllerDialog.ui b/ui/ModuleControllerDialog.ui
index a12ec6e2..97dd1397 100644
--- a/ui/ModuleControllerDialog.ui
+++ b/ui/ModuleControllerDialog.ui
@@ -147,6 +147,23 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="Line" name="line_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="tipsLabel">
+ <property name="text">
+ <string>Tips: Module name front with &quot;*&quot; stands for integrated module.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab">