Moved images svg themes and resources out of src/

Moved svg and themes into images dir Tidy up to configure.in git-svn-id: http://svn.osgeo.org/qgis/trunk@4492 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 7, 2006 · ef715a8 · ef715a8
1 parent ed654c4
commit ef715a8
Show file tree

Hide file tree

Showing 258 changed files with 54 additions and 54 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -35,7 +35,7 @@ SUBDIRS = src providers plugins doc tools i18n designer_plugins helpviewer
 endif
 
 if HAVE_QT4
-SUBDIRS = src providers plugins doc tools i18n helpviewer
+SUBDIRS = src providers plugins doc tools i18n helpviewer resources images
 endif
 
 pkginclude_HEADERS = qgsconfig.h

diff --git a/configure.in b/configure.in
@@ -433,68 +433,68 @@ AC_SUBST(DEBUG_QGIS)
 
 AC_CONFIG_FILES([
   Makefile 
-  src/Makefile 
-  src/legend/Makefile
-  src/ui/Makefile
-  src/raster/Makefile
-  src/composer/Makefile
-  src/svg/Makefile
-  src/svg/biology/Makefile
-  src/svg/geometric/Makefile
-  src/svg/gpsicons/Makefile
-  src/svg/icon/Makefile
-  src/svg/north_arrows/Makefile
-  src/svg/symbol/Makefile
-  src/images/Makefile
-  src/images/north_arrows/Makefile
-  src/images/splash/Makefile
-  src/images/icons/Makefile
-  src/images/developers/Makefile
-  src/resources/Makefile
-  src/themes/Makefile
-  src/themes/default/Makefile
-  src/themes/nkids/Makefile
-  src/mac/Makefile
-  src/mac/Contents/Makefile
-  src/mac/Contents/Resources/Makefile
-  src/widgets/Makefile
-  src/widgets/projectionselector/Makefile
-  providers/Makefile 
-  providers/ogr/Makefile
-  providers/postgres/Makefile
-  providers/delimitedtext/Makefile
-  providers/grass/Makefile
-  providers/gpx/Makefile
-  providers/wms/Makefile
+  designer_plugins/Makefile
+  doc/Makefile
+  doc/images/Makefile
+  doc/install_guide/Makefile
+  doc/plugins/delimited_text/Makefile
+  doc/plugins/geoprocessing/buffer/Makefile
+  doc/plugins/geoprocessing/Makefile
+  doc/plugins/Makefile
+  helpviewer/Makefile
+  i18n/Makefile
+  images/Makefile
+  images/developers/Makefile
+  images/icons/Makefile
+  images/north_arrows/Makefile
+  images/splash/Makefile
+  images/svg/biology/Makefile
+  images/svg/geometric/Makefile
+  images/svg/gpsicons/Makefile
+  images/svg/icon/Makefile
+  images/svg/Makefile
+  images/svg/north_arrows/Makefile
+  images/svg/symbol/Makefile
+  images/themes/default/Makefile
+  images/themes/Makefile
+  images/themes/nkids/Makefile
   plugins/Makefile
   plugins/copyright_label/Makefile
   plugins/delimited_text/Makefile
   plugins/geoprocessing/Makefile
   plugins/georeferencer/Makefile
   plugins/gps_importer/Makefile
-  plugins/grid_maker/Makefile
-  plugins/grass/Makefile
   plugins/grass/config/Makefile
+  plugins/grass/Makefile
   plugins/grass/modules/Makefile
-  plugins/grass/themes/Makefile
   plugins/grass/themes/default/Makefile
+  plugins/grass/themes/Makefile
+  plugins/grid_maker/Makefile
   plugins/maplayer/Makefile
   plugins/north_arrow/Makefile
   plugins/scale_bar/Makefile
   plugins/spit/Makefile
-  doc/Makefile
-  doc/install_guide/Makefile
-  doc/images/Makefile
-  doc/plugins/Makefile
-  doc/plugins/geoprocessing/Makefile
-  doc/plugins/geoprocessing/buffer/Makefile
-  doc/plugins/delimited_text/Makefile
+  providers/Makefile 
+  providers/delimitedtext/Makefile
+  providers/gpx/Makefile
+  providers/grass/Makefile
+  providers/ogr/Makefile
+  providers/postgres/Makefile
+  providers/wms/Makefile
+  resources/Makefile
+  src/Makefile 
+  src/composer/Makefile
+  src/legend/Makefile
+  src/mac/Contents/Makefile
+  src/mac/Contents/Resources/Makefile
+  src/mac/Makefile
+  src/raster/Makefile
+  src/ui/Makefile
+  src/widgets/Makefile
+  src/widgets/projectionselector/Makefile
   tools/Makefile
-  tools/qgis_config/Makefile
   tools/mapserver_export/Makefile
-  designer_plugins/Makefile
-  i18n/Makefile
-  helpviewer/Makefile
+  tools/qgis_config/Makefile
   qgis.spec
 ])
 

diff --git a/src/images/.cvsignore → images/.cvsignore b/src/images/.cvsignore → images/.cvsignore
diff --git a/src/images/Makefile.am → images/Makefile.am b/src/images/Makefile.am → images/Makefile.am
@@ -10,4 +10,4 @@
 #
 # $Id$
 
