Merged changes in 0.5 release branch to MAIN

git-svn-id: http://svn.osgeo.org/qgis/trunk@2094 c8812cc2-4d05-0410-92ff-de0c093fc19c
SKrywinski · Oct 4, 2004 · f5c424a · f5c424a
1 parent 93867f1
commit f5c424a
Show file tree

Hide file tree

Showing 126 changed files with 5,531 additions and 2,821 deletions.
diff --git a/README b/README
@@ -1,24 +1,19 @@
-README for QGIS version 0.4 'Baby'
+README for QGIS version 0.5 'Bandit'
 Quantum GIS (QGIS) is designed to be a Geographic Information System (GIS) 
 built for Linux/Unix. QGIS offers support for vector and raster formats. 
 Currently QGIS supports many common vector and raster formats shapefiles
 and PostgreSQL/PostGIS layers. 
 
 This release adds:
-  Features
-    Map Overview
-    Preliminary printing support
-    Menu cleanups
-    User interface improvements
-    Icon Themes (only default theme currently available)
-    Capture point to clipboard
-
-  Core Plugins
-    Scale bar plugin
-    Improved GPS tools plugin
-
-  Known Issues
-   Map units are not stored when a QGIS project is saved
+  * Windows version
+  * Feature labeling with optional buffering
+  * Preliminary digitizing support for shapefiles
+  * GRASS digitizing support
+  * GPS SVG icons 
+  * Unique value renderers
+  * User interface improvements
+  * Specify a query when loading a PostGIS layer
+  * Italian translation 
 
 Supported raster formats include:
   Grass

diff --git a/configure.in b/configure.in
@@ -1,6 +1,6 @@
 
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.in,v 1.193 2004/09/23 09:07:48 larsl Exp
+dnl configure.in,v 1.194 2004/10/04 00:53:40 gsherman Exp
 
 
 
@@ -24,9 +24,9 @@ dnl ---------------------------------------------------------------------------
 dnl version number
 dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
-MINOR_VERSION=4
+MINOR_VERSION=5
 MICRO_VERSION=0
