Encapsulated QCustomPlot into TPlotWidget, providing a QCustomPlot wi…

…th data storage and buttons for data manipulation / export. Reworked About Plugins dialog to be general About dialog. Added 'runTool()' command to allow running of tools from scripts. Renamed ringstool to springstool. Added quiet argument to Pattern::createMatrices(). Added Ring::atomArray() to return array of atoms in ring. Fixed - detection of SP rings in tool_springs was not quite correct.

configure.ac

@@ -189,7 +189,7 @@ src/plugins/io_vfield/Makefile
 src/plugins/io_xyz/Makefile
 src/plugins/method_mopac71/Makefile
 src/plugins/method_mopac71/mopac7.1/Makefile
-src/plugins/tool_rings/Makefile
+src/plugins/tool_springs/Makefile
 src/plugins/tool_test/Makefile
 src/sg/Makefile
 src/templates/Makefile

data/test/tool_springs/Franzblau_fig1.akf

@@ -0,0 +1,17 @@
+title  'Franzblau Fig. 1'
+atom   1 Si -3.589831 2.687586 0.000000 0.000000 Line 0.000000 1.000000 0.200000 1.000000 0 *
+atom   2 Si 0.558710 3.771151 0.000000 0.000000 Line 0.000000 1.000000 0.200000 1.000000 0 *
+atom   3 Si -1.766587 0.388918 0.000000 0.000000 Line 0.000000 1.000000 0.200000 1.000000 0 *
+atom   4 Si 2.962997 0.441770 0.000000 0.000000 Line 0.000000 1.000000 0.200000 1.000000 0 *
+atom   5 Si -3.563407 -1.751598 0.000000 0.000000 Line 0.000000 1.000000 0.200000 1.000000 0 *
+atom   6 Si 0.611562 -2.808463 0.000000 0.000000 Line 0.000000 1.000000 0.200000 1.000000 0 *
+atom   7 Si 4.786557 -2.729364 0.000000 0.000000 Line 0.000000 1.000000 0.200000 1.000000 0 *
+bond   5 1 single
+bond   6 5 single
+bond   7 6 single
+bond   4 7 single
+bond   2 4 single
+bond   3 2 single
+bond   6 3 single
+bond   6 4 single
+bond   2 1 single

src/base/cell.cpp

@@ -131,7 +131,6 @@ Model* UnitCell::parent()
 bool UnitCell::copy(UnitCell* source)
 {
 	if (source == NULL) return false;
-	source->print();
 	(*this) = (*source);
 	return true;
 }

src/base/pattern.cpp

@@ -699,7 +699,7 @@ void Pattern::deleteExpression()
 }
 
 // Create connectivity and scaling matrices for molecules in pattern
