summaryrefslogtreecommitdiff
path: root/sfx2/uiconfig
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-06-22 15:17:04 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-06-23 10:21:26 +0200
commit6c0a6e2e91069da9db13c27a058721b88e8eaba9 (patch)
treed337ad09cefc3e3a6356385b4c63fbe809665cbb /sfx2/uiconfig
parent3c5e074a8fe5e0a18d326d37bc54a5ec0f077e4e (diff)
weld emoji dropdown
sharing a single widget between multiple notebook pages isn't going to work with native notebooks, so replace with a row of toggle buttons Change-Id: Ic24632f6d94d9238423f8b5e61d5e945c98e4a3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96891 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/uiconfig')
-rw-r--r--sfx2/uiconfig/ui/emojicontrol.ui270
1 files changed, 98 insertions, 172 deletions
diff --git a/sfx2/uiconfig/ui/emojicontrol.ui b/sfx2/uiconfig/ui/emojicontrol.ui
index ea9d72ccb2ee..7ff1033566da 100644
--- a/sfx2/uiconfig/ui/emojicontrol.ui
+++ b/sfx2/uiconfig/ui/emojicontrol.ui
@@ -1,17 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.2 -->
<interface domain="sfx">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
- <object class="GtkWindow" id="emojictrl">
+ <object class="GtkPopover" id="emojictrl">
<property name="can_focus">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">popup-menu</property>
- <property name="skip_pager_hint">True</property>
- <property name="deletable">False</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkBox" id="container">
<property name="width_request">350</property>
<property name="height_request">200</property>
<property name="visible">True</property>
@@ -19,233 +13,165 @@
<property name="resize_mode">queue</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkNotebook" id="tabcontrol">
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="scrollable">True</property>
- <property name="enable_popup">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">3</property>
<child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="sfxlo-EmojiView" id="emoji_view">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin">0</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="people">
- <property name="width_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
+ <object class="GtkToggleButton" id="people">
<property name="label" translatable="no">1f603</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="nature">
- <property name="width_request">40</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">1f43c</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="food">
- <property name="width_request">40</property>
+ <object class="GtkToggleButton" id="nature">
+ <property name="label" translatable="no">1f43c</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">1f34f</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="activity">
+ <object class="GtkToggleButton" id="food">
+ <property name="label" translatable="no">1f34f</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">1f3c8</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="travel">
+ <object class="GtkToggleButton" id="activity">
+ <property name="label" translatable="no">1f3c8</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">1f697</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="objects">
+ <object class="GtkToggleButton" id="travel">
+ <property name="label" translatable="no">1f697</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">1f4f1</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkToggleButton" id="objects">
+ <property name="label" translatable="no">1f4f1</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">6</property>
+ <property name="left_attach">5</property>
+ <property name="top_attach">0</property>
</packing>
</child>
- <child type="tab">
- <object class="GtkLabel" id="symbols">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToggleButton" id="symbols">
<property name="label" translatable="no">1f499</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">6</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">6</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkToggleButton" id="flags">
+ <property name="label" translatable="no">1f1ee-1f1f3</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">7</property>
+ <property name="left_attach">7</property>
+ <property name="top_attach">0</property>
</packing>
</child>
- <child type="tab">
- <object class="GtkLabel" id="flags">
+ <child>
+ <object class="GtkToggleButton" id="unicode9">
+ <property name="label" translatable="no">1f939</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">1f1ee-1f1f3</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">7</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">8</property>
+ <property name="top_attach">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="emoji_win">
+ <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="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
- <placeholder/>
+ <object class="GtkDrawingArea" id="emoji_view">
+ <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>
</child>
</object>
- <packing>
- <property name="position">8</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="unicode9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">1f939</property>
- </object>
- <packing>
- <property name="position">8</property>
- <property name="tab_fill">False</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>