Changeset 5b991a

Timestamp:

Nov 16, 2012, 11:10:57 AM (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:

30421d

Parents:

e59e8e

git-author:

Michael Ankele <ankele@…> (11/14/12 15:06:00)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:57)

Message:

compile icons into the executable

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• data/Makefile.am (added)
• data/icons/Makefile.am (added)
• data/icons/logos.qrc (added)
• src/Makefile.am (modified) (1 diff)
• src/UIElements/Makefile.am (modified) (1 diff)
• src/UIElements/Qt4/QtMainWindow.cpp (modified) (2 diffs)
• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (2 diffs)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = LinearAlgebra src src/unittests tests utils doc
+SUBDIRS = LinearAlgebra data/icons src src/unittests data tests utils doc
 
 AUTOMAKE_OPTIONS = subdir-objects

configure.ac

@@ -57 +57 @@
                 [moc-qt4 moc], 
                 [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])],
+                [$have_qtgui_path]
+        )
+        AC_PATH_PROGS([QT_RCC],
+                [rcc-qt4 rcc], 
+                [AC_MSG_ERROR(["Qts rcc not found, please use --with-Qt-bin."])],
                 [$have_qtgui_path]
         )
@@ -321 +326 @@
         doc/Makefile
         src/Makefile
+        data/Makefile
+        data/icons/Makefile
         utils/Makefile
 ])

src/Makefile.am

@@ -300 +300 @@
 
 
-molecuilder_CPPFLAGS = $(AM_CPPFLAGS)
+molecuilder_CPPFLAGS = $(AM_CPPFLAGS) ${QT_CFLAGS}
 #molecuilder_CXXFLAGS += -DNO_CACHING
 molecuilder_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)

src/UIElements/Makefile.am

@@ -307 +307 @@
 
 libMolecuilderQtUI_la_LIBADD = \
+        ../data/icons/liblogo.la \
         ${QT_LIBS} \
         -lQtOpenGL \
         ${GLU_LIBS}
+
+##libMolecuilderQtUI_la_LDADD = \
+##      ../data/icons/liblogo.a
 
 nobase_libMolecuilderQtUI_la_include_HEADERS = ${QTUIHEADER} $(QTUIUI_UIFILES)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -71 +71 @@
 #include "Actions/WorldAction/OutputAsAction.hpp"
 
+
 using namespace MoleCuilder;
 
@@ -76 +77 @@
     theApp(_theApp)
 {
+  Q_INIT_RESOURCE(logos);
   QCoreApplication::setOrganizationName("ins");
   QCoreApplication::setOrganizationDomain("ins.uni-bonn.de");

src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

@@ -168 +168 @@
   stereoMenu->addAction(stereoAnaglyphAction);
   stereoButton->setMenu(stereoMenu);
-  stereoButton->setIcon(QIcon(QPixmap("/home/ankele/workspace/molecuilder/data/icons/icon_view_stereo.png")));
+  stereoButton->setIcon(QIcon(QPixmap(":/icon_view_stereo.png")));
   stereoButton->setPopupMode(QToolButton::InstantPopup);
   toolbar->addWidget(stereoButton);
@@ -174 +174 @@
   // selection mode
   toolbar->addSeparator();
-  QAction *selAtomAction = new QAction(QIcon(QPixmap("/home/ankele/workspace/molecuilder/data/icons/icon_select_atom.png")), tr("select atom by clicking"), this);
+  QAction *selAtomAction = new QAction(QIcon(QPixmap(":/icon_select_atom.png")), tr("select atom by clicking"), this);
   connect(selAtomAction, SIGNAL(triggered()), worldscene, SLOT(setSelectionModeAtom()));
   toolbar->addAction(selAtomAction);
-  QAction *selMolAction = new QAction(QIcon(QPixmap("/home/ankele/workspace/molecuilder/data/icons/icon_select_molecule.png")), tr("select molecule by clicking"), this);
+  QAction *selMolAction = new QAction(QIcon(QPixmap(":/icon_select_molecule.png")), tr("select molecule by clicking"), this);
   connect(selMolAction, SIGNAL(triggered()), worldscene, SLOT(setSelectionModeMolecule()));
   toolbar->addAction(selMolAction);