-void Pattern::createMatrices(bool forceFull)
+void Pattern::createMatrices(bool forceFull, bool quiet)
 {
 	Messenger::enter("Pattern::createMatrices");
 	int n, m, a1, a2;
@@ -715,14 +715,14 @@ void Pattern::createMatrices(bool forceFull)
 	elecScaleMatrix_ = new double*[nAtoms_];
 	for (n=0; n<nAtoms_; n++) elecScaleMatrix_[n] = new double[nAtoms_];
 
-	Messenger::print("Connectivity matrix.....initialising....");
+	if (!quiet) Messenger::print("Connectivity matrix.....initialising....");
 	for (n=0; n<nAtoms_; ++n)
 		for (m=0; m<nAtoms_; ++m) conMatrix_[n][m] = 0;
 
 	// Since the full transformation to the connectivity matrix is quite intensive, we will only do this for patterns containing less than 1000 atoms
 	if (forceFull || (nAtoms_ < 1000))
 	{
-		Messenger::print("seeding.....");
+		if (!quiet) Messenger::print("seeding.....");
 		// First, build up the bond matrix
 		Atom* i = firstAtom_;
 		int ii = i->id();
@@ -742,7 +742,7 @@ void Pattern::createMatrices(bool forceFull)
 // 		}
 
 		// Now, transform into the connectivity matrix.
-		Messenger::print("transforming (full).....");
+		if (!quiet) Messenger::print("transforming (full).....");
 		for (a1=0; a1<nAtoms_; a1++)
 		{
 			for (a2=0; a2<nAtoms_; a2++)
@@ -774,7 +774,7 @@ void Pattern::createMatrices(bool forceFull)
 	else
 	{
 		// Create minimal transformation matrix, using only bond, angle, and torsion data
-		Messenger::print("transforming (minimal).....");
+		if (!quiet) Messenger::print("transforming (minimal).....");
 
 		// There may be more than one consecutive bound fragment in the pattern, so we must perform treeSelects in order to populate the initial matrix
 		Atom* i = firstAtom_;
@@ -842,7 +842,7 @@ void Pattern::createMatrices(bool forceFull)
 			conMatrix_[pb->atomId(3)][pb->atomId(0)] = 3;
 		}
 	}
-	Messenger::print("done.");
+	if (!quiet) Messenger::print("done.");
 
 // 	printf("Connectivity Matrix\n");
 // 	for (n=0; n<nAtoms_; n++)

src/base/pattern.h

@@ -293,7 +293,7 @@ class Pattern : public ListItem<Pattern>
 	// Create the shell of the energy expression
 	bool createExpression(bool vdwOnly = false, bool allowDummy = false, Forcefield* defaultForcefield = NULL);
 	// Create the connectivity and scaling matrices
-	void createMatrices(bool forceFull = false);
+	void createMatrices(bool forceFull = false, bool quiet = false);
 	// Update scaling matrices
 	void updateScaleMatrices();
 	// Return connectivity distance between atom indices specified

src/base/ring.cpp

@@ -112,6 +112,12 @@ RefListItem<Atom,int>* Ring::atoms() const
 	return atoms_.first();
 }
 
+// Return array of referenced atoms
+RefListItem<Atom,int>** Ring::atomArray()
+{
+	return atoms_.array();
+}
+
 // Return last referenced atom
 RefListItem<Atom,int>* Ring::lastAtom() const
 {

src/base/ring.h

@@ -70,6 +70,8 @@ class Ring : public ListItem<Ring>
 	Pattern* parent();
 	// Return first referenced atom
 	RefListItem<Atom,int>* atoms() const;
+	// Return array of referenced atoms
+	RefListItem<Atom,int>** atomArray();
 	// Return last referenced atom
 	RefListItem<Atom,int>* lastAtom() const;
 	// Return first referenced bond

src/command/CMakeLists.txt

@@ -35,6 +35,7 @@ select.cpp
 site.cpp
 string.cpp
 system.cpp
+tools.cpp
 trajectory.cpp
 transform.cpp
 view.cpp

src/command/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libcommand.la
 
-libcommand_la_SOURCES = analyse.cpp atom.cpp bonds.cpp build.cpp cell.cpp charge.cpp colourscale.cpp commands.cpp disorder.cpp edit.cpp energy.cpp flow.cpp forcefield.cpp forces.cpp functions.cpp glyph.cpp grid.cpp image.cpp labels.cpp math.cpp mc.cpp measure.cpp messaging.cpp minimise.cpp model.cpp modelextras.cpp operators.cpp pattern.cpp pores.cpp readwrite.cpp script.cpp select.cpp site.cpp string.cpp system.cpp trajectory.cpp transform.cpp view.cpp
+libcommand_la_SOURCES = analyse.cpp atom.cpp bonds.cpp build.cpp cell.cpp charge.cpp colourscale.cpp commands.cpp disorder.cpp edit.cpp energy.cpp flow.cpp forcefield.cpp forces.cpp functions.cpp glyph.cpp grid.cpp image.cpp labels.cpp math.cpp mc.cpp measure.cpp messaging.cpp minimise.cpp model.cpp modelextras.cpp operators.cpp pattern.cpp pores.cpp readwrite.cpp script.cpp select.cpp site.cpp string.cpp system.cpp tools.cpp trajectory.cpp transform.cpp view.cpp
 
 noinst_HEADERS = commands.h
 

src/command/commands.cpp

@@ -1217,6 +1217,11 @@ CommandData Commands::data_[Commands::nCommands] = {
 		"",
 		"Print program version information" },
 
+	// Tool commands
+	{ "runTool",		"C",		VTypes::IntegerData,
+		"string toolName[,option=value,...]",
+		"Run the specified tool, setting options if provided" },
+
 	// Trajectory commands
 	{ "addFrame",		"c",		VTypes::ModelData,
 		"string name = null",

src/command/commands.h

@@ -1,6 +1,6 @@
 /*
 	*** Command Functions
-	*** src/parser/commands.h
+	*** src/command/commands.h
 	Copyright T. Youngs 2007-2017
 
 	This file is part of Aten.
@@ -515,6 +515,9 @@ class Commands
 		Seed,
 		Version,
 
+		// Tool Commands
+		RunTool,
+
 		// Trajectory Commands
 		AddFrame,
 		ClearTrajectory,
@@ -546,7 +549,7 @@ class Commands
 		TranslateCell,
 		TranslateWorld,
 
-		// View
+		// View Commands
 		AxisRotateView,
 		GetView,
 		Orthographic,
@@ -953,6 +956,8 @@ class Commands
 	bool function_SearchCommands(CommandNode* c, Bundle& obj, ReturnValue& rv);
 	bool function_Seed(CommandNode* c, Bundle& obj, ReturnValue& rv);
 	bool function_Version(CommandNode* c, Bundle& obj, ReturnValue& rv);
+	// Tool Commands
+	bool function_RunTool(CommandNode* c, Bundle& obj, ReturnValue& rv);
 	// Trajectory Commands
 	bool function_AddFrame(CommandNode* c, Bundle& obj, ReturnValue& rv);
 	bool function_ClearTrajectory(CommandNode* c, Bundle& obj, ReturnValue& rv);

src/command/functions.cpp

@@ -474,6 +474,9 @@ void Commands::initPointers()
 	pointers_[Seed] = &AtenSpace::Commands::function_Seed;
 	pointers_[Version] = &AtenSpace::Commands::function_Version;
 
+	// Tool Commands
+	pointers_[RunTool] = &AtenSpace::Commands::function_RunTool;
+
 	// Trajectory Commands
 	pointers_[AddFrame] = &AtenSpace::Commands::function_AddFrame;
 	pointers_[ClearTrajectory] = &AtenSpace::Commands::function_ClearTrajectory;

src/command/tools.cpp

@@ -0,0 +1,63 @@
+/*
+	*** Tool Commands
+	*** src/command/tool.cpp
+	Copyright T. Youngs 2007-2017
+
+	This file is part of Aten.
+
+	Aten is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	Aten is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Aten.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "command/commands.h"
+#include "parser/commandnode.h"
+#include "gui/mainwindow.h"
+#include "model/model.h"
+#include "base/sysfunc.h"
+#include "main/aten.h"
+
+ATEN_USING_NAMESPACE
+
+// Run specified tool, with options if provided
+bool Commands::function_RunTool(CommandNode* c, Bundle& obj, ReturnValue& rv)
+{
+	if (obj.notifyNull(Bundle::ModelPointer)) return false;
+
+	// Parse the first option so we can get the filter nickname and any filter options
+	LineParser parser;
+	parser.getArgsDelim(Parser::UseQuotes, c->argc(0));
+
+	// First part of argument zero is tool nickname (followed by options)
+	ToolPluginInterface* plugin = aten_.pluginStore().findToolPluginByNickname(PluginTypes::GeneralToolPlugin, parser.argc(0));
+
+	// Check that a suitable plugin was found
+	if (plugin == NULL)
+	{
+		// Print list of valid plugin nicknames
+		aten_.pluginStore().showToolPluginNicknames(PluginTypes::GeneralToolPlugin);
+		Messenger::print("Nothing was run.");
+		rv.set(false);
+		return false;
+	}
+
+	// Loop over remaining arguments which are option assignments
+	KVMap pluginOptions;
+	for (int n = 1; n < parser.nArgs(); ++n) pluginOptions.add(parser.argc(n));
+
+	bool result = aten_.runTool(plugin, pluginOptions, false);
+
+	rv.set(result);
+
+	return result;
+}
+

src/gui/CMakeLists.txt

@@ -2,7 +2,7 @@
 # the UI file won't be wrapped!
 # Meta-Objects
 SET(gui_MOC_HDRS
-  aboutplugins.h
+  about.h
   colourdialog.h
   disorderoptions.h
   disorderwizard.h
@@ -106,7 +106,7 @@ QT5_WRAP_CPP(treegui_MOC_SRCS ${treegui_MOC_HDRS})
 
 # User Interface Files
 SET(gui_UIS
-  aboutplugins.ui
+  about.ui
   colourdialog.ui
   disorderoptions.ui
   disorderwizard.ui
@@ -197,7 +197,7 @@ QT5_WRAP_UI(treegui_UIS_H ${treegui_UIS})
 set(gui_SRCS
   useractions.h
   useractions.cpp
-  aboutplugins_funcs.cpp
+  about_funcs.cpp
   colourdialog_funcs.cpp
   disorderoptions_funcs.cpp
   disorderwizard_funcs.cpp

src/gui/Makefile.am

@@ -25,15 +25,15 @@ clean-local:
 
 libtreegui_la_SOURCES = treegui.ui treegui_funcs.cpp
 
-libgui_la_SOURCES = icons.qrc aboutplugins.ui colourdialog.ui disorderoptions.ui disorderwizard.ui exportfilm.ui exportimage.ui ffeditor.ui fileselectorwidget.ui openexpression.ui opengrid.ui openmodel.ui opentrajectory.ui prefs.ui progress.ui saveexpression.ui savemodel.ui selectpattern.ui selectvariable.ui zmatrix.ui mainwindow.ui
+libgui_la_SOURCES = icons.qrc about.ui colourdialog.ui disorderoptions.ui disorderwizard.ui exportfilm.ui exportimage.ui ffeditor.ui fileselectorwidget.ui openexpression.ui opengrid.ui openmodel.ui opentrajectory.ui prefs.ui progress.ui saveexpression.ui savemodel.ui selectpattern.ui selectvariable.ui zmatrix.ui mainwindow.ui
 
 libgui_la_SOURCES += popupbuildaddatom.ui popupbuildaddh.ui popupbuildclear.ui popupbuildfragments.ui popupbuildgrow.ui popupbuildrebond.ui popupbuildtransmute.ui popupcellangles.ui popupcelllengths.ui popupcellmatrix.ui popupcellmiller.ui popupcellreplicate.ui popupcellscale.ui popupcellspacegroup.ui popupcolour.ui popupelementtable.ui popupfileaten.ui popupfileimage.ui popupfileopen.ui popupfilesave.ui popupfilesession.ui popupforcefieldsassign.ui popupforcefieldsminimise.ui popupforcefieldsopen.ui popupforcefieldstest.ui popupgeometrycentre.ui popupgridcolour.ui popupgridmatrix.ui popupgridorigin.ui popupgridset.ui popupgridshift.ui popupgridstyle.ui popupgridsopen.ui popuplabeloptions.ui popupmeasureangle.ui popupmeasureclear.ui popupmeasuredistance.ui popupmeasuretorsion.ui popupporesdrill.ui popupporesscheme.ui popupscriptsopen.ui popuptransformangle.ui popuptransformcentre.ui popuptransformconvert.ui popuptransformdistance.ui popuptransformflip.ui popuptransformrotate.ui popuptransformmultiply.ui popuptransformreposition.ui popuptransformshift.ui popuptransformtorsion.ui popuptransformtranslate.ui popupviewcolourscheme.ui popupviewreset.ui popupviewstyle.ui
 
 #OLD FILES FOR UPDATING BEGIN HERE
 libgui_la_SOURCES += glyphs.ui vibrations.ui viewbasis.ui vieweigenvector.ui
 #OLD FILES END HERE
 
-libgui_la_SOURCES += aboutplugins_funcs.cpp colourdialog_funcs.cpp disorderoptions_funcs.cpp disorderwizard_funcs.cpp exportfilm_funcs.cpp exportimage_funcs.cpp ffeditor_funcs.cpp fileselectorwidget_funcs.cpp layoutlist.cpp mainwindow_atoms.cpp mainwindow_context.cpp mainwindow_film.cpp mainwindow_funcs.cpp mainwindow_image.cpp mainwindow_interaction.cpp mainwindow_messages.cpp mainwindow_models.cpp mainwindow_panel_build.cpp mainwindow_panel_calculate.cpp mainwindow_panel_cell.cpp mainwindow_panel_forcefields.cpp mainwindow_panel_grids.cpp mainwindow_panel_home.cpp mainwindow_panel_select.cpp mainwindow_panel_selection.cpp mainwindow_panel_tools.cpp mainwindow_panel_trajectory.cpp mainwindow_panel_transform.cpp mainwindow_quickcommand.cpp mainwindow_session.cpp mainwindow_update.cpp prefs_funcs.cpp progress_funcs.cpp selectpattern_funcs.cpp selectvariable_funcs.cpp settings.cpp zmatrix_funcs.cpp
+libgui_la_SOURCES += about_funcs.cpp colourdialog_funcs.cpp disorderoptions_funcs.cpp disorderwizard_funcs.cpp exportfilm_funcs.cpp exportimage_funcs.cpp ffeditor_funcs.cpp fileselectorwidget_funcs.cpp layoutlist.cpp mainwindow_atoms.cpp mainwindow_context.cpp mainwindow_film.cpp mainwindow_funcs.cpp mainwindow_image.cpp mainwindow_interaction.cpp mainwindow_messages.cpp mainwindow_models.cpp mainwindow_panel_build.cpp mainwindow_panel_calculate.cpp mainwindow_panel_cell.cpp mainwindow_panel_forcefields.cpp mainwindow_panel_grids.cpp mainwindow_panel_home.cpp mainwindow_panel_select.cpp mainwindow_panel_selection.cpp mainwindow_panel_tools.cpp mainwindow_panel_trajectory.cpp mainwindow_panel_transform.cpp mainwindow_quickcommand.cpp mainwindow_session.cpp mainwindow_update.cpp prefs_funcs.cpp progress_funcs.cpp selectpattern_funcs.cpp selectvariable_funcs.cpp settings.cpp zmatrix_funcs.cpp
 
 libgui_la_SOURCES += popupbuildaddatom_funcs.cpp popupbuildaddh_funcs.cpp popupbuildclear_funcs.cpp popupbuildfragments_funcs.cpp popupbuildgrow_funcs.cpp popupbuildrebond_funcs.cpp popupbuildtransmute_funcs.cpp popupcellangles_funcs.cpp popupcelllengths_funcs.cpp popupcellmatrix_funcs.cpp popupcellmiller_funcs.cpp popupcellreplicate_funcs.cpp popupcellscale_funcs.cpp popupcellspacegroup_funcs.cpp popupcolour_funcs.cpp popupelementtable_funcs.cpp popupfileaten_funcs.cpp popupfileimage_funcs.cpp popupfileopen_funcs.cpp popupfilesave_funcs.cpp popupfilesession_funcs.cpp popupforcefieldsassign_funcs.cpp popupforcefieldsminimise_funcs.cpp popupforcefieldsopen_funcs.cpp popupforcefieldstest_funcs.cpp popupgeometrycentre_funcs.cpp popupgridcolour_funcs.cpp popupgridmatrix_funcs.cpp popupgridorigin_funcs.cpp popupgridset_funcs.cpp popupgridshift_funcs.cpp popupgridstyle_funcs.cpp popupgridsopen_funcs.cpp popuplabeloptions_funcs.cpp popupmeasureangle_funcs.cpp popupmeasureclear_funcs.cpp popupmeasuredistance_funcs.cpp popupmeasuretorsion_funcs.cpp popupporesdrill_funcs.cpp popupporesscheme_funcs.cpp popupscriptsopen_funcs.cpp popuptransformangle_funcs.cpp popuptransformcentre_funcs.cpp popuptransformconvert_funcs.cpp popuptransformdistance_funcs.cpp popuptransformflip_funcs.cpp popuptransformmultiply_funcs.cpp popuptransformreposition_funcs.cpp popuptransformrotate_funcs.cpp popuptransformshift_funcs.cpp popuptransformtorsion_funcs.cpp popuptransformtranslate_funcs.cpp popupviewcolourscheme_funcs.cpp popupviewreset_funcs.cpp popupviewstyle_funcs.cpp
 
@@ -49,7 +49,7 @@ libgui_la_SOURCES += glyphs_funcs.cpp vibrations_funcs.cpp viewbasis_funcs.cpp v
 
 libgui_la_SOURCES += useractions.cpp
 
-noinst_HEADERS = aboutplugins.h colourdialog.h disorderoptions.h disorderwizard.h exportfilm.h exportimage.h ffeditor.h filedialog.h fileselectorwidget.h glyphs.h layoutlist.h mainwindow.h openexpression.h opengrid.h openmodel.h opentrajectory.h prefs.h progress.h saveexpression.h savemodel.h selectpattern.h selectvariable.h textratreewidgetitem.h tmenubuttongroup.h treegui.h useractions.h vibrations.h viewbasis.h vieweigenvector.h zmatrix.h
+noinst_HEADERS = about.h colourdialog.h disorderoptions.h disorderwizard.h exportfilm.h exportimage.h ffeditor.h filedialog.h fileselectorwidget.h glyphs.h layoutlist.h mainwindow.h openexpression.h opengrid.h openmodel.h opentrajectory.h prefs.h progress.h saveexpression.h savemodel.h selectpattern.h selectvariable.h textratreewidgetitem.h tmenubuttongroup.h treegui.h useractions.h vibrations.h viewbasis.h vieweigenvector.h zmatrix.h
 noinst_HEADERS += popupbuildaddatom.h popupbuildaddh.h popupbuildclear.h popupbuildfragments.h popupbuildgrow.h popupbuildrebond.h popupbuildtransmute.h popupcellangles.h popupcelllengths.h popupcellmatrix.h popupcellmiller.h popupcellreplicate.h popupcellscale.h popupcellspacegroup.h popupcolour.h popupelementtable.h popupfileaten.h popupfileimage.h popupfileopen.h popupfilesave.h popupfilesession.h popupforcefieldsassign.h popupforcefieldsminimise.h popupforcefieldsopen.h popupforcefieldstest.h popupgeometrycentre.h popupgridcolour.h popupgridmatrix.h popupgridorigin.h popupgridset.h popupgridshift.h popupgridstyle.h popupgridsopen.h popuplabeloptions.h popupmeasureangle.h popupmeasureclear.h popupmeasuredistance.h popupmeasuretorsion.h popupporesdrill.h popupporesscheme.h popupscriptsopen.h popuptransformangle.h popuptransformcentre.h popuptransformconvert.h popuptransformdistance.h popuptransformflip.h popuptransformmultiply.h popuptransformreposition.h popuptransformrotate.h popuptransformshift.h popuptransformtorsion.h popuptransformtranslate.h popupviewcolourscheme.h popupviewreset.h popupviewstyle.h
 
 

src/gui/aboutplugins.h → src/gui/about.h

@@ -1,6 +1,6 @@
 /*
-	*** About Plugins Dialog
-	*** src/gui/aboutplugins.h
+	*** About Dialog
+	*** src/gui/about.h
 	Copyright T. Youngs 2013-2017
 
 	This file is part of Aten.
@@ -19,10 +19,10 @@
 	along with Aten.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef ATEN_ATENABOUTPLUGINS_H
-#define ATEN_ATENABOUTPLUGINS_H
+#ifndef ATEN_ATENABOUT_H
+#define ATEN_ATENABOUT_H
 
-#include "gui/ui_aboutplugins.h"
+#include "gui/ui_about.h"
 #include "base/namespace.h"
 #include <QDialog>
 
@@ -38,23 +38,23 @@ ATEN_USING_NAMESPACE
 // Forward Declarations (Qt)
 class AtenWindow;
 
-class AtenAboutPlugins : public QDialog
+class AtenAbout : public QDialog
 {
 	// All Qt declarations must include this macro
 	Q_OBJECT
 
 	private:
 	// Main form declaration
-	Ui::AboutPluginsDialog ui;
+	Ui::AboutDialog ui;
 	// Reference to main window
 	AtenWindow& atenWindow_;
 	// Reference to plugin store
 	const PluginStore& pluginStore_;
 
 	public:
 	// Constructor / Destructor
-	AtenAboutPlugins(AtenWindow& parent);
-	~AtenAboutPlugins();
+	AtenAbout(AtenWindow& parent);
+	~AtenAbout();
 
 
 	/*