diff --git a/ChangeLog b/ChangeLog index fc9dcd59ba7..7f843216071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ /* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */ ------------------------------------------------------------------------------ Version 0.8 'Joesephine' .... development version +2005-11-30 [timlinux] 0.7.9.4 +** Refactored all src/*.ui into src/ui/ dir for cleaner separation of ui's 2005-12-29 [gsherman] 0.7.9.3 ** Merged Ui branch into HEAD 2005-11-10 [timlinux] 0.7.9.2 diff --git a/configure.in b/configure.in index b97b64582d1..7c798696969 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl --------------------------------------------------------------------------- MAJOR_VERSION=0 MINOR_VERSION=7 MICRO_VERSION=9 -EXTRA_VERSION=3 +EXTRA_VERSION=4 if test $EXTRA_VERSION -eq 0; then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION} else @@ -435,6 +435,7 @@ AC_CONFIG_FILES([ Makefile src/Makefile src/legend/Makefile + src/ui/Makefile src/raster/Makefile src/svg/Makefile src/svg/biology/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a310cc1f30a..f1f1630a2e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ if HAVE_QTMAC MAC = mac endif -SUBDIRS = legend svg images themes resources raster $(MAC) +SUBDIRS = ui legend svg images themes resources raster $(MAC) if !HAVE_QTMAC PREFIX=-DPREFIX=\"$(prefix)\" @@ -23,21 +23,6 @@ WIDGETPATH=../widgets %.moc.cpp: %.h $(MOC) -o $@ $< -ui_%.h: %.ui - $(UIC) -o $@ $< - -## %.moc.uic.cpp: %.uic.h -## $(MOC) -o $@ $< - -## %.uic.h: %.ui -## $(UIC) -o $@ $< - -## if !NO_UIC_IMPLEMENTATIONS -## %.uic.cpp: %.ui -## $(UIC) -o $@ -impl $*.uic.h $< -## endif - - ## main app if HAVE_QTMAC ## Qt/Mac binary must be in MacOS directory within bundle, not in bin subdirectory @@ -121,169 +106,7 @@ qgisHEADERS = \ qgslayerprojectionselector.h \ $(WIDGETPATH)/projectionselector/qgsprojectionselector.h - -## qt designer files for all the GUI stuff - -qgis_UIC = \ - qgsabout.ui \ - qgsaddattrdialogbase.ui \ - qgsadvancedattrsearchbase.ui \ - qgsattributedialogbase.ui \ - qgsattributeactiondialogbase.ui \ - qgsattributetablebase.ui \ - qgsbookmarksbase.ui \ - qgscontcoldialogbase.ui \ - qgsdelattrdialogbase.ui \ - qgsdlgvectorlayerpropertiesbase.ui \ - qgsgeomtypedialogbase.ui \ - qgsgrasydialogbase.ui \ - qgshelpviewerbase.ui \ - qgsidentifyresultsbase.ui \ - qgslabeldialogbase.ui \ - qgslinestyledialogbase.ui \ - qgsludialogbase.ui \ - qgsmapserverexportbase.ui \ - qgsmarkerdialogbase.ui \ - qgsmessageviewer.ui \ - qgsmeasurebase.ui \ - qgsnewhttpconnectionbase.ui \ - qgsoptionsbase.ui \ - qgspastetransformationsbase.ui \ - qgspatterndialogbase.ui \ - qgspluginmanagerbase.ui \ - qgsprojectpropertiesbase.ui \ - qgsrasterlayerpropertiesbase.ui \ - qgsserversourceselectbase.ui \ - qgssisydialogbase.ui \ - qgsuvaldialogbase.ui \ - qgslayerprojectionselectorbase.ui \ - qgscustomprojectiondialogbase.ui \ - qgscomposerbase.ui \ - qgscompositionbase.ui \ - qgsgeomtypedialogbase.ui \ - qgspastetransformationsbase.ui \ - qgscomposermapbase.ui \ - qgscomposerlabelbase.ui \ - qgscomposerpicturebase.ui \ - qgscomposerscalebarbase.ui \ - qgscomposervectorlegendbase.ui \ - qgscontcoldialogbase.ui \ - qgsattributedialogbase.ui \ - qgsfillstylewidgetbase.ui \ - qgsgrasydialogbase.ui \ - qgslabeldialogbase.ui \ - qgslinestylewidgetbase.ui \ - qgsmeasurebase.ui \ - qgspointstylewidgetbase.ui \ - qgsidentifyresultsbase.ui \ - qgsuvaldialogbase.ui \ - qgsattributetabledisplaybase.ui \ - qgsaddattrdialogbase.ui \ - qgsadvancedattrsearch.ui \ - qgsattributeactiondialogbase.ui \ - qgsdelattrdialogbase.ui \ - qgspgquerybuilderbase.ui \ - qgsludialogbase.ui \ - qgspatterndialogbase.ui \ - qgslinestyledialogbase.ui \ - qgsmarkerdialogbase.ui \ - qgsnewhttpconnectionbase.ui \ - qgsnewconnectionbase.ui \ - $(WIDGETPATH)/projectionselector/qgsprojectionselectorbase.ui - -## all the ui files generate a corresponding header file -## qgis_UIHEADERS = $(qgis_UIC:.ui=.uic.h) -qgis_UIHEADERS = ui_qgisappbase.h \ - ui_qgsabout.h \ - ui_qgsaddattrdialogbase.h \ - ui_qgsadvancedattrsearchbase.h \ - ui_qgsattributedialogbase.h \ - ui_qgsattributeactiondialogbase.h \ - ui_qgsattributetablebase.h \ - ui_qgsbookmarksbase.h \ - ui_qgscontcoldialogbase.h \ - ui_qgsdelattrdialogbase.h \ - ui_qgsdlgvectorlayerpropertiesbase.h \ - ui_qgsgeomtypedialogbase.h \ - ui_qgsgrasydialogbase.h \ - ui_qgshelpviewerbase.h \ - ui_qgsidentifyresultsbase.h \ - ui_qgslabeldialogbase.h \ - ui_qgslinestyledialogbase.h \ - ui_qgsludialogbase.h \ - ui_qgsmapserverexportbase.h \ - ui_qgsmarkerdialogbase.h \ - ui_qgsmessageviewer.h \ - ui_qgsmeasurebase.h \ - ui_qgsnewhttpconnectionbase.h \ - ui_qgsoptionsbase.h \ - ui_qgspastetransformationsbase.h \ - ui_qgspatterndialogbase.h \ - ui_qgspluginmanagerbase.h \ - ui_qgsprojectpropertiesbase.h \ - ui_qgsrasterlayerpropertiesbase.h \ - ui_qgsserversourceselectbase.h \ - ui_qgssisydialogbase.h \ - ui_qgsuvaldialogbase.h \ - ui_qgslayerprojectionselectorbase.h \ - ui_qgscustomprojectiondialogbase.h \ - ui_qgscomposerbase.h \ - ui_qgscompositionbase.h \ - ui_qgsgeomtypedialogbase.h \ - ui_qgspastetransformationsbase.h \ - ui_qgscomposermapbase.h \ - ui_qgscomposerlabelbase.h \ - ui_qgscomposerpicturebase.h \ - ui_qgscomposerscalebarbase.h \ - ui_qgscomposervectorlegendbase.h \ - ui_qgscontcoldialogbase.h \ - ui_qgsattributedialogbase.h \ - ui_qgsfillstylewidgetbase.h \ - ui_qgsgrasydialogbase.h \ - ui_qgslabeldialogbase.h \ - ui_qgslinestylewidgetbase.h \ - ui_qgsmeasurebase.h \ - ui_qgspointstylewidgetbase.h \ - ui_qgsidentifyresultsbase.h \ - ui_qgsaddattrdialogbase.h \ - ui_qgsadvancedattrsearchbase.h \ - ui_qgsattributeactiondialogbase.h \ - ui_qgsdelattrdialogbase.h \ - ui_qgspgquerybuilderbase.h \ - ui_qgsludialogbase.h \ - ui_qgspatterndialogbase.h \ - ui_qgslinestyledialogbase.h \ - ui_qgsmarkerdialogbase.h \ - ui_qgsuvaldialogbase.h \ - ui_qgsnewhttpconnectionbase.h \ - ui_qgsnewconnectionbase.h \ - $(WIDGETPATH)/projectionselector/ui_qgsprojectionselectorbase.h - -## if !NO_UIC_IMPLEMENTATIONS -## similarly all the ui files generate a corresponding implementation file -## qgis_UISOURCES = $(qgis_UIC:.ui=.uic.cpp) -## endif - -## these are optional ancillary user-defined qtdesigner-based headers -#qgis_UIH = \ -# qgsabout.ui.h \ -# qgsattributetablebase.ui.h \ -# qgshelpviewerbase.ui.h \ -# qgsmapserverexportbase.ui.h \ -# qgsmessageviewer.ui.h \ -# qgsoptionsbase.ui.h \ -# qgsrasterlayerpropertiesbase.ui.h \ -# qgsserversourceselectbase.ui.h \ -# qgslabeldialogbase.ui.h \ -# qgslayerprojectionselectorbase.ui.h \ -# qgsprojectpropertiesbase.ui.h - -## these generated files need MOC files, too -#qgis_UIMOC = $(qgis_UIC:.ui=.moc.uic.cpp) - - ## non-uic files generated from MOC - qgis_MOC = \ qgisinterface.moc.cpp \ qgsabout.moc.cpp \ @@ -396,10 +219,6 @@ postgresSOURCES = qgsdbsourceselect.cpp \ qgsnewconnection.cpp \ qgspgquerybuilder.cpp -postgresUIC = qgsdbsourceselectbase.ui \ - qgsnewconnectionbase.ui \ - qgspgquerybuilderbase.ui - postgresUIH = postgresLIBHEADERS = qgspgutil.h postgresLIBSOURCES = qgspgutil.cpp @@ -408,11 +227,6 @@ postgresUIHEADERS = ui_qgsdbsourceselectbase.h \ ui_qgsnewconnectionbase.h \ ui_qgspgquerybuilderbase.h if HAVE_POSTGRESQL -## postgresUIHEADERS = $(postgresUIC:.ui=.uic.h) -## if !NO_UIC_IMPLEMENTATIONS -## postgresUISOURCES = $(postgresUIC:.ui=.uic.cpp) -## endif -## postgresUIMOC = $(postgresUIC:.ui=.moc.uic.cpp) postgresMOC = $(postgresHEADERS:.h=.moc.cpp) @@ -426,8 +240,8 @@ nodist_qgis_SOURCES = $(qgis_MOC) \ ## BUILT_SOURCES = $(qgis_MOC) $(qgis_UIMOC) $(qgis_UIHEADERS) $(qgis_UISOURCES) $(qgis_YACC) \ -BUILT_SOURCES = $(qgis_MOC) $(qgis_UIHEADERS) $(qgis_YACC) \ - $(postgresMOC) $(postgresUIMOC) $(postgresUIHEADERS) $(postgresUISOURCES) +BUILT_SOURCES = $(qgis_MOC) $(qgis_YACC) \ + $(postgresMOC) $(postgresUIMOC) qgis_LDADD = raster/libqgsraster.la legend/libqgis_legend.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) $(PYTHON_LIB) -lproj -lsqlite3 libqgis.la @@ -436,7 +250,7 @@ qgis_LDFLAGS = -framework ApplicationServices else qgis_LDFLAGS = -rdynamic endif -qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../widgets/projectionselector/ -I./legend/ -I./raster/ +qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../widgets/projectionselector/ -I./legend/ -I./raster/ -I./ui/ libqgisHEADERS = \ @@ -498,21 +312,6 @@ libqgisHEADERS = \ qgsvectorlayer.h \ omggdal.h -## qt designer files for all the GUI stuff - -libqgis_la_UIC = \ - qgisappbase.ui \ - qgscomposerbase.ui \ - qgscomposerlabelbase.ui \ - qgscomposermapbase.ui \ - qgscomposerpicturebase.ui \ - qgscomposerscalebarbase.ui \ - qgscomposervectorlegendbase.ui \ - qgscompositionbase.ui \ - qgscustomprojectiondialogbase.ui \ - qgsfillstylewidgetbase.ui \ - qgslinestylewidgetbase.ui \ - qgspointstylewidgetbase.ui ## all the ui files generate a corresponding header file ## libqgis_la_UIHEADERS = $(libqgis_la_UIC:.ui=.uic.h) @@ -630,7 +429,7 @@ BUILT_SOURCES += $(libqgis_la_MOC) $(libqgis_la_UIHEADERS) libqgis_la_LIBADD = raster/libqgsraster.la legend/libqgis_legend.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3 libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION) -libqgis_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../widgets/projectionselector/ -I./legend/ -I./raster/ +libqgis_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../widgets/projectionselector/ -I./legend/ -I./raster/ -I./ui/ ## for installing headers in $(includedir)/qgis pkginclude_HEADERS = $(qgisHEADERS) \ diff --git a/src/qgisappbase.ui b/src/ui/qgisappbase.ui similarity index 100% rename from src/qgisappbase.ui rename to src/ui/qgisappbase.ui diff --git a/src/qgsabout.ui b/src/ui/qgsabout.ui similarity index 100% rename from src/qgsabout.ui rename to src/ui/qgsabout.ui diff --git a/src/qgsaddattrdialogbase.ui b/src/ui/qgsaddattrdialogbase.ui similarity index 100% rename from src/qgsaddattrdialogbase.ui rename to src/ui/qgsaddattrdialogbase.ui diff --git a/src/qgsadvancedattrsearchbase.ui b/src/ui/qgsadvancedattrsearchbase.ui similarity index 100% rename from src/qgsadvancedattrsearchbase.ui rename to src/ui/qgsadvancedattrsearchbase.ui diff --git a/src/qgsattributeactiondialogbase.ui b/src/ui/qgsattributeactiondialogbase.ui similarity index 100% rename from src/qgsattributeactiondialogbase.ui rename to src/ui/qgsattributeactiondialogbase.ui diff --git a/src/qgsattributedialogbase.ui b/src/ui/qgsattributedialogbase.ui similarity index 100% rename from src/qgsattributedialogbase.ui rename to src/ui/qgsattributedialogbase.ui diff --git a/src/qgsattributetablebase.ui b/src/ui/qgsattributetablebase.ui similarity index 100% rename from src/qgsattributetablebase.ui rename to src/ui/qgsattributetablebase.ui diff --git a/src/qgsbookmarksbase.ui b/src/ui/qgsbookmarksbase.ui similarity index 100% rename from src/qgsbookmarksbase.ui rename to src/ui/qgsbookmarksbase.ui diff --git a/src/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui similarity index 100% rename from src/qgscomposerbase.ui rename to src/ui/qgscomposerbase.ui diff --git a/src/qgscomposerlabelbase.ui b/src/ui/qgscomposerlabelbase.ui similarity index 100% rename from src/qgscomposerlabelbase.ui rename to src/ui/qgscomposerlabelbase.ui diff --git a/src/qgscomposermapbase.ui b/src/ui/qgscomposermapbase.ui similarity index 100% rename from src/qgscomposermapbase.ui rename to src/ui/qgscomposermapbase.ui diff --git a/src/qgscomposerpicturebase.ui b/src/ui/qgscomposerpicturebase.ui similarity index 100% rename from src/qgscomposerpicturebase.ui rename to src/ui/qgscomposerpicturebase.ui diff --git a/src/qgscomposerscalebarbase.ui b/src/ui/qgscomposerscalebarbase.ui similarity index 100% rename from src/qgscomposerscalebarbase.ui rename to src/ui/qgscomposerscalebarbase.ui diff --git a/src/qgscomposervectorlegendbase.ui b/src/ui/qgscomposervectorlegendbase.ui similarity index 100% rename from src/qgscomposervectorlegendbase.ui rename to src/ui/qgscomposervectorlegendbase.ui diff --git a/src/qgscompositionbase.ui b/src/ui/qgscompositionbase.ui similarity index 100% rename from src/qgscompositionbase.ui rename to src/ui/qgscompositionbase.ui diff --git a/src/qgscontcoldialogbase.ui b/src/ui/qgscontcoldialogbase.ui similarity index 100% rename from src/qgscontcoldialogbase.ui rename to src/ui/qgscontcoldialogbase.ui diff --git a/src/qgscustomprojectiondialogbase.ui b/src/ui/qgscustomprojectiondialogbase.ui similarity index 100% rename from src/qgscustomprojectiondialogbase.ui rename to src/ui/qgscustomprojectiondialogbase.ui diff --git a/src/qgsdbsourceselectbase.ui b/src/ui/qgsdbsourceselectbase.ui similarity index 100% rename from src/qgsdbsourceselectbase.ui rename to src/ui/qgsdbsourceselectbase.ui diff --git a/src/qgsdelattrdialogbase.ui b/src/ui/qgsdelattrdialogbase.ui similarity index 100% rename from src/qgsdelattrdialogbase.ui rename to src/ui/qgsdelattrdialogbase.ui diff --git a/src/qgsdlgvectorlayerpropertiesbase.ui b/src/ui/qgsdlgvectorlayerpropertiesbase.ui similarity index 100% rename from src/qgsdlgvectorlayerpropertiesbase.ui rename to src/ui/qgsdlgvectorlayerpropertiesbase.ui diff --git a/src/qgsfillstylewidgetbase.ui b/src/ui/qgsfillstylewidgetbase.ui similarity index 100% rename from src/qgsfillstylewidgetbase.ui rename to src/ui/qgsfillstylewidgetbase.ui diff --git a/src/qgsgeomtypedialogbase.ui b/src/ui/qgsgeomtypedialogbase.ui similarity index 100% rename from src/qgsgeomtypedialogbase.ui rename to src/ui/qgsgeomtypedialogbase.ui diff --git a/src/qgsgrasydialogbase.ui b/src/ui/qgsgrasydialogbase.ui similarity index 100% rename from src/qgsgrasydialogbase.ui rename to src/ui/qgsgrasydialogbase.ui diff --git a/src/qgshelpviewerbase.ui b/src/ui/qgshelpviewerbase.ui similarity index 100% rename from src/qgshelpviewerbase.ui rename to src/ui/qgshelpviewerbase.ui diff --git a/src/qgsidentifyresultsbase.ui b/src/ui/qgsidentifyresultsbase.ui similarity index 100% rename from src/qgsidentifyresultsbase.ui rename to src/ui/qgsidentifyresultsbase.ui diff --git a/src/qgslabeldialogbase.ui b/src/ui/qgslabeldialogbase.ui similarity index 100% rename from src/qgslabeldialogbase.ui rename to src/ui/qgslabeldialogbase.ui diff --git a/src/qgslayerprojectionselectorbase.ui b/src/ui/qgslayerprojectionselectorbase.ui similarity index 100% rename from src/qgslayerprojectionselectorbase.ui rename to src/ui/qgslayerprojectionselectorbase.ui diff --git a/src/qgslinestyledialogbase.ui b/src/ui/qgslinestyledialogbase.ui similarity index 100% rename from src/qgslinestyledialogbase.ui rename to src/ui/qgslinestyledialogbase.ui diff --git a/src/qgslinestylewidgetbase.ui b/src/ui/qgslinestylewidgetbase.ui similarity index 100% rename from src/qgslinestylewidgetbase.ui rename to src/ui/qgslinestylewidgetbase.ui diff --git a/src/qgsludialogbase.ui b/src/ui/qgsludialogbase.ui similarity index 100% rename from src/qgsludialogbase.ui rename to src/ui/qgsludialogbase.ui diff --git a/src/qgsmapserverexportbase.ui b/src/ui/qgsmapserverexportbase.ui similarity index 100% rename from src/qgsmapserverexportbase.ui rename to src/ui/qgsmapserverexportbase.ui diff --git a/src/qgsmarkerdialogbase.ui b/src/ui/qgsmarkerdialogbase.ui similarity index 100% rename from src/qgsmarkerdialogbase.ui rename to src/ui/qgsmarkerdialogbase.ui diff --git a/src/qgsmeasurebase.ui b/src/ui/qgsmeasurebase.ui similarity index 100% rename from src/qgsmeasurebase.ui rename to src/ui/qgsmeasurebase.ui diff --git a/src/qgsmessageviewer.ui b/src/ui/qgsmessageviewer.ui similarity index 100% rename from src/qgsmessageviewer.ui rename to src/ui/qgsmessageviewer.ui diff --git a/src/qgsnewconnectionbase.ui b/src/ui/qgsnewconnectionbase.ui similarity index 100% rename from src/qgsnewconnectionbase.ui rename to src/ui/qgsnewconnectionbase.ui diff --git a/src/qgsnewhttpconnectionbase.ui b/src/ui/qgsnewhttpconnectionbase.ui similarity index 100% rename from src/qgsnewhttpconnectionbase.ui rename to src/ui/qgsnewhttpconnectionbase.ui diff --git a/src/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui similarity index 100% rename from src/qgsoptionsbase.ui rename to src/ui/qgsoptionsbase.ui diff --git a/src/qgspastetransformationsbase.ui b/src/ui/qgspastetransformationsbase.ui similarity index 100% rename from src/qgspastetransformationsbase.ui rename to src/ui/qgspastetransformationsbase.ui diff --git a/src/qgspatterndialogbase.ui b/src/ui/qgspatterndialogbase.ui similarity index 100% rename from src/qgspatterndialogbase.ui rename to src/ui/qgspatterndialogbase.ui diff --git a/src/qgspgquerybuilderbase.ui b/src/ui/qgspgquerybuilderbase.ui similarity index 100% rename from src/qgspgquerybuilderbase.ui rename to src/ui/qgspgquerybuilderbase.ui diff --git a/src/qgspluginmanagerbase.ui b/src/ui/qgspluginmanagerbase.ui similarity index 100% rename from src/qgspluginmanagerbase.ui rename to src/ui/qgspluginmanagerbase.ui diff --git a/src/qgspointstylewidgetbase.ui b/src/ui/qgspointstylewidgetbase.ui similarity index 100% rename from src/qgspointstylewidgetbase.ui rename to src/ui/qgspointstylewidgetbase.ui diff --git a/src/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui similarity index 100% rename from src/qgsprojectpropertiesbase.ui rename to src/ui/qgsprojectpropertiesbase.ui diff --git a/src/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui similarity index 100% rename from src/qgsrasterlayerpropertiesbase.ui rename to src/ui/qgsrasterlayerpropertiesbase.ui diff --git a/src/qgsserversourceselectbase.ui b/src/ui/qgsserversourceselectbase.ui similarity index 100% rename from src/qgsserversourceselectbase.ui rename to src/ui/qgsserversourceselectbase.ui diff --git a/src/qgssisydialogbase.ui b/src/ui/qgssisydialogbase.ui similarity index 100% rename from src/qgssisydialogbase.ui rename to src/ui/qgssisydialogbase.ui diff --git a/src/qgsuvaldialogbase.ui b/src/ui/qgsuvaldialogbase.ui similarity index 100% rename from src/qgsuvaldialogbase.ui rename to src/ui/qgsuvaldialogbase.ui diff --git a/src/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui similarity index 100% rename from src/qgsvectorlayerpropertiesbase.ui rename to src/ui/qgsvectorlayerpropertiesbase.ui diff --git a/src/qgsvectorsymbologywidgetbase.ui b/src/ui/qgsvectorsymbologywidgetbase.ui similarity index 100% rename from src/qgsvectorsymbologywidgetbase.ui rename to src/ui/qgsvectorsymbologywidgetbase.ui