diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-23 19:14:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-24 20:23:11 +0100 |
| commit | 7def3650fae374d06f28fe466cbc150567ea511f (patch) | |
| tree | 199045a1ff2e5e352141e03b8f25983f07eb3db0 /fpicker/uiconfig | |
| parent | 29d2024e16ce3cb81ad7f5b5f7e1b93378a93199 (diff) | |
Resolves: tdf#128940 use a normal MenuButton
instead of a split toolbar item
Change-Id: I2e706d1a3255dca7a51d323a2bcf750f28b8fd1e
Reviewed-on: https://gerrit.libreoffice.org/83582
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker/uiconfig')
| -rw-r--r-- | fpicker/uiconfig/ui/remotefilesdialog.ui | 102 |
1 files changed, 43 insertions, 59 deletions
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui index 93c17f05ba27..a069b2fb0c21 100644 --- a/fpicker/uiconfig/ui/remotefilesdialog.ui +++ b/fpicker/uiconfig/ui/remotefilesdialog.ui @@ -51,6 +51,42 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkMenu" id="service_edit_menu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="add_service"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="remotefilesdialog|edit_service">_Add service</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="edit_service"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="remotefilesdialog|edit_service">_Edit service</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="delete_service"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="remotefilesdialog|delete_service">_Delete service</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="change_password"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="remotefilesdialog|change_password">_Change password</property> + <property name="use_underline">True</property> + </object> + </child> + </object> <object class="GtkDialog" id="RemoteFilesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -174,38 +210,16 @@ </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkMenuButton" id="add_service_btn"> + <property name="label" translatable="yes" context="remotefilesdialog|add_service_btn">_Manage services</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="propagate_natural_width">True</property> - <property name="propagate_natural_height">True</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="popup">service_edit_menu</property> + <property name="use_popover">False</property> <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkToolbar" id="add_service_bar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuToolButton" id="add_service_btn"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="remotefilesdialog|add_service_btn">Add service</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - </child> - </object> + <placeholder/> </child> </object> <packing> @@ -454,8 +468,6 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore2</property> - <property name="pixbuf_column">0</property> - <property name="text_column">1</property> </object> </child> </object> @@ -558,32 +570,4 @@ <action-widget response="-5">save</action-widget> </action-widgets> </object> - <object class="GtkMenu" id="service_edit_menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="edit_service"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="remotefilesdialog|edit_service">_Edit service</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="delete_service"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="remotefilesdialog|delete_service">_Delete service</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="change_password"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="remotefilesdialog|change_password">_Change password</property> - <property name="use_underline">True</property> - </object> - </child> - </object> </interface> |