diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-12 14:15:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-12 14:16:30 +0000 |
| commit | e5cb1989520baf321961dbb82437d1b00a2a499c (patch) | |
| tree | 847ed522bc8632fa0c1d4ca510d61e106ba76ec3 | |
| parent | c15913b273c74bbfe7b24f99934e09a3249a81a9 (diff) | |
Resolves: fdo#75982 set mnemonics targets for hidden labels
the key piece though is that labels that have mnemonic targets
are always candidates for getting mnemonics generated for them
Change-Id: Ie4bcbc18e94467936f40875c749cd22793021d0c
| -rw-r--r-- | sc/uiconfig/scalc/ui/pivottablelayout.ui | 15 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sc/uiconfig/scalc/ui/pivottablelayout.ui b/sc/uiconfig/scalc/ui/pivottablelayout.ui index 17b6055601bc..2071a0e89e69 100644 --- a/sc/uiconfig/scalc/ui/pivottablelayout.ui +++ b/sc/uiconfig/scalc/ui/pivottablelayout.ui @@ -536,8 +536,11 @@ </child> <child> <object class="GtkLabel" id="page_text"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Page Fields</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">pagefield</property> </object> <packing> <property name="expand">False</property> @@ -547,8 +550,11 @@ </child> <child> <object class="GtkLabel" id="column_text"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Column Fields</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">columnfield</property> </object> <packing> <property name="expand">False</property> @@ -558,8 +564,11 @@ </child> <child> <object class="GtkLabel" id="row_text"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Row Fields</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">rowfield</property> </object> <packing> <property name="expand">False</property> @@ -569,8 +578,11 @@ </child> <child> <object class="GtkLabel" id="data_text"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Data Fields</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">datafield</property> </object> <packing> <property name="expand">False</property> @@ -581,7 +593,10 @@ <child> <object class="GtkLabel" id="select_text"> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="label" translatable="yes">Selection area</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">buttonfield</property> </object> <packing> <property name="expand">False</property> diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 55f985668a49..ab03297f744a 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -87,6 +87,11 @@ static bool ImplIsMnemonicCtrl( Window* pWindow ) if ( pWindow->GetType() == WINDOW_FIXEDTEXT ) { + FixedText *pText = static_cast<FixedText*>(pWindow); + if (pText->get_mnemonic_widget()) + return true; + //This is the legacy pre-layout logic which we retain + //until we can be sure we can remove it if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) ) return false; Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT ); |