Rearrange folders structure to remove unnecessary 'krecipes' second level subfolder

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 0c8ed6c9a4)
2 months ago · 2879ff70be
parent 3eb38d2556
commit 2879ff70be
361 changed files with 28 additions and 29 deletions
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@ -23,4 +23,4 @@ include( TDEL10n )

 ##### create translation templates ##############

-tde_l10n_auto_add_subdirectories( )
+tde_l10n_create_template( "krecipes" )
--- a/configure.files
+++ b/configure.files
@ -1,4 +1,4 @@
 ./admin/configure.in.min
 configure.in.in
-./krecipes/configure.in.bot
-./krecipes/configure.in.in
+./src/configure.in.bot
+./src/configure.in.in
--- a/configure.in
+++ b/configure.in
@ -179,6 +179,7 @@ AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
 AM_CONDITIONAL(krecipes_SUBDIR_included, test "x$krecipes_SUBDIR_included" = xyes)
 AM_CONDITIONAL(po_SUBDIR_included, test "x$po_SUBDIR_included" = xyes)
 AC_CONFIG_FILES([ Makefile ])
+AC_CONFIG_FILES([ data/Makefile ])
 AC_CONFIG_FILES([ doc/Makefile ])
 AC_CONFIG_FILES([ doc/da/Makefile ])
 AC_CONFIG_FILES([ doc/en/Makefile ])
@ -186,22 +187,20 @@ AC_CONFIG_FILES([ doc/es/Makefile ])
 AC_CONFIG_FILES([ doc/et/Makefile ])
 AC_CONFIG_FILES([ doc/pt/Makefile ])
 AC_CONFIG_FILES([ doc/sv/Makefile ])
-AC_CONFIG_FILES([ krecipes/Makefile ])
-AC_CONFIG_FILES([ krecipes/data/Makefile ])
-AC_CONFIG_FILES([ krecipes/icons/Makefile ])
-AC_CONFIG_FILES([ krecipes/layouts/Makefile ])
-AC_CONFIG_FILES([ krecipes/pics/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/backends/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/backends/MySQL/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/backends/PostgreSQL/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/backends/SQLite/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/datablocks/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/dialogs/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/exporters/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/importers/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/tests/Makefile ])
-AC_CONFIG_FILES([ krecipes/src/widgets/Makefile ])
+AC_CONFIG_FILES([ icons/Makefile ])
+AC_CONFIG_FILES([ layouts/Makefile ])
+AC_CONFIG_FILES([ src/Makefile ])
+AC_CONFIG_FILES([ src/backends/Makefile ])
+AC_CONFIG_FILES([ src/backends/MySQL/Makefile ])
+AC_CONFIG_FILES([ src/backends/PostgreSQL/Makefile ])
+AC_CONFIG_FILES([ src/backends/SQLite/Makefile ])
+AC_CONFIG_FILES([ src/datablocks/Makefile ])
+AC_CONFIG_FILES([ src/dialogs/Makefile ])
+AC_CONFIG_FILES([ src/exporters/Makefile ])
+AC_CONFIG_FILES([ src/importers/Makefile ])
+AC_CONFIG_FILES([ src/tests/Makefile ])
+AC_CONFIG_FILES([ src/widgets/Makefile ])
+AC_CONFIG_FILES([ pics/Makefile ])
 AC_CONFIG_FILES([ po/Makefile ])
 AC_CONFIG_FILES([ po/az/Makefile ])
 AC_CONFIG_FILES([ po/bg/Makefile ])
