Changeset d5307b

Timestamp:

Nov 20, 2012, 8:34:10 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:

cebac0

Parents:

d61161

git-author:

Frederik Heber <heber@…> (11/19/12 13:48:06)

git-committer:

Frederik Heber <heber@…> (11/20/12 08:34:10)

Message:

DISTFIX: new logo files were not in EXTRA_DIST.

• renamed logos.qrc -> icons.qrc to match with icon file prefix.
• renamed liblogo.a libicons.a.
• adapted QtMainWindow::QtMainWindow.
• qrc_icons.cpp needs to be in CLEANFILES.

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• data/Makefile.am (deleted)
• data/icons/Makefile.am (modified) (2 diffs)
• data/icons/icons.qrc (moved) (moved from data/icons/logos.qrc )
• src/UIElements/Makefile.am (modified) (2 diffs)
• src/UIElements/Qt4/QtMainWindow.cpp (modified) (1 diff)

Makefile.am

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

configure.ac

@@ -328 +328 @@
         doc/Makefile
         src/Makefile
-        data/Makefile
         data/icons/Makefile
         utils/Makefile

data/icons/Makefile.am

@@ -1 @@
- AM_CPPFLAGS = ${QT_CFLAGS}
+AM_CPPFLAGS = ${QT_CFLAGS}
+
+EXTRA_DIST = \
+        icons.qrc \
+        icon_select_atom.png \
+        icon_select_molecule.png \
+        icon_view_stereo.png
 
 qrc_%.cpp qrc_%.d: %.qrc
@@ -7 +13 @@
         grep "<file" $< | sed -e "s#.*<file.*>\(.*\)</file>#\t\1#" >>qrc_$*.d
 
-noinst_LTLIBRARIES = liblogo.la
-liblogo_la_SOURCES = qrc_logos.cpp
+noinst_LTLIBRARIES = libicons.la
+libicons_la_SOURCES = qrc_icons.cpp
 
-sinclude qrc_logos.d
-CLEANFILES = qrc_logos.d
+sinclude qrc_icons.d
+CLEANFILES = qrc_icons.cpp qrc_icons.d

src/UIElements/Makefile.am

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

src/UIElements/Qt4/QtMainWindow.cpp

@@ -77 +77 @@
     theApp(_theApp)
 {
-  Q_INIT_RESOURCE(logos);
+  Q_INIT_RESOURCE(icons);
   QCoreApplication::setOrganizationName("ins");
   QCoreApplication::setOrganizationDomain("ins.uni-bonn.de");