-EXTRA_VERSION=38
+EXTRA_VERSION=0
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else
@@ -249,8 +249,7 @@ AC_CONFIG_FILES([
   plugins/grid_maker/Makefile
   plugins/grass/Makefile
   doc/Makefile
-  doc/skin/Makefile
-  doc/skin/images/Makefile
+  doc/install_guide/Makefile
   doc/images/Makefile
   doc/plugins/Makefile
   doc/plugins/geoprocessing/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -11,21 +11,18 @@
 docdatadir = $(datadir)/$(PACKAGE)/doc
 
 docdata_DATA = \
-     README \
-     favicon.ico \
-     images \
-     index.html \
-     index.pdf \
-     install.html \
-		 install.css \
-     install.pdf \
-     plugins \
-     skin \
-     userguide.html \
-     userguide.pdf
+							 favicon.ico \
+							 images \
+							 index.html \
+							 install_guide \
+							 install.pdf \
+							 plugins \
+							 qgisdoc.css \
+							 README \
+							 userguide.pdf 
 
 # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)#     \1 \\#'
 
-SUBDIRS = images plugins skin
+SUBDIRS = images plugins install_guide
 
 EXTRA_DIST = $(docdata_DATA)
diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am
@@ -10,53 +10,7 @@
 
 docdatadir = $(datadir)/$(PACKAGE)/doc/images
 
-docdata_DATA = \
-     add_layer_dialog.png \
-     back20x20.png \
-     checkversion.png \
-     configure.png \
-     connect_no.png \
-     contents.png \
-     exit.png \
-     filenew.png \
-     filesave.png \
-     filesaveas.png \
-     gis_add_pg_layer.png \
-     gis_add_vector_layer.png \
-     gis_identify.png \
-     gis_pan.png \
-     gis_view_all.png \
-     gis_zoom_to_selected.png \
-     icon_small.png \
-     loaded_shapefiles.png \
-     mapserver.png \
-     open.png \
-     package_network.png \
-     qgis_vector_layer_properties.png \
-     qgis_vector_layer_properties1.png \
-     qgis_vector_layer_properties2.png \
-     qgis_vector_layer_properties3.png \
-     reload20x20.png \
-     select_features.png \
-     sf.png \
-     table.png \
-     viewmag-.png \
-     zoomin.png \
-     gis_add_raster_layer.png \
-     change_symbology.gif \
-     qgis_raster_properties_symbology_tab.png \
-     qgis_mainwindow01.png \
-     project.png \
-     loaded_shapefiles.gif \
-     add_layer_dialog.gif \
-     qgis_raster_popup_properties_selected.png \
-     built-with-forrest-button.png \
-     layer_properties.gif \
-     qgis_raster_properties_general_tab.png \
-     qgis_raster_properties_statistics_tab.png \
-     qgis_load_data_on_startup.png \
-     btn_add_layer.gif \
-     changed_symbology.gif
+docdata_DATA =  qgis_new_80pct.png
 
 # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)#     \1 \\#'
 

diff --git a/doc/images/add_layer_dialog.gif b/doc/images/add_layer_dialog.gif
diff --git a/doc/images/add_layer_dialog.png b/doc/images/add_layer_dialog.png
diff --git a/doc/images/back20x20.png b/doc/images/back20x20.png
diff --git a/doc/images/btn_add_layer.gif b/doc/images/btn_add_layer.gif
diff --git a/doc/images/built-with-forrest-button.png b/doc/images/built-with-forrest-button.png
diff --git a/doc/images/change_symbology.gif b/doc/images/change_symbology.gif
diff --git a/doc/images/changed_symbology.gif b/doc/images/changed_symbology.gif
diff --git a/doc/images/checkversion.png b/doc/images/checkversion.png
diff --git a/doc/images/configure.png b/doc/images/configure.png
diff --git a/doc/images/connect_no.png b/doc/images/connect_no.png
diff --git a/doc/images/contents.png b/doc/images/contents.png
diff --git a/doc/images/exit.png b/doc/images/exit.png
diff --git a/doc/images/filenew.png b/doc/images/filenew.png
diff --git a/doc/images/filesave.png b/doc/images/filesave.png
diff --git a/doc/images/filesaveas.png b/doc/images/filesaveas.png
diff --git a/doc/images/gis_add_pg_layer.png b/doc/images/gis_add_pg_layer.png
diff --git a/doc/images/gis_add_raster_layer.png b/doc/images/gis_add_raster_layer.png
diff --git a/doc/images/gis_add_vector_layer.png b/doc/images/gis_add_vector_layer.png
diff --git a/doc/images/gis_identify.png b/doc/images/gis_identify.png
diff --git a/doc/images/gis_pan.png b/doc/images/gis_pan.png
diff --git a/doc/images/gis_view_all.png b/doc/images/gis_view_all.png
diff --git a/doc/images/gis_zoom_to_selected.png b/doc/images/gis_zoom_to_selected.png
diff --git a/doc/images/icon_small.png b/doc/images/icon_small.png
diff --git a/doc/images/layer_properties.gif b/doc/images/layer_properties.gif
diff --git a/doc/images/loaded_shapefiles.gif b/doc/images/loaded_shapefiles.gif
diff --git a/doc/images/loaded_shapefiles.png b/doc/images/loaded_shapefiles.png
diff --git a/doc/images/mapserver.png b/doc/images/mapserver.png
diff --git a/doc/images/open.png b/doc/images/open.png
diff --git a/doc/images/package_network.png b/doc/images/package_network.png
diff --git a/doc/images/project.png b/doc/images/project.png
diff --git a/doc/images/qgis_load_data_on_startup.png b/doc/images/qgis_load_data_on_startup.png
diff --git a/doc/images/qgis_mainwindow01.png b/doc/images/qgis_mainwindow01.png
diff --git a/doc/images/qgis_new_80pct.png b/doc/images/qgis_new_80pct.png
diff --git a/doc/images/qgis_raster_popup_properties_selected.png b/doc/images/qgis_raster_popup_properties_selected.png
diff --git a/doc/images/qgis_raster_properties_general_tab.png b/doc/images/qgis_raster_properties_general_tab.png
diff --git a/doc/images/qgis_raster_properties_statistics_tab.png b/doc/images/qgis_raster_properties_statistics_tab.png
diff --git a/doc/images/qgis_raster_properties_symbology_tab.png b/doc/images/qgis_raster_properties_symbology_tab.png
diff --git a/doc/images/qgis_vector_layer_properties.png b/doc/images/qgis_vector_layer_properties.png
diff --git a/doc/images/qgis_vector_layer_properties1.png b/doc/images/qgis_vector_layer_properties1.png
diff --git a/doc/images/qgis_vector_layer_properties2.png b/doc/images/qgis_vector_layer_properties2.png
diff --git a/doc/images/qgis_vector_layer_properties3.png b/doc/images/qgis_vector_layer_properties3.png
diff --git a/doc/images/reload20x20.png b/doc/images/reload20x20.png
diff --git a/doc/images/select_features.png b/doc/images/select_features.png
diff --git a/doc/images/sf.png b/doc/images/sf.png
diff --git a/doc/images/table.png b/doc/images/table.png
diff --git a/doc/images/viewmag-.png b/doc/images/viewmag-.png
diff --git a/doc/images/zoomin.png b/doc/images/zoomin.png