diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | basctl/Module_basctl.mk | 2 | ||||
| -rw-r--r-- | basctl/UIConfig_basicide.mk (renamed from basctl/UI_basicide.mk) | 4 | ||||
| -rw-r--r-- | chart2/Module_chart2.mk | 2 | ||||
| -rw-r--r-- | chart2/UIConfig_chart2.mk (renamed from chart2/UI_chart2.mk) | 4 | ||||
| -rw-r--r-- | cui/Module_cui.mk | 2 | ||||
| -rw-r--r-- | cui/UIConfig_cui.mk (renamed from cui/UI_cui.mk) | 4 | ||||
| -rw-r--r-- | dbaccess/Module_dbaccess.mk | 2 | ||||
| -rw-r--r-- | dbaccess/UIConfig_dbaccess.mk (renamed from dbaccess/UI_dbaccess.mk) | 4 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 2 | ||||
| -rw-r--r-- | desktop/UIConfig_deployment.mk (renamed from desktop/UI_deployment.mk) | 4 | ||||
| -rw-r--r-- | filter/Module_filter.mk | 2 | ||||
| -rw-r--r-- | filter/UIConfig_xsltdlg.mk (renamed from filter/UI_xsltdlg.mk) | 4 | ||||
| -rw-r--r-- | padmin/Module_padmin.mk | 2 | ||||
| -rw-r--r-- | padmin/UIConfig_spa.mk (renamed from padmin/UI_spa.mk) | 4 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 2 | ||||
| -rw-r--r-- | sc/UIConfig_scalc.mk (renamed from sc/UI_scalc.mk) | 4 | ||||
| -rw-r--r-- | sd/Module_sd.mk | 4 | ||||
| -rw-r--r-- | sd/UIConfig_sdraw.mk (renamed from sd/UI_sdraw.mk) | 4 | ||||
| -rw-r--r-- | sd/UIConfig_simpress.mk (renamed from sd/UI_simpress.mk) | 4 | ||||
| -rw-r--r-- | sfx2/Module_sfx2.mk | 2 | ||||
| -rw-r--r-- | sfx2/UIConfig_sfx.mk (renamed from sfx2/UI_sfx.mk) | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Postprocess.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/UIConfig.mk (renamed from solenv/gbuild/UI.mk) | 113 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 | ||||
| -rw-r--r-- | starmath/Module_starmath.mk | 2 | ||||
| -rw-r--r-- | starmath/UIConfig_smath.mk (renamed from starmath/UI_smath.mk) | 4 | ||||
| -rw-r--r-- | svtools/Module_svtools.mk | 2 | ||||
| -rw-r--r-- | svtools/UIConfig_svt.mk (renamed from svtools/UI_svt.mk) | 4 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 2 | ||||
| -rw-r--r-- | svx/UIConfig_svx.mk (renamed from svx/UI_svx.mk) | 4 | ||||
| -rw-r--r-- | sw/Module_sw.mk | 2 | ||||
| -rw-r--r-- | sw/UIConfig_swriter.mk (renamed from sw/UI_swriter.mk) | 4 | ||||
| -rw-r--r-- | tubes/Module_tubes.mk | 2 | ||||
| -rw-r--r-- | tubes/UIConfig_tubes.mk (renamed from tubes/UI_tubes.mk) | 4 | ||||
| -rw-r--r-- | uui/Module_uui.mk | 2 | ||||
| -rw-r--r-- | uui/UIConfig_uui.mk (renamed from uui/UI_uui.mk) | 4 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/UIConfig_vcl.mk (renamed from vcl/UI_vcl.mk) | 4 | ||||
| -rw-r--r-- | xmlsecurity/Module_xmlsecurity.mk | 2 | ||||
| -rw-r--r-- | xmlsecurity/UIConfig_xmlsec.mk (renamed from xmlsecurity/UI_xmlsec.mk) | 4 |
42 files changed, 120 insertions, 117 deletions
diff --git a/Makefile.in b/Makefile.in index fd4cba6bd2a8..56b36320fdd8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -120,7 +120,7 @@ gbuild_TARGETS := AllLangHelp \ Pyuno \ Rdb \ StaticLibrary \ - UI \ + UIConfig \ UnoApi \ UnoApiMerge \ UnpackedTarball \ diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 3542e2b461aa..ddb86ab445a9 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -39,7 +39,7 @@ endif $(eval $(call gb_Module_add_targets,basctl,\ Package_uiconfig \ - UI_basicide \ + UIConfig_basicide \ )) # vim: set noet sw=4 ts=4: diff --git a/basctl/UI_basicide.mk b/basctl/UIConfig_basicide.mk index a808d92155d8..66dfb833e6a8 100644 --- a/basctl/UI_basicide.mk +++ b/basctl/UIConfig_basicide.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,modules/BasicIDE)) +$(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE)) -$(eval $(call gb_UI_add_uifiles,modules/BasicIDE,\ +$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\ basctl/uiconfig/basicide/ui/basicmacrodialog \ )) diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index 03fa54b3cc39..e8b8567f8cf7 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,chart2,\ Library_chartcontroller \ Library_chartcore \ Package_uiconfig \ - UI_chart2 \ + UIConfig_chart2 \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\ diff --git a/chart2/UI_chart2.mk b/chart2/UIConfig_chart2.mk index e75f209b4636..4c19d79f87c8 100644 --- a/chart2/UI_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,modules/schart)) +$(eval $(call gb_UIConfig_UIConfig,modules/schart)) -$(eval $(call gb_UI_add_uifiles,modules/schart,\ +$(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ chart2/uiconfig/ui/smoothlinesdlg \ )) diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk index 895013eb2f8b..12b3beef709e 100644 --- a/cui/Module_cui.mk +++ b/cui/Module_cui.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,cui)) $(eval $(call gb_Module_add_targets,cui,\ AllLangResTarget_cui \ Library_cui \ - UI_cui \ + UIConfig_cui \ )) # vim: set noet sw=4 ts=4: diff --git a/cui/UI_cui.mk b/cui/UIConfig_cui.mk index c5cf568ede56..3fbdb234c331 100644 --- a/cui/UI_cui.mk +++ b/cui/UIConfig_cui.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,cui)) +$(eval $(call gb_UIConfig_UIConfig,cui)) -$(eval $(call gb_UI_add_uifiles,cui,\ +$(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/aboutdialog \ cui/uiconfig/ui/asiantypography \ cui/uiconfig/ui/backgroundpage \ diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index 0e5fe133ad2c..598ec4226f9d 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\ Library_sdbt \ Package_inc \ Package_uiconfig \ - UI_dbaccess \ + UIConfig_dbaccess \ )) $(eval $(call gb_Module_add_check_targets,dbaccess,\ diff --git a/dbaccess/UI_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk index 3468a40f03fa..eb979729ca3f 100644 --- a/dbaccess/UI_dbaccess.mk +++ b/dbaccess/UIConfig_dbaccess.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,dbaccess)) +$(eval $(call gb_UIConfig_UIConfig,dbaccess)) -$(eval $(call gb_UI_add_uifiles,dbaccess, \ +$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \ dbaccess/uiconfig/ui/querypropertiesdialog \ dbaccess/uiconfig/ui/generalpagedialog \ dbaccess/uiconfig/ui/generalpagewizard \ diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 73bd2291b8ad..a81460415d94 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ Library_sofficeapp \ Library_spl \ Package_intro \ - UI_deployment \ + UIConfig_deployment \ Zip_brand \ Zip_brand_dev \ )) diff --git a/desktop/UI_deployment.mk b/desktop/UIConfig_deployment.mk index cf680891a625..f23136b3968f 100644 --- a/desktop/UI_deployment.mk +++ b/desktop/UIConfig_deployment.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,desktop)) +$(eval $(call gb_UIConfig_UIConfig,desktop)) -$(eval $(call gb_UI_add_uifiles,desktop,\ +$(eval $(call gb_UIConfig_add_uifiles,desktop,\ desktop/uiconfig/ui/cmdlinehelp \ desktop/uiconfig/ui/extensionmanager \ )) diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index b13407c67917..4f241d75e9b2 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Module_add_targets,filter,\ Package_inc \ Package_docbook \ Package_xslt \ - UI_xsltdlg \ + UIConfig_xsltdlg \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/filter/UI_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk index 618678977310..0a9294d6d4af 100644 --- a/filter/UI_xsltdlg.mk +++ b/filter/UIConfig_xsltdlg.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,filter)) +$(eval $(call gb_UIConfig_UIConfig,filter)) -$(eval $(call gb_UI_add_uifiles,filter,\ +$(eval $(call gb_UIConfig_add_uifiles,filter,\ filter/uiconfig/ui/testxmlfilter \ filter/uiconfig/ui/xmlfiltersettings \ )) diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk index c8d024d00d88..9407b9794dfb 100644 --- a/padmin/Module_padmin.mk +++ b/padmin/Module_padmin.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,padmin,\ Library_spa \ AllLangResTarget_spa \ Package_inc \ - UI_spa \ + UIConfig_spa \ )) endif diff --git a/padmin/UI_spa.mk b/padmin/UIConfig_spa.mk index 6b1e011a4111..565f0cc57536 100644 --- a/padmin/UI_spa.mk +++ b/padmin/UIConfig_spa.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,spa)) +$(eval $(call gb_UIConfig_UIConfig,spa)) -$(eval $(call gb_UI_add_uifiles,spa,\ +$(eval $(call gb_UIConfig_add_uifiles,spa,\ padmin/uiconfig/ui/printerdevicepage \ padmin/uiconfig/ui/printerpaperpage \ padmin/uiconfig/ui/printerpropertiesdialog \ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 4a4fc4192b85..2d8231f5a2bd 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,sc,\ Library_scfilt \ Library_scui \ Package_uiconfig \ - UI_scalc \ + UIConfig_scalc \ )) ifneq ($(DISABLE_SCRIPTING),TRUE) diff --git a/sc/UI_scalc.mk b/sc/UIConfig_scalc.mk index f7c13f09f7dd..e6b055f6f29b 100644 --- a/sc/UI_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,modules/scalc)) +$(eval $(call gb_UIConfig_UIConfig,modules/scalc)) -$(eval $(call gb_UI_add_uifiles,modules/scalc,\ +$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/cellprotectionpage \ sc/uiconfig/scalc/ui/definename \ sc/uiconfig/scalc/ui/deletecontents \ diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 163e6ed4c3e7..722bb1363247 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -38,8 +38,8 @@ $(eval $(call gb_Module_add_targets,sd,\ Package_uiconfig \ Package_web \ Package_xml \ - UI_sdraw \ - UI_simpress \ + UIConfig_sdraw \ + UIConfig_simpress \ )) ifneq ($(OS),DRAGONFLY) diff --git a/sd/UI_sdraw.mk b/sd/UIConfig_sdraw.mk index c557e6683719..700020252481 100644 --- a/sd/UI_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,modules/sdraw)) +$(eval $(call gb_UIConfig_UIConfig,modules/sdraw)) -$(eval $(call gb_UI_add_uifiles,modules/sdraw,\ +$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ sd/uiconfig/sdraw/ui/printeroptions \ )) diff --git a/sd/UI_simpress.mk b/sd/UIConfig_simpress.mk index d6cf6e08c1bc..00f28498e4ae 100644 --- a/sd/UI_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,modules/simpress)) +$(eval $(call gb_UIConfig_UIConfig,modules/simpress)) -$(eval $(call gb_UI_add_uifiles,modules/simpress,\ +$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/presentationdialog \ sd/uiconfig/simpress/ui/printeroptions \ sd/uiconfig/simpress/ui/photoalbum \ diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 993ee47d3cf7..4c852b7c1564 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,sfx2,\ Library_sfx \ Package_inc \ Package_sdi \ - UI_sfx \ + UIConfig_sfx \ )) $(eval $(call gb_Module_add_check_targets,sfx2,\ diff --git a/sfx2/UI_sfx.mk b/sfx2/UIConfig_sfx.mk index 0b59c7fe387e..2a551930361e 100644 --- a/sfx2/UI_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,sfx)) +$(eval $(call gb_UIConfig_UIConfig,sfx)) -$(eval $(call gb_UI_add_uifiles,sfx,\ +$(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/checkin \ sfx2/uiconfig/ui/custominfopage \ sfx2/uiconfig/ui/descriptioninfopage \ diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 3e2a1cff1b21..972a795538f0 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -28,7 +28,7 @@ $(call gb_Postprocess_Postprocess,AllLibraries,All libraries) $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but instset,$(WORKDIR)/Module/) $(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/) $(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/) -$(call gb_Postprocess_Postprocess,AllUIs,All UI files,$(WORKDIR)/UI/) +$(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 3ea8951178ce..923f7b616151 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -191,7 +191,7 @@ gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstwo gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1))) gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1) gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx -gb_UI_get_target = $(WORKDIR)/UI/$(1) +gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1) gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1) gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external @@ -306,7 +306,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ CppunitTestFakeExecutable \ CustomTarget \ ExternalProject \ - UI \ + UIConfig \ UILocalizeTarget \ UnoApiHeadersTarget \ UnoApiTarget \ diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UIConfig.mk index 1cbb86613f94..1bd01be318bc 100644 --- a/solenv/gbuild/UI.mk +++ b/solenv/gbuild/UIConfig.mk @@ -32,7 +32,7 @@ MERGEINPUT=`$(gb_MKTEMP)` && \ echo $(POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ $(gb_UILocalizeTarget_COMMAND) \ - -i $(UI_FILE) \ + -i $(UIConfig_FILE) \ -o $(call gb_UILocalizeTarget_get_workdir,$(2)) \ -l all \ -m $${MERGEINPUT} \ @@ -68,7 +68,7 @@ endef # gb_UILocalizeTarget__UILocalizeTarget_impl target pofiles define gb_UILocalizeTarget__UILocalizeTarget_impl $(call gb_UILocalizeTarget_get_target,$(1)) : POFILES := $(2) -$(call gb_UILocalizeTarget_get_target,$(1)) : UI_FILE := $(SRCDIR)/$(1).ui +$(call gb_UILocalizeTarget_get_target,$(1)) : UIConfig_FILE := $(SRCDIR)/$(1).ui $(call gb_UILocalizeTarget_get_target,$(1)) : $(2) $(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(1).ui @@ -78,97 +78,100 @@ $(call gb_UILocalizeTarget_get_target,$(1)) :| \ endef -# class UI +# class UIConfig -# Handles UI description files (suffix .ui) for the new layouting mechanism. +# Handles UI configuration files. +# +# This mostly means UI description files (suffix .ui) for the new layouting +# mechanism. # en-US is the default, so there is no translation for it -gb_UI_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) +gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) -$(dir $(call gb_UI_get_target,%)).dir : +$(dir $(call gb_UIConfig_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(dir $(call gb_UI_get_target,%))%/.dir : +$(dir $(call gb_UIConfig_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(call gb_UI_get_target,%) : - $(call gb_Output_announce,$*,$(true),UI ,2) +$(call gb_UIConfig_get_target,%) : + $(call gb_Output_announce,$*,$(true),UIC,2) $(call gb_Helper_abbreviate_dirs,\ touch $@ \ ) -.PHONY : $(call gb_UI_get_clean_target,%) -$(call gb_UI_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UI ,2) +.PHONY : $(call gb_UIConfig_get_clean_target,%) +$(call gb_UIConfig_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),UIC,2) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_UI_get_target,$*) \ + rm -f $(call gb_UIConfig_get_target,$*) \ ) -# Translates and delivers a set of .ui files +# Processes and delivers a set of UI configuration files. # -# gb_UI_UI modulename -define gb_UI_UI +# gb_UIConfig_UIConfig modulename +define gb_UIConfig_UIConfig $(call gb_Package_Package_internal,$(1)_ui,$(SRCDIR)) -$(call gb_UI_get_target,$(1)) :| $(dir $(call gb_UI_get_target,$(1))).dir -$(call gb_UI_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui) -$(call gb_Postprocess_get_target,AllUIs) : $(call gb_UI_get_target,$(1)) -$(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui) +$(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir +$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui) +$(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1)) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui) -ifneq ($(gb_UI_LANGS),) +ifneq ($(gb_UIConfig_LANGS),) $(call gb_Package_Package_internal,$(1)_ui_localized,$(gb_UILocalizeTarget_WORKDIR)) -$(call gb_UI_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui_localized) -$(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui_localized) +$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui_localized) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui_localized) endif -$$(eval $$(call gb_Module_register_target,$(call gb_UI_get_target,$(1)),$(call gb_UI_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),UI) +$$(eval $$(call gb_Module_register_target,$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),UIConfig) endef -# gb_UI__package_uifile target package destfile srcfile -define gb_UI__package_uifile +# gb_UIConfig__package_uifile target package destfile srcfile +define gb_UIConfig__package_uifile $(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4)) endef -# gb_UI__add_uifile target file -define gb_UI__add_uifile -$(call gb_UI__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui) +# gb_UIConfig__add_uifile target file +define gb_UIConfig__add_uifile +$(call gb_UIConfig__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui) endef -# gb_UI__add_uifile_for_lang target file lang -define gb_UI__add_uifile_for_lang -$(call gb_UI__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui) +# gb_UIConfig__add_uifile_for_lang target file lang +define gb_UIConfig__add_uifile_for_lang +$(call gb_UIConfig__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui) endef -# gb_UI__add_translations_impl target uifile langs -define gb_UI__add_translations_impl +# gb_UIConfig__add_translations_impl target uifile langs +define gb_UIConfig__add_translations_impl $(call gb_UILocalizeTarget_UILocalizeTarget,$(2)) -$(call gb_UI_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2)) -$(call gb_UI_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(2)) +$(call gb_UIConfig_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2)) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(2)) $(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call gb_UILocalizeTarget_get_target,$(2)) -$(foreach lang,$(3),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(lang))) +$(foreach lang,$(3),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(lang))) endef -# gb_UI__add_translations target uifile langs qtz -define gb_UI__add_translations -$(if $(strip $(3) $(4)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3))) -$(if $(strip $(4)),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(strip $(4)))) +# gb_UIConfig__add_translations target uifile langs qtz +define gb_UIConfig__add_translations +$(if $(strip $(3) $(4)),$(call gb_UIConfig__add_translations_impl,$(1),$(2),$(3))) +$(if $(strip $(4)),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(strip $(4)))) endef # Adds translations for languages that have corresponding .po file # -# gb_UI__add_uifile_translations target uifile -define gb_UI__add_uifile_translations -$(call gb_UI__add_translations,$(1),$(2),\ - $(foreach lang,$(gb_UI_LANGS),\ +# gb_UIConfig__add_uifile_translations target uifile +define gb_UIConfig__add_uifile_translations +$(call gb_UIConfig__add_translations,$(1),$(2),\ + $(foreach lang,$(gb_UIConfig_LANGS),\ $(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po),$(lang)) \ ),\ - $(filter qtz,$(gb_UI_LANGS)) \ + $(filter qtz,$(gb_UIConfig_LANGS)) \ ) endef @@ -177,21 +180,21 @@ endef # # The file is relative to $(SRCDIR) and without extension. # -# gb_UI_add_uifile target uifile -define gb_UI_add_uifile -$(call gb_UI__add_uifile,$(1),$(2)) +# gb_UIConfig_add_uifile target uifile +define gb_UIConfig_add_uifile +$(call gb_UIConfig__add_uifile,$(1),$(2)) -ifneq ($(gb_UI_LANGS),) -$(call gb_UI__add_uifile_translations,$(1),$(2)) +ifneq ($(gb_UIConfig_LANGS),) +$(call gb_UIConfig__add_uifile_translations,$(1),$(2)) endif endef # Adds multiple .ui files to the package # -# gb_UI_add_uifiles target uifile(s) -define gb_UI_add_uifiles -$(foreach uifile,$(2),$(call gb_UI_add_uifile,$(1),$(uifile))) +# gb_UIConfig_add_uifiles target uifile(s) +define gb_UIConfig_add_uifiles +$(foreach uifile,$(2),$(call gb_UIConfig_add_uifile,$(1),$(uifile))) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 3d2796fe965d..a138cd1827c0 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -320,7 +320,7 @@ include $(foreach class, \ JavaClassSet \ JunitTest \ Module \ - UI \ + UIConfig \ UnoApiTarget \ UnoApi \ UnoApiMerge \ diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 95578de5178d..897f2f285846 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,starmath,\ Library_sm \ Library_smd \ Package_uiconfig \ - UI_smath \ + UIConfig_smath \ )) $(eval $(call gb_Module_add_check_targets,starmath,\ diff --git a/starmath/UI_smath.mk b/starmath/UIConfig_smath.mk index 6cbfb8dff20f..a88475d8b842 100644 --- a/starmath/UI_smath.mk +++ b/starmath/UIConfig_smath.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,modules/smath)) +$(eval $(call gb_UIConfig_UIConfig,modules/smath)) -$(eval $(call gb_UI_add_uifiles,modules/smath,\ +$(eval $(call gb_UIConfig_add_uifiles,modules/smath,\ starmath/uiconfig/smath/ui/printeroptions \ )) diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk index c2d10c116b41..a7eb36c66d61 100644 --- a/svtools/Module_svtools.mk +++ b/svtools/Module_svtools.mk @@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,svtools,\ Library_hatchwindowfactory \ Library_svt \ Package_inc \ - UI_svt \ + UIConfig_svt \ )) ifneq ($(CROSS_COMPILING),YES) diff --git a/svtools/UI_svt.mk b/svtools/UIConfig_svt.mk index 2e5dc0a89be0..153054fa1000 100644 --- a/svtools/UI_svt.mk +++ b/svtools/UIConfig_svt.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,svt)) +$(eval $(call gb_UIConfig_UIConfig,svt)) -$(eval $(call gb_UI_add_uifiles,svt,\ +$(eval $(call gb_UIConfig_add_uifiles,svt,\ svtools/uiconfig/ui/addresstemplatedialog \ svtools/uiconfig/ui/graphicexport \ svtools/uiconfig/ui/placeedit \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index d5aceb8eb21c..a8b69adb78d1 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Module_add_targets,svx,\ Package_globlmn_hrc \ Package_inc \ Package_sdi \ - UI_svx \ + UIConfig_svx \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/svx/UI_svx.mk b/svx/UIConfig_svx.mk index f7e28aec722e..e9bc81479a41 100644 --- a/svx/UI_svx.mk +++ b/svx/UIConfig_svx.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,svx)) +$(eval $(call gb_UIConfig_UIConfig,svx)) -$(eval $(call gb_UI_add_uifiles,svx,\ +$(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/acceptrejectchangesdialog \ svx/uiconfig/ui/asianphoneticguidedialog \ svx/uiconfig/ui/chineseconversiondialog \ diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 2f6e75b00b94..d85712f3cdee 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,sw,\ Library_swd \ Library_swui \ Package_uiconfig \ - UI_swriter \ + UIConfig_swriter \ )) ifneq ($(DISABLE_SCRIPTING),TRUE) diff --git a/sw/UI_swriter.mk b/sw/UIConfig_swriter.mk index 1ae6c0c28c8c..6857a06523b4 100644 --- a/sw/UI_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,modules/swriter)) +$(eval $(call gb_UIConfig_UIConfig,modules/swriter)) -$(eval $(call gb_UI_add_uifiles,modules/swriter,\ +$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/autoformattable \ sw/uiconfig/swriter/ui/autotext \ sw/uiconfig/swriter/ui/bibliographyentry \ diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk index dc0bba82b283..703df3cbd88b 100644 --- a/tubes/Module_tubes.mk +++ b/tubes/Module_tubes.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,tubes,\ Executable_liboapprover \ Library_tubes \ Package_inc \ - UI_tubes \ + UIConfig_tubes \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,tubes,\ diff --git a/tubes/UI_tubes.mk b/tubes/UIConfig_tubes.mk index 59801da9667f..43a0febe52f4 100644 --- a/tubes/UI_tubes.mk +++ b/tubes/UIConfig_tubes.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,tubes)) +$(eval $(call gb_UIConfig_UIConfig,tubes)) -$(eval $(call gb_UI_add_uifiles,tubes,\ +$(eval $(call gb_UIConfig_add_uifiles,tubes,\ tubes/uiconfig/ui/contacts \ )) diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk index e70e94edc8e4..0f60a5b82184 100644 --- a/uui/Module_uui.mk +++ b/uui/Module_uui.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Module_Module,uui)) $(eval $(call gb_Module_add_targets,uui,\ AllLangResTarget_uui \ Library_uui \ - UI_uui \ + UIConfig_uui \ )) # vim: set noet sw=4 ts=4: diff --git a/uui/UI_uui.mk b/uui/UIConfig_uui.mk index 826b4edd063a..3b34479de4c4 100644 --- a/uui/UI_uui.mk +++ b/uui/UIConfig_uui.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,uui)) +$(eval $(call gb_UIConfig_UIConfig,uui)) -$(eval $(call gb_UI_add_uifiles,uui,\ +$(eval $(call gb_UIConfig_add_uifiles,uui,\ uui/uiconfig/ui/masterpassworddlg \ uui/uiconfig/ui/setmasterpassworddlg \ )) diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 116e81544e11..12189048b2d5 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ Executable_ui-previewer) \ - UI_vcl \ + UIConfig_vcl \ )) ifeq ($(GUIBASE),unx) diff --git a/vcl/UI_vcl.mk b/vcl/UIConfig_vcl.mk index b39bb788e6ec..ff6db5bcf76f 100644 --- a/vcl/UI_vcl.mk +++ b/vcl/UIConfig_vcl.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,vcl)) +$(eval $(call gb_UIConfig_UIConfig,vcl)) -$(eval $(call gb_UI_add_uifiles,vcl,\ +$(eval $(call gb_UIConfig_add_uifiles,vcl,\ vcl/uiconfig/ui/printdialog \ )) diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index d6f66ba91f54..88dee899d281 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\ Library_xmlsecurity \ Library_xsec_fw \ $(if $(filter-out IOS ANDROID,$(OS)),Library_xsec_xmlsec) \ - UI_xmlsec \ + UIConfig_xmlsec \ )) #FIXME: ^^^, get nss&libxmlsec building on ios and android diff --git a/xmlsecurity/UI_xmlsec.mk b/xmlsecurity/UIConfig_xmlsec.mk index e07a558cd788..5bc39e9d1b18 100644 --- a/xmlsecurity/UI_xmlsec.mk +++ b/xmlsecurity/UIConfig_xmlsec.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UI_UI,xmlsec)) +$(eval $(call gb_UIConfig_UIConfig,xmlsec)) -$(eval $(call gb_UI_add_uifiles,xmlsec,\ +$(eval $(call gb_UIConfig_add_uifiles,xmlsec,\ xmlsecurity/uiconfig/ui/digitalsignaturesdialog \ xmlsecurity/uiconfig/ui/securitylevelpage \ xmlsecurity/uiconfig/ui/securitytrustpage \ |