Changeset e9be39 for src

Timestamp:

Dec 4, 2010, 11:42:39 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

3a21a7

Parents:

f0f9a6

git-author:

Frederik Heber <heber@…> (11/08/10 12:32:45)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:42:39)

Message:

Renamed SeperatorItem -> SeparatorMenuItem.

• in files and declarations.

Location:

src/UIElements

Files:

• Makefile.am (modified) (2 diffs)
• Menu/TextMenu/SeparatorMenuItem.cpp (moved) (moved from src/UIElements/Menu/TextMenu/SeperatorItem.cpp ) (5 diffs)
• Menu/TextMenu/SeparatorMenuItem.hpp (moved) (moved from src/UIElements/Menu/TextMenu/SeperatorItem.hpp ) (4 diffs)
• Menu/TextMenu/TextMenu.hpp (modified) (2 diffs)
• TextUI/TextWindow.cpp (modified) (2 diffs)

src/UIElements/Makefile.am

@@ -33 +33 @@
   Menu/TextMenu/SubMenuItem.cpp \
   Menu/TextMenu/ActionMenuItem.cpp \
-  Menu/TextMenu/SeperatorItem.cpp \
+  Menu/TextMenu/SeparatorMenuItem.cpp \
   Menu/TextMenu/DisplayMenuItem.cpp
   
@@ -42 +42 @@
   Menu/TextMenu/SubMenuItem.hpp \
   Menu/TextMenu/ActionMenuItem.hpp \
-  Menu/TextMenu/SeperatorItem.hpp \
+  Menu/TextMenu/SeparatorMenuItem.hpp \
   Menu/TextMenu/DisplayMenuItem.hpp
 

src/UIElements/Menu/TextMenu/SeparatorMenuItem.cpp

@@ -7 +7 @@
 
 /*
- * SeperatorItem.cpp
+ * SeparatorMenuItem.cpp
  *
  *  Created on: Dec 11, 2009
@@ -23 +23 @@
 #include <sstream>
 
-#include "Menu/TextMenu/SeperatorItem.hpp"
+#include "Menu/TextMenu/SeparatorMenuItem.hpp"
 #include "defs.hpp"
 
 
-SeperatorItem::SeperatorItem(TxMenu* const menu):
+SeparatorMenuItem::SeparatorMenuItem(TxMenu* const menu):
   MenuItem('\0',"",menu),
   spacer(STD_SEPERATOR_SPACER),
@@ -36 +36 @@
 }
 
-SeperatorItem::SeperatorItem(TxMenu* const menu,char _spacer, int _length):
+SeparatorMenuItem::SeparatorMenuItem(TxMenu* const menu,char _spacer, int _length):
   MenuItem('\0',"",menu),
   spacer(_spacer),
@@ -45 +45 @@
 }
 
-SeperatorItem::~SeperatorItem()
+SeparatorMenuItem::~SeparatorMenuItem()
 {
   // TODO Auto-generated destructor stub
@@ -51 +51 @@
 
 
-void SeperatorItem::doTrigger(){}
-bool SeperatorItem::checkTrigger(char){
+void SeparatorMenuItem::doTrigger(){}
+bool SeparatorMenuItem::checkTrigger(char){
   return false;
 }
 
-const std::string SeperatorItem::getDescription() {
+const std::string SeparatorMenuItem::getDescription() {
   return std::string("");
 }
 
-const std::string SeperatorItem::formatEntry(){
+const std::string SeparatorMenuItem::formatEntry(){
   std::stringstream s;
   for(int i=0; i<length;i++)

src/UIElements/Menu/TextMenu/SeparatorMenuItem.hpp

@@ -1 +1 @@
 /*
- * SeperatorItem.h
+ * SeparatorMenuItem.h
  *
  *  Created on: Dec 11, 2009
@@ -6 +6 @@
  */
 
-#ifndef SEPERATORITEM_H_
-#define SEPERATORITEM_H_
+#ifndef SEPARATORITEM_H_
+#define SEPARATORITEM_H_
 
 #include <string>
@@ -16 +16 @@
 
 /**
- * Produce a Seperator within a Menu.
+ * Produce a Separator within a Menu.
  *
  * All triggers are ignored for this Item.
  */
-class SeperatorItem : public MenuItem
+class SeparatorMenuItem : public MenuItem
 {
 public:
-  SeperatorItem(TxMenu* const );
-  SeperatorItem(TxMenu* const ,char,int);
-  virtual ~SeperatorItem();
+  SeparatorMenuItem(TxMenu* const );
+  SeparatorMenuItem(TxMenu* const ,char,int);
+  virtual ~SeparatorMenuItem();
 
   virtual void doTrigger();
@@ -38 +38 @@
 };
 
-#endif /* SEPERATORITEM_H_ */
+#endif /* SEPARATORITEM_H_ */

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -21 +21 @@
 #include "Menu/TextMenu/TxMenuLeaveAction.hpp"
 #include "Menu/TextMenu/ActionMenuItem.hpp"
-#include "Menu/TextMenu/SeperatorItem.hpp"
+#include "Menu/TextMenu/SeparatorMenuItem.hpp"
 #include "Menu/TextMenu/SubMenuItem.hpp"
 
@@ -114 +114 @@
   virtual void addSeparatorItem()
   {
-    new SeperatorItem(MenuInstance);
+    new SeparatorMenuItem(MenuInstance);
   }
 

src/UIElements/TextUI/TextWindow.cpp

@@ -26 +26 @@
 #include "Menu/TextMenu/TxMenu.hpp"
 #include "Menu/TextMenu/ActionMenuItem.hpp"
-#include "Menu/TextMenu/SeperatorItem.hpp"
+#include "Menu/TextMenu/SeparatorMenuItem.hpp"
 #include "Menu/TextMenu/DisplayMenuItem.hpp"
 #include "Menu/TextMenu/SubMenuItem.hpp"
@@ -65 +65 @@
   new DisplayMenuItem(main_menu->getMenuInstance(),moleculeView,"Molecule List");
 
-  new SeperatorItem(main_menu->getMenuInstance());
+  new SeparatorMenuItem(main_menu->getMenuInstance());
 
   main_menu->init();
 
-  new SeperatorItem(main_menu->getMenuInstance());
+  new SeparatorMenuItem(main_menu->getMenuInstance());
 
   // save has reserved key 's'