Changeset 216dad for src/UIElements/Views/Qt4

Timestamp:

Dec 14, 2012, 5:40:13 PM (12 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:

3ce0f1

Parents:

7e19060

git-author:

Michael Ankele <ankele@…> (11/21/12 14:54:53)

git-committer:

Frederik Heber <heber@…> (12/14/12 17:40:13)

Message:

added shape edit actions to QtShapeController

File:

• src/UIElements/Views/Qt4/QtShapeController.cpp (modified) (4 diffs)

src/UIElements/Views/Qt4/QtShapeController.cpp

@@ -45 +45 @@
 #include<Qt/qlabel.h>
 #include <Qt/qaction.h>
+#include <Qt/qmenu.h>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -57 +58 @@
   QtShapeList *shapeList = new QtShapeList;
   QPushButton *createButton = new QPushButton(QIcon(QIcon::fromTheme("edit-add")), "create");
-  QPushButton *combineButton = new QPushButton("combine");
+  QPushButton *editButton = new QPushButton(QIcon(QIcon::fromTheme("edit")), "edit");
   QPushButton *deleteButton = new QPushButton(QIcon(QIcon::fromTheme("edit-delete")), "delete");
 
@@ -65 +66 @@
   QHBoxLayout *buttonBox = new QHBoxLayout;
   buttonBox->addWidget(createButton);
-  buttonBox->addWidget(combineButton);
+  buttonBox->addWidget(editButton);
   buttonBox->addWidget(deleteButton);
   setLayout(shapeBox);
@@ -80 +81 @@
   QObject::connect(createButton, SIGNAL(clicked()),action,SIGNAL(triggered()));
 
-  action = new QAction(QString("combine shapes"), combineButton);
+  QMenu *editMenu = new QMenu();
   pipe = new QtMenuPipe("combine-shapes", action);
-  QObject::connect(action, SIGNAL(triggered()),pipe,SLOT(called()));
-  plumbing.push_back(pipe);
-  QObject::connect(combineButton, SIGNAL(clicked()),action,SIGNAL(triggered()));
+  action = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("combine"), this);
+  connect(action, SIGNAL(triggered()), pipe, SLOT(called()));
+  editMenu->addAction(action);
+  pipe = new QtMenuPipe("translate-shapes", action);
+  action = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("translate"), this);
+  connect(action, SIGNAL(triggered()), pipe, SLOT(called()));
+  editMenu->addAction(action);
+  pipe = new QtMenuPipe("rotate-shapes", action);
+  action = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("rotate"), this);
+  connect(action, SIGNAL(triggered()), pipe, SLOT(called()));
+  editMenu->addAction(action);
+  editButton->setMenu(editMenu);
 
   action = new QAction(QString("remove shapes"), deleteButton);