diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-01 17:22:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-02 14:05:50 +0100 |
| commit | 91548e11b37f52aed476996d7d97ad2b45e43ed5 (patch) | |
| tree | 48a92754b723b3d41a19e2bc014cd250279e6580 /cui/uiconfig | |
| parent | 0887551123df339cb6e5a2fdad470963c6dc1229 (diff) | |
weld SvxIconSelectorDialog
and use a ValueSet here instead of the odd toolbar use
Change-Id: Ic2e78664ebde31751055d2c9fec66c7dabe8d05f
Reviewed-on: https://gerrit.libreoffice.org/68598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/uiconfig')
| -rw-r--r-- | cui/uiconfig/ui/iconselectordialog.ui | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/cui/uiconfig/ui/iconselectordialog.ui b/cui/uiconfig/ui/iconselectordialog.ui index b0b8ff2700ce..a12fee076901 100644 --- a/cui/uiconfig/ui/iconselectordialog.ui +++ b/cui/uiconfig/ui/iconselectordialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkDialog" id="IconSelector"> @@ -9,7 +9,13 @@ <property name="border_width">6</property> <property name="title" translatable="yes" context="iconselectordialog|IconSelector">Change Icon</property> <property name="resizable">False</property> + <property name="modal">True</property> + <property name="default_width">0</property> + <property name="default_height">0</property> <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -106,11 +112,27 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkToolbar" id="symbolsToolbar"> + <object class="GtkScrolledWindow" id="symbolswin"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</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="symbolsToolbar"> + <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> </child> </object> @@ -187,12 +209,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <property name="label" translatable="yes" context="iconselectordialog|noteLabel">Note: The size of an icon should be 16x16 pixel to achieve best quality. Different sized icons will be scaled automatically.</property> <property name="wrap">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> <packing> <property name="expand">False</property> |