Skip to content
Permalink
Browse files

Drop composer from app

  • Loading branch information
nyalldawson committed Jan 10, 2018
1 parent d87c605 commit b95363c5b6321f4c0325177f2dc76992ad9f7b73
Showing with 10 additions and 29,778 deletions.
  1. +0 −27 python/core/layout/qgslayoutmanager.sip
  2. +1 −0 python/core/layout/qgsmasterlayoutinterface.sip
  3. +3 −48 src/app/CMakeLists.txt
  4. +0 −402 src/app/composer/qgsatlascompositionwidget.cpp
  5. +0 −64 src/app/composer/qgsatlascompositionwidget.h
  6. +0 −463 src/app/composer/qgsattributeselectiondialog.cpp
  7. +0 −150 src/app/composer/qgsattributeselectiondialog.h
  8. +0 −3,779 src/app/composer/qgscomposer.cpp
  9. +0 −632 src/app/composer/qgscomposer.h
  10. +0 −364 src/app/composer/qgscomposerarrowwidget.cpp
  11. +0 −64 src/app/composer/qgscomposerarrowwidget.h
  12. +0 −1,134 src/app/composer/qgscomposerattributetablewidget.cpp
  13. +0 −94 src/app/composer/qgscomposerattributetablewidget.h
  14. +0 −482 src/app/composer/qgscomposerhtmlwidget.cpp
  15. +0 −69 src/app/composer/qgscomposerhtmlwidget.h
  16. +0 −173 src/app/composer/qgscomposerimageexportoptionsdialog.cpp
  17. +0 −122 src/app/composer/qgscomposerimageexportoptionsdialog.h
  18. +0 −817 src/app/composer/qgscomposeritemwidget.cpp
  19. +0 −216 src/app/composer/qgscomposeritemwidget.h
  20. +0 −295 src/app/composer/qgscomposerlabelwidget.cpp
  21. +0 −61 src/app/composer/qgscomposerlabelwidget.h
  22. +0 −49 src/app/composer/qgscomposerlegendlayersdialog.cpp
  23. +0 −42 src/app/composer/qgscomposerlegendlayersdialog.h
  24. +0 −1,163 src/app/composer/qgscomposerlegendwidget.cpp
  25. +0 −129 src/app/composer/qgscomposerlegendwidget.h
  26. +0 −258 src/app/composer/qgscomposermanager.cpp
  27. +0 −91 src/app/composer/qgscomposermanager.h
  28. +0 −1,259 src/app/composer/qgscomposermapgridwidget.cpp
  29. +0 −146 src/app/composer/qgscomposermapgridwidget.h
  30. +0 −1,664 src/app/composer/qgscomposermapwidget.cpp
  31. +0 −173 src/app/composer/qgscomposermapwidget.h
  32. +0 −725 src/app/composer/qgscomposerpicturewidget.cpp
  33. +0 −96 src/app/composer/qgscomposerpicturewidget.h
  34. +0 −110 src/app/composer/qgscomposerpolygonwidget.cpp
  35. +0 −50 src/app/composer/qgscomposerpolygonwidget.h
  36. +0 −103 src/app/composer/qgscomposerpolylinewidget.cpp
  37. +0 −50 src/app/composer/qgscomposerpolylinewidget.h
  38. +0 −699 src/app/composer/qgscomposerscalebarwidget.cpp
  39. +0 −79 src/app/composer/qgscomposerscalebarwidget.h
  40. +0 −161 src/app/composer/qgscomposershapewidget.cpp
  41. +0 −51 src/app/composer/qgscomposershapewidget.h
  42. +0 −133 src/app/composer/qgscomposertablebackgroundcolorsdialog.cpp
  43. +0 −67 src/app/composer/qgscomposertablebackgroundcolorsdialog.h
  44. +0 −721 src/app/composer/qgscompositionwidget.cpp
  45. +0 −119 src/app/composer/qgscompositionwidget.h
  46. +0 −80 src/app/qgisapp.cpp
  47. +0 −19 src/app/qgisapp.h
  48. +0 −1 src/app/qgsoptions.cpp
  49. +0 −1 src/app/qgsprojectproperties.cpp
  50. +0 −26 src/core/layout/qgslayoutmanager.cpp
  51. +1 −22 src/core/layout/qgslayoutmanager.h
  52. +4 −0 src/core/layout/qgsmasterlayoutinterface.h
  53. +0 −2 src/ui/CMakeLists.txt
  54. +0 −377 src/ui/composer/qgsatlascompositionwidgetbase.ui
  55. +0 −316 src/ui/composer/qgsattributeselectiondialogbase.ui
  56. +0 −330 src/ui/composer/qgscomposerarrowwidgetbase.ui
  57. +0 −907 src/ui/composer/qgscomposerattributetablewidgetbase.ui
  58. +0 −1,130 src/ui/composer/qgscomposerbase.ui
  59. +0 −330 src/ui/composer/qgscomposerhtmlwidgetbase.ui
  60. +0 −320 src/ui/composer/qgscomposerimageexportoptions.ui
  61. +0 −846 src/ui/composer/qgscomposeritemwidgetbase.ui
  62. +0 −391 src/ui/composer/qgscomposerlabelwidgetbase.ui
  63. +0 −67 src/ui/composer/qgscomposerlegendlayersdialogbase.ui
  64. +0 −1,183 src/ui/composer/qgscomposerlegendwidgetbase.ui
  65. +0 −84 src/ui/composer/qgscomposermanagerbase.ui
  66. +0 −859 src/ui/composer/qgscomposermapgridwidgetbase.ui
  67. +0 −912 src/ui/composer/qgscomposermapwidgetbase.ui
  68. +0 −619 src/ui/composer/qgscomposerpicturewidgetbase.ui
  69. +0 −128 src/ui/composer/qgscomposerpolygonwidgetbase.ui
  70. +0 −106 src/ui/composer/qgscomposerpolylinewidgetbase.ui
  71. +0 −778 src/ui/composer/qgscomposerscalebarwidgetbase.ui
  72. +0 −157 src/ui/composer/qgscomposershapewidgetbase.ui
  73. +0 −547 src/ui/composer/qgscomposertablebackgroundstyles.ui
  74. +0 −509 src/ui/composer/qgscomposertablewidgetbase.ui
  75. +0 −186 src/ui/composer/qgscomposervectorlegendbase.ui
  76. +0 −196 src/ui/composer/qgscompositionbase.ui
  77. +0 −744 src/ui/composer/qgscompositionwidgetbase.ui
  78. 0 src/ui/{composer → layout}/qgssvgexportoptions.ui
  79. +1 −11 src/ui/qgisapp.ui