-SUBDIRS = north_arrows splash icons developers
+SUBDIRS = north_arrows splash icons developers themes svg
diff --git a/src/images/developers/.cvsignore → images/developers/.cvsignore b/src/images/developers/.cvsignore → images/developers/.cvsignore
diff --git a/src/images/developers/Denis_Antipov.jpg → images/developers/Denis_Antipov.jpg b/src/images/developers/Denis_Antipov.jpg → images/developers/Denis_Antipov.jpg
diff --git a/src/images/developers/Gary_E.Sherman.jpg → images/developers/Gary_E.Sherman.jpg b/src/images/developers/Gary_E.Sherman.jpg → images/developers/Gary_E.Sherman.jpg
diff --git a/src/images/developers/Gavin_Macaulay.jpg → images/developers/Gavin_Macaulay.jpg b/src/images/developers/Gavin_Macaulay.jpg → images/developers/Gavin_Macaulay.jpg
diff --git a/src/images/developers/Jens_Oberender.jpg → images/developers/Jens_Oberender.jpg b/src/images/developers/Jens_Oberender.jpg → images/developers/Jens_Oberender.jpg
diff --git a/src/images/developers/Lars_Luthman.jpg → images/developers/Lars_Luthman.jpg b/src/images/developers/Lars_Luthman.jpg → images/developers/Lars_Luthman.jpg
diff --git a/src/images/developers/Makefile.am → images/developers/Makefile.am b/src/images/developers/Makefile.am → images/developers/Makefile.am
diff --git a/src/images/developers/Marco_Hugentobler.jpg → images/developers/Marco_Hugentobler.jpg b/src/images/developers/Marco_Hugentobler.jpg → images/developers/Marco_Hugentobler.jpg
diff --git a/src/images/developers/Mark_Coletti.jpg → images/developers/Mark_Coletti.jpg b/src/images/developers/Mark_Coletti.jpg → images/developers/Mark_Coletti.jpg
diff --git a/src/images/developers/Masaru_Hoshi.jpg → images/developers/Masaru_Hoshi.jpg b/src/images/developers/Masaru_Hoshi.jpg → images/developers/Masaru_Hoshi.jpg
diff --git a/src/images/developers/Peter_Brewer.jpg → images/developers/Peter_Brewer.jpg b/src/images/developers/Peter_Brewer.jpg → images/developers/Peter_Brewer.jpg
diff --git a/src/images/developers/Radim_Blazek.jpg → images/developers/Radim_Blazek.jpg b/src/images/developers/Radim_Blazek.jpg → images/developers/Radim_Blazek.jpg
diff --git a/src/images/developers/Steve_Halasz.jpg → images/developers/Steve_Halasz.jpg b/src/images/developers/Steve_Halasz.jpg → images/developers/Steve_Halasz.jpg
diff --git a/src/images/developers/Tim_Sutton.jpg → images/developers/Tim_Sutton.jpg b/src/images/developers/Tim_Sutton.jpg → images/developers/Tim_Sutton.jpg
diff --git a/src/images/developers/Tom_Elwertowski.jpg → images/developers/Tom_Elwertowski.jpg b/src/images/developers/Tom_Elwertowski.jpg → images/developers/Tom_Elwertowski.jpg
diff --git a/src/images/icons/.cvsignore → images/icons/.cvsignore b/src/images/icons/.cvsignore → images/icons/.cvsignore
diff --git a/src/images/icons/Makefile.am → images/icons/Makefile.am b/src/images/icons/Makefile.am → images/icons/Makefile.am
diff --git a/src/images/icons/collapse_tree.png → images/icons/collapse_tree.png b/src/images/icons/collapse_tree.png → images/icons/collapse_tree.png
diff --git a/src/images/icons/editable.png → images/icons/editable.png b/src/images/icons/editable.png → images/icons/editable.png
diff --git a/src/images/icons/expand_tree.png → images/icons/expand_tree.png b/src/images/icons/expand_tree.png → images/icons/expand_tree.png
diff --git a/src/images/icons/file.png → images/icons/file.png b/src/images/icons/file.png → images/icons/file.png
diff --git a/src/images/icons/folder.png → images/icons/folder.png b/src/images/icons/folder.png → images/icons/folder.png
diff --git a/src/images/icons/folder_new.png → images/icons/folder_new.png b/src/images/icons/folder_new.png → images/icons/folder_new.png
diff --git a/src/images/icons/inoverview.png → images/icons/inoverview.png b/src/images/icons/inoverview.png → images/icons/inoverview.png
diff --git a/src/images/icons/inoverview.xcf → images/icons/inoverview.xcf b/src/images/icons/inoverview.xcf → images/icons/inoverview.xcf
diff --git a/src/images/icons/layer.png → images/icons/layer.png b/src/images/icons/layer.png → images/icons/layer.png
diff --git a/src/images/icons/no_pyramid.png → images/icons/no_pyramid.png b/src/images/icons/no_pyramid.png → images/icons/no_pyramid.png
diff --git a/src/images/icons/properties.png → images/icons/properties.png b/src/images/icons/properties.png → images/icons/properties.png
diff --git a/src/images/icons/property_item.png → images/icons/property_item.png b/src/images/icons/property_item.png → images/icons/property_item.png
diff --git a/src/images/icons/pyramid.png → images/icons/pyramid.png b/src/images/icons/pyramid.png → images/icons/pyramid.png
diff --git a/src/images/icons/qgis-icon-16x16.png → images/icons/qgis-icon-16x16.png b/src/images/icons/qgis-icon-16x16.png → images/icons/qgis-icon-16x16.png
diff --git a/src/images/icons/qgis-icon.png → images/icons/qgis-icon.png b/src/images/icons/qgis-icon.png → images/icons/qgis-icon.png
diff --git a/src/images/icons/qgis-mime-icon.png → images/icons/qgis-mime-icon.png b/src/images/icons/qgis-mime-icon.png → images/icons/qgis-mime-icon.png
diff --git a/src/images/icons/remove.png → images/icons/remove.png b/src/images/icons/remove.png → images/icons/remove.png
diff --git a/src/images/icons/remove_from_overview.png → images/icons/remove_from_overview.png b/src/images/icons/remove_from_overview.png → images/icons/remove_from_overview.png
diff --git a/src/images/icons/symbology.png → images/icons/symbology.png b/src/images/icons/symbology.png → images/icons/symbology.png
diff --git a/src/images/north_arrows/.cvsignore → images/north_arrows/.cvsignore b/src/images/north_arrows/.cvsignore → images/north_arrows/.cvsignore
diff --git a/src/images/north_arrows/Makefile.am → images/north_arrows/Makefile.am b/src/images/north_arrows/Makefile.am → images/north_arrows/Makefile.am
diff --git a/src/images/north_arrows/default.png → images/north_arrows/default.png b/src/images/north_arrows/default.png → images/north_arrows/default.png
diff --git a/src/images/splash/.cvsignore → images/splash/.cvsignore b/src/images/splash/.cvsignore → images/splash/.cvsignore
diff --git a/src/images/splash/Makefile.am → images/splash/Makefile.am b/src/images/splash/Makefile.am → images/splash/Makefile.am
diff --git a/src/images/splash/splash.png → images/splash/splash.png b/src/images/splash/splash.png → images/splash/splash.png
diff --git a/src/images/splash/splash.xcf → images/splash/splash.xcf b/src/images/splash/splash.xcf → images/splash/splash.xcf
diff --git a/src/images/splash/splash_mask.png → images/splash/splash_mask.png b/src/images/splash/splash_mask.png → images/splash/splash_mask.png
diff --git a/src/resources/.cvsignore → images/svg/.cvsignore b/src/resources/.cvsignore → images/svg/.cvsignore
diff --git a/src/svg/Makefile.am → images/svg/Makefile.am b/src/svg/Makefile.am → images/svg/Makefile.am
diff --git a/src/svg/.cvsignore → images/svg/biology/.cvsignore b/src/svg/.cvsignore → images/svg/biology/.cvsignore
diff --git a/src/svg/biology/Coniferous.svg → images/svg/biology/Coniferous.svg b/src/svg/biology/Coniferous.svg → images/svg/biology/Coniferous.svg
diff --git a/src/svg/biology/Deciduous.svg → images/svg/biology/Deciduous.svg b/src/svg/biology/Deciduous.svg → images/svg/biology/Deciduous.svg
diff --git a/src/svg/biology/Flower.svg → images/svg/biology/Flower.svg b/src/svg/biology/Flower.svg → images/svg/biology/Flower.svg
diff --git a/src/svg/biology/Makefile.am → images/svg/biology/Makefile.am b/src/svg/biology/Makefile.am → images/svg/biology/Makefile.am
diff --git a/src/svg/biology/.cvsignore → images/svg/geometric/.cvsignore b/src/svg/biology/.cvsignore → images/svg/geometric/.cvsignore
diff --git a/src/svg/geometric/Makefile.am → images/svg/geometric/Makefile.am b/src/svg/geometric/Makefile.am → images/svg/geometric/Makefile.am
diff --git a/src/svg/geometric/Square1.svg → images/svg/geometric/Square1.svg b/src/svg/geometric/Square1.svg → images/svg/geometric/Square1.svg
diff --git a/src/svg/geometric/Square2.svg → images/svg/geometric/Square2.svg b/src/svg/geometric/Square2.svg → images/svg/geometric/Square2.svg
diff --git a/src/svg/geometric/Triangle1.svg → images/svg/geometric/Triangle1.svg b/src/svg/geometric/Triangle1.svg → images/svg/geometric/Triangle1.svg
diff --git a/src/svg/geometric/.cvsignore → images/svg/gpsicons/.cvsignore b/src/svg/geometric/.cvsignore → images/svg/gpsicons/.cvsignore
diff --git a/src/svg/gpsicons/Makefile.am → images/svg/gpsicons/Makefile.am b/src/svg/gpsicons/Makefile.am → images/svg/gpsicons/Makefile.am
diff --git a/src/svg/gpsicons/anchor.svg → images/svg/gpsicons/anchor.svg b/src/svg/gpsicons/anchor.svg → images/svg/gpsicons/anchor.svg
diff --git a/src/svg/gpsicons/boat.svg → images/svg/gpsicons/boat.svg b/src/svg/gpsicons/boat.svg → images/svg/gpsicons/boat.svg
diff --git a/src/svg/gpsicons/camera.svg → images/svg/gpsicons/camera.svg b/src/svg/gpsicons/camera.svg → images/svg/gpsicons/camera.svg
diff --git a/src/svg/gpsicons/car.svg → images/svg/gpsicons/car.svg b/src/svg/gpsicons/car.svg → images/svg/gpsicons/car.svg
diff --git a/src/svg/gpsicons/city_building.svg → images/svg/gpsicons/city_building.svg b/src/svg/gpsicons/city_building.svg → images/svg/gpsicons/city_building.svg
diff --git a/src/svg/gpsicons/couple.svg → images/svg/gpsicons/couple.svg b/src/svg/gpsicons/couple.svg → images/svg/gpsicons/couple.svg
diff --git a/src/svg/gpsicons/cross.svg → images/svg/gpsicons/cross.svg b/src/svg/gpsicons/cross.svg → images/svg/gpsicons/cross.svg
diff --git a/src/svg/gpsicons/deer.svg → images/svg/gpsicons/deer.svg b/src/svg/gpsicons/deer.svg → images/svg/gpsicons/deer.svg
diff --git a/src/svg/gpsicons/dollar.svg → images/svg/gpsicons/dollar.svg b/src/svg/gpsicons/dollar.svg → images/svg/gpsicons/dollar.svg
diff --git a/src/svg/gpsicons/fish.svg → images/svg/gpsicons/fish.svg b/src/svg/gpsicons/fish.svg → images/svg/gpsicons/fish.svg
diff --git a/src/svg/gpsicons/flag.svg → images/svg/gpsicons/flag.svg b/src/svg/gpsicons/flag.svg → images/svg/gpsicons/flag.svg
diff --git a/src/svg/gpsicons/food.svg → images/svg/gpsicons/food.svg b/src/svg/gpsicons/food.svg → images/svg/gpsicons/food.svg
diff --git a/src/svg/gpsicons/gas.svg → images/svg/gpsicons/gas.svg b/src/svg/gpsicons/gas.svg → images/svg/gpsicons/gas.svg
diff --git a/src/svg/gpsicons/golf.svg → images/svg/gpsicons/golf.svg b/src/svg/gpsicons/golf.svg → images/svg/gpsicons/golf.svg
diff --git a/src/svg/gpsicons/h.svg → images/svg/gpsicons/h.svg b/src/svg/gpsicons/h.svg → images/svg/gpsicons/h.svg
diff --git a/src/svg/gpsicons/house.svg → images/svg/gpsicons/house.svg b/src/svg/gpsicons/house.svg → images/svg/gpsicons/house.svg
diff --git a/src/svg/gpsicons/parachute.svg → images/svg/gpsicons/parachute.svg b/src/svg/gpsicons/parachute.svg → images/svg/gpsicons/parachute.svg
diff --git a/src/svg/gpsicons/phone.svg → images/svg/gpsicons/phone.svg b/src/svg/gpsicons/phone.svg → images/svg/gpsicons/phone.svg
diff --git a/src/svg/gpsicons/plane.svg → images/svg/gpsicons/plane.svg b/src/svg/gpsicons/plane.svg → images/svg/gpsicons/plane.svg
diff --git a/src/svg/gpsicons/point.svg → images/svg/gpsicons/point.svg b/src/svg/gpsicons/point.svg → images/svg/gpsicons/point.svg
diff --git a/src/svg/gpsicons/question.svg → images/svg/gpsicons/question.svg b/src/svg/gpsicons/question.svg → images/svg/gpsicons/question.svg
diff --git a/src/svg/gpsicons/shipwreck.svg → images/svg/gpsicons/shipwreck.svg b/src/svg/gpsicons/shipwreck.svg → images/svg/gpsicons/shipwreck.svg
diff --git a/src/svg/gpsicons/skier.svg → images/svg/gpsicons/skier.svg b/src/svg/gpsicons/skier.svg → images/svg/gpsicons/skier.svg
diff --git a/src/svg/gpsicons/skull.svg → images/svg/gpsicons/skull.svg b/src/svg/gpsicons/skull.svg → images/svg/gpsicons/skull.svg
diff --git a/src/svg/gpsicons/swimmer.svg → images/svg/gpsicons/swimmer.svg b/src/svg/gpsicons/swimmer.svg → images/svg/gpsicons/swimmer.svg
diff --git a/src/svg/gpsicons/table.svg → images/svg/gpsicons/table.svg b/src/svg/gpsicons/table.svg → images/svg/gpsicons/table.svg
diff --git a/src/svg/gpsicons/teepee.svg → images/svg/gpsicons/teepee.svg b/src/svg/gpsicons/teepee.svg → images/svg/gpsicons/teepee.svg
diff --git a/src/svg/gpsicons/tree.svg → images/svg/gpsicons/tree.svg b/src/svg/gpsicons/tree.svg → images/svg/gpsicons/tree.svg
diff --git a/src/svg/gpsicons/walker.svg → images/svg/gpsicons/walker.svg b/src/svg/gpsicons/walker.svg → images/svg/gpsicons/walker.svg
diff --git a/src/svg/gpsicons/.cvsignore → images/svg/icon/.cvsignore b/src/svg/gpsicons/.cvsignore → images/svg/icon/.cvsignore
diff --git a/src/svg/icon/Makefile.am → images/svg/icon/Makefile.am b/src/svg/icon/Makefile.am → images/svg/icon/Makefile.am
diff --git a/src/svg/icon/golfcourse.svg → images/svg/icon/golfcourse.svg b/src/svg/icon/golfcourse.svg → images/svg/icon/golfcourse.svg
diff --git a/src/svg/icon/.cvsignore → images/svg/north_arrows/.cvsignore b/src/svg/icon/.cvsignore → images/svg/north_arrows/.cvsignore
diff --git a/src/svg/north_arrows/Makefile.am → images/svg/north_arrows/Makefile.am b/src/svg/north_arrows/Makefile.am → images/svg/north_arrows/Makefile.am
diff --git a/src/svg/north_arrows/NorthArrow1.svg → images/svg/north_arrows/NorthArrow1.svg b/src/svg/north_arrows/NorthArrow1.svg → images/svg/north_arrows/NorthArrow1.svg
diff --git a/src/svg/north_arrows/NorthArrow2.svg → images/svg/north_arrows/NorthArrow2.svg b/src/svg/north_arrows/NorthArrow2.svg → images/svg/north_arrows/NorthArrow2.svg
diff --git a/src/svg/north_arrows/NorthArrow3.svg → images/svg/north_arrows/NorthArrow3.svg b/src/svg/north_arrows/NorthArrow3.svg → images/svg/north_arrows/NorthArrow3.svg
diff --git a/src/svg/north_arrows/NorthArrow4.svg → images/svg/north_arrows/NorthArrow4.svg b/src/svg/north_arrows/NorthArrow4.svg → images/svg/north_arrows/NorthArrow4.svg
diff --git a/src/svg/north_arrows/NorthArrow5.svg → images/svg/north_arrows/NorthArrow5.svg b/src/svg/north_arrows/NorthArrow5.svg → images/svg/north_arrows/NorthArrow5.svg
diff --git a/src/svg/north_arrows/NorthArrow6.svg → images/svg/north_arrows/NorthArrow6.svg b/src/svg/north_arrows/NorthArrow6.svg → images/svg/north_arrows/NorthArrow6.svg
diff --git a/src/svg/north_arrows/default.png → images/svg/north_arrows/default.png b/src/svg/north_arrows/default.png → images/svg/north_arrows/default.png
diff --git a/src/svg/north_arrows/default.svg → images/svg/north_arrows/default.svg b/src/svg/north_arrows/default.svg → images/svg/north_arrows/default.svg
diff --git a/src/svg/north_arrows/.cvsignore → images/svg/symbol/.cvsignore b/src/svg/north_arrows/.cvsignore → images/svg/symbol/.cvsignore
diff --git a/src/svg/symbol/Cross1.svg → images/svg/symbol/Cross1.svg b/src/svg/symbol/Cross1.svg → images/svg/symbol/Cross1.svg
diff --git a/src/svg/symbol/Cross2.svg → images/svg/symbol/Cross2.svg b/src/svg/symbol/Cross2.svg → images/svg/symbol/Cross2.svg
diff --git a/src/svg/symbol/Cross4.svg → images/svg/symbol/Cross4.svg b/src/svg/symbol/Cross4.svg → images/svg/symbol/Cross4.svg
diff --git a/src/svg/symbol/Cross5.svg → images/svg/symbol/Cross5.svg b/src/svg/symbol/Cross5.svg → images/svg/symbol/Cross5.svg
diff --git a/src/svg/symbol/Cross6.svg → images/svg/symbol/Cross6.svg b/src/svg/symbol/Cross6.svg → images/svg/symbol/Cross6.svg
diff --git a/src/svg/symbol/Makefile.am → images/svg/symbol/Makefile.am b/src/svg/symbol/Makefile.am → images/svg/symbol/Makefile.am
diff --git a/src/svg/symbol/Star1.svg → images/svg/symbol/Star1.svg b/src/svg/symbol/Star1.svg → images/svg/symbol/Star1.svg
diff --git a/src/svg/symbol/Star2.svg → images/svg/symbol/Star2.svg b/src/svg/symbol/Star2.svg → images/svg/symbol/Star2.svg
diff --git a/src/svg/symbol/Star3.svg → images/svg/symbol/Star3.svg b/src/svg/symbol/Star3.svg → images/svg/symbol/Star3.svg
diff --git a/src/svg/symbol/.cvsignore → images/themes/.cvsignore b/src/svg/symbol/.cvsignore → images/themes/.cvsignore
diff --git a/src/themes/Makefile.am → images/themes/Makefile.am b/src/themes/Makefile.am → images/themes/Makefile.am
diff --git a/src/themes/.cvsignore → images/themes/default/.cvsignore b/src/themes/.cvsignore → images/themes/default/.cvsignore
diff --git a/src/themes/default/Makefile.am → images/themes/default/Makefile.am b/src/themes/default/Makefile.am → images/themes/default/Makefile.am
diff --git a/src/themes/default/icon_template.xcf → images/themes/default/icon_template.xcf b/src/themes/default/icon_template.xcf → images/themes/default/icon_template.xcf
diff --git a/src/themes/default/line_layer.xpm → images/themes/default/line_layer.xpm b/src/themes/default/line_layer.xpm → images/themes/default/line_layer.xpm
diff --git a/...hemes/default/mActionAddAllToOverview.png → ...hemes/default/mActionAddAllToOverview.png b/...hemes/default/mActionAddAllToOverview.png → ...hemes/default/mActionAddAllToOverview.png
diff --git a/src/themes/default/mActionAddLayer.png → images/themes/default/mActionAddLayer.png b/src/themes/default/mActionAddLayer.png → images/themes/default/mActionAddLayer.png
diff --git a/src/themes/default/mActionAddLegend.png → images/themes/default/mActionAddLegend.png b/src/themes/default/mActionAddLegend.png → images/themes/default/mActionAddLegend.png
diff --git a/src/themes/default/mActionAddNonDbLayer.png → ...s/themes/default/mActionAddNonDbLayer.png b/src/themes/default/mActionAddNonDbLayer.png → ...s/themes/default/mActionAddNonDbLayer.png
diff --git a/src/themes/default/mActionAddRasterLayer.png → .../themes/default/mActionAddRasterLayer.png b/src/themes/default/mActionAddRasterLayer.png → .../themes/default/mActionAddRasterLayer.png
diff --git a/src/themes/default/mActionAddWmsLayer.png → images/themes/default/mActionAddWmsLayer.png b/src/themes/default/mActionAddWmsLayer.png → images/themes/default/mActionAddWmsLayer.png
diff --git a/src/themes/default/mActionCaptureLine.png → images/themes/default/mActionCaptureLine.png b/src/themes/default/mActionCaptureLine.png → images/themes/default/mActionCaptureLine.png
diff --git a/src/themes/default/mActionCaptureLine.xcf → images/themes/default/mActionCaptureLine.xcf b/src/themes/default/mActionCaptureLine.xcf → images/themes/default/mActionCaptureLine.xcf
diff --git a/src/themes/default/mActionCapturePoint.png → ...es/themes/default/mActionCapturePoint.png b/src/themes/default/mActionCapturePoint.png → ...es/themes/default/mActionCapturePoint.png
diff --git a/src/themes/default/mActionCapturePoint.xcf → ...es/themes/default/mActionCapturePoint.xcf b/src/themes/default/mActionCapturePoint.xcf → ...es/themes/default/mActionCapturePoint.xcf
diff --git a/src/themes/default/mActionCapturePolygon.png → .../themes/default/mActionCapturePolygon.png b/src/themes/default/mActionCapturePolygon.png → .../themes/default/mActionCapturePolygon.png
diff --git a/src/themes/default/mActionCapturePolygon.xcf → .../themes/default/mActionCapturePolygon.xcf b/src/themes/default/mActionCapturePolygon.xcf → .../themes/default/mActionCapturePolygon.xcf
diff --git a/...hemes/default/mActionCheckQgisVersion.png → ...hemes/default/mActionCheckQgisVersion.png b/...hemes/default/mActionCheckQgisVersion.png → ...hemes/default/mActionCheckQgisVersion.png
diff --git a/src/themes/default/mActionContextHelp.png → images/themes/default/mActionContextHelp.png b/src/themes/default/mActionContextHelp.png → images/themes/default/mActionContextHelp.png
diff --git a/src/themes/default/mActionCopySelected.png → ...es/themes/default/mActionCopySelected.png b/src/themes/default/mActionCopySelected.png → ...es/themes/default/mActionCopySelected.png
diff --git a/...hemes/default/mActionCustomProjection.png → ...hemes/default/mActionCustomProjection.png b/...hemes/default/mActionCustomProjection.png → ...hemes/default/mActionCustomProjection.png
diff --git a/...themes/default/mActionDeleteAttribute.png → ...themes/default/mActionDeleteAttribute.png b/...themes/default/mActionDeleteAttribute.png → ...themes/default/mActionDeleteAttribute.png
diff --git a/src/themes/default/mActionDeleteSelected.png → .../themes/default/mActionDeleteSelected.png b/src/themes/default/mActionDeleteSelected.png → .../themes/default/mActionDeleteSelected.png
diff --git a/src/themes/default/mActionDraw.png → images/themes/default/mActionDraw.png b/src/themes/default/mActionDraw.png → images/themes/default/mActionDraw.png
diff --git a/...themes/default/mActionExportMapServer.png → ...themes/default/mActionExportMapServer.png b/...themes/default/mActionExportMapServer.png → ...themes/default/mActionExportMapServer.png
diff --git a/src/themes/default/mActionFileExit.png → images/themes/default/mActionFileExit.png b/src/themes/default/mActionFileExit.png → images/themes/default/mActionFileExit.png
diff --git a/src/themes/default/mActionFileNew.png → images/themes/default/mActionFileNew.png b/src/themes/default/mActionFileNew.png → images/themes/default/mActionFileNew.png
diff --git a/src/themes/default/mActionFileOpen.png → images/themes/default/mActionFileOpen.png b/src/themes/default/mActionFileOpen.png → images/themes/default/mActionFileOpen.png
diff --git a/src/themes/default/mActionFilePrint.png → images/themes/default/mActionFilePrint.png b/src/themes/default/mActionFilePrint.png → images/themes/default/mActionFilePrint.png
diff --git a/src/themes/default/mActionFileSave.png → images/themes/default/mActionFileSave.png b/src/themes/default/mActionFileSave.png → images/themes/default/mActionFileSave.png
diff --git a/src/themes/default/mActionFileSaveAs.png → images/themes/default/mActionFileSaveAs.png b/src/themes/default/mActionFileSaveAs.png → images/themes/default/mActionFileSaveAs.png
diff --git a/src/themes/default/mActionHelpAbout.png → images/themes/default/mActionHelpAbout.png b/src/themes/default/mActionHelpAbout.png → images/themes/default/mActionHelpAbout.png
diff --git a/src/themes/default/mActionHelpContents.png → ...es/themes/default/mActionHelpContents.png b/src/themes/default/mActionHelpContents.png → ...es/themes/default/mActionHelpContents.png
diff --git a/src/themes/default/mActionHideAllLayers.png → ...s/themes/default/mActionHideAllLayers.png b/src/themes/default/mActionHideAllLayers.png → ...s/themes/default/mActionHideAllLayers.png
diff --git a/src/themes/default/mActionIdentify.png → images/themes/default/mActionIdentify.png b/src/themes/default/mActionIdentify.png → images/themes/default/mActionIdentify.png
diff --git a/src/themes/default/mActionInOverview.png → images/themes/default/mActionInOverview.png b/src/themes/default/mActionInOverview.png → images/themes/default/mActionInOverview.png
diff --git a/...themes/default/mActionInvertSelection.png → ...themes/default/mActionInvertSelection.png b/...themes/default/mActionInvertSelection.png → ...themes/default/mActionInvertSelection.png
diff --git a/src/themes/default/mActionLabel.png → images/themes/default/mActionLabel.png b/src/themes/default/mActionLabel.png → images/themes/default/mActionLabel.png
diff --git a/src/themes/default/mActionMeasure.png → images/themes/default/mActionMeasure.png b/src/themes/default/mActionMeasure.png → images/themes/default/mActionMeasure.png
diff --git a/src/themes/default/mActionMeasure.xcf → images/themes/default/mActionMeasure.xcf b/src/themes/default/mActionMeasure.xcf → images/themes/default/mActionMeasure.xcf
diff --git a/src/themes/default/mActionMeasureArea.png → images/themes/default/mActionMeasureArea.png b/src/themes/default/mActionMeasureArea.png → images/themes/default/mActionMeasureArea.png
diff --git a/src/themes/default/mActionMeasureArea.xcf → images/themes/default/mActionMeasureArea.xcf b/src/themes/default/mActionMeasureArea.xcf → images/themes/default/mActionMeasureArea.xcf
diff --git a/src/themes/default/mActionNewAttribute.png → ...es/themes/default/mActionNewAttribute.png b/src/themes/default/mActionNewAttribute.png → ...es/themes/default/mActionNewAttribute.png
diff --git a/src/themes/default/mActionNewBookmark.png → images/themes/default/mActionNewBookmark.png b/src/themes/default/mActionNewBookmark.png → images/themes/default/mActionNewBookmark.png
diff --git a/src/themes/default/mActionNewVectorLayer.png → .../themes/default/mActionNewVectorLayer.png b/src/themes/default/mActionNewVectorLayer.png → .../themes/default/mActionNewVectorLayer.png
diff --git a/src/themes/default/mActionNewVectorLayer.xcf → .../themes/default/mActionNewVectorLayer.xcf b/src/themes/default/mActionNewVectorLayer.xcf → .../themes/default/mActionNewVectorLayer.xcf
diff --git a/src/themes/default/mActionOpenTable.png → images/themes/default/mActionOpenTable.png b/src/themes/default/mActionOpenTable.png → images/themes/default/mActionOpenTable.png
diff --git a/src/themes/default/mActionOptions.png → images/themes/default/mActionOptions.png b/src/themes/default/mActionOptions.png → images/themes/default/mActionOptions.png
diff --git a/src/themes/default/mActionPan.png → images/themes/default/mActionPan.png b/src/themes/default/mActionPan.png → images/themes/default/mActionPan.png
diff --git a/...emes/default/mActionProjectProperties.png → ...emes/default/mActionProjectProperties.png b/...emes/default/mActionProjectProperties.png → ...emes/default/mActionProjectProperties.png
diff --git a/src/themes/default/mActionQgisHomePage.png → ...es/themes/default/mActionQgisHomePage.png b/src/themes/default/mActionQgisHomePage.png → ...es/themes/default/mActionQgisHomePage.png
diff --git a/...es/default/mActionQgisSourceForgePage.png → ...es/default/mActionQgisSourceForgePage.png b/...es/default/mActionQgisSourceForgePage.png → ...es/default/mActionQgisSourceForgePage.png
diff --git a/.../default/mActionRemoveAllFromOverview.png → .../default/mActionRemoveAllFromOverview.png b/.../default/mActionRemoveAllFromOverview.png → .../default/mActionRemoveAllFromOverview.png
diff --git a/src/themes/default/mActionRemoveLayer.png → images/themes/default/mActionRemoveLayer.png b/src/themes/default/mActionRemoveLayer.png → images/themes/default/mActionRemoveLayer.png
diff --git a/src/themes/default/mActionSaveAsSVG.png → images/themes/default/mActionSaveAsSVG.png b/src/themes/default/mActionSaveAsSVG.png → images/themes/default/mActionSaveAsSVG.png
diff --git a/src/themes/default/mActionSaveMapAsImage.png → .../themes/default/mActionSaveMapAsImage.png b/src/themes/default/mActionSaveMapAsImage.png → .../themes/default/mActionSaveMapAsImage.png
diff --git a/src/themes/default/mActionScaleBar.png → images/themes/default/mActionScaleBar.png b/src/themes/default/mActionScaleBar.png → images/themes/default/mActionScaleBar.png
diff --git a/src/themes/default/mActionSelect.png → images/themes/default/mActionSelect.png b/src/themes/default/mActionSelect.png → images/themes/default/mActionSelect.png
diff --git a/src/themes/default/mActionSelectedToTop.png → ...s/themes/default/mActionSelectedToTop.png b/src/themes/default/mActionSelectedToTop.png → ...s/themes/default/mActionSelectedToTop.png
diff --git a/src/themes/default/mActionShowAllLayers.png → ...s/themes/default/mActionShowAllLayers.png b/src/themes/default/mActionShowAllLayers.png → ...s/themes/default/mActionShowAllLayers.png
diff --git a/src/themes/default/mActionShowBookmarks.png → ...s/themes/default/mActionShowBookmarks.png b/src/themes/default/mActionShowBookmarks.png → ...s/themes/default/mActionShowBookmarks.png
diff --git a/...emes/default/mActionShowPluginManager.png → ...emes/default/mActionShowPluginManager.png b/...emes/default/mActionShowPluginManager.png → ...emes/default/mActionShowPluginManager.png
diff --git a/...mes/default/mActionUnselectAttributes.xpm → ...mes/default/mActionUnselectAttributes.xpm b/...mes/default/mActionUnselectAttributes.xpm → ...mes/default/mActionUnselectAttributes.xpm
diff --git a/src/themes/default/mActionZoomFullExtent.png → .../themes/default/mActionZoomFullExtent.png b/src/themes/default/mActionZoomFullExtent.png → .../themes/default/mActionZoomFullExtent.png
diff --git a/src/themes/default/mActionZoomIn.png → images/themes/default/mActionZoomIn.png b/src/themes/default/mActionZoomIn.png → images/themes/default/mActionZoomIn.png
diff --git a/src/themes/default/mActionZoomLast.png → images/themes/default/mActionZoomLast.png b/src/themes/default/mActionZoomLast.png → images/themes/default/mActionZoomLast.png
diff --git a/src/themes/default/mActionZoomOut.png → images/themes/default/mActionZoomOut.png b/src/themes/default/mActionZoomOut.png → images/themes/default/mActionZoomOut.png
diff --git a/src/themes/default/mActionZoomToLayer.png → images/themes/default/mActionZoomToLayer.png b/src/themes/default/mActionZoomToLayer.png → images/themes/default/mActionZoomToLayer.png
diff --git a/src/themes/default/mActionZoomToSelected.png → .../themes/default/mActionZoomToSelected.png b/src/themes/default/mActionZoomToSelected.png → .../themes/default/mActionZoomToSelected.png
diff --git a/...hemes/default/mIconProjectionDisabled.png → ...hemes/default/mIconProjectionDisabled.png b/...hemes/default/mIconProjectionDisabled.png → ...hemes/default/mIconProjectionDisabled.png
diff --git a/...themes/default/mIconProjectionEnabled.png → ...themes/default/mIconProjectionEnabled.png b/...themes/default/mIconProjectionEnabled.png → ...themes/default/mIconProjectionEnabled.png
diff --git a/...themes/default/mIconProjectionProblem.png → ...themes/default/mIconProjectionProblem.png b/...themes/default/mIconProjectionProblem.png → ...themes/default/mIconProjectionProblem.png
diff --git a/src/themes/default/point_layer.xpm → images/themes/default/point_layer.xpm b/src/themes/default/point_layer.xpm → images/themes/default/point_layer.xpm
diff --git a/src/themes/default/polygon_layer.xpm → images/themes/default/polygon_layer.xpm b/src/themes/default/polygon_layer.xpm → images/themes/default/polygon_layer.xpm
diff --git a/src/themes/default/qgis.xpm → images/themes/default/qgis.xpm b/src/themes/default/qgis.xpm → images/themes/default/qgis.xpm
diff --git a/src/themes/default/.cvsignore → images/themes/nkids/.cvsignore b/src/themes/default/.cvsignore → images/themes/nkids/.cvsignore
diff --git a/src/themes/nkids/Makefile.am → images/themes/nkids/Makefile.am b/src/themes/nkids/Makefile.am → images/themes/nkids/Makefile.am
diff --git a/src/themes/nkids/action.png → images/themes/nkids/action.png b/src/themes/nkids/action.png → images/themes/nkids/action.png
diff --git a/src/themes/nkids/contexthelp.png → images/themes/nkids/contexthelp.png b/src/themes/nkids/contexthelp.png → images/themes/nkids/contexthelp.png
diff --git a/src/themes/nkids/delete_selected.png → images/themes/nkids/delete_selected.png b/src/themes/nkids/delete_selected.png → images/themes/nkids/delete_selected.png
diff --git a/src/themes/nkids/gis_plain_cursor.png → images/themes/nkids/gis_plain_cursor.png b/src/themes/nkids/gis_plain_cursor.png → images/themes/nkids/gis_plain_cursor.png
diff --git a/src/themes/nkids/inline_table.png → images/themes/nkids/inline_table.png b/src/themes/nkids/inline_table.png → images/themes/nkids/inline_table.png
diff --git a/src/themes/nkids/layers.png → images/themes/nkids/layers.png b/src/themes/nkids/layers.png → images/themes/nkids/layers.png
diff --git a/src/themes/nkids/mActionAddAllToOverview.png → .../themes/nkids/mActionAddAllToOverview.png b/src/themes/nkids/mActionAddAllToOverview.png → .../themes/nkids/mActionAddAllToOverview.png
diff --git a/src/themes/nkids/mActionAddLayer.png → images/themes/nkids/mActionAddLayer.png b/src/themes/nkids/mActionAddLayer.png → images/themes/nkids/mActionAddLayer.png
diff --git a/src/themes/nkids/mActionAddNonDbLayer.png → images/themes/nkids/mActionAddNonDbLayer.png b/src/themes/nkids/mActionAddNonDbLayer.png → images/themes/nkids/mActionAddNonDbLayer.png
diff --git a/src/themes/nkids/mActionAddRasterLayer.png → ...es/themes/nkids/mActionAddRasterLayer.png b/src/themes/nkids/mActionAddRasterLayer.png → ...es/themes/nkids/mActionAddRasterLayer.png
diff --git a/src/themes/nkids/mActionAddWmsLayer.png → images/themes/nkids/mActionAddWmsLayer.png b/src/themes/nkids/mActionAddWmsLayer.png → images/themes/nkids/mActionAddWmsLayer.png
diff --git a/src/themes/nkids/mActionCaptureLine.png → images/themes/nkids/mActionCaptureLine.png b/src/themes/nkids/mActionCaptureLine.png → images/themes/nkids/mActionCaptureLine.png
diff --git a/src/themes/nkids/mActionCapturePoint.png → images/themes/nkids/mActionCapturePoint.png b/src/themes/nkids/mActionCapturePoint.png → images/themes/nkids/mActionCapturePoint.png
diff --git a/src/themes/nkids/mActionCapturePolygon.png → ...es/themes/nkids/mActionCapturePolygon.png b/src/themes/nkids/mActionCapturePolygon.png → ...es/themes/nkids/mActionCapturePolygon.png
diff --git a/src/themes/nkids/mActionCustomProjection.png → .../themes/nkids/mActionCustomProjection.png b/src/themes/nkids/mActionCustomProjection.png → .../themes/nkids/mActionCustomProjection.png
diff --git a/src/themes/nkids/mActionDraw.png → images/themes/nkids/mActionDraw.png b/src/themes/nkids/mActionDraw.png → images/themes/nkids/mActionDraw.png
diff --git a/src/themes/nkids/mActionExportMapServer.png → ...s/themes/nkids/mActionExportMapServer.png b/src/themes/nkids/mActionExportMapServer.png → ...s/themes/nkids/mActionExportMapServer.png
diff --git a/src/themes/nkids/mActionFileExit.png → images/themes/nkids/mActionFileExit.png b/src/themes/nkids/mActionFileExit.png → images/themes/nkids/mActionFileExit.png
diff --git a/src/themes/nkids/mActionFileNew.png → images/themes/nkids/mActionFileNew.png b/src/themes/nkids/mActionFileNew.png → images/themes/nkids/mActionFileNew.png
diff --git a/src/themes/nkids/mActionFileOpen.png → images/themes/nkids/mActionFileOpen.png b/src/themes/nkids/mActionFileOpen.png → images/themes/nkids/mActionFileOpen.png
diff --git a/src/themes/nkids/mActionFilePrint.png → images/themes/nkids/mActionFilePrint.png b/src/themes/nkids/mActionFilePrint.png → images/themes/nkids/mActionFilePrint.png
diff --git a/src/themes/nkids/mActionFileSave.png → images/themes/nkids/mActionFileSave.png b/src/themes/nkids/mActionFileSave.png → images/themes/nkids/mActionFileSave.png
diff --git a/src/themes/nkids/mActionFileSaveAs.png → images/themes/nkids/mActionFileSaveAs.png b/src/themes/nkids/mActionFileSaveAs.png → images/themes/nkids/mActionFileSaveAs.png
diff --git a/src/themes/nkids/mActionHelpAbout.png → images/themes/nkids/mActionHelpAbout.png b/src/themes/nkids/mActionHelpAbout.png → images/themes/nkids/mActionHelpAbout.png
diff --git a/src/themes/nkids/mActionHelpContents.png → images/themes/nkids/mActionHelpContents.png b/src/themes/nkids/mActionHelpContents.png → images/themes/nkids/mActionHelpContents.png
diff --git a/src/themes/nkids/mActionHideAllLayers.png → images/themes/nkids/mActionHideAllLayers.png b/src/themes/nkids/mActionHideAllLayers.png → images/themes/nkids/mActionHideAllLayers.png
diff --git a/src/themes/nkids/mActionIdentify.png → images/themes/nkids/mActionIdentify.png b/src/themes/nkids/mActionIdentify.png → images/themes/nkids/mActionIdentify.png
diff --git a/src/themes/nkids/mActionInOverview.png → images/themes/nkids/mActionInOverview.png b/src/themes/nkids/mActionInOverview.png → images/themes/nkids/mActionInOverview.png
diff --git a/src/themes/nkids/mActionMeasure.png → images/themes/nkids/mActionMeasure.png b/src/themes/nkids/mActionMeasure.png → images/themes/nkids/mActionMeasure.png
diff --git a/src/themes/nkids/mActionNewBookmark.png → images/themes/nkids/mActionNewBookmark.png b/src/themes/nkids/mActionNewBookmark.png → images/themes/nkids/mActionNewBookmark.png
diff --git a/src/themes/nkids/mActionNewVectorLayer.png → ...es/themes/nkids/mActionNewVectorLayer.png b/src/themes/nkids/mActionNewVectorLayer.png → ...es/themes/nkids/mActionNewVectorLayer.png
diff --git a/src/themes/nkids/mActionOpenTable.png → images/themes/nkids/mActionOpenTable.png b/src/themes/nkids/mActionOpenTable.png → images/themes/nkids/mActionOpenTable.png
diff --git a/src/themes/nkids/mActionOptions.png → images/themes/nkids/mActionOptions.png b/src/themes/nkids/mActionOptions.png → images/themes/nkids/mActionOptions.png
diff --git a/src/themes/nkids/mActionPan.png → images/themes/nkids/mActionPan.png b/src/themes/nkids/mActionPan.png → images/themes/nkids/mActionPan.png
diff --git a/...themes/nkids/mActionProjectProperties.png → ...themes/nkids/mActionProjectProperties.png b/...themes/nkids/mActionProjectProperties.png → ...themes/nkids/mActionProjectProperties.png
diff --git a/src/themes/nkids/mActionQgisHomePage.png → images/themes/nkids/mActionQgisHomePage.png b/src/themes/nkids/mActionQgisHomePage.png → images/themes/nkids/mActionQgisHomePage.png
diff --git a/...es/nkids/mActionRemoveAllFromOverview.png → ...es/nkids/mActionRemoveAllFromOverview.png b/...es/nkids/mActionRemoveAllFromOverview.png → ...es/nkids/mActionRemoveAllFromOverview.png
diff --git a/src/themes/nkids/mActionRemoveLayer.png → images/themes/nkids/mActionRemoveLayer.png b/src/themes/nkids/mActionRemoveLayer.png → images/themes/nkids/mActionRemoveLayer.png
diff --git a/src/themes/nkids/mActionSaveMapAsImage.png → ...es/themes/nkids/mActionSaveMapAsImage.png b/src/themes/nkids/mActionSaveMapAsImage.png → ...es/themes/nkids/mActionSaveMapAsImage.png
diff --git a/src/themes/nkids/mActionSelect.png → images/themes/nkids/mActionSelect.png b/src/themes/nkids/mActionSelect.png → images/themes/nkids/mActionSelect.png
diff --git a/src/themes/nkids/mActionShowAllLayers.png → images/themes/nkids/mActionShowAllLayers.png b/src/themes/nkids/mActionShowAllLayers.png → images/themes/nkids/mActionShowAllLayers.png
diff --git a/src/themes/nkids/mActionShowBookmarks.png → images/themes/nkids/mActionShowBookmarks.png b/src/themes/nkids/mActionShowBookmarks.png → images/themes/nkids/mActionShowBookmarks.png
diff --git a/...themes/nkids/mActionShowPluginManager.png → ...themes/nkids/mActionShowPluginManager.png b/...themes/nkids/mActionShowPluginManager.png → ...themes/nkids/mActionShowPluginManager.png
diff --git a/src/themes/nkids/mActionZoomFullExtent.png → ...es/themes/nkids/mActionZoomFullExtent.png b/src/themes/nkids/mActionZoomFullExtent.png → ...es/themes/nkids/mActionZoomFullExtent.png
diff --git a/src/themes/nkids/mActionZoomIn.png → images/themes/nkids/mActionZoomIn.png b/src/themes/nkids/mActionZoomIn.png → images/themes/nkids/mActionZoomIn.png
diff --git a/src/themes/nkids/mActionZoomLast.png → images/themes/nkids/mActionZoomLast.png b/src/themes/nkids/mActionZoomLast.png → images/themes/nkids/mActionZoomLast.png
diff --git a/src/themes/nkids/mActionZoomOut.png → images/themes/nkids/mActionZoomOut.png b/src/themes/nkids/mActionZoomOut.png → images/themes/nkids/mActionZoomOut.png
diff --git a/src/themes/nkids/mActionZoomToLayer.png → images/themes/nkids/mActionZoomToLayer.png b/src/themes/nkids/mActionZoomToLayer.png → images/themes/nkids/mActionZoomToLayer.png
diff --git a/src/themes/nkids/mActionZoomToSelected.png → ...es/themes/nkids/mActionZoomToSelected.png b/src/themes/nkids/mActionZoomToSelected.png → ...es/themes/nkids/mActionZoomToSelected.png
diff --git a/src/themes/nkids/over-.png → images/themes/nkids/over-.png b/src/themes/nkids/over-.png → images/themes/nkids/over-.png
diff --git a/src/themes/nkids/over.png → images/themes/nkids/over.png b/src/themes/nkids/over.png → images/themes/nkids/over.png
diff --git a/src/themes/nkids/over1.png → images/themes/nkids/over1.png b/src/themes/nkids/over1.png → images/themes/nkids/over1.png
diff --git a/src/themes/nkids/qgis32x32.png → images/themes/nkids/qgis32x32.png b/src/themes/nkids/qgis32x32.png → images/themes/nkids/qgis32x32.png
diff --git a/src/themes/nkids/remove_all_to_overview.png → ...s/themes/nkids/remove_all_to_overview.png b/src/themes/nkids/remove_all_to_overview.png → ...s/themes/nkids/remove_all_to_overview.png
diff --git a/src/themes/nkids/show_all_layers1.png → images/themes/nkids/show_all_layers1.png b/src/themes/nkids/show_all_layers1.png → images/themes/nkids/show_all_layers1.png
diff --git a/src/themes/nkids/show_layerReal.png → images/themes/nkids/show_layerReal.png b/src/themes/nkids/show_layerReal.png → images/themes/nkids/show_layerReal.png
diff --git a/src/themes/nkids/.cvsignore → resources/.cvsignore b/src/themes/nkids/.cvsignore → resources/.cvsignore
diff --git a/src/resources/Makefile.am → resources/Makefile.am b/src/resources/Makefile.am → resources/Makefile.am
diff --git a/src/resources/qgis.db → resources/qgis.db b/src/resources/qgis.db → resources/qgis.db
diff --git a/src/resources/qgis_help.db → resources/qgis_help.db b/src/resources/qgis_help.db → resources/qgis_help.db
diff --git a/src/resources/spatial_ref_sys.txt → resources/spatial_ref_sys.txt b/src/resources/spatial_ref_sys.txt → resources/spatial_ref_sys.txt
diff --git a/src/resources/srs.db → resources/srs.db b/src/resources/srs.db → resources/srs.db
diff --git a/src/resources/wkt_defs.txt → resources/wkt_defs.txt b/src/resources/wkt_defs.txt → resources/wkt_defs.txt
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -17,7 +17,7 @@ if HAVE_QTMAC
 MAC = mac
 endif
 