--- a/krecipes/data/Makefile.am
+++ b/krecipes/data/Makefile.am
--- a/krecipes/data/abbrev.txt
+++ b/krecipes/data/abbrev.txt
--- a/krecipes/data/data.sql
+++ b/krecipes/data/data.sql
--- a/krecipes/data/samples-cs_CZ.kreml
+++ b/krecipes/data/samples-cs_CZ.kreml
--- a/krecipes/data/samples-en_US.kreml
+++ b/krecipes/data/samples-en_US.kreml
--- a/krecipes/data/weight.txt
+++ b/krecipes/data/weight.txt
--- a/krecipes/data/x-krecipes-backup.desktop
+++ b/krecipes/data/x-krecipes-backup.desktop
--- a/krecipes/data/x-krecipes-recipes.desktop
+++ b/krecipes/data/x-krecipes-recipes.desktop
--- a/krecipes/icons/Makefile.am
+++ b/krecipes/icons/Makefile.am
--- a/krecipes/icons/cr128-mime-krecipes_file.png
+++ b/krecipes/icons/cr128-mime-krecipes_file.png
--- a/krecipes/icons/cr16-action-categories.png
+++ b/krecipes/icons/cr16-action-categories.png
--- a/krecipes/icons/cr16-action-diet.png
+++ b/krecipes/icons/cr16-action-diet.png
--- a/krecipes/icons/cr16-action-ingredients.png
+++ b/krecipes/icons/cr16-action-ingredients.png
--- a/krecipes/icons/cr16-action-properties.png
+++ b/krecipes/icons/cr16-action-properties.png
--- a/krecipes/icons/cr16-action-trolley.png
+++ b/krecipes/icons/cr16-action-trolley.png
--- a/krecipes/icons/cr16-action-units.png
+++ b/krecipes/icons/cr16-action-units.png
--- a/krecipes/icons/cr16-mime-krecipes_file.png
+++ b/krecipes/icons/cr16-mime-krecipes_file.png
--- a/krecipes/icons/cr22-action-categories.png
+++ b/krecipes/icons/cr22-action-categories.png
--- a/krecipes/icons/cr22-action-diet.png
+++ b/krecipes/icons/cr22-action-diet.png
--- a/krecipes/icons/cr22-action-ingredients.png
+++ b/krecipes/icons/cr22-action-ingredients.png
--- a/krecipes/icons/cr22-action-properties.png
+++ b/krecipes/icons/cr22-action-properties.png
--- a/krecipes/icons/cr22-action-trolley.png
+++ b/krecipes/icons/cr22-action-trolley.png
--- a/krecipes/icons/cr22-action-units.png
+++ b/krecipes/icons/cr22-action-units.png
--- a/krecipes/icons/cr32-action-categories.png
+++ b/krecipes/icons/cr32-action-categories.png
--- a/krecipes/icons/cr32-action-diet.png
+++ b/krecipes/icons/cr32-action-diet.png
--- a/krecipes/icons/cr32-action-ingredients.png
+++ b/krecipes/icons/cr32-action-ingredients.png
--- a/krecipes/icons/cr32-action-krectip.png
+++ b/krecipes/icons/cr32-action-krectip.png
--- a/krecipes/icons/cr32-action-properties.png
+++ b/krecipes/icons/cr32-action-properties.png
--- a/krecipes/icons/cr32-action-trolley.png
+++ b/krecipes/icons/cr32-action-trolley.png
--- a/krecipes/icons/cr32-action-units.png
+++ b/krecipes/icons/cr32-action-units.png
--- a/krecipes/icons/cr32-mime-krecipes_file.png
+++ b/krecipes/icons/cr32-mime-krecipes_file.png
--- a/krecipes/icons/cr48-action-categories.png
+++ b/krecipes/icons/cr48-action-categories.png
--- a/krecipes/icons/cr48-action-diet.png
+++ b/krecipes/icons/cr48-action-diet.png
--- a/krecipes/icons/cr48-action-ingredients.png
+++ b/krecipes/icons/cr48-action-ingredients.png
--- a/krecipes/icons/cr48-action-properties.png
+++ b/krecipes/icons/cr48-action-properties.png
--- a/krecipes/icons/cr48-action-trolley.png
+++ b/krecipes/icons/cr48-action-trolley.png
--- a/krecipes/icons/cr48-action-units.png
+++ b/krecipes/icons/cr48-action-units.png
--- a/krecipes/icons/cr64-mime-krecipes_file.png
+++ b/krecipes/icons/cr64-mime-krecipes_file.png
--- a/krecipes/CMakeL10n.txt
+++ b/krecipes/CMakeL10n.txt
@ -1,3 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_create_template( "krecipes" )
--- a/krecipes/Makefile.am
+++ b/krecipes/Makefile.am
@ -1,6 +0,0 @@
-SUBDIRS = src icons pics data layouts
-
-messages: rc.cpp
-	find ./src/ -name \*.ui | xargs --no-run-if-empty $(EXTRACTRC) >> rc.cpp
-	$(XGETTEXT) rc.cpp `find ./src/ -name \*.cpp` -o $(podir)/krecipes.pot
-	rm -f rc.cpp
--- a/krecipes/NEWS
+++ b/krecipes/NEWS
--- a/krecipes/layouts/Blue.klo
+++ b/krecipes/layouts/Blue.klo
--- a/krecipes/layouts/Default.klo
+++ b/krecipes/layouts/Default.klo
--- a/krecipes/layouts/Default.template
+++ b/krecipes/layouts/Default.template
--- a/krecipes/layouts/Makefile.am
+++ b/krecipes/layouts/Makefile.am
--- a/krecipes/layouts/Two_Column.template
+++ b/krecipes/layouts/Two_Column.template
--- a/krecipes/pics/Makefile.am
+++ b/krecipes/pics/Makefile.am
--- a/krecipes/pics/dbpermissions.png
+++ b/krecipes/pics/dbpermissions.png
--- a/krecipes/pics/menubg.png
+++ b/krecipes/pics/menubg.png
--- a/krecipes/pics/network.png
+++ b/krecipes/pics/network.png
--- a/krecipes/pics/rating0.png
+++ b/krecipes/pics/rating0.png
--- a/krecipes/pics/rating1.png
+++ b/krecipes/pics/rating1.png
--- a/krecipes/pics/rating2.png
+++ b/krecipes/pics/rating2.png
--- a/krecipes/pics/rating3.png
+++ b/krecipes/pics/rating3.png
--- a/krecipes/pics/rating4.png
+++ b/krecipes/pics/rating4.png
--- a/krecipes/pics/rating5.png
+++ b/krecipes/pics/rating5.png
--- a/krecipes/pics/recipes.png
+++ b/krecipes/pics/recipes.png
--- a/krecipes/pics/save.png
+++ b/krecipes/pics/save.png
--- a/krecipes/pics/star_half.png
+++ b/krecipes/pics/star_half.png
--- a/krecipes/pics/star_off.png
+++ b/krecipes/pics/star_off.png
--- a/krecipes/pics/star_on.png
+++ b/krecipes/pics/star_on.png
--- a/krecipes/pics/startlogo.png
+++ b/krecipes/pics/startlogo.png
--- a/krecipes/pics/wizard.png
+++ b/krecipes/pics/wizard.png
--- a/krecipes/src/Makefile.am
+++ b/krecipes/src/Makefile.am
@ -55,3 +55,8 @@ kdelnk_DATA = krecipes.desktop
 # this is where the XML-GUI resource file goes
 rcdir = $(kde_datadir)/krecipes
 rc_DATA = krecipesui.rc
