[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig
Yousuf Philips
philipz85 at hotmail.com
Mon Sep 21 23:21:36 PDT 2015
include/svx/sidebar/LinePropertyPanelBase.hxx | 2
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 16 ---
svx/uiconfig/ui/sidebarline.ui | 109 +++++++++++-----------
3 files changed, 59 insertions(+), 68 deletions(-)
New commits:
commit 050447a30012717643f1d056e0ba614f36e1303f
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Tue Sep 1 10:34:17 2015 +0400
tdf#89543 Unhide arrow style drop downs
Change-Id: I44c2b93389b88c0c1821ac727b46275bce8b076d
Reviewed-on: https://gerrit.libreoffice.org/18290
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 8db5b44..dadb601 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -126,11 +126,9 @@ private:
//ui controls
VclPtr<FixedText> mpFTWidth;
VclPtr<ToolBox> mpTBWidth;
- VclPtr<FixedText> mpFTStyle;
VclPtr<ListBox> mpLBStyle;
VclPtr<FixedText> mpFTTransparency;
VclPtr<MetricField> mpMFTransparent;
- VclPtr<FixedText> mpFTArrow;
VclPtr<ListBox> mpLBStart;
VclPtr<ListBox> mpLBEnd;
VclPtr<FixedText> mpFTEdgeStyle;
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 9f4d20a..f4ee9ca 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -166,11 +166,9 @@ LinePropertyPanelBase::LinePropertyPanelBase(
get(mpFTWidth, "widthlabel");
get(mpTBWidth, "width");
get(mpTBColor, "color");
- get(mpFTStyle, "stylelabel");
get(mpLBStyle, "linestyle");
get(mpFTTransparency, "translabel");
get(mpMFTransparent, "linetransparency");
- get(mpFTArrow, "arrowlabel");
get(mpLBStart, "beginarrowstyle");
get(mpLBEnd, "endarrowstyle");
get(mpFTEdgeStyle, "cornerlabel");
@@ -193,11 +191,9 @@ void LinePropertyPanelBase::dispose()
mpFTWidth.clear();
mpTBWidth.clear();
mpTBColor.clear();
- mpFTStyle.clear();
mpLBStyle.clear();
mpFTTransparency.clear();
mpMFTransparent.clear();
- mpFTArrow.clear();
mpLBStart.clear();
mpLBEnd.clear();
mpFTEdgeStyle.clear();
@@ -253,9 +249,7 @@ void LinePropertyPanelBase::Initialize()
mpMFTransparent->SetAccessibleName(OUString("Transparency")); //wj acc
mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth);
- mpLBStyle->SetAccessibleRelationLabeledBy(mpFTStyle);
mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTransparency);
- mpLBStart->SetAccessibleRelationLabeledBy(mpFTArrow);
mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd);
aLink = LINK( this, LinePropertyPanelBase, ChangeEdgeStyleHdl );
@@ -275,12 +269,10 @@ void LinePropertyPanelBase::updateLineStyle(bool bDisabled, bool bSetOrDefault,
{
if(bDisabled)
{
- mpFTStyle->Disable();
mpLBStyle->Disable();
}
else
{
- mpFTStyle->Enable();
mpLBStyle->Enable();
}
@@ -303,12 +295,10 @@ void LinePropertyPanelBase::updateLineDash(bool bDisabled, bool bSetOrDefault, c
{
if(bDisabled)
{
- mpFTStyle->Disable();
mpLBStyle->Disable();
}
else
{
- mpFTStyle->Enable();
mpLBStyle->Enable();
}
@@ -389,12 +379,10 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault,
{
if(bDisabled)
{
- mpFTArrow->Disable();
mpLBStart->Disable();
}
else
{
- mpFTArrow->Enable();
mpLBStart->Enable();
}
@@ -417,12 +405,10 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault,
{
if(bDisabled)
{
- mpFTArrow->Disable();
mpLBEnd->Disable();
}
else
{
- mpFTArrow->Enable();
mpLBEnd->Enable();
}
@@ -925,6 +911,8 @@ void LinePropertyPanelBase::ActivateControls()
mpGridLineProps->Enable( bLineStyle );
mpBoxArrowProps->Enable( bLineStyle );
+ mpLBStart->Enable( bLineStyle );
+ mpLBEnd->Enable( bLineStyle );
}
void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit)
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 52ab635..c706aeb 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <requires lib="LibreOffice" version="1.0"/>
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
- <property name="step_increment">5</property>
+ <property name="step_increment">10</property>
<property name="page_increment">20</property>
</object>
<object class="GtkGrid" id="LinePropertyPanel">
@@ -29,21 +29,27 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="stylelabel">
+ <object class="GtkComboBoxText" id="beginarrowstyle">
+ <property name="width_request">65</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Style:</property>
- <property name="use_underline">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the style of the beginning arrowhead.</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="linestyle">
+ <property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -54,7 +60,24 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="endarrowstyle">
+ <property name="width_request">65</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the style of the ending arrowhead.</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
+ <property name="margin_right">6</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -82,6 +105,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -109,6 +134,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -122,6 +149,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -152,6 +181,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -165,6 +196,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -174,7 +207,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
<property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
- <property name="hexpand">True</property>
+ <property name="halign">start</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">5</property>
@@ -182,6 +215,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -196,48 +231,6 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="arrowlabel">
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Arrow:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">beginarrowstyle</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="beginarrowstyle">
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select the style of the beginning arrowhead.</property>
- <property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="endarrowstyle">
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select the style of the ending arrowhead.</property>
- <property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkGrid" id="grid5">
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
@@ -255,6 +248,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -280,6 +275,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -294,6 +291,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -317,6 +316,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -337,12 +338,16 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list