Changeset b59da6 for src/UIElements/Menu/Qt4

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.

Location:

src/UIElements/Menu/Qt4

Files:

• QtMenu.cpp (deleted)
• QtMenu.hpp (modified) (1 diff)
• QtMenuPipe.cpp (added)
• QtMenuPipe.hpp (added)

src/UIElements/Menu/Qt4/QtMenu.hpp

@@ -2 +2 @@
  * QtMenu.hpp
  *
- *  Created on: Jan 15, 2010
- *      Author: crueger
+ *  Created on: Nov 5, 2010
+ *      Author: heber
  */
 
-#ifndef QTMENU_HPP_
-#define QTMENU_HPP_
+#ifndef MENUINTERFACEQT_HPP_
+#define MENUINTERFACEQT_HPP_
 
+#include <Qt/qaction.h>
+
+#include <iostream>
 #include <list>
-
-#include <QtGui/QMenu>
-#include <QtCore/QObject>
+#include <map>
+#include <string>
 
 #include "Menu/Menu.hpp"
+#include "Menu/MenuInterface.hpp"
+#include "Menu/Qt4/QtMenuPipe.hpp"
 
-class QtMenuPipe;
+/** QtMenu is a specialization of MenuInterface to Qt-like menus.
+ * I.e. with this interface we can access QMenu and QMenuBar.
+ * (The latter is the reason why we have to add this additional wrapping layer).
+ */
+template <class T>
+class QtMenu : virtual public MenuInterface, public Menu
+{
+public:
+  explicit QtMenu(const std::string &_token) :
+    MenuInterface(_token),
+    Menu(_token),
+    MenuInstance(new T(QString(getNameWithAccelerator(_token).c_str()))),
+    deleteMenu(true)
+  {}
 
-class QtMenu : public QMenu, public Menu
-{
-  Q_OBJECT
+  QtMenu(T *_Menu, const std::string &_token) :
+    MenuInterface(_token),
+    Menu(_token),
+    MenuInstance(_Menu),
+    deleteMenu(false)
+  {}
 
-public:
-  QtMenu(const char *);
-  virtual ~QtMenu();
+  virtual ~QtMenu()
+  {
+    for(std::list<QtMenuPipe*>::iterator it=plumbing.begin(); it != plumbing.end(); it++)
+      delete (*it);
 
-  virtual void addItem(MenuItem*);
-  virtual void removeItem(MenuItem*);
-  virtual void display();
+    if (deleteMenu)
+      delete MenuInstance;
+  }
+
+  T * const getMenuInstance()
+  {
+    return MenuInstance;
+  }
+
+protected:
+  // We need to have a reference of the Menu, as Qt returns reference to added menu as well
+  T *MenuInstance;
+
+  /** Puts Qt's token, the ampersand, in front of the accelerator char in the menu name.
+   * \param ActionName Action of menu
+   * \return name with ampersand added at the right place
+   */
+  std::string getNameWithAccelerator(const std::string &ActionName)
+  {
+    std::string newname;
+    bool Inserted = false;
+    std::pair < MenuShortcutMap::iterator, bool > Inserter;
+    for (std::string::const_iterator CharRunner = ActionName.begin();
+        CharRunner != ActionName.end();
+        ++CharRunner) {
+      std::cout << "Current char is " << *CharRunner << std::endl;
+      if (!Inserted) {
+        Inserter = ShortcutMap.insert(
+            std::pair<char, std::string > (*CharRunner, ActionName)
+            );
+        if (Inserter.second) {
+          std::cout << "Accelerator is " << *CharRunner << std::endl;
+          newname += '&';
+          Inserted = true;
+        }
+      }
+      newname += *CharRunner;
+    }
+    return newname;
+  }
+
 private:
-  list<QtMenuPipe*> plumbing;
+  bool deleteMenu;
+  std::list<QtMenuPipe*> plumbing;
+
+  typedef std::map <char, std::string> MenuShortcutMap;
+  MenuShortcutMap ShortcutMap;
+
+  virtual void addActionItem(const std::string &token, const std::string &description)
+  {
+    QAction *action = MenuInstance->addAction(QString(getNameWithAccelerator(description).c_str()));
+    QtMenuPipe *pipe = new QtMenuPipe(token,action);
+    QObject::connect(action, SIGNAL(triggered()),pipe,SLOT(called()));
+    plumbing.push_back(pipe);
+  }
+
+  virtual void addSeparatorItem()
+  {
+    MenuInstance->addSeparator();
+  }
+
+  virtual void addSubmenuItem(const std::string &token, const std::string &description)
+  {
+    QMenu *Menu = MenuInstance->addMenu(QString(token.c_str()));
+    QtMenu<QMenu> *NewMenu = new QtMenu<QMenu>(Menu, token);
+    NewMenu->init();
+  }
+
 };
 
-// This handles the plumbing from QT to internal Items
-// Slots from QT are redirected to internal methods.
-// This way methods can be used where no QT is available
-class QtMenuPipe : public QObject {
-  Q_OBJECT
-public:
-  QtMenuPipe(MenuItem*,QAction*);
-  virtual ~QtMenuPipe();
-public slots:
-  void called();
-private:
-  MenuItem *theItem;
-  QAction *theAction;
-};
-
-#endif /* QTMENU_HPP_ */
+#endif /* MENUINTERFACEQT_HPP_ */