diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-01-04 13:09:00 +0100 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-01-11 00:43:54 +0100 |
commit | 92262c813f19f7df90a75d0b5758ceec9c89741e (patch) | |
tree | da32249aa21e0dfc2019b4f0e987ec62991b9b57 /cui | |
parent | Fix typo (diff) | |
download | core-92262c813f19f7df90a75d0b5758ceec9c89741e.tar.gz core-92262c813f19f7df90a75d0b5758ceec9c89741e.zip |
tdf#114701 Missing widget labels in Customization dialog
Labels placed above controls
Change-Id: If05d54a172a3d4f98231fc7a3fb30d097e4e216e
Reviewed-on: https://gerrit.libreoffice.org/47391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/uiconfig/ui/menuassignpage.ui | 387 |
1 files changed, 231 insertions, 156 deletions
diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui index 0d887b7cbb58..256908b436c1 100644 --- a/cui/uiconfig/ui/menuassignpage.ui +++ b/cui/uiconfig/ui/menuassignpage.ui @@ -47,18 +47,16 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="row_spacing">4</property> + <property name="column_spacing">4</property> <child> <object class="GtkLabel" id="searchlabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">center</property> - <property name="margin_bottom">5</property> <property name="label" translatable="yes" context="menuassignpage|contentslabel">_Search</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">searchEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -66,189 +64,112 @@ </packing> </child> <child> - <object class="GtkLabel" id="categorylabel"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="margin_bottom">5</property> - <property name="label" translatable="yes" context="menuassignpage|contentslabel">Categor_y</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">commandcategorylist</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="desc:border"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes" context="menuassignpage|desc">Local help is not installed.</property> + <property name="editable">False</property> + <property name="cursor_visible">False</property> + <property name="accepts_tab">False</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">7</property> </packing> </child> <child> - <object class="GtkLabel" id="functionslabel"> + <object class="GtkLabel" id="descriptionlabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="label" translatable="yes" context="menuassignpage|contentslabel">_Function</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">functions:border</property> + <property name="label" translatable="yes" context="menuassignpage|label33">Description</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">6</property> </packing> </child> <child> - <object class="GtkLabel" id="descriptionlabel"> + <object class="cuilo-SfxConfigFunctionListBox" id="functions:border"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="label" translatable="yes" context="menuassignpage|label33">Description</property> + <property name="can_focus">True</property> + <property name="margin_bottom">4</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">5</property> </packing> </child> <child> - <object class="GtkEntry" id="searchEntry"> + <object class="GtkLabel" id="leftfunctionlabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_bottom">5</property> - <property name="placeholder_text" translatable="yes" context="menuassignpage|searchEntry">Type to search</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="label" translatable="yes" context="menuassignpage|contentslabel">_Function</property> + <property name="use_underline">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> <object class="cuilo-CommandCategoryListBox" id="commandcategorylist"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_bottom">5</property> + <property name="margin_bottom">4</property> <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="cuilo-SfxConfigFunctionListBox" id="functions:border"> + <object class="GtkLabel" id="categorylabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="label" translatable="yes" context="menuassignpage|contentslabel">Categor_y</property> + <property name="use_underline">True</property> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkEntry" id="searchEntry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="desc:border"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes" context="menuassignpage|desc">Local help is not installed.</property> - <property name="editable">False</property> - <property name="cursor_visible">False</property> - <property name="accepts_tab">False</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="grid7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">5</property> - <child> - <object class="GtkButton" id="add"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="menuassignpage|add">Add item</property> - <property name="halign">center</property> - <property name="valign">start</property> - <property name="margin_bottom">5</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="image">image3</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <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> - <property name="margin_top">5</property> - <child> - <object class="GtkButton" id="remove"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="menuassignpage|remove">Remove item</property> - <property name="halign">center</property> - <property name="valign">end</property> - <property name="margin_bottom">5</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="image">image4</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="margin_bottom">4</property> + <property name="placeholder_text" translatable="yes" context="menuassignpage|searchEntry">Type to search</property> </object> <packing> - <property name="left_attach">2</property> + <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="height">2</property> </packing> </child> <child> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_bottom">5</property> + <property name="margin_bottom">4</property> <property name="hexpand">True</property> <child> <object class="GtkComboBoxText" id="savein"> @@ -278,16 +199,15 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkGrid"> + <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_bottom">5</property> - <property name="column_spacing">5</property> + <property name="margin_bottom">4</property> <child> <object class="GtkComboBoxText" id="toplevellist"> <property name="visible">True</property> @@ -304,7 +224,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="margin_left">5</property> <property name="image">image5</property> <property name="always_show_image">True</property> </object> @@ -318,7 +239,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="margin_left">1</property> <property name="image">image6</property> <property name="always_show_image">True</property> </object> @@ -329,14 +251,15 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> + <property name="left_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> <object class="GtkGrid" id="entries"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="margin_bottom">4</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> @@ -368,8 +291,8 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> + <property name="left_attach">2</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -431,7 +354,7 @@ <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="defaultsbtn-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="menuassignpage|defaultsbtn-atkobject">Resets the selected toolbar, menu, or context menu to its default state.</property> + <property name="AtkObject::accessible-description" translatable="yes" context="menuassignpage|defaultsbtn">Resets the selected toolbar, menu, or context menu to its default state.</property> </object> </child> </object> @@ -443,8 +366,82 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> + <property name="left_attach">2</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">5</property> + <child> + <object class="GtkButton" id="add"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="menuassignpage|add">Add item</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="margin_bottom">5</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="image">image3</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <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> + <property name="margin_top">5</property> + <child> + <object class="GtkButton" id="remove"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="menuassignpage|remove">Remove item</property> + <property name="halign">center</property> + <property name="valign">end</property> + <property name="margin_bottom">5</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="image">image4</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -458,6 +455,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="menuassignpage|moveupbtn">Move up</property> <property name="image">image1</property> </object> <packing> @@ -470,6 +468,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="menuassignpage|movedownbtn">Move down</property> <property name="image">image2</property> </object> <packing> @@ -479,9 +478,60 @@ </child> </object> <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - <property name="height">2</property> + <property name="left_attach">3</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="scopelabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="menuassignpage|scopelabel">S_cope</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="targetlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="menuassignpage|targetlabel">_Target</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="rightfunctionlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="menuassignpage|functionlabel">F_unction</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="customizelabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="menuassignpage|customizelabel">_Customize</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">6</property> </packing> </child> <child> @@ -496,6 +546,36 @@ <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -506,25 +586,20 @@ </object> <object class="GtkSizeGroup" id="sizegrp1"> <widgets> + <widget name="grid6"/> <widget name="functions:border"/> - <widget name="entries"/> - <widget name="desc:border"/> - <widget name="commandcategorylist"/> - <widget name="searchEntry"/> </widgets> </object> <object class="GtkSizeGroup" id="sizegrp2"> <property name="mode">vertical</property> <widgets> - <widget name="searchEntry"/> - <widget name="searchlabel"/> - <widget name="savein"/> - <widget name="functionbtn"/> - <widget name="categorylabel"/> <widget name="commandcategorylist"/> <widget name="toplevellist"/> <widget name="plusbtn"/> <widget name="minusbtn"/> + <widget name="searchEntry"/> + <widget name="savein"/> + <widget name="functionbtn"/> </widgets> </object> <object class="GtkMenu" id="insertmenu"> |