[Libreoffice-commits] core.git: cui/source cui/uiconfig
Katarina Behrens
bubli at bubli.org
Sat Mar 29 14:34:44 PDT 2014
cui/source/inc/cuitabline.hxx | 4 ++-
cui/source/tabpages/tpline.cxx | 17 ++++++++--------
cui/uiconfig/ui/linetabpage.ui | 42 +++++++++++++++++++++++++++++++++--------
3 files changed, 46 insertions(+), 17 deletions(-)
New commits:
commit 654cea3304572e4d33030c8e60503750b06156a3
Author: Katarina Behrens <bubli at bubli.org>
Date: Sat Mar 29 22:15:41 2014 +0100
fdo#74287: Correctly enable/disable widgets w/ invisible lines
Restore pre-ui behaviour - disable transparency & width control,
but keep colour control active when line contains symbols (e.g.
scatter chart)
Change-Id: I4005fc376fa1640c5b9d7e736fbdac7417f0edd9
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index e795453..0a8a09b 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -91,10 +91,12 @@ class SvxLineTabPage : public SvxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
private:
- VclBox* m_pBoxStyle;
+ VclBox* m_pBoxColor;
LineLB* m_pLbLineStyle;
ColorLB* m_pLbColor;
+ VclBox* m_pBoxWidth;
MetricField* m_pMtrLineWidth;
+ VclBox* m_pBoxTransparency;
MetricField* m_pMtrTransparent;
VclFrame* m_pFlLineEnds;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index a9a27e4..9afc604 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -110,9 +110,11 @@ SvxLineTabPage::SvxLineTabPage
nPageType ( 0 )
{
get(m_pLbLineStyle,"LB_LINE_STYLE");
+ get(m_pBoxColor,"boxCOLOR");
get(m_pLbColor,"LB_COLOR");
- get(m_pBoxStyle,"boxSTYLE_ATTR");
+ get(m_pBoxWidth,"boxWIDTH");
get(m_pMtrLineWidth,"MTR_FLD_LINE_WIDTH");
+ get(m_pBoxTransparency,"boxTRANSPARENCY");
get(m_pMtrTransparent,"MTR_LINE_TRANSPARENT");
get(m_pFlLineEnds,"FL_LINE_ENDS");
@@ -1545,13 +1547,11 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
// Make transparency accessible accordingly
if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible
{
-// aFtTransparent.Disable();
- m_pMtrTransparent->Disable();
+ m_pBoxTransparency->Disable();
}
else
{
-// aFtTransparent.Enable();
- m_pMtrTransparent->Enable();
+ m_pBoxTransparency->Enable();
}
const bool bHasLineStyle = m_pLbLineStyle->GetSelectEntryPos() !=0;
@@ -1611,9 +1611,9 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl)
if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible
{
if(!bSymbols)
- m_pLbColor->Disable();
+ m_pBoxColor->Disable();
- m_pBoxStyle->Disable();
+ m_pBoxWidth->Disable();
if( m_pFlLineEnds->IsEnabled() )
{
@@ -1627,7 +1627,8 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl)
}
else
{
- m_pBoxStyle->Enable();
+ m_pBoxColor->Enable();
+ m_pBoxWidth->Enable();
if( m_pFlLineEnds->IsEnabled() )
{
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index 85c0f9f..670dfba 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -86,7 +86,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="boxSTYLE_ATTR">
+ <object class="GtkBox" id="boxCOLOR">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -117,6 +117,18 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxWIDTH">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="FT_LINE_WIDTH">
<property name="visible">True</property>
@@ -129,24 +141,37 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="MTR_FLD_LINE_WIDTH:0cm">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentWIDTH</property>
<property name="digits">2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</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="GtkBox" id="boxTRANSPARENCY">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="FT_TRANSPARENT">
<property name="visible">True</property>
@@ -159,28 +184,29 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="MTR_LINE_TRANSPARENT:0%">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentPERCENT</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list