@@ -117,12 +117,6 @@ Returns true if save was successful.
Duplicates an existing ``layout`` from the manager. The new
layout will automatically be stored in the manager.
Returns new the layout if duplication was successful.
%End

QString generateUniqueComposerTitle() const;
%Docstring
Generates a unique title for a new composition, which does not
clash with any already contained by the manager.
%End

QString generateUniqueTitle( QgsMasterLayoutInterface::Type type = QgsMasterLayoutInterface::PrintLayout ) const;
@@ -133,47 +127,26 @@ clash with any already contained by the manager.

signals:

void compositionAboutToBeAdded( const QString &name );
%Docstring
Emitted when a composition is about to be added to the manager
%End

void layoutAboutToBeAdded( const QString &name );
%Docstring
Emitted when a layout is about to be added to the manager
%End

void compositionAdded( const QString &name );
%Docstring
Emitted when a composition has been added to the manager
%End

void layoutAdded( const QString &name );
%Docstring
Emitted when a layout has been added to the manager
%End

void compositionRemoved( const QString &name );
%Docstring
Emitted when a composition was removed from the manager
%End

void layoutRemoved( const QString &name );
%Docstring
Emitted when a layout was removed from the manager
%End

void compositionAboutToBeRemoved( const QString &name );
%Docstring
Emitted when a composition is about to be removed from the manager
%End

void layoutAboutToBeRemoved( const QString &name );
%Docstring
Emitted when a layout is about to be removed from the manager
%End


