Show button only if default editor is set in settings + small fixes

ossia · Jan 8, 2025 · d4a13e3 · d4a13e3
1 parent ffa0ab1
commit d4a13e3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/src/plugins/score-lib-process/Process/Script/MultiScriptEditor.hpp b/src/plugins/score-lib-process/Process/Script/MultiScriptEditor.hpp
@@ -27,7 +27,7 @@ class SCORE_LIB_PROCESS_EXPORT MultiScriptDialog : public QDialog
   void setText(int idx, const QString& str);
   void setError(const QString& str);
   void clearError();
-  void openInExternalEditor();
+  void openInExternalEditor(const QString& editorPath);
 
 protected:
   virtual void on_accepted() = 0;

diff --git a/src/plugins/score-lib-process/Process/Script/ScriptEditor.cpp b/src/plugins/score-lib-process/Process/Script/ScriptEditor.cpp
@@ -58,10 +58,15 @@ ScriptDialog::ScriptDialog(
       bbox->button(QDialogButtonBox::Close), &QPushButton::clicked, this,
       &QDialog::close);
 
-  auto openExternalBtn = new QPushButton{tr("Open in external editor.."), this};
-  connect(
-      openExternalBtn, &QPushButton::clicked, this, [this] { openInExternalEditor(); });
-  lay->addWidget(openExternalBtn);
+  if(auto editorPath = QSettings{}.value("Skin/DefaultEditor").toString();
+     !editorPath.isEmpty())
+  {
+    auto openExternalBtn = new QPushButton{tr("Edit in default editor"), this};
+    connect(openExternalBtn, &QPushButton::clicked, this, [this, editorPath] {
+      openInExternalEditor(editorPath);
+    });
+    lay->addWidget(openExternalBtn);
+  }
 }
 
 QString ScriptDialog::text() const noexcept
@@ -118,10 +123,15 @@ MultiScriptDialog::MultiScriptDialog(const score::DocumentContext& ctx, QWidget*
       bbox->button(QDialogButtonBox::Close), &QPushButton::clicked, this,
       &QDialog::close);
 
-  auto openExternalBtn = new QPushButton{tr("Open in external editor.."), this};
-  connect(
-      openExternalBtn, &QPushButton::clicked, this, [this] { openInExternalEditor(); });
-  lay->addWidget(openExternalBtn);
+  if(auto editorPath = QSettings{}.value("Skin/DefaultEditor").toString();
+     !editorPath.isEmpty())
+  {
+    auto openExternalBtn = new QPushButton{tr("Edit in default editor"), this};
+    connect(openExternalBtn, &QPushButton::clicked, this, [this, editorPath] {
+      openInExternalEditor(editorPath);
+    });
+    lay->addWidget(openExternalBtn);
+  }
 }
 
 void MultiScriptDialog::addTab(
@@ -167,9 +177,8 @@ void MultiScriptDialog::clearError()
   m_error->clear();
 }
 
-void ScriptDialog::openInExternalEditor()
+void ScriptDialog::openInExternalEditor(const QString& editorPath)
 {
-  QString editorPath = QSettings{}.value("Skin/DefaultEditor").toString();
 
   if(editorPath.isEmpty())
   {
@@ -178,8 +187,8 @@ void ScriptDialog::openInExternalEditor()
     return;
   }
 
-  QString tempFile = QStandardPaths::writableLocation(QStandardPaths::TempLocation)
-                     + "/ossia_script_temp.js";
+  const QString tempFile = QStandardPaths::writableLocation(QStandardPaths::TempLocation)
+                           + "/ossia_script_temp.js";
   QFile file(tempFile);
   if(!file.open(QIODevice::WriteOnly))
   {
@@ -188,15 +197,13 @@ void ScriptDialog::openInExternalEditor()
   }
 
   file.write(this->text().toUtf8());
-  file.close();
 
   auto& w = score::FileWatch::instance();
   m_fileHandle = std::make_shared<std::function<void()>>([this, tempFile]() {
     QFile file(tempFile);
     if(file.open(QIODevice::ReadOnly))
     {
       QString updatedContent = QString::fromUtf8(file.readAll());
-      file.close();
 
       QMetaObject::invokeMethod(m_textedit, [this, updatedContent]() {
         if(m_textedit)
@@ -208,7 +215,7 @@ void ScriptDialog::openInExternalEditor()
   });
   w.add(tempFile, m_fileHandle);
 
-  if(!QProcess::startDetached(editorPath, QStringList() << tempFile))
+  if(!QProcess::startDetached(editorPath, QStringList{tempFile}))
   {
     QMessageBox::warning(this, tr("Error"), tr("failed to launch external editor"));
   }
@@ -224,10 +231,8 @@ void ScriptDialog::stopWatchingFile(const QString& tempFile)
   auto& w = score::FileWatch::instance();
   w.remove(tempFile, m_fileHandle);
 }
-void MultiScriptDialog::openInExternalEditor()
+void MultiScriptDialog::openInExternalEditor(const QString& editorPath)
 {
-  QString editorPath = QSettings{}.value("Skin/DefaultEditor").toString();
-
   if(editorPath.isEmpty())
   {
     QMessageBox::warning(
@@ -266,7 +271,6 @@ void MultiScriptDialog::openInExternalEditor()
       QString content = textedit->document()->toPlainText();
       file.write(content.toUtf8());
     }
-    file.close();
 
     openedFiles.append(tempFile);
   }

diff --git a/src/plugins/score-lib-process/Process/Script/ScriptEditor.hpp b/src/plugins/score-lib-process/Process/Script/ScriptEditor.hpp
@@ -28,7 +28,7 @@ class SCORE_LIB_PROCESS_EXPORT ScriptDialog : public QDialog
 
   void setText(const QString& str);
   void setError(int line, const QString& str);
-  void openInExternalEditor();
+  void openInExternalEditor(const QString& editorPath);
   void stopWatchingFile(const QString& tempFile);
 
 protected: