[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
Caolán McNamara
caolanm at redhat.com
Tue Nov 26 04:05:11 PST 2013
cui/source/customize/macropg.cxx | 11 +++++++----
cui/source/dialogs/cuigrfflt.cxx | 5 -----
cui/source/dialogs/iconcdlg.cxx | 5 +++++
cui/source/inc/headertablistbox.hxx | 2 +-
cui/source/tabpages/tparea.cxx | 3 +++
cui/uiconfig/ui/bitmaptabpage.ui | 2 +-
cui/uiconfig/ui/colorpage.ui | 10 ++++++++++
cui/uiconfig/ui/connectortabpage.ui | 7 ++++++-
8 files changed, 33 insertions(+), 12 deletions(-)
New commits:
commit 52cd29a3388ec29d4de8423bb0979bcfb7a7cfcd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 26 12:04:21 2013 +0000
add accessibility names to .ui
Change-Id: I09fc4a0166e1b9e9949ed9e3407e709954c88b1e
diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index 42c0998..10f6d68 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bitmaptabpage.ui
@@ -60,7 +60,7 @@
<property name="valign">start</property>
<child internal-child="accessible">
<object class="AtkObject" id="CTL_PIXEL-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+ <property name="AtkObject::accessible-name" translatable="yes">Pattern Editor</property>
</object>
</child>
</object>
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 0630cb8..104ba54 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -177,6 +177,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="oldpreview-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Old Color</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -191,6 +196,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="newpreview-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">New Color</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/cui/uiconfig/ui/connectortabpage.ui b/cui/uiconfig/ui/connectortabpage.ui
index c2d6939..811b42f 100644
--- a/cui/uiconfig/ui/connectortabpage.ui
+++ b/cui/uiconfig/ui/connectortabpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires LibreOffice 1.0 -->
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -369,6 +369,11 @@
<property name="tooltip_text" translatable="yes">Preview</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CTL_PREVIEW:border-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
commit abbe6ce54c1ad96b1c12f019825916e078a02cb3
Author: Steve Yin <steve_y at apache.org>
Date: Tue Nov 26 12:02:05 2013 +0000
Integrate branch of IAccessible2
Change-Id: Ic7d66abbfe8d88bfad66b1dbc8dd5bd103419714
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index acad203..2880494 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -146,12 +146,15 @@ long _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
return nRet;
}
-_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
- Control( pParent, rId ),
- maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
- maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId )
+ : Control( pParent, rId )
+ , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+ , maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
{
maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
+
+ // enable the cell focus to show visible focus
+ maListBox.EnableCellFocus();
}
_HeaderTabListBox::~_HeaderTabListBox()
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4d34a68..0b6da15 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -311,8 +311,6 @@ GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rG
maCbxInvert.Check( bInvert );
maCbxInvert.SetToggleHdl( GetModifyHdl() );
-
- maMtrThreshold.GrabFocus();
}
// -----------------------------------------------------------------------------
@@ -371,8 +369,6 @@ GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic
maMtrSepia.SetValue( nSepiaPercent );
maMtrSepia.SetModifyHdl( GetModifyHdl() );
-
- maMtrSepia.GrabFocus();
}
// -----------------------------------------------------------------------------
@@ -423,7 +419,6 @@ GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraph
maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
maNumPoster.SetValue( nPosterCount );
maNumPoster.SetModifyHdl( GetModifyHdl() );
- maNumPoster.GrabFocus();
}
// -----------------------------------------------------------------------------
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 18ffc57..3768911 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -412,6 +412,11 @@ void IconChoiceDialog::ShowPage( sal_uInt16 nId )
ActivatePageImpl( );
if(bInvalidate)
Invalidate();
+
+ // IA2 CWS. MT: I guess we want the event now, and not in Paint()?
+ IconChoicePageData* pData = GetPageData ( mnCurrentPageId );
+ if(pData)
+ ShowPageImpl ( pData );
}
/**********************************************************************
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index cd80bf8..0be8ebe 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -27,8 +27,8 @@
class _HeaderTabListBox : public Control
{
private:
- SvHeaderTabListBox maListBox;
HeaderBar maHeaderBar;
+ SvHeaderTabListBox maListBox;
protected:
DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
virtual long Notify( NotifyEvent& rNEvt );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 462b410..790c0f3 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2036,6 +2036,9 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
m_pFlPosition->Enable();
m_pFlOffset->Enable();
+ if (!m_pRbtRow->IsChecked() && !m_pRbtColumn->IsChecked())
+ m_pRbtRow->Check();
+
// Controls for Hatch-Background
m_pFlHatchBckgrd->Hide();
More information about the Libreoffice-commits
mailing list