Merge pull request #743 from ghutchis/add-ellipsis-generators

Add "..." to all input generators to indicate opening a dialog
OpenChemistry · Aug 19, 2021 · 62c0d51 · 62c0d51
2 parents 4db1722 + 4fc5f9f
commit 62c0d51
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/avogadro/qtplugins/apbs/apbs.cpp b/avogadro/qtplugins/apbs/apbs.cpp
@@ -40,12 +40,12 @@ Apbs::Apbs(QObject* parent_)
     m_progressDialog(nullptr), m_dialog(nullptr)
 {
   QAction* action = new QAction(this);
-  action->setText(tr("Run APBS"));
+  action->setText(tr("Run APBS..."));
   connect(action, SIGNAL(triggered()), this, SLOT(onRunApbs()));
   m_actions.append(action);
 
   action = new QAction(this);
-  action->setText(tr("Open Output File"));
+  action->setText(tr("Open Output File..."));
   connect(action, SIGNAL(triggered()), this, SLOT(onOpenOutputFile()));
   m_actions.append(action);
 }

diff --git a/avogadro/qtplugins/cp2kinput/cp2kinput.cpp b/avogadro/qtplugins/cp2kinput/cp2kinput.cpp
@@ -41,7 +41,7 @@ Cp2kInput::Cp2kInput(QObject* parent_)
     m_dialog(nullptr), m_outputFormat(nullptr)
 {
   m_action->setEnabled(true);
-  m_action->setText(tr("&CP2K"));
+  m_action->setText(tr("&CP2K..."));
   connect(m_action, SIGNAL(triggered()), SLOT(menuActivated()));
 }
 

diff --git a/avogadro/qtplugins/gamessinput/gamessinput.cpp b/avogadro/qtplugins/gamessinput/gamessinput.cpp
@@ -42,7 +42,7 @@ GamessInput::GamessInput(QObject* parent_)
     m_dialog(nullptr), m_outputFormat(nullptr)
 {
   m_action->setEnabled(true);
-  m_action->setText(tr("&GAMESS"));
+  m_action->setText(tr("&GAMESS..."));
   connect(m_action, SIGNAL(triggered()), SLOT(menuActivated()));
 }
 

diff --git a/avogadro/qtplugins/lammpsinput/lammpsinput.cpp b/avogadro/qtplugins/lammpsinput/lammpsinput.cpp
@@ -38,7 +38,7 @@ LammpsInput::LammpsInput(QObject* parent_)
     m_dialog(nullptr), m_outputFormat(nullptr)
 {
   m_action->setEnabled(true);
-  m_action->setText(tr("&LAMMPS Input"));
+  m_action->setText(tr("&LAMMPS..."));
   connect(m_action, SIGNAL(triggered()), SLOT(menuActivated()));
 }
 

diff --git a/avogadro/qtplugins/openmminput/openmminput.cpp b/avogadro/qtplugins/openmminput/openmminput.cpp
@@ -38,7 +38,7 @@ OpenMMInput::OpenMMInput(QObject* parent_)
     m_dialog(nullptr), m_outputFormat(nullptr)
 {
   m_action->setEnabled(true);
-  m_action->setText(tr("&OpenMM Script Builder"));
+  m_action->setText(tr("&OpenMM Script..."));
   connect(m_action, SIGNAL(triggered()), SLOT(menuActivated()));
 }
 

diff --git a/avogadro/qtplugins/quantuminput/quantuminput.cpp b/avogadro/qtplugins/quantuminput/quantuminput.cpp
@@ -224,11 +224,15 @@ void QuantumInput::updateActions()
     QStringList scripts = m_inputGeneratorScripts.values(programName);
     // Include the full path if there are multiple generators with the same
     // name.
+    QString label = programName;
+    if (!label.endsWith("..."))
+      label.append("...");
+
     if (scripts.size() == 1) {
-      addAction(programName, scripts.first());
+      addAction(label, scripts.first());
     } else {
       foreach (const QString& filePath, scripts) {
-        addAction(QString("%1 (%2)").arg(programName, filePath), filePath);
+        addAction(QString("%1 (%2)").arg(label, filePath), filePath);
       }
     }
   }