diff options
author | Justin Luth <justin.luth@collabora.com> | 2020-12-01 12:09:34 +0300 |
---|---|---|
committer | Justin Luth <justin_luth@sil.org> | 2020-12-03 06:11:45 +0100 |
commit | 78ec4f4cbd5b7cc5b7eeb465fe7950fc72ce2847 (patch) | |
tree | 41afec85e908e1517f291a1bb7fe8959aab35c43 /sd/uiconfig | |
parent | 39e962f5356b5fbbf269607b4432a4f28f56ae4f (diff) |
tdf#116815 Draw UI: remove presentation-only stuff
These items are not saved or imported into Draw,
so remove them from the UI interface.
They are just inherited from Impress.
Specifically:
-Display Master Background
-Display Master Objects
-Master Elements
This patch removes these 3 elements in Draw from:
-sidebar page properties
-main traditional menu
-Tabbed Notebook bar's layout tab,
and the tab's Layout menu,
and when viewing master - context tab
-Compact Notebook bar's layout tab,
and the tab's Layout menu,
and when viewing master - context tab
-Single Notebook bar's master context view
-Compact groupped bar's Page menu
(even though it isn't visible.)
Change-Id: Ibae57bfec18cd44e9a76e6847a4c5215945b64ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107002
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'sd/uiconfig')
-rw-r--r-- | sd/uiconfig/sdraw/menubar/menubar.xml | 4 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 146 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 215 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 14 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_single.ui | 122 |
5 files changed, 0 insertions, 501 deletions
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index bdcc15444dc8..a2d06a2ec2ec 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -448,10 +448,6 @@ <menu:menuitem menu:id=".uno:InsertMasterPage"/> <menu:menuitem menu:id=".uno:DeleteMasterPage"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:DisplayMasterBackground"/> - <menu:menuitem menu:id=".uno:DisplayMasterObjects"/> - <menu:menuitem menu:id=".uno:MasterLayouts"/> - <menu:menuseparator/> <menu:menu menu:id=".uno:SlideMoveMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:MovePageFirst"/> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 512ddb512df7..8824cc4637cc 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -1355,20 +1355,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSlide-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6281,83 +6267,6 @@ </packing> </child> <child> - <object class="VclOptionalBox" id="Page-Section-MasterSlide1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="GroupB57"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA26"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Page-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</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="sfxlo-NotebookbarToolBox" id="LineB28"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Page-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <style> - <class name="priority-2"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> - </child> - <child> <object class="VclOptionalBox" id="Page-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -17655,61 +17564,6 @@ </packing> </child> <child> - <object class="VclOptionalBox" id="Master-Section-MasterLayouts"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkSeparator" id="separator61"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom124"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - <child> - <object class="GtkToolButton" id="MasterPage-MasterLayouts1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:MasterLayouts</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - <child> <object class="VclOptionalBox" id="Master-Section-ShowHide"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index 7745842f0f95..bef513927bbe 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -1263,20 +1263,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSlide-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6117,85 +6103,6 @@ </packing> </child> <child> - <object class="VclOptionalBox" id="Layout-Section-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom69"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Page-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-7"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> - </child> - <child> - <object class="VclOptionalBox" id="Layout-Section-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom66"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Page-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-6"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">10</property> - </packing> - </child> - <child> <object class="VclOptionalBox" id="Layout-Section-SelectGroup"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -18674,128 +18581,6 @@ </packing> </child> <child> - <object class="VclOptionalBox" id="Master-Section-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Anchor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Master-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-4"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">8</property> - </packing> - </child> - <child> - <object class="VclOptionalBox" id="Master-Section-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Draw20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Master-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_horizontal">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <style> - <class name="priority-3"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> - </child> - <child> - <object class="VclOptionalBox" id="Master-Section-MasterLayouts"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Draw21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Master-MasterLayouts"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_horizontal">False</property> - <property name="action_name">.uno:MasterLayouts</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <style> - <class name="priority-2"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">10</property> - </packing> - </child> - <child> <object class="VclOptionalBox" id="Master-Section-PageMode"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 59ca912fa6d0..2c0ab5f3ca11 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -2757,20 +2757,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSlide-separator5"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_single.ui b/sd/uiconfig/sdraw/ui/notebookbar_single.ui index 7824636dde81..106c3f5df571 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_single.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_single.ui @@ -11833,128 +11833,6 @@ </packing> </child> <child> - <object class="VclOptionalBox" id="Master-Section-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Anchor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Master-DisplayMasterBackground"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-4"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">8</property> - </packing> - </child> - <child> - <object class="VclOptionalBox" id="Master-Section-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Draw20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Master-DisplayMasterObjects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_horizontal">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <style> - <class name="priority-3"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> - </child> - <child> - <object class="VclOptionalBox" id="Master-Section-MasterLayouts"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Draw21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Master-MasterLayouts"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_horizontal">False</property> - <property name="action_name">.uno:MasterLayouts</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <style> - <class name="priority-2"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">10</property> - </packing> - </child> - <child> <object class="VclOptionalBox" id="Master-Section-PageMode"> <property name="visible">True</property> <property name="can_focus">False</property> |