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

Timestamp:

Dec 4, 2010, 11:33:47 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:

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/TxMenu.hpp (moved) (moved from src/UIElements/Menu/TextMenu.hpp ) (5 diffs)

src/UIElements/Menu/TextMenu/TxMenu.hpp

@@ -1 +1 @@
 /*
- * TextMenu.h
+ * TxMenu.h
  *
  *  Created on: Dec 10, 2009
@@ -6 +6 @@
  */
 
-#ifndef TEXTMENU_H_
-#define TEXTMENU_H_
+#ifndef TXMENU_H_
+#define TXMENU_H_
 
 #include <list>
@@ -25 +25 @@
  * All Items are displayed and user is prompted for a key. The item corresponding to that key is then activated.
  */
-class TextMenu : public Menu
+class TxMenu
 {
 public:
   class LeaveAction : public Action {
   public:
-    LeaveAction(TextMenu*, const ActionTraits &_trait);
+    LeaveAction(TxMenu* const, const ActionTraits &_trait);
     virtual ~LeaveAction();
 
@@ -44 +44 @@
     virtual Action::state_ptr performRedo(Action::state_ptr);
 
-    ActionTraits *LeaveActionTrait;
-    TextMenu* menu;
+    TxMenu* const menu;
   };
 
-  TextMenu(ostream& _outputter, const string _title, char _spacer=STD_MENU_TITLE_SPACER,int _length=STD_MENU_LENGTH);
-  virtual ~TextMenu();
+  TxMenu(std::ostream& _outputter, const std::string _title, char _spacer=STD_MENU_TITLE_SPACER,int _length=STD_MENU_LENGTH);
+  virtual ~TxMenu();
 
-  virtual void addItem(MenuItem*);
-  virtual void removeItem(MenuItem*);
-  virtual void display();
-  virtual string getTitle();
+  void addItem(MenuItem*);
+  void removeItem(MenuItem*);
+  void display();
+  std::string getTitle();
+  std::ostream& getOutputter();
+  char getSuitableShortForm(std::set <char> &ShortcutList, const std::string name) const;
 
   /**
    * Call doQuit if you want to return from this menu.
    */
-  virtual void doQuit();
+  void doQuit();
   /**
    * Check whether someone has chosen to quit
    */
-  virtual bool hasQuit();
+  bool hasQuit();
 
-  virtual void addDefault(MenuItem*);
+  void addDefault(MenuItem*);
 
 protected:
-  virtual void showEntry(MenuItem*);
+  void showEntry(MenuItem*);
 
 private:
-  list<MenuItem*> items;
+  std::list<MenuItem*> items;
 
   MenuItem* defaultItem;
 
-  ostream& outputter;
-  string title;
+  std::ostream& outputter;
+  std::string title;
   char spacer;
   int length;
@@ -83 +84 @@
 };
 
-#endif /* TEXTMENU_H_ */
+#endif /* TXMENU_H_ */