svx/source/sidebar/text/TextPropertyPanel.cxx | 8 ------
svx/source/sidebar/text/TextPropertyPanel.hxx | 2 -
svx/uiconfig/ui/sidebartextpanel.ui | 32 +++-----------------------
sw/uiconfig/sglobal/toolbar/textstylebar.xml | 2 -
sw/uiconfig/swriter/toolbar/textstylebar.xml | 2 -
sw/uiconfig/swriter/ui/notebookbar_groups.ui | 2 -
6 files changed, 8 insertions(+), 40 deletions(-)
New commits:
commit c0f1f67bfd2853554b58127e91443526c44163d7
Author: Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Wed Jul 5 01:28:05 2023 +0300
Commit: Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Wed Jul 5 08:14:20 2023 +0200
Swap .uno:FontColor for .uno:Color
Following tdf#105293, which left some UI elements unchanged.
This also simplifies the sidebar, as .uno:Color is universal
while .uno:FontColor works only with Writer text. It also
benefits tdf#154270, as using the same command in the toolbar
and the sidebar will keep their color in sync.
Change-Id: Ia6e1ffef4012b6f8db4c9079d0b0c99a59887670
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154012
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index d5bfc2a480df..5b4e907cd86b 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -49,9 +49,7 @@ TextPropertyPanel::TextPropertyPanel(weld::Widget* pParent,
const css::uno::Refe
, mxFontEffectsDispatch(new ToolbarUnoDispatcher(*mxFontEffects,
*m_xBuilder, rxFrame))
, mxFontAdjust(m_xBuilder->weld_toolbar("fontadjust"))
, mxFontAdjustDispatch(new ToolbarUnoDispatcher(*mxFontAdjust,
*m_xBuilder, rxFrame))
- , mxToolBoxFontColorSw(m_xBuilder->weld_toolbar("colorbar_writer"))
- , mxToolBoxFontColorSwDispatch(new
ToolbarUnoDispatcher(*mxToolBoxFontColorSw, *m_xBuilder, rxFrame))
- , mxToolBoxFontColor(m_xBuilder->weld_toolbar("colorbar_others"))
+ , mxToolBoxFontColor(m_xBuilder->weld_toolbar("colorbar"))
, mxToolBoxFontColorDispatch(new ToolbarUnoDispatcher(*mxToolBoxFontColor,
*m_xBuilder, rxFrame))
, mxToolBoxBackgroundColor(m_xBuilder->weld_toolbar("colorbar_background"))
, mxToolBoxBackgroundColorDispatch(new
ToolbarUnoDispatcher(*mxToolBoxBackgroundColor, *m_xBuilder, rxFrame))
@@ -78,7 +76,6 @@ TextPropertyPanel::~TextPropertyPanel()
mxDefaultBarDispatch.reset();
mxPositionBarDispatch.reset();
mxSpacingBarDispatch.reset();
- mxToolBoxFontColorSwDispatch.reset();
mxToolBoxFontColorDispatch.reset();
mxToolBoxBackgroundColorDispatch.reset();
mxFontAdjustDispatch.reset();
@@ -90,7 +87,6 @@ TextPropertyPanel::~TextPropertyPanel()
mxDefaultBar.reset();
mxPositionBar.reset();
mxSpacingBar.reset();
- mxToolBoxFontColorSw.reset();
mxToolBoxFontColor.reset();
mxToolBoxBackgroundColor.reset();
mxFontAdjust.reset();
@@ -143,8 +139,6 @@ void TextPropertyPanel::HandleContextChange (
break;
}
- mxToolBoxFontColor->set_visible(!bWriterText);
- mxToolBoxFontColorSw->set_visible(bWriterText);
mxToolBoxBackgroundColor->set_visible(bWriterText || bDrawText);
mxResetBar->set_visible(bWriterText || bCalcText);
mxDefaultBar->set_visible(bDrawText);
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx
b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 3ad44bde78ac..c383ef1bd891 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -53,8 +53,6 @@ private:
std::unique_ptr<ToolbarUnoDispatcher> mxFontEffectsDispatch;
std::unique_ptr<weld::Toolbar> mxFontAdjust;
std::unique_ptr<ToolbarUnoDispatcher> mxFontAdjustDispatch;
- std::unique_ptr<weld::Toolbar> mxToolBoxFontColorSw;
- std::unique_ptr<ToolbarUnoDispatcher> mxToolBoxFontColorSwDispatch;
std::unique_ptr<weld::Toolbar> mxToolBoxFontColor;
std::unique_ptr<ToolbarUnoDispatcher> mxToolBoxFontColorDispatch;
std::unique_ptr<weld::Toolbar> mxToolBoxBackgroundColor;
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui
b/svx/uiconfig/ui/sidebartextpanel.ui
index 732c3ee421ed..97a92d97a0f5 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -161,31 +161,7 @@
<property name="can-focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkToolbar" id="colorbar_writer">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="toolbar-style">icons</property>
- <property name="show-arrow">False</property>
- <property name="icon_size">2</property>
- <child>
- <object class="GtkMenuToolButton" id=".uno:FontColor">
- <property name="visible">True</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="colorbar_others">
+ <object class="GtkToolbar" id="colorbar">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="toolbar-style">icons</property>
@@ -205,7 +181,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -228,7 +204,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -251,7 +227,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
index ce4093f0583e..1c6b8667a3ae 100644
--- a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
@@ -65,7 +65,7 @@
<toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:Color"/>
<toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml
b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 878e242cd99a..6bc8a084616a 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -65,7 +65,7 @@
<toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:CharBackColor" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index 92bb55394f7a..164a49b662f4 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1343,7 +1343,7 @@
<object class="GtkMenuToolButton" id="fontcolor">
<property name="visible">True</property>
<property name="is_important">True</property>
- <property
name="action_name">.uno:FontColor</property>
+ <property name="action_name">.uno:Color</property>
<property name="use_underline">True</property>
</object>
<packing>
