Reorganize menus - fix #474

avogadro/qtplugins/apbs/apbs.cpp

@@ -58,7 +58,7 @@ Apbs::~Apbs()
 
 QStringList Apbs::menuPath(QAction*) const
 {
-  return QStringList() << tr("&Extensions") << tr("&APBS");
+  return QStringList() << tr("&Input") << tr("&APBS");
 }
 
 void Apbs::setMolecule(QtGui::Molecule* mol)

avogadro/qtplugins/cp2kinput/cp2kinput.cpp

@@ -57,7 +57,7 @@ QList<QAction*> Cp2kInput::actions() const
 QStringList Cp2kInput::menuPath(QAction*) const
 {
   QStringList path;
-  path << tr("&Quantum") << tr("Input Generators");
+  path << tr("&Input");
   return path;
 }
 

avogadro/qtplugins/gamessinput/gamessinput.cpp

@@ -60,7 +60,7 @@ QList<QAction*> GamessInput::actions() const
 QStringList GamessInput::menuPath(QAction*) const
 {
   QStringList path;
-  path << tr("&Quantum") << tr("Input Generators");
+  path << tr("&Input");
   return path;
 }
 

avogadro/qtplugins/lammpsinput/lammpsinput.cpp

@@ -56,7 +56,7 @@ QList<QAction*> LammpsInput::actions() const
 QStringList LammpsInput::menuPath(QAction*) const
 {
   QStringList path;
-  path << tr("&Extensions") << tr("Molecular Dynamics");
+  path << tr("&Input");
   return path;
 }
 

avogadro/qtplugins/molecularproperties/molecularproperties.cpp

@@ -30,7 +30,7 @@ MolecularProperties::MolecularProperties(QObject* parent_)
     m_dialog(nullptr), m_molecule(nullptr)
 {
   m_action->setEnabled(true);
-  m_action->setText("&Molecular Properties...");
+  m_action->setText("&Molecular...");
   connect(m_action, SIGNAL(triggered()), SLOT(showDialog()));
 }
 
@@ -50,7 +50,7 @@ QList<QAction*> MolecularProperties::actions() const
 
 QStringList MolecularProperties::menuPath(QAction*) const
 {
-  return QStringList() << tr("&View");
+  return QStringList() << tr("&Analysis") << tr("&Properties");
 }
 
 void MolecularProperties::setMolecule(QtGui::Molecule* mol)

avogadro/qtplugins/openmminput/openmminput.cpp

@@ -54,7 +54,7 @@ QList<QAction*> OpenMMInput::actions() const
 QStringList OpenMMInput::menuPath(QAction*) const
 {
   QStringList path;
-  path << tr("&Extensions") << tr("Molecular Dynamics");
+  path << tr("&Input");
   return path;
 }
 

avogadro/qtplugins/qtaim/qtaimextension.cpp

@@ -87,7 +87,7 @@ QList<QAction*> QTAIMExtension::actions() const
 
 QStringList QTAIMExtension::menuPath(QAction*) const
 {
-  return QStringList() << tr("E&xtensions") << tr("QTAIM");
+  return QStringList() << tr("&Analysis") << tr("QTAIM");
 }
 
 void QTAIMExtension::setMolecule(QtGui::Molecule* molecule)

avogadro/qtplugins/quantuminput/quantuminput.cpp

@@ -50,6 +50,8 @@ using MoleQueue::InputGenerator;
 using MoleQueue::InputGeneratorDialog;
 using ::MoleQueue::JobObject;
 
+const int ConfigureAction = -1; // to find the configuration action
+
 QuantumInput::QuantumInput(QObject* parent_)
   : ExtensionPlugin(parent_)
   , m_molecule(nullptr)
@@ -69,10 +71,16 @@ QList<QAction*> QuantumInput::actions() const
   return m_actions;
 }
 
-QStringList QuantumInput::menuPath(QAction*) const
+QStringList QuantumInput::menuPath(QAction*action) const
 {
   QStringList path;
-  path << tr("&Quantum") << tr("Input Generators");
+  if (action == nullptr)
+    return path;
+
+  if (action->data() == ConfigureAction)
+    path << tr("&Extensions");
+  else
+    path << tr("&Input");
   return path;
 }
 
@@ -212,10 +220,6 @@ void QuantumInput::updateActions()
 {
   m_actions.clear();
 
-  QAction* action = new QAction(tr("Set Python Path..."), this);
-  connect(action, SIGNAL(triggered()), SLOT(configurePython()));
-  m_actions << action;
-
   foreach (const QString& programName, m_inputGeneratorScripts.uniqueKeys()) {
     QStringList scripts = m_inputGeneratorScripts.values(programName);
     // Include the full path if there are multiple generators with the same
@@ -228,6 +232,13 @@ void QuantumInput::updateActions()
       }
     }
   }
+
+  // Last one is the configuration action
+  // TODO: set this globally via the app
+  QAction* action = new QAction(tr("Set Python Path..."), this);
+  action->setData(ConfigureAction);
+  connect(action, SIGNAL(triggered()), SLOT(configurePython()));
+  m_actions << action;
 }
 
 void QuantumInput::addAction(const QString& label,

avogadro/qtplugins/spectra/spectra.cpp

@@ -52,7 +52,7 @@ QList<QAction*> Spectra::actions() const
 QStringList Spectra::menuPath(QAction*) const
 {
   QStringList path;
-  path << tr("&Quantum");
+  path << tr("&Analysis");
   return path;
 }
 

avogadro/qtplugins/surfaces/surfaces.cpp

@@ -117,7 +117,7 @@ QList<QAction*> Surfaces::actions() const
 QStringList Surfaces::menuPath(QAction*) const
 {
   QStringList path;
-  path << tr("&Extensions");
+  path << tr("&Analysis");
   return path;
 }
 

avogadro/qtplugins/symmetry/symmetry.cpp

@@ -50,7 +50,7 @@ Symmetry::Symmetry(QObject* parent_)
 
   m_ctx = msymCreateContext();
 
-  m_viewSymmetryAction->setText(tr("Symmetry Properties..."));
+  m_viewSymmetryAction->setText(tr("Symmetry..."));
   connect(m_viewSymmetryAction, SIGNAL(triggered()), SLOT(viewSymmetry()));
   m_actions.push_back(m_viewSymmetryAction);
   m_viewSymmetryAction->setProperty("menu priority", -50);
@@ -91,7 +91,7 @@ QList<QAction*> Symmetry::actions() const
 
 QStringList Symmetry::menuPath(QAction*) const
 {
-  return QStringList() << tr("&View");
+  return QStringList() << tr("&Analysis") << tr("&Properties");
 }
 
 void Symmetry::setMolecule(QtGui::Molecule* mol)