diff --git a/.gitignore b/.gitignore index 2020924ed476be278cab9210762fc867736ac676..cd2e7ca2436cee30b9bc51996e260844729371cb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ dist/ .DS_Store Tests/FunctionalTests/Jobs +/.gitignore +/MANIFEST diff --git a/MDANSE/GUI/Icons/atom.png b/MDANSE/GUI/Icons/atom.png new file mode 100644 index 0000000000000000000000000000000000000000..3cd2a54dea3934b7508acbdc905f67a683cc3f82 Binary files /dev/null and b/MDANSE/GUI/Icons/atom.png differ diff --git a/MDANSE/GUI/Icons/periodic_table.png b/MDANSE/GUI/Icons/periodic_table.png index e2ccc9251f9168a965ed5af2159ab446422ddf74..d78f49f91d11a2fbf9da2346a7c705c498047ef5 100644 Binary files a/MDANSE/GUI/Icons/periodic_table.png and b/MDANSE/GUI/Icons/periodic_table.png differ diff --git a/MDANSE/GUI/MainFrame.py b/MDANSE/GUI/MainFrame.py index 8396192e546d7397e2beae2f0dfc519f6a90cb8f..485ed8c824e353653c6680123fa866286a93dd53 100644 --- a/MDANSE/GUI/MainFrame.py +++ b/MDANSE/GUI/MainFrame.py @@ -187,10 +187,9 @@ class MainFrame(wx.Frame): loadDataButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["load",32,32], 'Load a trajectory') periodicTableButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["periodic_table",32,32], 'Launch the periodic table viewer') - elementsDatabaseButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["element",32,32], 'Launch the elements database editor') + elementsDatabaseButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["atom",32,32], 'Launch the elements database editor') plotButton = self._toolbar.AddSimpleTool(wx.ID_ANY,ICONS["plot",32,32], 'Launch the NetCDF plotter') udButton = self._toolbar.AddSimpleTool(wx.ID_ANY,ICONS["user",32,32], 'Launch the user definitions editor') - atomButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["atom",32,32], 'Create an atom database entry') preferencesButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["preferences",32,32], 'Launch the preferences editor') registryButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["registry",32,32], 'Inspect MDANSE classes framework') templateButton = self._toolbar.AddSimpleTool(wx.ID_ANY, ICONS["template",32,32], 'Save a template for a new analysis') @@ -211,7 +210,6 @@ class MainFrame(wx.Frame): self.Bind(wx.EVT_MENU, self.on_start_plotter, plotButton) self.Bind(wx.EVT_MENU, self.on_set_preferences, preferencesButton) self.Bind(wx.EVT_MENU, self.on_open_user_definitions, udButton) - self.Bind(wx.EVT_MENU, self.on_create_atom_database_entry, atomButton) self.Bind(wx.EVT_MENU, self.on_open_classes_registry, registryButton) self.Bind(wx.EVT_MENU, self.on_save_job_template, templateButton) self.Bind(wx.EVT_MENU, self.on_about, aboutButton) @@ -270,10 +268,6 @@ or directly to the MDANSE mailing list: d.ShowModal() d.Destroy() - def on_create_atom_database_entry(self,event): - - print "coucou" - def on_simple_help(self,event): path = os.path.join(PLATFORM.doc_path(),'simple_help.txt')