Cleanup ui folder by moving composer ui files

qgis · Aug 30, 2015 · e583d88 · e583d88
1 parent 440fcc3
commit e583d88
Show file tree

Hide file tree

Showing 21 changed files with 2 additions and 1 deletion.
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -3,8 +3,9 @@ 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 COMPOSER_UIS "${CMAKE_CURRENT_SOURCE_DIR}/composer/*.ui")
 
-QT4_WRAP_UI(QGIS_UIS_H ${QGIS_UIS} ${SYMBOLLAYER_UIS} ${EDITORWIDGET_UIS} ${PAINTEFFECT_UIS})
+QT4_WRAP_UI(QGIS_UIS_H ${QGIS_UIS} ${SYMBOLLAYER_UIS} ${EDITORWIDGET_UIS} ${PAINTEFFECT_UIS} ${COMPOSER_UIS})
 
 ADD_CUSTOM_TARGET(ui ALL DEPENDS ${QGIS_UIS_H})
 
diff --git a/src/ui/qgsatlascompositionwidgetbase.ui → ...composer/qgsatlascompositionwidgetbase.ui b/src/ui/qgsatlascompositionwidgetbase.ui → ...composer/qgsatlascompositionwidgetbase.ui
diff --git a/src/ui/qgsattributeselectiondialogbase.ui → ...mposer/qgsattributeselectiondialogbase.ui b/src/ui/qgsattributeselectiondialogbase.ui → ...mposer/qgsattributeselectiondialogbase.ui
diff --git a/src/ui/qgscomposerarrowwidgetbase.ui → ...ui/composer/qgscomposerarrowwidgetbase.ui b/src/ui/qgscomposerarrowwidgetbase.ui → ...ui/composer/qgscomposerarrowwidgetbase.ui
diff --git a/...ui/qgscomposerattributetablewidgetbase.ui → ...er/qgscomposerattributetablewidgetbase.ui b/...ui/qgscomposerattributetablewidgetbase.ui → ...er/qgscomposerattributetablewidgetbase.ui
diff --git a/src/ui/qgscomposerbase.ui → src/ui/composer/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui → src/ui/composer/qgscomposerbase.ui
diff --git a/src/ui/qgscomposerhtmlwidgetbase.ui → src/ui/composer/qgscomposerhtmlwidgetbase.ui b/src/ui/qgscomposerhtmlwidgetbase.ui → src/ui/composer/qgscomposerhtmlwidgetbase.ui
diff --git a/src/ui/qgscomposeritemwidgetbase.ui → src/ui/composer/qgscomposeritemwidgetbase.ui b/src/ui/qgscomposeritemwidgetbase.ui → src/ui/composer/qgscomposeritemwidgetbase.ui
diff --git a/src/ui/qgscomposerlabelwidgetbase.ui → ...ui/composer/qgscomposerlabelwidgetbase.ui b/src/ui/qgscomposerlabelwidgetbase.ui → ...ui/composer/qgscomposerlabelwidgetbase.ui
diff --git a/src/ui/qgscomposerlegenditemdialogbase.ui → ...mposer/qgscomposerlegenditemdialogbase.ui b/src/ui/qgscomposerlegenditemdialogbase.ui → ...mposer/qgscomposerlegenditemdialogbase.ui
diff --git a/src/ui/qgscomposerlegendlayersdialogbase.ui → ...oser/qgscomposerlegendlayersdialogbase.ui b/src/ui/qgscomposerlegendlayersdialogbase.ui → ...oser/qgscomposerlegendlayersdialogbase.ui
diff --git a/src/ui/qgscomposerlegendwidgetbase.ui → ...i/composer/qgscomposerlegendwidgetbase.ui b/src/ui/qgscomposerlegendwidgetbase.ui → ...i/composer/qgscomposerlegendwidgetbase.ui
diff --git a/src/ui/qgscomposermanagerbase.ui → src/ui/composer/qgscomposermanagerbase.ui b/src/ui/qgscomposermanagerbase.ui → src/ui/composer/qgscomposermanagerbase.ui
diff --git a/src/ui/qgscomposermapwidgetbase.ui → src/ui/composer/qgscomposermapwidgetbase.ui b/src/ui/qgscomposermapwidgetbase.ui → src/ui/composer/qgscomposermapwidgetbase.ui
diff --git a/src/ui/qgscomposerpicturewidgetbase.ui → .../composer/qgscomposerpicturewidgetbase.ui b/src/ui/qgscomposerpicturewidgetbase.ui → .../composer/qgscomposerpicturewidgetbase.ui
diff --git a/src/ui/qgscomposerscalebarwidgetbase.ui → ...composer/qgscomposerscalebarwidgetbase.ui b/src/ui/qgscomposerscalebarwidgetbase.ui → ...composer/qgscomposerscalebarwidgetbase.ui
diff --git a/src/ui/qgscomposershapewidgetbase.ui → ...ui/composer/qgscomposershapewidgetbase.ui b/src/ui/qgscomposershapewidgetbase.ui → ...ui/composer/qgscomposershapewidgetbase.ui
diff --git a/src/ui/qgscomposertablewidgetbase.ui → ...ui/composer/qgscomposertablewidgetbase.ui b/src/ui/qgscomposertablewidgetbase.ui → ...ui/composer/qgscomposertablewidgetbase.ui
diff --git a/src/ui/qgscomposervectorlegendbase.ui → ...i/composer/qgscomposervectorlegendbase.ui b/src/ui/qgscomposervectorlegendbase.ui → ...i/composer/qgscomposervectorlegendbase.ui
diff --git a/src/ui/qgscompositionbase.ui → src/ui/composer/qgscompositionbase.ui b/src/ui/qgscompositionbase.ui → src/ui/composer/qgscompositionbase.ui
diff --git a/src/ui/qgscompositionwidgetbase.ui → src/ui/composer/qgscompositionwidgetbase.ui b/src/ui/qgscompositionwidgetbase.ui → src/ui/composer/qgscompositionwidgetbase.ui