diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-06-10 13:48:49 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-06-16 14:30:02 +0300 |
commit | 5ea3e979216fee5b9ceb6c42b2770d32bde0ae16 (patch) | |
tree | 4adc6969b6b3cfe6954a92275653e86823dd7cb1 | |
parent | 07c845ffc43c4472c36b2912954f3730e2ed6c0b (diff) |
tdf#87651 Add outline buttons to impress sidebar
Change-Id: Id3cf58660bfcaf7424d027773894ce6888df788a
(cherry picked from commit ef530d397b021a9606bb3b3abe8c2290a1d94c59)
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 1 | ||||
-rw-r--r-- | svx/uiconfig/ui/sidebarparagraph.ui | 123 |
3 files changed, 102 insertions, 26 deletions
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index c26d4ecf7eb4..6555b924d465 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -151,6 +151,8 @@ void ParaPropertyPanel::HandleContextChange ( default: break; } + + mpTBxOutline->Show( maContext.GetApplication_DI() == sfx2::sidebar::EnumContext::Application_DrawImpress ); } void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent) @@ -597,6 +599,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, //NumBullet&Backcolor get(mpTBxNumBullet, "numberbullet"); get(mpTBxBackColor, "backgroundcolor"); + get(mpTBxOutline, "outline"); //Paragraph spacing get(mpTopDist, "aboveparaspacing"); mpTopDist->set_width_request(mpTopDist->get_preferred_size().Width()); @@ -624,6 +627,7 @@ void ParaPropertyPanel::dispose() mpTBxVertAlign.clear(); mpTBxNumBullet.clear(); mpTBxBackColor.clear(); + mpTBxOutline.clear(); mpTopDist.clear(); mpBottomDist.clear(); mpTbxIndent_IncDec.clear(); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 0e9877517efd..5d82886f418e 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -78,6 +78,7 @@ private: VclPtr<ToolBox> mpTBxVertAlign; //NumBullet&Backcolor VclPtr<ToolBox> mpTBxNumBullet; + VclPtr<ToolBox> mpTBxOutline; VclPtr<ToolBox> mpTBxBackColor; //Paragraph spacing VclPtr<SvxRelativeField> mpTopDist; diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 4b4897faf255..0d71cb74b3a5 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -59,32 +59,6 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="backgroundcolor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Paragraph Background Color</property> - <property name="halign">end</property> - <child> - <object class="GtkMenuToolButton" id="parabkcolor"> - <property name="width_request">105</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</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="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -639,6 +613,103 @@ <property name="top_attach">2</property> </packing> </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-SidebarToolBox" id="backgroundcolor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Paragraph Background Color</property> + <property name="halign">end</property> + <child> + <object class="GtkMenuToolButton" id="parabkcolor"> + <property name="width_request">105</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BackgroundColor</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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-SidebarToolBox" id="outline"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkToolButton" id="promote"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OutlineLeft</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="demote"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OutlineRight</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="moveup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OutlineUp</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="movedown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OutlineDown</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">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> |