Kaydet (Commit) e5cb1989 authored tarafından Caolán McNamara's avatar Caolán McNamara

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
üst c15913b2
...@@ -536,8 +536,11 @@ ...@@ -536,8 +536,11 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="page_text"> <object class="GtkLabel" id="page_text">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Page Fields</property> <property name="label" translatable="yes">Page Fields</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pagefield</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -547,8 +550,11 @@ ...@@ -547,8 +550,11 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="column_text"> <object class="GtkLabel" id="column_text">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Column Fields</property> <property name="label" translatable="yes">Column Fields</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">columnfield</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -558,8 +564,11 @@ ...@@ -558,8 +564,11 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="row_text"> <object class="GtkLabel" id="row_text">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Row Fields</property> <property name="label" translatable="yes">Row Fields</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rowfield</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -569,8 +578,11 @@ ...@@ -569,8 +578,11 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="data_text"> <object class="GtkLabel" id="data_text">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Data Fields</property> <property name="label" translatable="yes">Data Fields</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">datafield</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -581,7 +593,10 @@ ...@@ -581,7 +593,10 @@
<child> <child>
<object class="GtkLabel" id="select_text"> <object class="GtkLabel" id="select_text">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label" translatable="yes">Selection area</property> <property name="label" translatable="yes">Selection area</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">buttonfield</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
......
...@@ -87,6 +87,11 @@ static bool ImplIsMnemonicCtrl( Window* pWindow ) ...@@ -87,6 +87,11 @@ static bool ImplIsMnemonicCtrl( Window* pWindow )
if ( pWindow->GetType() == WINDOW_FIXEDTEXT ) 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) ) if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) )
return false; return false;
Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT ); Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT );
......
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