cui/source/customize/SvxNotebookbarConfigPage.cxx | 7
cui/source/customize/cfg.cxx | 2
cui/source/inc/cfg.hxx | 2
cui/uiconfig/ui/menuassignpage.ui | 541 ++++++++++------------
4 files changed, 265 insertions(+), 287 deletions(-)
New commits:
commit e7f62648f01ba776357e9fcbb9f49c2fb3490ab1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 8 20:34:21 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 9 09:05:04 2022 +0000
make Notebookbar customize page match indent with the others
remove intermediate grids with just one child, name the containers
of the groups of widgets to be hidden and hide the container rather
than the individual members so the container space doesn't push
this page out of alignment with the others.
Change-Id: Ie3fb291da49a6b43ca4516e5fe55b828543631e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143838
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 91ce6352ddca..35dc04aacbaa 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -107,14 +107,11 @@
SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
m_xDescriptionField->set_visible(false);
m_xMoveUpButton->set_visible(false);
m_xMoveDownButton->set_visible(false);
- m_xAddCommandButton->set_visible(false);
- m_xRemoveCommandButton->set_visible(false);
+ m_xCommandButtons->set_visible(false);
m_xLeftFunctionLabel->set_visible(false);
m_xSearchLabel->set_visible(false);
m_xCategoryLabel->set_visible(false);
- m_xInsertBtn->set_visible(false);
- m_xModifyBtn->set_visible(false);
- m_xResetBtn->set_visible(false);
+ m_xCustomizeBox->set_visible(false);
m_xCustomizeLabel->set_visible(false);
weld::TreeView& rCommandCategoryBox = m_xFunctions->get_widget();
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 030307879738..fe59621c1c4b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1009,9 +1009,11 @@ SvxConfigPage::SvxConfigPage(weld::Container* pPage,
weld::DialogController* pCo
, m_xMoveUpButton(m_xBuilder->weld_button("up"))
, m_xMoveDownButton(m_xBuilder->weld_button("down"))
, m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
+ , m_xCustomizeBox(m_xBuilder->weld_widget("customizebox"))
, m_xInsertBtn(m_xBuilder->weld_menu_button("insert"))
, m_xModifyBtn(m_xBuilder->weld_menu_button("modify"))
, m_xResetBtn(m_xBuilder->weld_button("defaultsbtn"))
+ , m_xCommandButtons(m_xBuilder->weld_widget("arrowgrid"))
, m_xAddCommandButton(m_xBuilder->weld_button("add"))
, m_xRemoveCommandButton(m_xBuilder->weld_button("remove"))
{
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 87b17b1c912f..10ce7d89af7b 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -411,12 +411,14 @@ protected:
std::unique_ptr<weld::ComboBox> m_xSaveInListBox;
+ std::unique_ptr<weld::Widget> m_xCustomizeBox;
std::unique_ptr<weld::MenuButton> m_xInsertBtn;
std::unique_ptr<weld::MenuButton> m_xModifyBtn;
// Used to reset the selected toolbar/menu/context menu
std::unique_ptr<weld::Button> m_xResetBtn;
// Middle buttons
+ std::unique_ptr<weld::Widget> m_xCommandButtons;
std::unique_ptr<weld::Button> m_xAddCommandButton;
std::unique_ptr<weld::Button> m_xRemoveCommandButton;
diff --git a/cui/uiconfig/ui/menuassignpage.ui
b/cui/uiconfig/ui/menuassignpage.ui
index b67c24b24f1f..b545c193a352 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -674,7 +674,7 @@
</packing>
</child>
<child>
- <object class="GtkButtonBox">
+ <object class="GtkButtonBox" id="customizebox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
@@ -762,7 +762,7 @@
</child>
<child>
<!-- n-columns=1 n-rows=2 -->
- <object class="GtkGrid" id="grid7">
+ <object class="GtkGrid" id="arrowgrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
@@ -770,32 +770,20 @@
<property name="margin-end">6</property>
<property name="row-spacing">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
+ <object class="GtkButton" id="add">
<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="image">image3</property>
- <property name="always-show-image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="add-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|add">Click on the right
arrow button to select a function on the left display box and copy to the right
display box. This will add the function to the selected menu.</property>
- </object>
- </child>
+ <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">10</property>
+ <property name="image">image3</property>
+ <property name="always-show-image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="add-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|add">Click on the right
arrow button to select a function on the left display box and copy to the right
display box. This will add the function to the selected menu.</property>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
</object>
<packing>
@@ -804,32 +792,21 @@
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
+ <object class="GtkButton" id="remove">
<property name="visible">True</property>
- <property name="can-focus">False</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-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="image">image4</property>
- <property name="always-show-image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="remove-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|remove">Click on the
left arrow button to remove the selected command from the current
menu.</property>
- </object>
- </child>
+ <property name="margin-bottom">5</property>
+ <property name="image">image4</property>
+ <property name="always-show-image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="remove-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|remove">Click on the
left arrow button to remove the selected command from the current
menu.</property>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
</object>
<packing>
commit 7938f3f84dec59e0714b4b4c97eb35fc26ba7054
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 8 20:27:22 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 9 09:04:55 2022 +0000
resave with latest glade
Change-Id: I548fac08a9b4d62d6e71bf5fa687d5c1ff2e11b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143837
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/menuassignpage.ui
b/cui/uiconfig/ui/menuassignpage.ui
index 2f554d4b91e3..b67c24b24f1f 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="icon-name">go-up</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="icon-name">go-down</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="icon-name">go-next</property>
<property name="icon_size">3</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="icon-name">go-previous</property>
<property name="icon_size">3</property>
</object>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">open-menu-symbolic</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">open-menu-symbolic</property>
<property name="icon_size">2</property>
</object>
<object class="GtkImage" id="image8">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">open-menu-symbolic</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">open-menu-symbolic</property>
<property name="icon_size">2</property>
</object>
<object class="GtkMenu" id="insertmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkMenuItem" id="insertseparator">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|insertseparator">Insert Separator</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="insertsubmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|insertsubmenu">Insert Submenu</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
</object>
@@ -96,193 +96,193 @@
</object>
<object class="GtkMenu" id="menugearmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkMenuItem" id="menu_gear_add">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_add">_Add...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_gear_delete">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_delete">_Delete</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_gear_rename">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_rename">_Rename...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_gear_move">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_move">_Move...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
</object>
<object class="GtkMenu" id="modifymenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkMenuItem" id="renameItem">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|renameItem">Rename...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="changeIcon">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|changeIcon">Change Icon...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="resetIcon">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|resetIcon">Reset Icon</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="restoreItem">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|restoreItem">Restore Default Command</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
</object>
<object class="GtkMenu" id="toolbargearmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkMenuItem" id="toolbar_gear_add">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_add">_Add...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="toolbar_gear_delete">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_delete">_Delete</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="toolbar_gear_rename">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_rename">_Rename...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="toolbar_gear_move">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_move">_Move...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="toolbar_gear_separator">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="toolbar_gear_iconAndText">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_iconAndText">_Icon and text</property>
- <property name="use_underline">True</property>
- <property name="draw_as_radio">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-as-radio">True</property>
<property name="group">toolbar_gear_iconOnly</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="toolbar_gear_iconOnly">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_iconOnly">Icon _only</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<property name="active">True</property>
- <property name="draw_as_radio">True</property>
+ <property name="draw-as-radio">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="toolbar_gear_textOnly">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">_Text only</property>
- <property name="use_underline">True</property>
- <property name="draw_as_radio">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-as-radio">True</property>
<property name="group">toolbar_gear_iconOnly</property>
</object>
</child>
</object>
<object class="GtkBox" id="MenuAssignPage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="border_width">6</property>
+ <property name="border-width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=4 n-rows=8 -->
<object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">4</property>
- <property name="column_spacing">4</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="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="label" translatable="yes"
context="menuassignpage|contentslabel">_Search</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="can-focus">True</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTextView" id="desc">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="menuassignpage|desc">Description of the currently selected
function.</property>
+ <property name="can-focus">True</property>
+ <property name="tooltip-text" translatable="yes"
context="menuassignpage|desc">Description of the currently selected
function.</property>
<property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
+ <property name="wrap-mode">word</property>
+ <property name="cursor-visible">False</property>
+ <property name="accepts-tab">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="desc-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|desc">The text box
contains a short description of the selected command.</property>
@@ -292,44 +292,44 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="descriptionlabel">
<property name="visible">True</property>
- <property name="can_focus">False</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">D_escription</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">desc</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">desc</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="functions">
- <property name="width_request">-1</property>
+ <property name="width-request">-1</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
+ <property name="can-focus">True</property>
+ <property name="has-tooltip">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="search_column">1</property>
- <property name="enable_tree_lines">True</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">1</property>
+ <property name="enable-tree-lines">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection1"/>
</child>
@@ -359,29 +359,29 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="leftfunctionlabel">
<property name="visible">True</property>
- <property name="can_focus">False</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">_Available Commands</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="commandcategorylist">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">4</property>
+ <property name="can-focus">False</property>
+ <property name="margin-bottom">4</property>
<property name="hexpand">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="commandcategorylist-atkobject">
@@ -390,32 +390,32 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="categorylabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <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>
- <property name="mnemonic_widget">commandcategorylist</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">commandcategorylist</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="searchEntry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_bottom">4</property>
- <property name="placeholder_text" translatable="yes"
context="menuassignpage|searchEntry">Type to search</property>
+ <property name="can-focus">True</property>
+ <property name="margin-bottom">4</property>
<property name="truncate-multiline">True</property>
+ <property name="placeholder-text" translatable="yes"
context="menuassignpage|searchEntry">Type to search</property>
<child internal-child="accessible">
<object class="AtkObject" id="searchEntry-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|searchEntry">Enter a
string in the text box to narrow the search of commands.</property>
@@ -423,21 +423,21 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">4</property>
+ <property name="can-focus">False</property>
+ <property name="margin-bottom">4</property>
<property name="hexpand">True</property>
<child>
<object class="GtkComboBoxText" id="savein">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="margin-end">5</property>
<property name="hexpand">True</property>
<child internal-child="accessible">
@@ -447,41 +447,41 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="functionbtn">
<property name="label" translatable="yes"
context="menuassignpage|functionbtn">_Function</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="hexpand">True</property>
- <property name="use_underline">True</property>
- <property name="image_position">right</property>
+ <property name="use-underline">True</property>
+ <property name="image-position">right</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=3 n-rows=1 -->
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">4</property>
+ <property name="can-focus">False</property>
+ <property name="margin-bottom">4</property>
<child>
<object class="GtkComboBoxText" id="toplevellist">
- <property name="width_request">1</property>
+ <property name="width-request">1</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="toplevellist-atkobject">
@@ -490,20 +490,20 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="menugearbtn">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="halign">end</property>
<property name="margin-start">1</property>
<property name="image">image7</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
<property name="popup">menugearmenu</property>
- <property name="use_popover">False</property>
+ <property name="use-popover">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="menugearbtn-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="menuassignpage|menugearbtn">Gear Menu</property>
@@ -512,20 +512,20 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="toolbargearbtn">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="halign">end</property>
<property name="margin-start">1</property>
<property name="image">image8</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
<property name="popup">toolbargearmenu</property>
- <property name="use_popover">False</property>
+ <property name="use-popover">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="toolbargearbtn-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="menuassignpage|toolbargearbtn">Gear Menu</property>
@@ -534,44 +534,44 @@
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="entries">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_bottom">4</property>
+ <property name="can-focus">True</property>
+ <property name="margin-bottom">4</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="GtkScrolledWindow">
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">True</property>
+ <property name="no-show-all">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="toolcontents">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="has-tooltip">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>
- <property name="headers_visible">False</property>
+ <property name="headers-visible">False</property>
<property name="reorderable">True</property>
- <property name="search_column">1</property>
- <property name="show_expanders">False</property>
+ <property name="search-column">1</property>
+ <property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
@@ -605,30 +605,30 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">True</property>
+ <property name="no-show-all">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="menucontents">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="has-tooltip">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore3</property>
- <property name="headers_visible">False</property>
+ <property name="headers-visible">False</property>
<property name="reorderable">True</property>
- <property name="search_column">1</property>
- <property name="show_expanders">False</property>
+ <property name="search-column">1</property>
+ <property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
</child>
@@ -663,40 +663,40 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkButtonBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
+ <property name="margin-top">5</property>
+ <property name="margin-bottom">5</property>
<property name="hexpand">True</property>
- <property name="layout_style">start</property>
+ <property name="layout-style">start</property>
<child>
<object class="GtkMenuButton" id="insert">
<property name="label" translatable="yes"
context="menuassignpage|insert">_Insert</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="margin-top">5</property>
+ <property name="margin-bottom">5</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="popup">insertmenu</property>
- <property name="use_popover">False</property>
+ <property name="use-popover">False</property>
<child>
<placeholder/>
</child>
@@ -711,16 +711,16 @@
<object class="GtkMenuButton" id="modify">
<property name="label" translatable="yes"
context="menuassignpage|modify">_Modify</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="margin-top">5</property>
+ <property name="margin-bottom">5</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="popup">modifymenu</property>
- <property name="use_popover">False</property>
+ <property name="use-popover">False</property>
<child>
<placeholder/>
</child>
@@ -735,13 +735,13 @@
<object class="GtkButton" id="defaultsbtn">
<property name="label" translatable="yes"
context="menuassignpage|defaultsbtn">_Defaults</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="use_underline">True</property>
+ <property name="margin-top">5</property>
+ <property name="margin-bottom">5</property>
+ <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">Resets the selected
toolbar, menu, or context menu to its default state.</property>
@@ -756,36 +756,36 @@
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">7</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
- <property name="row_spacing">6</property>
+ <property name="row-spacing">6</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">5</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="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="margin-bottom">5</property>
<property name="image">image3</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="add-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|add">Click on the right
arrow button to select a function on the left display box and copy to the right
display box. This will add the function to the selected menu.</property>
@@ -793,33 +793,33 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <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>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</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="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="margin-bottom">5</property>
<property name="image">image4</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="remove-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="menuassignpage|extended_tip|remove">Click on the
left arrow button to remove the selected command from the current
menu.</property>
@@ -827,35 +827,35 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <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>
+ <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>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">center</property>
- <property name="row_spacing">6</property>
+ <property name="row-spacing">6</property>
<child>
<object class="GtkButton" id="up">
<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="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>
<property name="always-show-image">True</property>
<child internal-child="accessible">
@@ -865,16 +865,16 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="down">
<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="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>
<property name="always-show-image">True</property>
<child internal-child="accessible">
@@ -884,66 +884,66 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">5</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="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>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <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="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>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
+ <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="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes"
context="menuassignpage|functionlabel">Assi_gned Commands</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">4</property>
+ <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="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>
+ <property name="use-underline">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">6</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
