Changeset 163110

Timestamp:

Sep 9, 2014, 10:27:26 PM (11 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:

86c013

Parents:

152e5c

git-author:

Frederik Heber <heber@…> (09/08/14 21:15:11)

git-committer:

Frederik Heber <heber@…> (09/09/14 22:27:26)

Message:

In QTUI Dialog window now has a meaningful title.

• Dialog cstor now requires a title.
• UIFactory::makeDialog() needs to be provided with this title.
• Menu::populateActions() uses addAction with twice just the token.
• Action::createDialog() provides title from its Traits.

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/unittests/stubs/DummyUI.hpp (modified) (2 diffs)
• UIElements/CommandLineUI/CommandLineDialog.cpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineDialog.hpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineUIFactory.cpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineUIFactory.hpp (modified) (1 diff)
• UIElements/Dialog.cpp (modified) (1 diff)
• UIElements/Dialog.hpp (modified) (1 diff)
• UIElements/Menu/Menu.cpp (modified) (1 diff)
• UIElements/Menu/Menu.hpp (modified) (1 diff)
• UIElements/Menu/Qt4/QtMenu.hpp (modified) (1 diff)
• UIElements/Qt4/QtDialog.cpp (modified) (1 diff)
• UIElements/Qt4/QtDialog.hpp (modified) (1 diff)
• UIElements/Qt4/QtUIFactory.cpp (modified) (1 diff)
• UIElements/Qt4/QtUIFactory.hpp (modified) (1 diff)
• UIElements/Qt4/Query/AtomsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/DoublesQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/ElementsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/FilesQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/IntsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/MoleculesQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/QtQueryList.hpp (modified) (1 diff)
• UIElements/Qt4/Query/StringsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/VectorsQtQuery.cpp (modified) (1 diff)
• UIElements/TextUI/TextDialog.cpp (modified) (1 diff)
• UIElements/TextUI/TextDialog.hpp (modified) (1 diff)
• UIElements/TextUI/TextUIFactory.cpp (modified) (1 diff)
• UIElements/TextUI/TextUIFactory.hpp (modified) (1 diff)
• UIElements/UIFactory.hpp (modified) (1 diff)
• UIElements/Views/Qt4/QtToolBar.cpp (modified) (1 diff)

src/Actions/Action.cpp

@@ -127 +127 @@
 
 Dialog * Action::createDialog(){
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
+  Dialog *dialog = UIFactory::getInstance().makeDialog(Traits.getName());
   return fillDialog(dialog);
 }

src/Actions/unittests/stubs/DummyUI.hpp

@@ -21 +21 @@
 {
 public:
-  DummyDialog(){}
+  DummyDialog(const std::string &_title) :
+    Dialog(_title)
+  {}
   virtual ~DummyDialog(){}
 
@@ -53 +55 @@
   virtual ~DummyUIFactory(){}
 
-  virtual Dialog* makeDialog(){return new DummyDialog;}
+  virtual Dialog* makeDialog(const std::string &_title){return new DummyDialog(_title);}
   virtual MainWindow* makeMainWindow(){return 0;}
 

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -42 +42 @@
 
 
-CommandLineDialog::CommandLineDialog()
+CommandLineDialog::CommandLineDialog(const std::string &_title) :
+    Dialog(_title)
 {
 }

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -30 +30 @@
 {
 public:
-  CommandLineDialog();
+  CommandLineDialog(const std::string &_title);
   virtual ~CommandLineDialog();
 

src/UIElements/CommandLineUI/CommandLineUIFactory.cpp

@@ -52 +52 @@
 
 
-Dialog* CommandLineUIFactory::makeDialog() {
-  return new CommandLineDialog();
+Dialog* CommandLineUIFactory::makeDialog(const std::string &_title) {
+  return new CommandLineDialog(_title);
 }
 

src/UIElements/CommandLineUI/CommandLineUIFactory.hpp

@@ -48 +48 @@
   virtual ~CommandLineUIFactory();
 
-  virtual Dialog* makeDialog();
+  virtual Dialog* makeDialog(const std::string &_title);
   virtual MainWindow* makeMainWindow();
 

src/UIElements/Dialog.cpp

@@ -50 +50 @@
 using namespace std;
 
-Dialog::Dialog()
+Dialog::Dialog(const std::string &_title)
 {
 }

src/UIElements/Dialog.hpp

@@ -153 +153 @@
 {
 public:
-  Dialog();
+  Dialog(const std::string &_title);
   virtual ~Dialog();
 

src/UIElements/Menu/Menu.cpp

@@ -130 +130 @@
     if (MenuName == name) {
       const std::string &ActionName = *iter;
-      Menu::addAction(ActionName);
+      const std::string &ActionDescription = CurrentTrait.getDescription();
+      Menu::addAction(ActionName, ActionDescription);
     }
   }
 }
 
-void Menu::addAction(const std::string &ActionName)
+void Menu::addAction(const std::string &ActionName, const std::string &ActionDescription)
 {
   LastItem = ActionItem;
-  addActionItem(ActionName, ActionName);
+  addActionItem(ActionName, ActionDescription);
 }
 

src/UIElements/Menu/Menu.hpp

@@ -61 +61 @@
 
 protected:
-  // Unique name of the menu for identification.
+  //!> Unique name of the menu for identification.
   const std::string name;
 
-  // populater function that adds all menu items
+  /** populater function that adds all menu items.
+   *
+   */
   void populate();
+
+  /** Populater function for all Actions in this menu.
+   *
+   */
   void populateActions();
 
 private:
-  void addAction(const std::string &ActionName);
+  /** Adds an action to this menu.
+   *
+   * @param ActionName name of action
+   * @param ActionDescription of the action (e.g. for tooltips)
+   */
+  void addAction(const std::string &ActionName, const std::string &ActionDescription);
+
+  /** Adds a separator (e.g. horizontal line) to menu.
+   *
+   */
   void addSeparator();
+
+  /** Adds a submenu to this menu.
+   *
+   * @param MenuName name of submenu
+   * @param MenuPosition position in sequence of items of submenu
+   */
   void addSubmenu(const std::string &MenuName, const int MenuPosition);
+
+  /** Checks whether an item named \a token exists in this menu.
+   *
+   * @param token name of action of submenu
+   * @return true - item exists, false - item does not exist in this menu
+   */
   bool isPresent(const std::string &token);
 
+  //!> enumeration of all valid item types
   enum ItemType {ActionItem, MenuItem, SeparatorItem, NoItem};
 
-  int TopPosition;  // current position to add
-  enum ItemType LastItem;  // check whether separator followed separator
-  std::set <std::string> DuplicatesList;  // is used to check for duplicates
+  //!> current position to add
+  int TopPosition;
+  //!> check whether separator followed separator
+  enum ItemType LastItem;
+  //!> is used to check for duplicates
+  std::set <std::string> DuplicatesList;
 };
 

src/UIElements/Menu/Qt4/QtMenu.hpp

@@ -103 +103 @@
   virtual void addActionItem(const std::string &token, const std::string &description)
   {
-    QAction *action = MenuInstance->addAction(QString(getNameWithAccelerator(description).c_str()));
+    QAction *action = MenuInstance->addAction(QString(getNameWithAccelerator(token).c_str()));
     QtMenuPipe *pipe = new QtMenuPipe(token,action);
     QObject::connect(action, SIGNAL(triggered()),pipe,SLOT(called()));

src/UIElements/Qt4/QtDialog.cpp

@@ -45 +45 @@
 using namespace std;
 
-QtDialog::QtDialog() :
-    QDialog(0)
-{
+QtDialog::QtDialog(const std::string &_title) :
+    QDialog(0),
+    Dialog(_title)
+{
+  setWindowTitle(QString(_title.c_str()));
   // creating and filling of the Dialog window
   mainLayout = new QVBoxLayout();

src/UIElements/Qt4/QtDialog.hpp

@@ -30 +30 @@
   Q_OBJECT
 public:
-  QtDialog();
+  QtDialog(const std::string &_title);
   virtual ~QtDialog();
 

src/UIElements/Qt4/QtUIFactory.cpp

@@ -67 +67 @@
 }
 
-Dialog* QtUIFactory::makeDialog() {
-  return new QtDialog();
+Dialog* QtUIFactory::makeDialog(const std::string &_title) {
+  return new QtDialog(_title);
 }
 

src/UIElements/Qt4/QtUIFactory.hpp

@@ -26 +26 @@
   virtual ~QtUIFactory();
 
-  virtual Dialog* makeDialog();
+  virtual Dialog* makeDialog(const std::string &_title);
   virtual MainWindow* makeMainWindow();
 

src/UIElements/Qt4/Query/AtomsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<const atom *>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new AtomQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/DoublesQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<double>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new DoubleQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/ElementsQtQuery.cpp

@@ -48 +48 @@
     QtQueryList<const element *>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new ElementQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/FilesQtQuery.cpp

@@ -48 +48 @@
     QtQueryList<boost::filesystem::path>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new FileQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/IntsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<int>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new IntQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/MoleculesQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<const molecule *>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new MoleculeQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/QtQueryList.hpp

@@ -107 +107 @@
 {
 public:
-  ListQuerySubDialog(QtQueryListUntyped *_parent) : parent(_parent), sub(NULL){}
+  ListQuerySubDialog(QtQueryListUntyped *_parent, const std::string &_title) :
+    Dialog(_title),
+    parent(_parent),
+    sub(NULL)
+  {}
   virtual void update()
   {

src/UIElements/Qt4/Query/StringsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<std::string>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new StringQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<unsigned int>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new UnsignedIntQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/VectorsQtQuery.cpp

@@ -48 +48 @@
     QtQueryList<Vector>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new VectorQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/TextUI/TextDialog.cpp

@@ -41 +41 @@
 
 
-TextDialog::TextDialog()
+TextDialog::TextDialog(const std::string &_title) :
+        Dialog(_title)
 {
 }

src/UIElements/TextUI/TextDialog.hpp

@@ -28 +28 @@
 {
 public:
-  TextDialog();
+  TextDialog(const std::string &_title);
   virtual ~TextDialog();
 

src/UIElements/TextUI/TextUIFactory.cpp

@@ -46 +46 @@
 
 
-Dialog* TextUIFactory::makeDialog() {
-  return new TextDialog();
+Dialog* TextUIFactory::makeDialog(const std::string &_title) {
+  return new TextDialog(_title);
 }
 

src/UIElements/TextUI/TextUIFactory.hpp

@@ -24 +24 @@
   virtual ~TextUIFactory();
 
-  virtual Dialog* makeDialog();
+  virtual Dialog* makeDialog(const std::string &_title);
   virtual MainWindow* makeMainWindow();
 

src/UIElements/UIFactory.hpp

@@ -56 +56 @@
    * Again the type is determined upon factory creation.
    */
-  virtual Dialog* makeDialog()=0;
+  virtual Dialog* makeDialog(const std::string &_title)=0;
 
 protected:

src/UIElements/Views/Qt4/QtToolBar.cpp

@@ -44 +44 @@
   QToolBar(_parent)
 {
-  addActionItem("undo", "undo", "edit-undo");
-  addActionItem("redo", "redo", "edit-redo");
+  addActionItem("undo", "undo the last Action", "edit-undo");
+  addActionItem("redo", "redo the last Action", "edit-redo");
 }