Merge pull request #1338 from ghutchis/fix-register-script-commands

Fixup mechanism to register script commands - now called by the app

avogadro/qtgui/extensionplugin.h

@@ -74,6 +74,12 @@ class AVOGADROQTGUI_EXPORT ExtensionPlugin : public QObject
    */
   virtual QList<Io::FileFormat*> fileFormats() const;
 
+  /**
+   * If the extension plugin has script commands, this method
+   * should be implemented to emit the registerCommand signals.
+   */
+  virtual void registerCommands() {}
+
 public slots:
   /**
    * Called when the current molecule changes.

avogadro/qtgui/toolplugin.h

@@ -103,6 +103,12 @@ class AVOGADROQTGUI_EXPORT ToolPlugin : public QObject
   virtual bool handleCommand(const QString& command,
                              const QVariantMap& options);
 
+  /**
+   * Called by the app to tell the tool to register commands.
+   * If the tool has commands, it should emit the registerCommand signals.
+   */
+  virtual void registerCommands() {}
+
 signals:
   /**
    * Emitted when draw() needs to be called again due to updates.

avogadro/qtplugins/spectra/spectra.cpp

@@ -27,16 +27,6 @@ Spectra::Spectra(QObject* p)
   action->setText(tr("Vibrational Modes…"));
   connect(action, SIGNAL(triggered()), SLOT(openDialog()));
   m_actions.push_back(action);
-
-  emit registerCommand("showVibrations",
-                       tr("Show the vibrational modes dialog."));
-  emit registerCommand("setVibrationalMode", tr("Set the vibrational mode."));
-  emit registerCommand("setVibrationalAmplitude",
-                       tr("Set the vibrational amplitude."));
-  emit registerCommand("startVibrationAnimation",
-                       tr("Start the vibrational animation."));
-  emit registerCommand("stopVibrationAnimation",
-                       tr("Stop the vibrational animation."));
 }
 
 Spectra::~Spectra() {}
@@ -68,6 +58,19 @@ void Spectra::setMolecule(QtGui::Molecule* mol)
     openDialog();
 }
 
+void Spectra::registerCommands()
+{
+  emit registerCommand("showVibrations",
+                       tr("Show the vibrational modes dialog."));
+  emit registerCommand("setVibrationalMode", tr("Set the vibrational mode."));
+  emit registerCommand("setVibrationalAmplitude",
+                       tr("Set the vibrational amplitude."));
+  emit registerCommand("startVibrationAnimation",
+                       tr("Start the vibrational animation."));
+  emit registerCommand("stopVibrationAnimation",
+                       tr("Stop the vibrational animation."));
+}
+
 bool Spectra::handleCommand(const QString& command, const QVariantMap& options)
 {
   if (m_molecule == nullptr)

avogadro/qtplugins/spectra/spectra.h

@@ -45,6 +45,8 @@ class Spectra : public QtGui::ExtensionPlugin
   bool handleCommand(const QString& command,
                      const QVariantMap& options) override;
 
+  void registerCommands() override;
+
 public slots:
   void setMode(int mode);
   void setAmplitude(int amplitude);