-SUBDIRS = ui legend svg images themes resources raster composer widgets $(MAC)
+SUBDIRS = ui legend raster composer widgets $(MAC)
 
 if !HAVE_QTMAC
 PREFIX=-DPREFIX=\"$(prefix)\"

diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp
@@ -119,7 +119,7 @@
 #include "qgsvectorfilewriter.h"
 #include "qgsvectorlayer.h"
 #include "../plugins/qgisplugin.h"
-#include "themes/default/qgis.xpm"
+#include "../images/themes/default/qgis.xpm"
 
 //
 // Gdal/Ogr includes

diff --git a/src/qgsdbsourceselect.cpp b/src/qgsdbsourceselect.cpp
@@ -29,9 +29,9 @@ email                : sherman at mrcc.com
 #include <qinputdialog.h>
 #include <q3groupbox.h>
 #include <QTextOStream>
-#include "themes/default/point_layer.xpm"
-#include "themes/default/line_layer.xpm"
-#include "themes/default/polygon_layer.xpm"
+#include "../images/themes/default/point_layer.xpm"
+#include "../images/themes/default/line_layer.xpm"
+#include "../images/themes/default/polygon_layer.xpm"
 #include "qgsdbsourceselect.h"
 #include "qgsnewconnection.h"
 #include "qgspgquerybuilder.h"