sd/source/ui/dlg/present.cxx | 6 -- sd/uiconfig/simpress/ui/presentationdialog.ui | 54 +++++++++++++++++++++----- 2 files changed, 44 insertions(+), 16 deletions(-)
New commits: commit 990d3c7ecab5c394abebf914dd7f148d6323780a Author: Caolán McNamara <[email protected]> Date: Thu Mar 14 20:23:50 2013 +0000 we can now move the a11y relationships into the .ui Change-Id: I73109b04a86096f2025947a1f1f383ae69d355ed diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index bf38907..f9f2ec2 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -90,12 +90,6 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aTmfPause->SetModifyHdl( LINK( this, SdStartPresentationDlg, ChangePauseHdl ) ); aTmfPause->SetFormat( TIMEF_SEC ); - aLbDias->SetAccessibleRelationLabeledBy( aRbtAtDia ); - aLbDias->SetAccessibleName(aRbtAtDia->GetText()); - aLbCustomshow->SetAccessibleRelationLabeledBy( aRbtCustomshow ); - aTmfPause->SetAccessibleRelationLabeledBy( aRbtAuto ); - aTmfPause->SetAccessibleName(aRbtAuto->GetText()); - // fill Listbox with page names for (std::vector<String>::const_iterator pIter = rPageNames.begin(); pIter != rPageNames.end(); ++pIter) aLbDias->InsertEntry(*pIter); diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui index 1e164f6..4d2d582 100644 --- a/sd/uiconfig/simpress/ui/presentationdialog.ui +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -53,6 +53,9 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">allslides</property> + <accessibility> + <relation type="label-for" target="from_cb"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -65,8 +68,15 @@ <object class="GtkComboBox" id="from_cb"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">6</property> <property name="hexpand">True</property> + <accessibility> + <relation type="labelled-by" target="from"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="from_cb-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Starting slide</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -112,6 +122,9 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">from</property> + <accessibility> + <relation type="label-for" target="customslideshow_cb"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -126,6 +139,9 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="hexpand">True</property> + <accessibility> + <relation type="labelled-by" target="customslideshow"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -362,6 +378,9 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">window</property> + <accessibility> + <relation type="label-for" target="pauseduration:hh:mm"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -393,7 +412,16 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Duration of pause</property> <property name="margin_left">12</property> + <accessibility> + <relation type="labelled-by" target="auto"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="pauseduration:hh:mm-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Pause Duration</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> commit 044bebafcc8f09018171ea1bdc62466ab5fb1dad Author: Caolán McNamara <[email protected]> Date: Thu Mar 14 20:16:08 2013 +0000 add some more spacing here and there Change-Id: I1ee617dcc510c41e579ffaaf90f3d3a27971d0bb diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui index c04fdc6..1e164f6 100644 --- a/sd/uiconfig/simpress/ui/presentationdialog.ui +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -3,7 +3,7 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="PresentationDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Slide Show</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -11,6 +11,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> @@ -30,17 +31,18 @@ <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">2</property> + <property name="row_spacing">6</property> <child> <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="from"> <property name="label" translatable="yes">_From:</property> @@ -122,7 +124,7 @@ <object class="GtkComboBox" id="customslideshow_cb"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">24</property> + <property name="margin_left">12</property> <property name="hexpand">True</property> </object> <packing> @@ -166,6 +168,7 @@ <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid7"> @@ -179,11 +182,11 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="column_spacing">12</property> <child> <object class="GtkComboBox" id="presdisplay_cb"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">6</property> <property name="hexpand">True</property> </object> <packing> @@ -197,6 +200,7 @@ <object class="GtkLabel" id="presdisplay_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">P_resentation display:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">presdisplay_cb</property> @@ -302,6 +306,7 @@ <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid3"> @@ -309,7 +314,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">2</property> + <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="default"> <property name="label" translatable="yes">_Default</property> @@ -371,7 +376,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="margin_left">24</property> + <property name="margin_left">12</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -388,7 +393,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="margin_left">24</property> + <property name="margin_left">12</property> </object> <packing> <property name="left_attach">0</property> @@ -431,6 +436,7 @@ <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid4"> @@ -438,7 +444,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">2</property> + <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="manualslides"> <property name="label" translatable="yes">Change slides _manually</property>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
