Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Also move labeling gui files to dedicated subdirectory
  • Loading branch information
nyalldawson committed Dec 11, 2019
1 parent a8adb2d commit d3da0e0
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 12 deletions.
1 change: 1 addition & 0 deletions python/CMakeLists.txt
Expand Up @@ -142,6 +142,7 @@ IF (WITH_GUI)
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
${CMAKE_SOURCE_DIR}/src/gui/effects
${CMAKE_SOURCE_DIR}/src/gui/labeling
${CMAKE_SOURCE_DIR}/src/gui/layertree
${CMAKE_SOURCE_DIR}/src/gui/layout
${CMAKE_SOURCE_DIR}/src/gui/locator
Expand Down
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgslabelobstaclesettingswidget.h *
* src/gui/labeling/qgslabelobstaclesettingswidget.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -54,7 +54,7 @@ Returns the obstacle settings defined by the widget.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgslabelobstaclesettingswidget.h *
* src/gui/labeling/qgslabelobstaclesettingswidget.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgslabelsettingswidgetbase.h *
* src/gui/labeling/qgslabelsettingswidgetbase.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -130,7 +130,7 @@ Constructor for QgsLabelSettingsWidgetDialog.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgslabelsettingswidgetbase.h *
* src/gui/labeling/qgslabelsettingswidgetbase.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions python/gui/gui_auto.sip
Expand Up @@ -96,8 +96,6 @@
%Include auto_generated/qgshistogramwidget.sip
%Include auto_generated/qgsidentifymenu.sip
%Include auto_generated/qgskeyvaluewidget.sip
%Include auto_generated/qgslabelobstaclesettingswidget.sip
%Include auto_generated/qgslabelsettingswidgetbase.sip
%Include auto_generated/qgslegendfilterbutton.sip
%Include auto_generated/qgslimitedrandomcolorrampdialog.sip
%Include auto_generated/qgslistwidget.sip
Expand Down Expand Up @@ -261,6 +259,8 @@
%Include auto_generated/effects/qgseffectstackpropertieswidget.sip
%Include auto_generated/effects/qgspainteffectpropertieswidget.sip
%Include auto_generated/effects/qgspainteffectwidget.sip
%Include auto_generated/labeling/qgslabelobstaclesettingswidget.sip
%Include auto_generated/labeling/qgslabelsettingswidgetbase.sip
%Include auto_generated/layertree/qgscustomlayerorderwidget.sip
%Include auto_generated/layertree/qgslayertreeembeddedconfigwidget.sip
%Include auto_generated/layertree/qgslayertreeembeddedwidgetregistry.sip
Expand Down
1 change: 1 addition & 0 deletions src/app/CMakeLists.txt
Expand Up @@ -452,6 +452,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/symbology
${CMAKE_SOURCE_DIR}/src/gui/attributetable
${CMAKE_SOURCE_DIR}/src/gui/auth
${CMAKE_SOURCE_DIR}/src/gui/labeling
${CMAKE_SOURCE_DIR}/src/gui/ogr
${CMAKE_SOURCE_DIR}/src/gui/processing
${CMAKE_SOURCE_DIR}/src/gui/raster
Expand Down
15 changes: 9 additions & 6 deletions src/gui/CMakeLists.txt
Expand Up @@ -159,6 +159,10 @@ SET(QGIS_GUI_SRCS
editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
editorwidgets/qgsvaluerelationwidgetfactory.cpp

labeling/qgslabelinggui.cpp
labeling/qgslabelobstaclesettingswidget.cpp
labeling/qgslabelsettingswidgetbase.cpp

layertree/qgscustomlayerorderwidget.cpp
layertree/qgslayertreeembeddedconfigwidget.cpp
layertree/qgslayertreeembeddedwidgetregistry.cpp
Expand Down Expand Up @@ -314,9 +318,6 @@ SET(QGIS_GUI_SRCS
qgshelp.cpp
qgsidentifymenu.cpp
qgskeyvaluewidget.cpp
qgslabelinggui.cpp
qgslabelobstaclesettingswidget.cpp
qgslabelsettingswidgetbase.cpp
qgslistwidget.cpp
qgslegendfilterbutton.cpp
qgslimitedrandomcolorrampdialog.cpp
Expand Down Expand Up @@ -517,9 +518,6 @@ SET(QGIS_GUI_HDRS
qgshistogramwidget.h
qgsidentifymenu.h
qgskeyvaluewidget.h
qgslabelinggui.h
qgslabelobstaclesettingswidget.h
qgslabelsettingswidgetbase.h
qgslegendfilterbutton.h
qgslimitedrandomcolorrampdialog.h
qgslistwidget.h
Expand Down Expand Up @@ -741,6 +739,10 @@ SET(QGIS_GUI_HDRS
effects/qgspainteffectpropertieswidget.h
effects/qgspainteffectwidget.h

labeling/qgslabelinggui.h
labeling/qgslabelobstaclesettingswidget.h
labeling/qgslabelsettingswidgetbase.h

layertree/qgscustomlayerorderwidget.h
layertree/qgslayertreeembeddedconfigwidget.h
layertree/qgslayertreeembeddedwidgetregistry.h
Expand Down Expand Up @@ -944,6 +946,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
${CMAKE_SOURCE_DIR}/src/gui/effects
${CMAKE_SOURCE_DIR}/src/gui/labeling
${CMAKE_SOURCE_DIR}/src/gui/layertree
${CMAKE_SOURCE_DIR}/src/gui/layout
${CMAKE_SOURCE_DIR}/src/gui/ogr
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions src/ui/CMakeLists.txt
Expand Up @@ -3,6 +3,7 @@ FILE(GLOB QGIS_UIS "${CMAKE_CURRENT_SOURCE_DIR}/*.ui")
FILE(GLOB SYMBOLLAYER_UIS "${CMAKE_CURRENT_SOURCE_DIR}/symbollayer/*.ui")
FILE(GLOB EDITORWIDGET_UIS "${CMAKE_CURRENT_SOURCE_DIR}/editorwidgets/*.ui")
FILE(GLOB PAINTEFFECT_UIS "${CMAKE_CURRENT_SOURCE_DIR}/effects/*.ui")
FILE(GLOB LABELING_UIS "${CMAKE_CURRENT_SOURCE_DIR}/labeling/*.ui")
FILE(GLOB LAYOUT_UIS "${CMAKE_CURRENT_SOURCE_DIR}/layout/*.ui")
FILE(GLOB PROCESSING_UIS "${CMAKE_CURRENT_SOURCE_DIR}/processing/*.ui")
FILE(GLOB AUTH_UIS "${CMAKE_CURRENT_SOURCE_DIR}/auth/*.ui")
Expand All @@ -25,6 +26,7 @@ QT5_WRAP_UI(QGIS_UIS_H
${MESH_UIS}
${_3D_UIS}
${CALLOUT_UIS}
${LABELING_UIS}
)

ADD_CUSTOM_TARGET(ui ALL DEPENDS ${QGIS_UIS_H})
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit d3da0e0

Please sign in to comment.