void layoutRenamed( QgsMasterLayoutInterface *layout, const QString &newName );
%Docstring
Emitted when a layout is renamed
@@ -7,6 +7,7 @@
************************************************************************/



%ModuleHeaderCode
#include "qgsprintlayout.h"
#include "qgsreport.h"
51 src/app/CMakeLists.txt 100644 → 100755
@@ -157,28 +157,6 @@ SET(QGIS_APP_SRCS
qgsmaptoolregularpolygoncenterpoint.cpp
qgsmaptoolregularpolygoncentercorner.cpp

composer/qgsattributeselectiondialog.cpp
composer/qgscomposer.cpp
composer/qgscomposerarrowwidget.cpp
composer/qgscomposerattributetablewidget.cpp
composer/qgscomposerhtmlwidget.cpp
composer/qgscomposerimageexportoptionsdialog.cpp
composer/qgscomposeritemwidget.cpp
composer/qgscomposerlabelwidget.cpp
composer/qgscomposerpicturewidget.cpp
composer/qgscomposermanager.cpp
composer/qgscomposermapgridwidget.cpp
composer/qgscomposermapwidget.cpp
composer/qgscomposerscalebarwidget.cpp
composer/qgscomposershapewidget.cpp
composer/qgscomposerpolygonwidget.cpp
composer/qgscomposerpolylinewidget.cpp
composer/qgscomposertablebackgroundcolorsdialog.cpp
composer/qgscomposerlegendlayersdialog.cpp
composer/qgscomposerlegendwidget.cpp
composer/qgscompositionwidget.cpp
composer/qgsatlascompositionwidget.cpp

layout/qgslayoutaddpagesdialog.cpp
layout/qgslayoutapputils.cpp
layout/qgslayoutatlaswidget.cpp
@@ -383,28 +361,6 @@ SET (QGIS_APP_MOC_HDRS
qgsmapthemes.h
qgshandlebadlayers.h

composer/qgsattributeselectiondialog.h
composer/qgscomposer.h
composer/qgscomposerarrowwidget.h
composer/qgscomposerattributetablewidget.h
composer/qgscomposerhtmlwidget.h
composer/qgscomposerimageexportoptionsdialog.h
composer/qgscomposeritemwidget.h
composer/qgscomposerlabelwidget.h
composer/qgscomposerlegendwidget.h
composer/qgscomposerlegendlayersdialog.h
composer/qgscomposermanager.h
composer/qgscomposermapgridwidget.h
composer/qgscomposermapwidget.h
composer/qgscomposerpicturewidget.h
composer/qgscomposerscalebarwidget.h
composer/qgscomposertablebackgroundcolorsdialog.h
composer/qgscomposershapewidget.h
composer/qgscomposerpolygonwidget.h
composer/qgscomposerpolylinewidget.h
composer/qgscompositionwidget.h
composer/qgsatlascompositionwidget.h

layout/qgslayoutaddpagesdialog.h
layout/qgslayoutappmenuprovider.h
layout/qgslayoutatlaswidget.h
@@ -610,7 +566,6 @@ ENDIF(MSVC)

INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/app
${CMAKE_SOURCE_DIR}/src/app/composer
${CMAKE_SOURCE_DIR}/src/app/layout
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
${CMAKE_SOURCE_DIR}/src/app/gps
@@ -621,9 +576,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/annotations
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/composer
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/composer
${CMAKE_SOURCE_DIR}/src/core/dxf
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
@@ -681,8 +636,8 @@ INCLUDE_DIRECTORIES(
../core
../core/annotations
../core/auth
../core/gps
../core/composer
../core/gps
../core/dxf
../core/geometry
../core/geocms/geonode
@@ -747,7 +702,7 @@ ELSE (ANDROID)
ENDIF (ANDROID)

# Putting IMAGE_RCC_SRCS into qgis_app lib is causing problems when the lib is
# loaded (by plugin for example) in test unit (qgis_composerpicturetest).
# loaded (by plugin for example) in test unit (qgis_layoutpicturetest).
ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS})

TARGET_LINK_LIBRARIES(qgis_app

0 comments on commit b95363c

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