[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/sifr icon-themes/tango icon-themes/tango_testing officecfg/registry sd/uiconfig svx/source svx/uiconfig
Katarina Behrens
Katarina.Behrens at cib.de
Mon Jun 1 10:13:44 PDT 2015
icon-themes/breeze/links.txt | 4 +
icon-themes/crystal/links.txt | 4 +
icon-themes/galaxy/links.txt | 3
icon-themes/hicontrast/links.txt | 4 +
icon-themes/human/links.txt | 4 +
icon-themes/industrial/links.txt | 4 +
icon-themes/oxygen/links.txt | 4 +
icon-themes/sifr/links.txt | 3
icon-themes/tango/links.txt | 3
icon-themes/tango_testing/links.txt | 4 +
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 8 ++
sd/uiconfig/sdraw/toolbar/textobjectbar.xml | 1
sd/uiconfig/simpress/toolbar/textobjectbar.xml | 1
svx/source/sidebar/text/TextPropertyPanel.cxx | 19 ++++-
svx/source/sidebar/text/TextPropertyPanel.hxx | 1
svx/uiconfig/ui/sidebartextpanel.ui | 33 ++++++++--
16 files changed, 91 insertions(+), 9 deletions(-)
New commits:
commit 0e2ef262bea4cbc7cb04cfcd1d47f2a9d6092398
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Thu May 21 13:58:52 2015 +0200
tdf#88276: Add background colour toolbar and sidebar buttons
but they do nothing yet, follow-up commit(s) add real functionality
to them
Change-Id: Ieac5d0326b284069b8da1b39f94bdb5a8c84b6dd
Reviewed-on: https://gerrit.libreoffice.org/15841
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
Tested-by: Yousuf Philips <philipz85 at hotmail.com>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index dcc73b8..32d8aac 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -105,3 +105,7 @@ database/linked_text_table.png cmd/sc_dataimport.png
#cmd/lc_undo.png cmd/he/lc_redo.png
#cmd/sc_redo.png cmd/he/sc_undo.png
#cmd/sc_undo.png cmd/he/sc_redo.png
+
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/crystal/links.txt b/icon-themes/crystal/links.txt
index 5c8bad3..3e7c8a7 100644
--- a/icon-themes/crystal/links.txt
+++ b/icon-themes/crystal/links.txt
@@ -4,3 +4,7 @@ cmd/lc_showsinglepage.png cmd/lc_adddirect.png
# paragraph line spacing
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
+
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 1ae02ae..0a898a7 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -69,3 +69,6 @@ cmd/sc_mailmergewizard.png cmd/sc_autoformat.png
cmd/sc_macrosmenu.png cmd/sc_trackchanges.png
cmd/sc_showannotations.png cmd/sc_insertannotation.png
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/hicontrast/links.txt b/icon-themes/hicontrast/links.txt
index a9a7c82..3c9fd17 100644
--- a/icon-themes/hicontrast/links.txt
+++ b/icon-themes/hicontrast/links.txt
@@ -1,3 +1,7 @@
# paragraph line spacing
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
+
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/human/links.txt b/icon-themes/human/links.txt
index 5c8bad3..3e7c8a7 100644
--- a/icon-themes/human/links.txt
+++ b/icon-themes/human/links.txt
@@ -4,3 +4,7 @@ cmd/lc_showsinglepage.png cmd/lc_adddirect.png
# paragraph line spacing
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
+
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/industrial/links.txt b/icon-themes/industrial/links.txt
index a9a7c82..3c9fd17 100644
--- a/icon-themes/industrial/links.txt
+++ b/icon-themes/industrial/links.txt
@@ -1,3 +1,7 @@
# paragraph line spacing
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
+
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/oxygen/links.txt b/icon-themes/oxygen/links.txt
index 5c8bad3..3e7c8a7 100644
--- a/icon-themes/oxygen/links.txt
+++ b/icon-themes/oxygen/links.txt
@@ -4,3 +4,7 @@ cmd/lc_showsinglepage.png cmd/lc_adddirect.png
# paragraph line spacing
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
+
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index e93c265..7f23e02 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -85,3 +85,6 @@ cmd/sc_insertrowbreak.png cmd/sc_insertpagebreak.png
cmd/lc_datafilterautofilter.png cmd/lc_autofilter.png
cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 46dc5eb..e9590f4 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -553,3 +553,6 @@ cmd/sc_mailmergewizard.png cmd/sc_autoformat.png
cmd/sc_macrosmenu.png cmd/sc_trackchanges.png
cmd/sc_showannotations.png cmd/sc_insertannotation.png
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/icon-themes/tango_testing/links.txt b/icon-themes/tango_testing/links.txt
index eec2444..d5e2302 100644
--- a/icon-themes/tango_testing/links.txt
+++ b/icon-themes/tango_testing/links.txt
@@ -34,3 +34,7 @@ cmd/lc_spellingandgrammardialog.png cmd/lc_spelldialog.png
# paragraph line spacing
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
+
+# text background colour Impress/Draw
+cmd/sc_charbackcolor.png cmd/sc_backcolor.png
+cmd/lc_charbackcolor.png cmd/lc_backcolor.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 20eab49..3dbd8a0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2793,6 +2793,14 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:CharBackColor" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Text Background Color</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:BackgroundPatternController" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Background Pattern</value>
diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml
index bfac926..32c2e63 100644
--- a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml
@@ -30,6 +30,7 @@
<toolbar:toolbaritem xlink:href=".uno:Shadowed" toolbar:helpid="10010"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="10028"/>
<toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="10030"/>
diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml
index c014ba2..6a59382 100644
--- a/sd/uiconfig/simpress/toolbar/textobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/textobjectbar.xml
@@ -30,6 +30,7 @@
<toolbar:toolbaritem xlink:href=".uno:Shadowed" toolbar:helpid="10010"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="10028"/>
<toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="10030"/>
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 5e4f48a..0166136 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -97,8 +97,9 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref
get(mpToolBoxFont, "fonteffects");
get(mpToolBoxIncDec, "fontadjust");
get(mpToolBoxSpacing, "spacingbar");
- get(mpToolBoxFontColorSw, "colorbar");
- get(mpToolBoxFontColor, "colorsingle");
+ get(mpToolBoxFontColorSw, "colorbar_writer");
+ get(mpToolBoxFontColor, "colorbar_others");
+ get(mpToolBoxBackgroundColor, "colorbar_background");
//toolbox
SetupToolboxItems();
@@ -144,15 +145,20 @@ void TextPropertyPanel::HandleContextChange (
mpToolBoxIncDec->Show(maContext.GetApplication_DI() != sfx2::sidebar::EnumContext::Application_Calc);
bool bWriterText = false;
+ bool bDrawText = false;
+ bool bNeedTextSpacing = false;
+
switch (maContext.GetCombinedContext_DI())
{
case CombinedEnumContext(Application_Calc, Context_Cell):
case CombinedEnumContext(Application_Calc, Context_Pivot):
- mpToolBoxSpacing->Disable();
+ // bNeedTextSpacing = false;
break;
case CombinedEnumContext(Application_Calc, Context_EditCell):
case CombinedEnumContext(Application_Calc, Context_DrawText):
+ bNeedTextSpacing = true;
+
case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
@@ -162,12 +168,13 @@ void TextPropertyPanel::HandleContextChange (
case CombinedEnumContext(Application_DrawImpress, Context_Draw):
case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
- mpToolBoxSpacing->Enable();
+ bNeedTextSpacing = true;
+ bDrawText = true;
break;
case CombinedEnumContext(Application_WriterVariants, Context_Text):
case CombinedEnumContext(Application_WriterVariants, Context_Table):
- mpToolBoxSpacing->Enable();
+ bNeedTextSpacing = true;
bWriterText = true;
break;
@@ -175,8 +182,10 @@ void TextPropertyPanel::HandleContextChange (
break;
}
+ mpToolBoxSpacing->Enable(bNeedTextSpacing);
mpToolBoxFontColor->Show(!bWriterText);
mpToolBoxFontColorSw->Show(bWriterText);
+ mpToolBoxBackgroundColor->Show(bDrawText);
}
void TextPropertyPanel::DataChanged (const DataChangedEvent& /*rEvent*/)
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 7ea19a6..30e494b 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -87,6 +87,7 @@ private:
VclPtr<ToolBox> mpToolBoxSpacing;
VclPtr<ToolBox> mpToolBoxFontColorSw;
VclPtr<ToolBox> mpToolBoxFontColor;
+ VclPtr<ToolBox> mpToolBoxBackgroundColor;
//control items
::sfx2::sidebar::ControllerItem maFontSizeControl;
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui
index 91930e9..eb962ba 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -215,7 +215,7 @@
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <object class="sfxlo-SidebarToolBox" id="colorbar">
+ <object class="sfxlo-SidebarToolBox" id="colorbar_writer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_arrow">False</property>
@@ -255,7 +255,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="colorsingle">
+ <object class="sfxlo-SidebarToolBox" id="colorbar_others">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -280,6 +280,31 @@
</packing>
</child>
<child>
+ <object class="sfxlo-SidebarToolBox" id="colorbar_background">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuToolButton" id="backgroundcolor">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:CharBackColor</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-SidebarToolBox" id="position">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -315,7 +340,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -341,7 +366,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list