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 /sfx2/uiconfig | |
parent | Avoid crash-reporter crash. (diff) | |
download | core-374599f8c26713905a310673d2b429083321186a.tar.gz core-374599f8c26713905a310673d2b429083321186a.zip |
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 'sfx2/uiconfig')
-rw-r--r-- | sfx2/uiconfig/ui/charmapcontrol.ui | 64 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/charviewmenu.ui | 25 |
2 files changed, 57 insertions, 32 deletions
diff --git a/sfx2/uiconfig/ui/charmapcontrol.ui b/sfx2/uiconfig/ui/charmapcontrol.ui index af77f159e021..510b079e61ca 100644 --- a/sfx2/uiconfig/ui/charmapcontrol.ui +++ b/sfx2/uiconfig/ui/charmapcontrol.ui @@ -37,7 +37,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-SvxCharView" id="favchar1"> + <object class="sfxlo-SvxCharViewControl" id="favchar1"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -49,7 +49,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar2"> + <object class="sfxlo-SvxCharViewControl" id="favchar2"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -61,7 +61,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar4"> + <object class="sfxlo-SvxCharViewControl" id="favchar4"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -73,7 +73,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar3"> + <object class="sfxlo-SvxCharViewControl" id="favchar3"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -85,7 +85,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar5"> + <object class="sfxlo-SvxCharViewControl" id="favchar5"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -97,7 +97,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar6"> + <object class="sfxlo-SvxCharViewControl" id="favchar6"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -109,7 +109,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar7"> + <object class="sfxlo-SvxCharViewControl" id="favchar7"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -121,7 +121,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar8"> + <object class="sfxlo-SvxCharViewControl" id="favchar8"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -133,7 +133,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar9"> + <object class="sfxlo-SvxCharViewControl" id="favchar9"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -145,7 +145,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar10"> + <object class="sfxlo-SvxCharViewControl" id="favchar10"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -157,7 +157,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar11"> + <object class="sfxlo-SvxCharViewControl" id="favchar11"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -169,7 +169,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar12"> + <object class="sfxlo-SvxCharViewControl" id="favchar12"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -181,7 +181,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar13"> + <object class="sfxlo-SvxCharViewControl" id="favchar13"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -193,7 +193,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar14"> + <object class="sfxlo-SvxCharViewControl" id="favchar14"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -205,7 +205,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar15"> + <object class="sfxlo-SvxCharViewControl" id="favchar15"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -217,7 +217,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="favchar16"> + <object class="sfxlo-SvxCharViewControl" id="favchar16"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -260,7 +260,7 @@ <property name="row_homogeneous">True</property> <property name="column_homogeneous">True</property> <child> - <object class="sfxlo-SvxCharView" id="viewchar1"> + <object class="sfxlo-SvxCharViewControl" id="viewchar1"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -272,7 +272,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar2"> + <object class="sfxlo-SvxCharViewControl" id="viewchar2"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -284,7 +284,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar4"> + <object class="sfxlo-SvxCharViewControl" id="viewchar4"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -296,7 +296,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar3"> + <object class="sfxlo-SvxCharViewControl" id="viewchar3"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -308,7 +308,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar5"> + <object class="sfxlo-SvxCharViewControl" id="viewchar5"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -320,7 +320,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar6"> + <object class="sfxlo-SvxCharViewControl" id="viewchar6"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -332,7 +332,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar16"> + <object class="sfxlo-SvxCharViewControl" id="viewchar16"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -344,7 +344,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar15"> + <object class="sfxlo-SvxCharViewControl" id="viewchar15"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -356,7 +356,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar14"> + <object class="sfxlo-SvxCharViewControl" id="viewchar14"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -368,7 +368,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar13"> + <object class="sfxlo-SvxCharViewControl" id="viewchar13"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -380,7 +380,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar12"> + <object class="sfxlo-SvxCharViewControl" id="viewchar12"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -392,7 +392,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar11"> + <object class="sfxlo-SvxCharViewControl" id="viewchar11"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -404,7 +404,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar10"> + <object class="sfxlo-SvxCharViewControl" id="viewchar10"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -416,7 +416,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar9"> + <object class="sfxlo-SvxCharViewControl" id="viewchar9"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -428,7 +428,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar8"> + <object class="sfxlo-SvxCharViewControl" id="viewchar8"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> @@ -440,7 +440,7 @@ </packing> </child> <child> - <object class="sfxlo-SvxCharView" id="viewchar7"> + <object class="sfxlo-SvxCharViewControl" id="viewchar7"> <property name="width_request">35</property> <property name="height_request">35</property> <property name="visible">True</property> diff --git a/sfx2/uiconfig/ui/charviewmenu.ui b/sfx2/uiconfig/ui/charviewmenu.ui new file mode 100644 index 000000000000..f0ff54ec195b --- /dev/null +++ b/sfx2/uiconfig/ui/charviewmenu.ui @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.2 --> +<interface domain="cui"> + <requires lib="gtk+" version="3.18"/> + <object class="GtkMenu" id="charviewmenu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="clearchar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="charviewmenu|clearchar">Remove</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="clearallchar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="charviewmenu|clearallchar">Clear All</property> + <property name="use_underline">True</property> + </object> + </child> + </object> +</interface> |