Skip to content
Permalink
Browse files
Merged print composer branch, with the exception of revisions 9087 - …
…9115

git-svn-id: http://svn.osgeo.org/qgis/trunk@9122 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Aug 23, 2008
1 parent d770844 commit 58f32408d1c67839fb26b1ae4f8b5fc35477ad76
Showing with 13,572 additions and 4,211 deletions.
  1. BIN images/themes/default/mActionGroupItems.png
  2. BIN images/themes/default/mActionMoveItemContent.png
  3. BIN images/themes/default/mActionUngroupItems.png
  4. +16 −14 src/app/CMakeLists.txt
  5. +519 −177 src/app/composer/qgscomposer.cpp
  6. +58 −15 src/app/composer/qgscomposer.h
  7. +463 −18 src/app/composer/qgscomposeritem.cpp
  8. +100 −30 src/app/composer/qgscomposeritem.h
  9. +176 −0 src/app/composer/qgscomposeritemgroup.cpp
  10. +68 −0 src/app/composer/qgscomposeritemgroup.h
  11. +149 −0 src/app/composer/qgscomposeritemwidget.cpp
  12. +48 −0 src/app/composer/qgscomposeritemwidget.h
  13. +91 −302 src/app/composer/qgscomposerlabel.cpp
  14. +35 −81 src/app/composer/qgscomposerlabel.h
  15. +71 −0 src/app/composer/qgscomposerlabelwidget.cpp
  16. +43 −0 src/app/composer/qgscomposerlabelwidget.h
  17. +521 −0 src/app/composer/qgscomposerlegend.cpp
  18. +140 −0 src/app/composer/qgscomposerlegend.h
  19. +44 −0 src/app/composer/qgscomposerlegenditemdialog.cpp
  20. +41 −0 src/app/composer/qgscomposerlegenditemdialog.h
  21. +342 −0 src/app/composer/qgscomposerlegendwidget.cpp
  22. +64 −0 src/app/composer/qgscomposerlegendwidget.h
  23. +286 −525 src/app/composer/qgscomposermap.cpp
  24. +277 −0 src/app/composer/qgscomposermapwidget.cpp
  25. +63 −0 src/app/composer/qgscomposermapwidget.h
  26. +147 −477 src/app/composer/qgscomposerpicture.cpp
  27. +58 −125 src/app/composer/qgscomposerpicture.h
  28. +167 −0 src/app/composer/qgscomposerpicturewidget.cpp
  29. +49 −0 src/app/composer/qgscomposerpicturewidget.h
  30. +276 −470 src/app/composer/qgscomposerscalebar.cpp
  31. +116 −109 src/app/composer/qgscomposerscalebar.h
  32. +324 −0 src/app/composer/qgscomposerscalebarwidget.cpp
  33. +63 −0 src/app/composer/qgscomposerscalebarwidget.h
  34. +17 −10 src/app/composer/qgscomposervectorlegend.cpp
  35. +9 −5 src/app/composer/qgscomposervectorlegend.h
  36. +373 −36 src/app/composer/qgscomposerview.cpp
  37. +79 −12 src/app/composer/qgscomposerview.h
  38. +105 −908 src/app/composer/qgscomposition.cpp
  39. +288 −0 src/app/composer/qgscompositionwidget.cpp
  40. +65 −0 src/app/composer/qgscompositionwidget.h
  41. +96 −0 src/app/composer/qgsdoubleboxscalebarstyle.cpp
  42. +39 −0 src/app/composer/qgsdoubleboxscalebarstyle.h
  43. +491 −0 src/app/composer/qgslegendmodel.cpp
  44. +79 −0 src/app/composer/qgslegendmodel.h
  45. +87 −0 src/app/composer/qgsnumericscalebarstyle.cpp
  46. +44 −0 src/app/composer/qgsnumericscalebarstyle.h
  47. +137 −0 src/app/composer/qgsscalebarstyle.cpp
  48. +51 −0 src/app/composer/qgsscalebarstyle.h
  49. +80 −0 src/app/composer/qgssingleboxscalebarstyle.cpp
  50. +40 −0 src/app/composer/qgssingleboxscalebarstyle.h
  51. +96 −0 src/app/composer/qgsticksscalebarstyle.cpp
  52. +50 −0 src/app/composer/qgsticksscalebarstyle.h
  53. +6 −0 src/app/qgisapp.cpp
  54. +22 −0 src/core/CMakeLists.txt
  55. +506 −0 src/core/composer/qgscomposeritem.cpp
  56. +156 −0 src/core/composer/qgscomposeritem.h
  57. +175 −0 src/core/composer/qgscomposeritemgroup.cpp
  58. +66 −0 src/core/composer/qgscomposeritemgroup.h
  59. +153 −0 src/core/composer/qgscomposerlabel.cpp
  60. +68 −0 src/core/composer/qgscomposerlabel.h
  61. +521 −0 src/core/composer/qgscomposerlegend.cpp
  62. +140 −0 src/core/composer/qgscomposerlegend.h
  63. +460 −0 src/core/composer/qgscomposermap.cpp
  64. +188 −0 src/core/composer/qgscomposermap.h
  65. +230 −0 src/core/composer/qgscomposerpicture.cpp
  66. +89 −0 src/core/composer/qgscomposerpicture.h
  67. +392 −0 src/core/composer/qgscomposerscalebar.cpp
  68. +164 −0 src/core/composer/qgscomposerscalebar.h
  69. +187 −0 src/core/composer/qgscomposition.cpp
  70. +107 −0 src/core/composer/qgscomposition.h
  71. +96 −0 src/core/composer/qgsdoubleboxscalebarstyle.cpp
  72. +39 −0 src/core/composer/qgsdoubleboxscalebarstyle.h
  73. +491 −0 src/core/composer/qgslegendmodel.cpp
  74. +79 −0 src/core/composer/qgslegendmodel.h
  75. +87 −0 src/core/composer/qgsnumericscalebarstyle.cpp
  76. +44 −0 src/core/composer/qgsnumericscalebarstyle.h
  77. +137 −0 src/core/composer/qgsscalebarstyle.cpp
  78. +51 −0 src/core/composer/qgsscalebarstyle.h
  79. +80 −0 src/core/composer/qgssingleboxscalebarstyle.cpp
  80. +40 −0 src/core/composer/qgssingleboxscalebarstyle.h
  81. +96 −0 src/core/composer/qgsticksscalebarstyle.cpp
  82. +50 −0 src/core/composer/qgsticksscalebarstyle.h
  83. +1 −1 src/core/qgsmaprenderer.cpp
  84. +4 −1 src/core/qgsmaprenderer.h
  85. +9 −20 src/core/raster/qgsrasterlayer.cpp
  86. +77 −30 src/ui/qgscomposerbase.ui
  87. +84 −0 src/ui/qgscomposeritemwidgetbase.ui
  88. +14 −38 src/ui/{qgscomposerlabelbase.ui → qgscomposerlabelwidgetbase.ui}
  89. +73 −0 src/ui/qgscomposerlegenditemdialogbase.ui
  90. +216 −0 src/ui/qgscomposerlegendwidgetbase.ui
  91. +0 −296 src/ui/qgscomposermapbase.ui
  92. +247 −0 src/ui/qgscomposermapwidgetbase.ui
  93. +0 −230 src/ui/qgscomposerpicturebase.ui
  94. +146 −0 src/ui/qgscomposerpicturewidgetbase.ui
  95. +0 −228 src/ui/qgscomposerscalebarbase.ui
  96. +242 −0 src/ui/qgscomposerscalebarwidgetbase.ui
  97. +38 −53 src/ui/qgscompositionbase.ui
  98. +228 −0 src/ui/qgscompositionwidget.h
  99. +232 −0 src/ui/qgscompositionwidgetbase.ui
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -56,14 +56,15 @@ SET(QGIS_APP_SRCS
qgsvectorlayerproperties.cpp

composer/qgscomposer.cpp
composer/qgscomposeritem.cpp
composer/qgscomposerlabel.cpp
composer/qgscomposerpicture.cpp
composer/qgscomposermap.cpp
composer/qgscomposerscalebar.cpp
composer/qgscomposervectorlegend.cpp
composer/qgscomposeritemwidget.cpp
composer/qgscomposerlabelwidget.cpp
composer/qgscomposerpicturewidget.cpp
composer/qgscomposermapwidget.cpp
composer/qgscomposerscalebarwidget.cpp
composer/qgscomposerlegenditemdialog.cpp
composer/qgscomposerlegendwidget.cpp
composer/qgscomposerview.cpp
composer/qgscomposition.cpp
composer/qgscompositionwidget.cpp

legend/qgslegendgroup.cpp
legend/qgslegend.cpp
@@ -120,13 +121,14 @@ SET (QGIS_APP_MOC_HDRS
qgsdbtablemodel.h

composer/qgscomposer.h
composer/qgscomposerlabel.h
composer/qgscomposerpicture.h
composer/qgscomposermap.h
composer/qgscomposerscalebar.h
composer/qgscomposervectorlegend.h
composer/qgscomposeritemwidget.h
composer/qgscomposerlabelwidget.h
composer/qgscomposerlegendwidget.h
composer/qgscomposermapwidget.h
composer/qgscomposerpicturewidget.h
composer/qgscomposerscalebarwidget.h
composer/qgscomposerview.h
composer/qgscomposition.h
composer/qgscompositionwidget.h

legend/qgslegend.h
legend/qgslegendlayer.h
@@ -184,7 +186,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
../core
../core/raster ../core/renderer ../core/symbology
../core/composer ../core/raster ../core/renderer ../core/symbology
../gui
../plugins
../python

0 comments on commit 58f3240

Please sign in to comment.