strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

translation domain of sfx for .ui in framework doesn't look right

Browse source 
though there is nothing to translate. Probably should be fwk, but
there are no other .uis in framework and startmodule doesn't feel
right either. So just put it alongside the other svtools .uis
and give it a svt translation domain and fetch it from svtools

Change-Id: If6b89ae3b2ba45673f5ee5e3e9a4e1da40c80a53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113528
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-04-02 20:05:37 +01:00
parent 84a4da19ae
commit 765e42d4c3
6 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
framework/UIConfig_startmodule.mk
View file

@ -13,9 +13,4 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/StartModule,\
framework/uiconfig/startmodule/menubar/menubar \
))
$(eval $(call gb_UIConfig_add_uifiles,modules/StartModule,\
framework/uiconfig/startmodule/ui/managedtoolbar \
framework/uiconfig/startmodule/ui/subtoolbar \
))
# vim: set noet sw=4 ts=4:

2
framework/source/uielement/subtoolbarcontroller.cxx
View file

@ -223,7 +223,7 @@ private:
SubToolbarControl::SubToolbarControl(css::uno::Reference< css::frame::XFrame > xFrame,
weld::Widget* pParent)
: WeldToolbarPopup(xFrame, pParent, "modules/StartModule/ui/subtoolbar.ui", "subtoolbar")
: WeldToolbarPopup(xFrame, pParent, "svt/ui/subtoolbar.ui", "subtoolbar")
, m_xTargetContainer(m_xBuilder->weld_container("container"))
{
}

2
framework/source/uielement/toolbarwrapper.cxx
View file

@ -154,7 +154,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments )
}
else if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xParentWindow.get()))
{
m_xBuilder.reset(Application::CreateBuilder(pTunnel->getWidget(), "modules/StartModule/ui/managedtoolbar.ui"));
m_xBuilder.reset(Application::CreateBuilder(pTunnel->getWidget(), "svt/ui/managedtoolbar.ui"));
m_xTopLevel = m_xBuilder->weld_container("toolbarcontainer");
m_xWeldedToolbar = m_xBuilder->weld_toolbar("managedtoolbar");
if ( m_xWeldedToolbar )

2
svtools/UIConfig_svt.mk
View file

@ -26,11 +26,13 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/javadisableddialog \
svtools/uiconfig/ui/listcontrol \
svtools/uiconfig/ui/linewindow \
svtools/uiconfig/ui/managedtoolbar \
svtools/uiconfig/ui/placeedit \
svtools/uiconfig/ui/printersetupdialog \
svtools/uiconfig/ui/querydeletedialog \
svtools/uiconfig/ui/restartdialog \
svtools/uiconfig/ui/spinfieldcontrol \
svtools/uiconfig/ui/subtoolbar \
svtools/uiconfig/ui/tabbuttons \
svtools/uiconfig/ui/tabbuttonsmirrored \
svtools/uiconfig/ui/tabbaredit \

2
framework/uiconfig/startmodule/ui/managedtoolbar.ui → svtools/uiconfig/ui/managedtoolbar.ui
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.4 -->
<interface domain="sfx">
<interface domain="svt">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="toolbarcontainer">
<property name="visible">True</property>

2
framework/uiconfig/startmodule/ui/subtoolbar.ui → svtools/uiconfig/ui/subtoolbar.ui
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.4 -->
<interface domain="sfx">
<interface domain="svt">
<requires lib="gtk+" version="3.20"/>
<object class="GtkPopover" id="subtoolbar">
<property name="can_focus">False</property>