diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-03-22 13:41:50 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-30 14:32:12 +0200 |
commit | 374599f8c26713905a310673d2b429083321186a (patch) | |
tree | 2ee4be182670b2ca9396a5f42d4122bed806a3ba /starmath/uiconfig | |
parent | 2d3a5e81e9730c1190f8592f85f5b99b6d4587ef (diff) |
weld SvxCharacterMap dialog
and SmSymDefineDialog
There's a whole bunch of interrelated stuff which needs to work at the same
time.
add menu support, keyboard support, better mouse support,
a gtk scrollable adaptor to support pseudo scrolling drawing bodge,
plugable uitest support for custom widgets, plugable a11y support
for custom widgets via the existing atk_object_wrapper_new wrapper
for XAccessible
In this specific case, change SvxCharacterMap from something that has an
internal scrollbar to a scrolledwindow where the scrollbar is external, which
drops the need for the a11y impl of SvxCharacterMap to emulate being a scrolled
window and internal table and just needs the table a11y impl
Change-Id: Ia2743d6958021c525a1900154dcbb69ae33fc400
Reviewed-on: https://gerrit.libreoffice.org/52084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath/uiconfig')
-rw-r--r-- | starmath/uiconfig/smath/ui/symdefinedialog.ui | 329 |
1 files changed, 196 insertions, 133 deletions
diff --git a/starmath/uiconfig/smath/ui/symdefinedialog.ui b/starmath/uiconfig/smath/ui/symdefinedialog.ui index 389e9db8e60e..154723ee9fed 100644 --- a/starmath/uiconfig/smath/ui/symdefinedialog.ui +++ b/starmath/uiconfig/smath/ui/symdefinedialog.ui @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.2 --> <interface domain="sm"> <requires lib="gtk+" version="3.18"/> - <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="EditSymbols"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -12,7 +11,69 @@ <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <property name="image_position">bottom</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + <property name="secondary">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> @@ -37,10 +98,10 @@ <object class="GtkLabel" id="oldSymbolSetText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="symdefinedialog|oldSymbolSetText">O_ld symbol set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">oldSymbolSets</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -48,7 +109,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="oldSymbolSets"> + <object class="GtkComboBoxText" id="oldSymbolSets"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -82,10 +143,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="symdefinedialog|oldSymbolText">_Old symbol:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">oldSymbols</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -93,7 +154,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="oldSymbols"> + <object class="GtkComboBoxText" id="oldSymbols"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -123,16 +184,98 @@ </packing> </child> <child> - <object class="svxlo-SvxShowCharSet" id="charsetDisplay"> - <property name="width_request">250</property> - <property name="height_request">250</property> + <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkScrolledWindow" id="showscroll"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">always</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="charsetDisplay"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="add"> + <property name="label">gtk-add</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="modify"> + <property name="label" translatable="yes" context="symdefinedialog|modify">_Modify</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="delete"> + <property name="label">gtk-delete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -153,10 +296,10 @@ <object class="GtkLabel" id="symbolText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes" context="symdefinedialog|symbolText">_Symbol:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">symbols</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -167,10 +310,10 @@ <object class="GtkLabel" id="symbolSetText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes" context="symdefinedialog|symbolSetText">Symbol s_et:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">symbolSets</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -181,10 +324,10 @@ <object class="GtkLabel" id="fontText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes" context="symdefinedialog|fontText">_Font:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">fonts</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -195,10 +338,10 @@ <object class="GtkLabel" id="styleText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes" context="symdefinedialog|styleText">S_tyle:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">styles</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -209,10 +352,10 @@ <object class="GtkLabel" id="fontsSubsetFT"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes" context="symdefinedialog|fontsSubsetFT">S_ubset:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">fontsSubsetLB</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -220,7 +363,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="fonts"> + <object class="GtkComboBoxText" id="fonts"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -232,7 +375,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="fontsSubsetLB"> + <object class="GtkComboBoxText" id="fontsSubsetLB"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -244,7 +387,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="symbols"> + <object class="GtkComboBoxText" id="symbols"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -252,7 +395,7 @@ <property name="has_entry">True</property> <child internal-child="entry"> <object class="GtkEntry" id="combobox-entry2"> - <property name="can_focus">False</property> + <property name="can_focus">True</property> </object> </child> </object> @@ -262,7 +405,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="symbolSets"> + <object class="GtkComboBoxText" id="symbolSets"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -270,7 +413,7 @@ <property name="has_entry">True</property> <child internal-child="entry"> <object class="GtkEntry" id="combobox-entry3"> - <property name="can_focus">False</property> + <property name="can_focus">True</property> </object> </child> </object> @@ -280,7 +423,7 @@ </packing> </child> <child> - <object class="svtlo-FontStyleBox" id="styles"> + <object class="GtkComboBoxText" id="styles"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -304,11 +447,14 @@ <property name="valign">end</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> <child> <object class="GtkLabel" id="oldSymbolName"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="ellipsize">middle</property> + <property name="width_chars">10</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">10</property> </object> <packing> <property name="left_attach">0</property> @@ -316,11 +462,12 @@ </packing> </child> <child> - <object class="smlo-SmShowChar" id="oldSymbolDisplay:border"> - <property name="width_request">60</property> - <property name="height_request">60</property> + <object class="GtkDrawingArea" id="oldSymbolDisplay"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> <packing> <property name="left_attach">0</property> @@ -331,6 +478,10 @@ <object class="GtkLabel" id="oldSymbolSetName"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="ellipsize">middle</property> + <property name="width_chars">10</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">10</property> </object> <packing> <property name="left_attach">0</property> @@ -341,6 +492,10 @@ <object class="GtkLabel" id="symbolName"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="ellipsize">middle</property> + <property name="width_chars">10</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">10</property> </object> <packing> <property name="left_attach">2</property> @@ -348,11 +503,12 @@ </packing> </child> <child> - <object class="smlo-SmShowChar" id="symbolDisplay:border"> - <property name="width_request">60</property> - <property name="height_request">60</property> + <object class="GtkDrawingArea" id="symbolDisplay"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> <packing> <property name="left_attach">2</property> @@ -363,6 +519,10 @@ <object class="GtkLabel" id="symbolSetName"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="ellipsize">middle</property> + <property name="width_chars">10</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">10</property> </object> <packing> <property name="left_attach">2</property> @@ -370,51 +530,12 @@ </packing> </child> <child> - <object class="GtkButton" id="delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="modify"> - <property name="label" translatable="yes" context="symdefinedialog|modify">_Modify</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="add"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> <object class="GtkImage" id="rightArrow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="pixbuf">starmath/res/ar_right.png</property> + <property name="icon_name">starmath/res/ar_right.png</property> </object> <packing> <property name="left_attach">1</property> @@ -435,66 +556,6 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="ok"> - <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="image_position">bottom</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="cancel"> - <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="help"> - <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> @@ -504,7 +565,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> @@ -515,6 +575,9 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> + <child> + <placeholder/> + </child> </object> <object class="GtkSizeGroup" id="sizegroup1"> <property name="mode">vertical</property> |