Skip to content

C
core
Kaydet (Commit) 429385a0 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Andras Timar
Dosyalara gözat
Seçenekler

tdf#87651 Add outline buttons to impress sidebar 

Change-Id: Id3cf58660bfcaf7424d027773894ce6888df788a
(cherry picked from commit ef530d39)
üst 99e5ea45
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 26 deletions
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Dosyayı görüntüle @ 429385a0
......@@ -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();
......
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
Dosyayı görüntüle @ 429385a0
......@@ -78,6 +78,7 @@ private:
VclPtr<ToolBox> mpTBxVertAlign;
//NumBullet&Backcolor
VclPtr<ToolBox> mpTBxNumBullet;
VclPtr<ToolBox> mpTBxOutline;
VclPtr<ToolBox> mpTBxBackColor;
//Paragraph spacing
VclPtr<SvxRelativeField> mpTopDist;
......
svx/uiconfig/ui/sidebarparagraph.ui
Dosyayı görüntüle @ 429385a0
......@@ -58,32 +58,6 @@
<property name="top_attach">1</property>
</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>
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment