Changeset b59da6 for src/UIElements/Menu/TextMenu/MenuItem.hpp

Timestamp:

Dec 4, 2010, 11:33:47 PM (15 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, Candidate_v1.7.0, Candidate_v1.7.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:

0af7ef

Parents:

5813ac

git-author:

Frederik Heber <heber@…> (11/08/10 09:36:45)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:33:47)

Message:

Refactoring of Menu structure for Qt and Text UI done.

• Menu is now the initialising class for the menu structure.
• MenuInterface contains virtual declarations of all functions that Menu needs to call.
• TextMenu and QtMenu are templated classes which contain both Menu and MenuInterface and implement the virtual functions.
• class TxMenu and its ...MenuItems contain most of the old Menu code for the text-based system. Most of the stuff, such as triggers, are now hidden internally.
• in ..MainWindow() we basically just construct the desired Menu and call init at the correct time.

File:

• src/UIElements/Menu/TextMenu/MenuItem.hpp (moved) (moved from src/UIElements/Menu/MenuItem.hpp ) (3 diffs)

src/UIElements/Menu/TextMenu/MenuItem.hpp

@@ -11 +11 @@
 #include <string>
 
-using namespace std;
-
-class Menu;
+class TxMenu;
 
 /**
@@ -22 +20 @@
 class MenuItem {
 public:
-  MenuItem(char,const char*,Menu*);
+  MenuItem(char,const std::string &,TxMenu* const);
   virtual ~MenuItem();
 
@@ -28 +26 @@
   virtual bool checkTrigger(char);
 
-  virtual const string formatEntry();
+  virtual const std::string formatEntry();
 
-  virtual const string getDescription();
+  virtual const std::string getDescription();
   char getTrigger();
 
-  void add_to_menu(Menu*);
+  void add_to_menu(TxMenu* const);
   bool wasAdded();
 
   virtual bool isActive();
 
-protected:
-  void setDescription(string);
-
 private:
   char trigger;
-  string *description;
+  const std::string description;
   bool added;
 };