Skip to content
Permalink
Browse files

merge of advanced printing branch 2

git-svn-id: http://svn.osgeo.org/qgis/trunk@10006 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent
mhugent committed Jan 24, 2009
1 parent 037d3db commit c87e63a097cb019f4286c8ad31b82de9b5cd76c6
Showing with 2,106 additions and 187 deletions.
  1. BIN images/themes/default/mActionAlignBottom.png
  2. BIN images/themes/default/mActionAlignHCenter.png
  3. BIN images/themes/default/mActionAlignLeft.png
  4. BIN images/themes/default/mActionAlignRight.png
  5. BIN images/themes/default/mActionAlignTop.png
  6. BIN images/themes/default/mActionAlignVCenter.png
  7. +2 −0 src/app/CMakeLists.txt
  8. +243 −37 src/app/composer/qgscomposer.cpp
  9. +38 −5 src/app/composer/qgscomposer.h
  10. +13 −0 src/app/composer/qgscomposeritemwidget.cpp
  11. +1 −0 src/app/composer/qgscomposeritemwidget.h
  12. +1 −2 src/app/composer/qgscomposermapwidget.cpp
  13. +171 −0 src/app/composer/qgscomposerpicturewidget.cpp
  14. +11 −0 src/app/composer/qgscomposerpicturewidget.h
  15. +162 −1 src/app/composer/qgscompositionwidget.cpp
  16. +10 −0 src/app/composer/qgscompositionwidget.h
  17. +214 −0 src/app/composer/qgsitempositiondialog.cpp
  18. +61 −0 src/app/composer/qgsitempositiondialog.h
  19. +1 −0 src/core/CMakeLists.txt
  20. +97 −45 src/core/composer/qgscomposeritem.cpp
  21. +32 −11 src/core/composer/qgscomposeritem.h
  22. +10 −1 src/core/composer/qgscomposerlegend.cpp
  23. +22 −7 src/core/composer/qgscomposermap.cpp
  24. +4 −2 src/core/composer/qgscomposermap.h
  25. +355 −5 src/core/composer/qgscomposition.cpp
  26. +55 −1 src/core/composer/qgscomposition.h
  27. +121 −0 src/core/composer/qgspaperitem.cpp
  28. +50 −0 src/core/composer/qgspaperitem.h
  29. +1 −1 src/core/renderer/qgsrenderer.cpp
  30. +3 −3 src/core/renderer/qgsrenderer.h
  31. +7 −6 src/gui/qgscomposerview.cpp
  32. +61 −5 src/ui/qgscomposerbase.ui
  33. +9 −2 src/ui/qgscomposeritemwidgetbase.ui
  34. +96 −17 src/ui/qgscomposerpicturewidgetbase.ui
  35. +95 −36 src/ui/qgscompositionwidgetbase.ui
  36. +160 −0 src/ui/qgsitempositiondialogbase.ui
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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

0 comments on commit c87e63a

Please sign in to comment.
You can’t perform that action at this time.