merge of advanced printing branch 2

git-svn-id: http://svn.osgeo.org/qgis/trunk@10006 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 24, 2009 · c87e63a · c87e63a
1 parent 037d3db
commit c87e63a
Show file tree

Hide file tree

Showing 36 changed files with 2,106 additions and 187 deletions.
diff --git a/images/themes/default/mActionAlignBottom.png b/images/themes/default/mActionAlignBottom.png
diff --git a/images/themes/default/mActionAlignHCenter.png b/images/themes/default/mActionAlignHCenter.png
diff --git a/images/themes/default/mActionAlignLeft.png b/images/themes/default/mActionAlignLeft.png
diff --git a/images/themes/default/mActionAlignRight.png b/images/themes/default/mActionAlignRight.png
diff --git a/images/themes/default/mActionAlignTop.png b/images/themes/default/mActionAlignTop.png
diff --git a/images/themes/default/mActionAlignVCenter.png b/images/themes/default/mActionAlignVCenter.png
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -64,6 +64,7 @@ SET(QGIS_APP_SRCS
   composer/qgscomposerlegenditemdialog.cpp
   composer/qgscomposerlegendwidget.cpp
   composer/qgscompositionwidget.cpp
+  composer/qgsitempositiondialog.cpp
 
   legend/qgslegendgroup.cpp
   legend/qgslegend.cpp
@@ -133,6 +134,7 @@ SET (QGIS_APP_MOC_HDRS
   composer/qgscomposerpicturewidget.h
   composer/qgscomposerscalebarwidget.h
   composer/qgscompositionwidget.h
+  composer/qgsitempositiondialog.h
 
   legend/qgslegend.h
   legend/qgslegendlayer.h