+
+messages: rc.cpp
+	find ./ -name \*.ui | xargs --no-run-if-empty $(EXTRACTRC) >> rc.cpp
+	$(XGETTEXT) rc.cpp `find ./ -name \*.cpp` -o $(podir)/krecipes.pot
+	rm -f rc.cpp
--- a/krecipes/src/backends/Makefile.am
+++ b/krecipes/src/backends/Makefile.am
--- a/krecipes/src/backends/MySQL/Makefile.am
+++ b/krecipes/src/backends/MySQL/Makefile.am
--- a/krecipes/src/backends/MySQL/mysqlrecipedb.cpp
+++ b/krecipes/src/backends/MySQL/mysqlrecipedb.cpp
--- a/krecipes/src/backends/MySQL/mysqlrecipedb.h
+++ b/krecipes/src/backends/MySQL/mysqlrecipedb.h
--- a/krecipes/src/backends/PostgreSQL/Makefile.am
+++ b/krecipes/src/backends/PostgreSQL/Makefile.am
--- a/krecipes/src/backends/PostgreSQL/psqlrecipedb.cpp
+++ b/krecipes/src/backends/PostgreSQL/psqlrecipedb.cpp
--- a/krecipes/src/backends/PostgreSQL/psqlrecipedb.h
+++ b/krecipes/src/backends/PostgreSQL/psqlrecipedb.h
--- a/krecipes/src/backends/SQLite/Makefile.am
+++ b/krecipes/src/backends/SQLite/Makefile.am
--- a/krecipes/src/backends/SQLite/literecipedb.cpp
+++ b/krecipes/src/backends/SQLite/literecipedb.cpp
--- a/krecipes/src/backends/SQLite/literecipedb.h
+++ b/krecipes/src/backends/SQLite/literecipedb.h
--- a/krecipes/src/backends/progressinterface.cpp
+++ b/krecipes/src/backends/progressinterface.cpp
--- a/krecipes/src/backends/progressinterface.h
+++ b/krecipes/src/backends/progressinterface.h
--- a/krecipes/src/backends/qsqlrecipedb.cpp
+++ b/krecipes/src/backends/qsqlrecipedb.cpp
--- a/krecipes/src/backends/qsqlrecipedb.h
+++ b/krecipes/src/backends/qsqlrecipedb.h
--- a/krecipes/src/backends/recipedb.cpp
+++ b/krecipes/src/backends/recipedb.cpp
--- a/krecipes/src/backends/recipedb.h
+++ b/krecipes/src/backends/recipedb.h
--- a/krecipes/src/backends/searchparameters.h
+++ b/krecipes/src/backends/searchparameters.h
--- a/krecipes/src/backends/usda_ingredient_data.h
+++ b/krecipes/src/backends/usda_ingredient_data.h
--- a/krecipes/src/backends/usda_property_data.h
+++ b/krecipes/src/backends/usda_property_data.h
--- a/krecipes/src/backends/usda_unit_data.h
+++ b/krecipes/src/backends/usda_unit_data.h
--- a/krecipes/configure.in.bot
+++ b/krecipes/configure.in.bot
--- a/krecipes/configure.in.in
+++ b/krecipes/configure.in.in
--- a/krecipes/src/convert_sqlite3.cpp
+++ b/krecipes/src/convert_sqlite3.cpp
--- a/krecipes/src/convert_sqlite3.h
+++ b/krecipes/src/convert_sqlite3.h
--- a/krecipes/src/datablocks/Makefile.am
+++ b/krecipes/src/datablocks/Makefile.am
--- a/krecipes/src/datablocks/categorytree.cpp
+++ b/krecipes/src/datablocks/categorytree.cpp
--- a/krecipes/src/datablocks/categorytree.h
+++ b/krecipes/src/datablocks/categorytree.h
--- a/krecipes/src/datablocks/constraintlist.cpp
+++ b/krecipes/src/datablocks/constraintlist.cpp
--- a/krecipes/src/datablocks/constraintlist.h
+++ b/krecipes/src/datablocks/constraintlist.h
--- a/krecipes/src/datablocks/element.cpp
+++ b/krecipes/src/datablocks/element.cpp
--- a/krecipes/src/datablocks/element.h
+++ b/krecipes/src/datablocks/element.h
--- a/krecipes/src/datablocks/elementlist.cpp
+++ b/krecipes/src/datablocks/elementlist.cpp
--- a/krecipes/src/datablocks/elementlist.h
+++ b/krecipes/src/datablocks/elementlist.h
--- a/krecipes/src/datablocks/ingredient.cpp
+++ b/krecipes/src/datablocks/ingredient.cpp
--- a/krecipes/src/datablocks/ingredient.h
+++ b/krecipes/src/datablocks/ingredient.h
--- a/krecipes/src/datablocks/ingredientlist.cpp
+++ b/krecipes/src/datablocks/ingredientlist.cpp
--- a/krecipes/src/datablocks/ingredientlist.h
+++ b/krecipes/src/datablocks/ingredientlist.h
--- a/krecipes/src/datablocks/ingredientproperty.cpp
+++ b/krecipes/src/datablocks/ingredientproperty.cpp
--- a/krecipes/src/datablocks/ingredientproperty.h
+++ b/krecipes/src/datablocks/ingredientproperty.h
--- a/krecipes/src/datablocks/ingredientpropertylist.cpp
+++ b/krecipes/src/datablocks/ingredientpropertylist.cpp
--- a/krecipes/src/datablocks/ingredientpropertylist.h
+++ b/krecipes/src/datablocks/ingredientpropertylist.h
--- a/krecipes/src/datablocks/kreborder.cpp
+++ b/krecipes/src/datablocks/kreborder.cpp
--- a/krecipes/src/datablocks/kreborder.h
+++ b/krecipes/src/datablocks/kreborder.h
--- a/krecipes/src/datablocks/mixednumber.cpp
+++ b/krecipes/src/datablocks/mixednumber.cpp
--- a/krecipes/src/datablocks/mixednumber.h
+++ b/krecipes/src/datablocks/mixednumber.h
--- a/krecipes/src/datablocks/rating.cpp
+++ b/krecipes/src/datablocks/rating.cpp
--- a/krecipes/src/datablocks/rating.h
+++ b/krecipes/src/datablocks/rating.h
--- a/krecipes/src/datablocks/recipe.cpp
+++ b/krecipes/src/datablocks/recipe.cpp
--- a/krecipes/src/datablocks/recipe.h
+++ b/krecipes/src/datablocks/recipe.h
--- a/krecipes/src/datablocks/recipelist.cpp
+++ b/krecipes/src/datablocks/recipelist.cpp
--- a/krecipes/src/datablocks/recipelist.h
+++ b/krecipes/src/datablocks/recipelist.h
--- a/krecipes/src/datablocks/unit.cpp
+++ b/krecipes/src/datablocks/unit.cpp
--- a/krecipes/src/datablocks/unit.h
+++ b/krecipes/src/datablocks/unit.h
--- a/krecipes/src/datablocks/unitratio.cpp
+++ b/krecipes/src/datablocks/unitratio.cpp
--- a/krecipes/src/datablocks/unitratio.h
+++ b/krecipes/src/datablocks/unitratio.h
--- a/krecipes/src/datablocks/unitratiolist.cpp
+++ b/krecipes/src/datablocks/unitratiolist.cpp
--- a/krecipes/src/datablocks/unitratiolist.h
+++ b/krecipes/src/datablocks/unitratiolist.h
--- a/krecipes/src/datablocks/weight.cpp
+++ b/krecipes/src/datablocks/weight.cpp
--- a/krecipes/src/datablocks/weight.h
+++ b/krecipes/src/datablocks/weight.h
--- a/krecipes/src/dialogs/Makefile.am
+++ b/krecipes/src/dialogs/Makefile.am
--- a/krecipes/src/dialogs/advancedsearchdialog.cpp
+++ b/krecipes/src/dialogs/advancedsearchdialog.cpp
--- a/krecipes/src/dialogs/advancedsearchdialog.h
+++ b/krecipes/src/dialogs/advancedsearchdialog.h
--- a/krecipes/src/dialogs/authorsdialog.cpp
+++ b/krecipes/src/dialogs/authorsdialog.cpp
--- a/krecipes/src/dialogs/authorsdialog.h
+++ b/krecipes/src/dialogs/authorsdialog.h
--- a/krecipes/src/dialogs/borderdialog.cpp
+++ b/krecipes/src/dialogs/borderdialog.cpp
--- a/krecipes/src/dialogs/borderdialog.h
+++ b/krecipes/src/dialogs/borderdialog.h
--- a/krecipes/src/dialogs/categorieseditordialog.cpp
+++ b/krecipes/src/dialogs/categorieseditordialog.cpp
--- a/krecipes/src/dialogs/categorieseditordialog.h
+++ b/krecipes/src/dialogs/categorieseditordialog.h
--- a/krecipes/src/dialogs/conversiondialog.cpp
+++ b/krecipes/src/dialogs/conversiondialog.cpp
--- a/krecipes/src/dialogs/conversiondialog.h
+++ b/krecipes/src/dialogs/conversiondialog.h
--- a/krecipes/src/dialogs/createcategorydialog.cpp
+++ b/krecipes/src/dialogs/createcategorydialog.cpp
--- a/krecipes/src/dialogs/createcategorydialog.h
+++ b/krecipes/src/dialogs/createcategorydialog.h
--- a/krecipes/src/dialogs/createelementdialog.cpp
+++ b/krecipes/src/dialogs/createelementdialog.cpp
--- a/krecipes/src/dialogs/createelementdialog.h
+++ b/krecipes/src/dialogs/createelementdialog.h
--- a/krecipes/src/dialogs/createingredientweightdialog.cpp
+++ b/krecipes/src/dialogs/createingredientweightdialog.cpp
--- a/krecipes/src/dialogs/createingredientweightdialog.h
+++ b/krecipes/src/dialogs/createingredientweightdialog.h
--- a/krecipes/src/dialogs/createpropertydialog.cpp
+++ b/krecipes/src/dialogs/createpropertydialog.cpp
--- a/krecipes/src/dialogs/createpropertydialog.h
+++ b/krecipes/src/dialogs/createpropertydialog.h
--- a/krecipes/src/dialogs/createunitdialog.cpp
+++ b/krecipes/src/dialogs/createunitdialog.cpp
--- a/krecipes/src/dialogs/createunitdialog.h
+++ b/krecipes/src/dialogs/createunitdialog.h
--- a/krecipes/src/dialogs/dbimportdialog.cpp
+++ b/krecipes/src/dialogs/dbimportdialog.cpp
--- a/krecipes/src/dialogs/dbimportdialog.h
+++ b/krecipes/src/dialogs/dbimportdialog.h
--- a/krecipes/src/dialogs/dependanciesdialog.cpp
+++ b/krecipes/src/dialogs/dependanciesdialog.cpp
--- a/krecipes/src/dialogs/dependanciesdialog.h
+++ b/krecipes/src/dialogs/dependanciesdialog.h
--- a/krecipes/src/dialogs/dietviewdialog.cpp
+++ b/krecipes/src/dialogs/dietviewdialog.cpp
--- a/krecipes/src/dialogs/dietviewdialog.h
+++ b/krecipes/src/dialogs/dietviewdialog.h
--- a/krecipes/src/dialogs/dietwizarddialog.cpp
+++ b/krecipes/src/dialogs/dietwizarddialog.cpp
--- a/krecipes/src/dialogs/dietwizarddialog.h
+++ b/krecipes/src/dialogs/dietwizarddialog.h
--- a/krecipes/src/dialogs/editratingdialog.cpp
+++ b/krecipes/src/dialogs/editratingdialog.cpp
--- a/krecipes/src/dialogs/editratingdialog.h
+++ b/krecipes/src/dialogs/editratingdialog.h
--- a/krecipes/src/dialogs/ingredientgroupsdialog.cpp
+++ b/krecipes/src/dialogs/ingredientgroupsdialog.cpp
--- a/krecipes/src/dialogs/ingredientgroupsdialog.h
+++ b/krecipes/src/dialogs/ingredientgroupsdialog.h
--- a/krecipes/src/dialogs/ingredientmatcherdialog.cpp
+++ b/krecipes/src/dialogs/ingredientmatcherdialog.cpp
--- a/krecipes/src/dialogs/ingredientmatcherdialog.h
+++ b/krecipes/src/dialogs/ingredientmatcherdialog.h
--- a/krecipes/src/dialogs/ingredientparserdialog.cpp
+++ b/krecipes/src/dialogs/ingredientparserdialog.cpp
--- a/krecipes/src/dialogs/ingredientparserdialog.h
+++ b/krecipes/src/dialogs/ingredientparserdialog.h
--- a/krecipes/src/dialogs/ingredientsdialog.cpp
+++ b/krecipes/src/dialogs/ingredientsdialog.cpp
--- a/krecipes/src/dialogs/ingredientsdialog.h
+++ b/krecipes/src/dialogs/ingredientsdialog.h
--- a/krecipes/src/dialogs/pagesetupdialog.cpp
+++ b/krecipes/src/dialogs/pagesetupdialog.cpp
--- a/krecipes/src/dialogs/pagesetupdialog.h
+++ b/krecipes/src/dialogs/pagesetupdialog.h
--- a/krecipes/src/dialogs/prepmethodsdialog.cpp
+++ b/krecipes/src/dialogs/prepmethodsdialog.cpp
--- a/krecipes/src/dialogs/prepmethodsdialog.h
+++ b/krecipes/src/dialogs/prepmethodsdialog.h
--- a/krecipes/src/dialogs/propertiesdialog.cpp
+++ b/krecipes/src/dialogs/propertiesdialog.cpp
--- a/krecipes/src/dialogs/propertiesdialog.h
+++ b/krecipes/src/dialogs/propertiesdialog.h
--- a/krecipes/src/dialogs/recipeimportdialog.cpp
+++ b/krecipes/src/dialogs/recipeimportdialog.cpp
--- a/krecipes/src/dialogs/recipeimportdialog.h
+++ b/krecipes/src/dialogs/recipeimportdialog.h
--- a/krecipes/src/dialogs/recipeinputdialog.cpp
+++ b/krecipes/src/dialogs/recipeinputdialog.cpp
--- a/krecipes/src/dialogs/recipeinputdialog.h
+++ b/krecipes/src/dialogs/recipeinputdialog.h
--- a/krecipes/src/dialogs/recipeprintpreview.cpp
+++ b/krecipes/src/dialogs/recipeprintpreview.cpp
--- a/krecipes/src/dialogs/recipeprintpreview.h
+++ b/krecipes/src/dialogs/recipeprintpreview.h
--- a/krecipes/src/dialogs/recipeviewdialog.cpp
+++ b/krecipes/src/dialogs/recipeviewdialog.cpp
--- a/krecipes/src/dialogs/recipeviewdialog.h
+++ b/krecipes/src/dialogs/recipeviewdialog.h
--- a/krecipes/src/dialogs/refineshoppinglistdialog.cpp
+++ b/krecipes/src/dialogs/refineshoppinglistdialog.cpp
--- a/krecipes/src/dialogs/refineshoppinglistdialog.h
+++ b/krecipes/src/dialogs/refineshoppinglistdialog.h
--- a/krecipes/src/dialogs/resizerecipedialog.cpp
+++ b/krecipes/src/dialogs/resizerecipedialog.cpp
--- a/krecipes/src/dialogs/resizerecipedialog.h
+++ b/krecipes/src/dialogs/resizerecipedialog.h
--- a/krecipes/src/dialogs/selectauthorsdialog.cpp
+++ b/krecipes/src/dialogs/selectauthorsdialog.cpp
--- a/krecipes/src/dialogs/selectauthorsdialog.h
+++ b/krecipes/src/dialogs/selectauthorsdialog.h
--- a/krecipes/src/dialogs/selectcategoriesdialog.cpp
+++ b/krecipes/src/dialogs/selectcategoriesdialog.cpp
--- a/krecipes/src/dialogs/selectcategoriesdialog.h
+++ b/krecipes/src/dialogs/selectcategoriesdialog.h
--- a/krecipes/src/dialogs/selectpropertydialog.cpp
+++ b/krecipes/src/dialogs/selectpropertydialog.cpp
--- a/krecipes/src/dialogs/selectpropertydialog.h
+++ b/krecipes/src/dialogs/selectpropertydialog.h
--- a/krecipes/src/dialogs/selectrecipedialog.cpp
+++ b/krecipes/src/dialogs/selectrecipedialog.cpp
--- a/krecipes/src/dialogs/selectrecipedialog.h
+++ b/krecipes/src/dialogs/selectrecipedialog.h
--- a/krecipes/src/dialogs/selectunitdialog.cpp
+++ b/krecipes/src/dialogs/selectunitdialog.cpp
--- a/krecipes/src/dialogs/selectunitdialog.h
+++ b/krecipes/src/dialogs/selectunitdialog.h
--- a/krecipes/src/dialogs/setupdisplay.cpp
+++ b/krecipes/src/dialogs/setupdisplay.cpp
--- a/krecipes/src/dialogs/setupdisplay.h
+++ b/krecipes/src/dialogs/setupdisplay.h
--- a/krecipes/src/dialogs/shoppinglistdialog.cpp
+++ b/krecipes/src/dialogs/shoppinglistdialog.cpp
--- a/krecipes/src/dialogs/shoppinglistdialog.h
+++ b/krecipes/src/dialogs/shoppinglistdialog.h
--- a/krecipes/src/dialogs/shoppinglistviewdialog.cpp
+++ b/krecipes/src/dialogs/shoppinglistviewdialog.cpp
--- a/krecipes/src/dialogs/shoppinglistviewdialog.h
+++ b/krecipes/src/dialogs/shoppinglistviewdialog.h
--- a/krecipes/src/dialogs/similarcategoriesdialog.cpp
+++ b/krecipes/src/dialogs/similarcategoriesdialog.cpp
--- a/krecipes/src/dialogs/similarcategoriesdialog.h
+++ b/krecipes/src/dialogs/similarcategoriesdialog.h
--- a/krecipes/src/dialogs/unitsdialog.cpp
+++ b/krecipes/src/dialogs/unitsdialog.cpp
--- a/krecipes/src/dialogs/unitsdialog.h
+++ b/krecipes/src/dialogs/unitsdialog.h
--- a/krecipes/src/dialogs/usdadatadialog.cpp
+++ b/krecipes/src/dialogs/usdadatadialog.cpp
--- a/krecipes/src/dialogs/usdadatadialog.h
+++ b/krecipes/src/dialogs/usdadatadialog.h
--- a/krecipes/src/exporters/Makefile.am
+++ b/krecipes/src/exporters/Makefile.am
--- a/krecipes/src/exporters/baseexporter.cpp
+++ b/krecipes/src/exporters/baseexporter.cpp
--- a/krecipes/src/exporters/baseexporter.h
+++ b/krecipes/src/exporters/baseexporter.h
--- a/krecipes/src/exporters/cookmlexporter.cpp
+++ b/krecipes/src/exporters/cookmlexporter.cpp
--- a/krecipes/src/exporters/cookmlexporter.h
+++ b/krecipes/src/exporters/cookmlexporter.h
--- a/krecipes/src/exporters/htmlbookexporter.cpp
+++ b/krecipes/src/exporters/htmlbookexporter.cpp
--- a/krecipes/src/exporters/htmlbookexporter.h
+++ b/krecipes/src/exporters/htmlbookexporter.h
--- a/krecipes/src/exporters/htmlexporter.cpp
+++ b/krecipes/src/exporters/htmlexporter.cpp
--- a/krecipes/src/exporters/htmlexporter.h
+++ b/krecipes/src/exporters/htmlexporter.h
--- a/krecipes/src/exporters/kreexporter.cpp
+++ b/krecipes/src/exporters/kreexporter.cpp
--- a/krecipes/src/exporters/kreexporter.h
+++ b/krecipes/src/exporters/kreexporter.h
--- a/krecipes/src/exporters/mmfexporter.cpp
+++ b/krecipes/src/exporters/mmfexporter.cpp
--- a/krecipes/src/exporters/mmfexporter.h
+++ b/krecipes/src/exporters/mmfexporter.h
--- a/krecipes/src/exporters/plaintextexporter.cpp
+++ b/krecipes/src/exporters/plaintextexporter.cpp
--- a/krecipes/src/exporters/plaintextexporter.h
+++ b/krecipes/src/exporters/plaintextexporter.h
--- a/krecipes/src/exporters/recipemlexporter.cpp
+++ b/krecipes/src/exporters/recipemlexporter.cpp
--- a/krecipes/src/exporters/recipemlexporter.h
+++ b/krecipes/src/exporters/recipemlexporter.h
--- a/krecipes/src/exporters/rezkonvexporter.cpp
+++ b/krecipes/src/exporters/rezkonvexporter.cpp
--- a/krecipes/src/exporters/rezkonvexporter.h
+++ b/krecipes/src/exporters/rezkonvexporter.h
--- a/krecipes/src/hi128-app-krecipes.png
+++ b/krecipes/src/hi128-app-krecipes.png
--- a/krecipes/src/hi16-app-krecipes.png
+++ b/krecipes/src/hi16-app-krecipes.png
--- a/krecipes/src/hi22-app-krecipes.png
+++ b/krecipes/src/hi22-app-krecipes.png
--- a/krecipes/src/hi32-app-krecipes.png
+++ b/krecipes/src/hi32-app-krecipes.png
--- a/krecipes/src/hi48-app-krecipes.png
+++ b/krecipes/src/hi48-app-krecipes.png
--- a/krecipes/src/hi64-app-krecipes.png
+++ b/krecipes/src/hi64-app-krecipes.png
--- a/krecipes/src/image.h
+++ b/krecipes/src/image.h
--- a/krecipes/src/importers/Makefile.am
+++ b/krecipes/src/importers/Makefile.am
--- a/krecipes/src/importers/baseimporter.cpp
+++ b/krecipes/src/importers/baseimporter.cpp
--- a/krecipes/src/importers/baseimporter.h
+++ b/krecipes/src/importers/baseimporter.h
--- a/krecipes/src/importers/kredbimporter.cpp
+++ b/krecipes/src/importers/kredbimporter.cpp
--- a/krecipes/src/importers/kredbimporter.h
+++ b/krecipes/src/importers/kredbimporter.h
--- a/krecipes/src/importers/kreimporter.cpp
+++ b/krecipes/src/importers/kreimporter.cpp
--- a/krecipes/src/importers/kreimporter.h
+++ b/krecipes/src/importers/kreimporter.h
--- a/krecipes/src/importers/mmfimporter.cpp
+++ b/krecipes/src/importers/mmfimporter.cpp
--- a/krecipes/src/importers/mmfimporter.h
+++ b/krecipes/src/importers/mmfimporter.h
--- a/krecipes/src/importers/mx2importer.cpp
+++ b/krecipes/src/importers/mx2importer.cpp
--- a/krecipes/src/importers/mx2importer.h
+++ b/krecipes/src/importers/mx2importer.h
--- a/krecipes/src/importers/mxpimporter.cpp
+++ b/krecipes/src/importers/mxpimporter.cpp
--- a/krecipes/src/importers/mxpimporter.h
+++ b/krecipes/src/importers/mxpimporter.h
--- a/krecipes/src/importers/nycgenericimporter.cpp
+++ b/krecipes/src/importers/nycgenericimporter.cpp
--- a/krecipes/src/importers/nycgenericimporter.h
+++ b/krecipes/src/importers/nycgenericimporter.h
--- a/krecipes/src/importers/recipemlimporter.cpp
+++ b/krecipes/src/importers/recipemlimporter.cpp
--- a/krecipes/src/importers/recipemlimporter.h
+++ b/krecipes/src/importers/recipemlimporter.h
--- a/krecipes/src/importers/rezkonvimporter.cpp
+++ b/krecipes/src/importers/rezkonvimporter.cpp
--- a/krecipes/src/importers/rezkonvimporter.h
+++ b/krecipes/src/importers/rezkonvimporter.h
--- a/krecipes/src/klomanager.cpp
+++ b/krecipes/src/klomanager.cpp
--- a/krecipes/src/klomanager.h
+++ b/krecipes/src/klomanager.h
--- a/krecipes/src/krecipes.cpp
+++ b/krecipes/src/krecipes.cpp
--- a/krecipes/src/krecipes.desktop
+++ b/krecipes/src/krecipes.desktop
--- a/krecipes/src/krecipes.h
+++ b/krecipes/src/krecipes.h
--- a/krecipes/src/krecipesdbiface.h
+++ b/krecipes/src/krecipesdbiface.h
--- a/krecipes/src/krecipesiface.h
+++ b/krecipes/src/krecipesiface.h
--- a/krecipes/src/krecipesui.rc
+++ b/krecipes/src/krecipesui.rc
--- a/krecipes/src/krecipesview.cpp
+++ b/krecipes/src/krecipesview.cpp
--- a/krecipes/src/krecipesview.h
+++ b/krecipes/src/krecipesview.h
--- a/krecipes/src/krepagelayout.cpp
+++ b/krecipes/src/krepagelayout.cpp
--- a/krecipes/src/krepagelayout.h
+++ b/krecipes/src/krepagelayout.h
--- a/krecipes/src/kstartuplogo.cpp
+++ b/krecipes/src/kstartuplogo.cpp
--- a/krecipes/src/kstartuplogo.h
+++ b/krecipes/src/kstartuplogo.h
--- a/krecipes/src/main.cpp
+++ b/krecipes/src/main.cpp
--- a/krecipes/src/mmdata.h
+++ b/krecipes/src/mmdata.h
--- a/krecipes/src/pref.cpp
+++ b/krecipes/src/pref.cpp
--- a/krecipes/src/pref.h
+++ b/krecipes/src/pref.h
--- a/krecipes/src/profiling.h
+++ b/krecipes/src/profiling.h
--- a/krecipes/src/propertycalculator.cpp
+++ b/krecipes/src/propertycalculator.cpp
--- a/krecipes/src/propertycalculator.h
+++ b/krecipes/src/propertycalculator.h
--- a/krecipes/src/recipeactionshandler.cpp
+++ b/krecipes/src/recipeactionshandler.cpp
--- a/krecipes/src/recipeactionshandler.h
+++ b/krecipes/src/recipeactionshandler.h
--- a/krecipes/src/recipefilter.cpp
+++ b/krecipes/src/recipefilter.cpp
--- a/krecipes/src/recipefilter.h
+++ b/krecipes/src/recipefilter.h
--- a/krecipes/src/setupwizard.cpp
+++ b/krecipes/src/setupwizard.cpp
--- a/krecipes/src/setupwizard.h
+++ b/krecipes/src/setupwizard.h
--- a/krecipes/src/shoppingcalculator.cpp
+++ b/krecipes/src/shoppingcalculator.cpp
--- a/krecipes/src/shoppingcalculator.h
+++ b/krecipes/src/shoppingcalculator.h
--- a/krecipes/src/tests/Makefile.am
+++ b/krecipes/src/tests/Makefile.am
--- a/krecipes/src/tests/checks.h
+++ b/krecipes/src/tests/checks.h
--- a/krecipes/src/tests/exportertest.h
+++ b/krecipes/src/tests/exportertest.h
--- a/krecipes/src/tests/importertest.h
+++ b/krecipes/src/tests/importertest.h
--- a/krecipes/src/tests/kretest.cpp
+++ b/krecipes/src/tests/kretest.cpp
--- a/krecipes/src/tests/kretest.txt
+++ b/krecipes/src/tests/kretest.txt
--- a/krecipes/src/tests/mmftest.cpp
+++ b/krecipes/src/tests/mmftest.cpp
--- a/krecipes/src/tests/mmftest.txt
+++ b/krecipes/src/tests/mmftest.txt
--- a/krecipes/src/tests/mx2test.cpp
+++ b/krecipes/src/tests/mx2test.cpp
--- a/krecipes/src/tests/mx2test.txt
+++ b/krecipes/src/tests/mx2test.txt
--- a/krecipes/src/tests/mxptest.cpp
+++ b/krecipes/src/tests/mxptest.cpp
--- a/krecipes/src/tests/mxptest.txt
+++ b/krecipes/src/tests/mxptest.txt
--- a/krecipes/src/tests/nyctest.cpp
+++ b/krecipes/src/tests/nyctest.cpp
--- a/krecipes/src/tests/nyctest.txt
+++ b/krecipes/src/tests/nyctest.txt
--- a/krecipes/src/tests/recipemltest.cpp
+++ b/krecipes/src/tests/recipemltest.cpp
--- a/krecipes/src/tests/recipemltest.txt
+++ b/krecipes/src/tests/recipemltest.txt
--- a/krecipes/src/tests/rezkonvtest.cpp
+++ b/krecipes/src/tests/rezkonvtest.cpp
--- a/krecipes/src/tests/rezkonvtest.txt
+++ b/krecipes/src/tests/rezkonvtest.txt
--- a/krecipes/src/tests/test_photo.jpg
+++ b/krecipes/src/tests/test_photo.jpg
--- a/krecipes/src/widgets/Makefile.am
+++ b/krecipes/src/widgets/Makefile.am
--- a/krecipes/src/widgets/amountunitinput.cpp
+++ b/krecipes/src/widgets/amountunitinput.cpp
--- a/krecipes/src/widgets/amountunitinput.h
+++ b/krecipes/src/widgets/amountunitinput.h
--- a/krecipes/src/widgets/authorlistview.cpp
+++ b/krecipes/src/widgets/authorlistview.cpp
--- a/krecipes/src/widgets/authorlistview.h
+++ b/krecipes/src/widgets/authorlistview.h
--- a/krecipes/src/widgets/categorycombobox.cpp
+++ b/krecipes/src/widgets/categorycombobox.cpp
--- a/krecipes/src/widgets/categorycombobox.h
+++ b/krecipes/src/widgets/categorycombobox.h
--- a/krecipes/src/widgets/categorylistview.cpp
+++ b/krecipes/src/widgets/categorylistview.cpp
--- a/krecipes/src/widgets/categorylistview.h
+++ b/krecipes/src/widgets/categorylistview.h
--- a/krecipes/src/widgets/conversiontable.cpp
+++ b/krecipes/src/widgets/conversiontable.cpp
--- a/krecipes/src/widgets/conversiontable.h
+++ b/krecipes/src/widgets/conversiontable.h
--- a/krecipes/src/widgets/criteriacombobox.cpp
+++ b/krecipes/src/widgets/criteriacombobox.cpp
--- a/krecipes/src/widgets/criteriacombobox.h
+++ b/krecipes/src/widgets/criteriacombobox.h
--- a/krecipes/src/widgets/dblistviewbase.cpp
+++ b/krecipes/src/widgets/dblistviewbase.cpp
--- a/krecipes/src/widgets/dblistviewbase.h
+++ b/krecipes/src/widgets/dblistviewbase.h
--- a/krecipes/src/widgets/fractioninput.cpp
+++ b/krecipes/src/widgets/fractioninput.cpp
--- a/krecipes/src/widgets/fractioninput.h
+++ b/krecipes/src/widgets/fractioninput.h
--- a/krecipes/src/widgets/headercombobox.cpp
+++ b/krecipes/src/widgets/headercombobox.cpp
--- a/krecipes/src/widgets/headercombobox.h
+++ b/krecipes/src/widgets/headercombobox.h
--- a/krecipes/src/widgets/headerlistview.cpp
+++ b/krecipes/src/widgets/headerlistview.cpp
--- a/krecipes/src/widgets/headerlistview.h
+++ b/krecipes/src/widgets/headerlistview.h
--- a/krecipes/src/widgets/inglistviewitem.cpp
+++ b/krecipes/src/widgets/inglistviewitem.cpp
--- a/krecipes/src/widgets/inglistviewitem.h
+++ b/krecipes/src/widgets/inglistviewitem.h
--- a/krecipes/src/widgets/ingredientcombobox.cpp
+++ b/krecipes/src/widgets/ingredientcombobox.cpp
--- a/krecipes/src/widgets/ingredientcombobox.h
+++ b/krecipes/src/widgets/ingredientcombobox.h
--- a/krecipes/src/widgets/ingredientinputwidget.cpp
+++ b/krecipes/src/widgets/ingredientinputwidget.cpp
--- a/krecipes/src/widgets/ingredientinputwidget.h
+++ b/krecipes/src/widgets/ingredientinputwidget.h
--- a/krecipes/src/widgets/ingredientlistview.cpp
+++ b/krecipes/src/widgets/ingredientlistview.cpp
--- a/krecipes/src/widgets/ingredientlistview.h
+++ b/krecipes/src/widgets/ingredientlistview.h
--- a/krecipes/src/widgets/kdateedit.cpp
+++ b/krecipes/src/widgets/kdateedit.cpp
--- a/krecipes/src/widgets/kdateedit.h
+++ b/krecipes/src/widgets/kdateedit.h
--- a/krecipes/src/widgets/kdatepickerpopup.cpp
+++ b/krecipes/src/widgets/kdatepickerpopup.cpp
--- a/krecipes/src/widgets/kdatepickerpopup.h
+++ b/krecipes/src/widgets/kdatepickerpopup.h
--- a/krecipes/src/widgets/krelistview.cpp
+++ b/krecipes/src/widgets/krelistview.cpp
--- a/krecipes/src/widgets/krelistview.h
+++ b/krecipes/src/widgets/krelistview.h
--- a/krecipes/src/widgets/kremenu.cpp
+++ b/krecipes/src/widgets/kremenu.cpp
--- a/krecipes/src/widgets/kremenu.h
+++ b/krecipes/src/widgets/kremenu.h
--- a/krecipes/src/widgets/kreruler.cpp
+++ b/krecipes/src/widgets/kreruler.cpp
--- a/krecipes/src/widgets/kreruler.h
+++ b/krecipes/src/widgets/kreruler.h
--- a/krecipes/src/widgets/kretextedit.cpp
+++ b/krecipes/src/widgets/kretextedit.cpp
--- a/krecipes/src/widgets/kretextedit.h
+++ b/krecipes/src/widgets/kretextedit.h
--- a/krecipes/src/widgets/kwidgetlistbox.cpp
+++ b/krecipes/src/widgets/kwidgetlistbox.cpp
--- a/krecipes/src/widgets/kwidgetlistbox.h
+++ b/krecipes/src/widgets/kwidgetlistbox.h
--- a/krecipes/src/widgets/paneldeco.cpp
+++ b/krecipes/src/widgets/paneldeco.cpp
--- a/krecipes/src/widgets/paneldeco.h
+++ b/krecipes/src/widgets/paneldeco.h
--- a/krecipes/src/widgets/prepmethodcombobox.cpp
+++ b/krecipes/src/widgets/prepmethodcombobox.cpp
--- a/krecipes/src/widgets/prepmethodcombobox.h
+++ b/krecipes/src/widgets/prepmethodcombobox.h
--- a/krecipes/src/widgets/prepmethodlistview.cpp
+++ b/krecipes/src/widgets/prepmethodlistview.cpp
--- a/krecipes/src/widgets/prepmethodlistview.h
+++ b/krecipes/src/widgets/prepmethodlistview.h
--- a/krecipes/src/widgets/propertylistview.cpp
+++ b/krecipes/src/widgets/propertylistview.cpp
--- a/krecipes/src/widgets/propertylistview.h
+++ b/krecipes/src/widgets/propertylistview.h
--- a/krecipes/src/widgets/ratingdisplaywidget.ui
+++ b/krecipes/src/widgets/ratingdisplaywidget.ui
--- a/krecipes/src/widgets/ratingwidget.cpp
+++ b/krecipes/src/widgets/ratingwidget.cpp
--- a/krecipes/src/widgets/ratingwidget.h
+++ b/krecipes/src/widgets/ratingwidget.h
--- a/krecipes/src/widgets/recipelistview.cpp
+++ b/krecipes/src/widgets/recipelistview.cpp
--- a/krecipes/src/widgets/recipelistview.h
+++ b/krecipes/src/widgets/recipelistview.h
--- a/krecipes/src/widgets/unitcombobox.cpp
+++ b/krecipes/src/widgets/unitcombobox.cpp
--- a/krecipes/src/widgets/unitcombobox.h
+++ b/krecipes/src/widgets/unitcombobox.h
--- a/krecipes/src/widgets/unitlistview.cpp
+++ b/krecipes/src/widgets/unitlistview.cpp
--- a/krecipes/src/widgets/unitlistview.h
+++ b/krecipes/src/widgets/unitlistview.h
--- a/krecipes/src/widgets/weightinput.cpp
+++ b/krecipes/src/widgets/weightinput.cpp
--- a/krecipes/src/widgets/weightinput.h
+++ b/krecipes/src/widgets/weightinput.h
--- a/6
+++ b/6
@ -1,3 +1,7 @@
+data
 doc
-krecipes
+icons
+layouts
+pics
 po
+src