musescore · igorkorsukov · May 26, 2025 · May 23, 2025 · May 23, 2025 · May 23, 2025
diff --git a/src/appshell/qml/DevTools/Interactive/InteractiveTests.qml b/src/appshell/qml/DevTools/Interactive/InteractiveTests.qml
@@ -67,13 +67,44 @@ Rectangle {
         spacing: 16
         columns: 2
 
+        FlatButton {
+            width: 200
+            navigation.panel: navPanel
+            navigation.row: 0
+            text: "[cpp] selectOpeningFile"
+            onClicked: testModel.selectOpeningFile()
+        }
+
+        FlatButton {
+            width: 200
+            navigation.panel: navPanel
+            navigation.row: 0
+            text: "[cpp] selectSavingFile"
+            onClicked: testModel.selectSavingFile()
+        }
+
+        FlatButton {
+            width: 200
+            navigation.panel: navPanel
+            navigation.row: 0
+            text: "[cpp] selectDirectory"
+            onClicked: testModel.selectDirectory()
+        }
+
+        FlatButton {
+            width: 200
+            navigation.panel: navPanel
+            navigation.row: 0
+            text: "[cpp] showProgress"
+            onClicked: testModel.showProgress()
+        }
 
         FlatButton {
             width: 200
             navigation.panel: navPanel
             navigation.row: 0
-            text: "[cpp] Sample dialog"
-            onClicked: testModel.openSampleDialog()
+            text: "[cpp] Sample dialog sync"
+            onClicked: testModel.openSampleDialogSync()
         }
 
         FlatButton {

diff --git a/src/framework/audioplugins/internal/registeraudiopluginsscenario.cpp b/src/framework/audioplugins/internal/registeraudiopluginsscenario.cpp
@@ -77,10 +77,7 @@ Ret RegisterAudioPluginsScenario::registerNewPlugins()
 
 void RegisterAudioPluginsScenario::processPluginsRegistration(const io::paths_t& pluginPaths)
 {
-    Ret ret = interactive()->showProgress(muse::trc("audio", "Scanning audio plugins"), &m_progress);
-    if (!ret) {
-        LOGE() << ret.toString();
-    }
+    interactive()->showProgress(muse::trc("audio", "Scanning audio plugins"), &m_progress);
 
     m_aborted = false;
     m_progress.start();

diff --git a/src/framework/audioplugins/tests/registeraudiopluginsscenariotest.cpp b/src/framework/audioplugins/tests/registeraudiopluginsscenariotest.cpp
@@ -155,7 +155,7 @@ TEST_F(AudioPlugins_RegisterAudioPluginsScenarioTest, RegisterNewPlugins)
 
     // [THEN] The progress bar is shown
     EXPECT_CALL(*m_interactive, showProgress(muse::trc("audio", "Scanning audio plugins"), _))
-    .WillOnce(Return(muse::make_ok()));
+    .Times(1);
 
     // [THEN] Processes started only for unregistered plugins
     for (const path_t& pluginPath : foundPluginPaths) {

diff --git a/src/framework/autobot/internal/autobotinteractive.cpp b/src/framework/autobot/internal/autobotinteractive.cpp
@@ -95,9 +95,9 @@ async::Promise<IInteractive::Result> AutobotInteractive::error(const std::string
     return m_real->error(contentTitle, text, buttons, defBtn, options, dialogTitle);
 }
 
-Ret AutobotInteractive::showProgress(const std::string& title, Progress* progress) const
+void AutobotInteractive::showProgress(const std::string& title, Progress* progress)
 {
-    return m_real->showProgress(title, progress);
+    m_real->showProgress(title, progress);
 }
 
 io::path_t AutobotInteractive::selectOpeningFile(const QString& title, const io::path_t& dir, const std::vector<std::string>& filter)

diff --git a/src/framework/autobot/internal/autobotinteractive.h b/src/framework/autobot/internal/autobotinteractive.h
@@ -69,7 +69,7 @@ class AutobotInteractive : public IInteractive
                                  const std::string& dialogTitle = "") override;
 
     // progress
-    Ret showProgress(const std::string& title, Progress* progress) const override;
+    void showProgress(const std::string& title, Progress* progress) override;
 
     // files
     io::path_t selectOpeningFile(const QString& title, const io::path_t& dir, const std::vector<std::string>& filter) override;

diff --git a/src/framework/global/async/promise.h b/src/framework/global/async/promise.h
@@ -28,8 +28,12 @@ namespace muse::async {
 template<typename ... T>
 using Promise = kors::async::Promise<T...>;
 
+using PromiseType = kors::async::PromiseType;
+
 template<typename ... T>
-constexpr auto make_promise = kors::async::make_promise<T...>;
+auto make_promise = [](typename Promise<T...>::Body f, PromiseType type = PromiseType::AsyncByPromise) {
+    return kors::async::make_promise<T...>(f, type);
+};
 }
 
 #endif // MUSE_ASYNC_PROMISE_H
diff --git a/src/framework/global/iinteractive.h b/src/framework/global/iinteractive.h
@@ -208,7 +208,7 @@ class IInteractive : MODULE_EXPORT_INTERFACE
     }
 
     // progress
-    virtual Ret showProgress(const std::string& title, Progress* progress) const = 0;
+    virtual void showProgress(const std::string& title, Progress* progress) = 0;
 
     // files
     virtual io::path_t selectOpeningFile(const QString& title, const io::path_t& dir, const std::vector<std::string>& filter) = 0;