diff options
author | andreas kainz <kainz.a@gmail.com> | 2018-10-18 15:13:24 +0200 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2018-10-18 21:15:26 +0200 |
commit | ca341bbe44169135958d7a0b28feaed7d1aa11d3 (patch) | |
tree | 38fd7ecf340846c27a27fd9410a82839d26c866e /sd/uiconfig | |
parent | 3f9c477929c261a8862411c00153e4c7d0d0ae7c (diff) |
Sync Image/Graphic Tabb and context menu
NB: sync MenuImage in tabbed toolbar
context menu: sync graphic.xml context menu
in writer, calc, impress and draw
Change-Id: Idab90ae9af7ac68815fe689811d6c11f948063ca
Reviewed-on: https://gerrit.libreoffice.org/61938
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sd/uiconfig')
-rw-r--r-- | sd/uiconfig/sdraw/popupmenu/graphic.xml | 3 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 69 | ||||
-rw-r--r-- | sd/uiconfig/simpress/popupmenu/graphic.xml | 11 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 69 |
4 files changed, 108 insertions, 44 deletions
diff --git a/sd/uiconfig/sdraw/popupmenu/graphic.xml b/sd/uiconfig/sdraw/popupmenu/graphic.xml index 95171630443a..9107d5888f6b 100644 --- a/sd/uiconfig/sdraw/popupmenu/graphic.xml +++ b/sd/uiconfig/sdraw/popupmenu/graphic.xml @@ -70,7 +70,8 @@ <menu:menuitem menu:id=".uno:EnterGroup"/> <menu:menuitem menu:id=".uno:LeaveGroup"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:ObjectTitleDescription"/> <menu:menuitem menu:id=".uno:NameGroup"/> + <menu:menuitem menu:id=".uno:ObjectTitleDescription"/> + <menu:menuseparator/> <menu:menuitem menu:id=".uno:EditStyle"/> </menu:menupopup> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index fb90567bf803..f7f8afcdd81e 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -496,89 +496,107 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="HelpIndexD"> + <object class="GtkMenuItem" id="MenuHelp-HelpIndex"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HelpIndex</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtendedHelpD"> + <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtendedHelp</property> </object> </child> <child> - <object class="GtkMenuItem" id="DocumentationD"> + <object class="GtkMenuItem" id="MenuHelp-Documentation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Documentation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator94"> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="QuestionAnswersD1"> + <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:QuestionAnswers</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendFeedbackD1"> + <object class="GtkMenuItem" id="MenuHelp-SendFeedback"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendFeedback</property> </object> </child> <child> - <object class="GtkMenuItem" id="DonationD1"> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Donation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator100"> + <object class="GtkMenuItem" id="MenuHelp-SafeMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:SafeMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="SafeModeD1"> + <object class="GtkMenuItem" id="MenuHelp-GetInvolved"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SafeMode</property> + <property name="action_name">.uno:GetInvolved</property> </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD"> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="drawnotebookbar|Help">_Check for Updates...</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator113"> + <object class="GtkMenuItem" id="MenuHelp-Donation"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Donation</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowLicenseD1"> + <object class="GtkMenuItem" id="MenuHelp-ShowLicense"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowLicense</property> </object> </child> <child> - <object class="GtkMenuItem" id="AboutD"> + <object class="GtkMenuItem" id="MenuHelp-UpdateMenu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHelp-About"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:About</property> @@ -844,6 +862,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuImage-OriginalSize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OriginalSize</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuImage-ImageMapDialog"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -871,10 +896,16 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuImage-GraphicDialog"> + <object class="GtkSeparatorMenuItem" id="separator35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-AnimationEffects"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicDialog</property> + <property name="action_name">.uno:AnimationEffects</property> </object> </child> </object> diff --git a/sd/uiconfig/simpress/popupmenu/graphic.xml b/sd/uiconfig/simpress/popupmenu/graphic.xml index 7189be930ad9..112ddab678e6 100644 --- a/sd/uiconfig/simpress/popupmenu/graphic.xml +++ b/sd/uiconfig/simpress/popupmenu/graphic.xml @@ -65,13 +65,14 @@ <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/> </menu:menupopup> </menu:menu> - <menu:menuitem menu:id=".uno:FormatGroup"/> - <menu:menuitem menu:id=".uno:FormatUngroup"/> - <menu:menuitem menu:id=".uno:EnterGroup"/> - <menu:menuitem menu:id=".uno:LeaveGroup"/> + <menu:menuitem menu:id=".uno:FormatGroup"/> + <menu:menuitem menu:id=".uno:FormatUngroup"/> + <menu:menuitem menu:id=".uno:EnterGroup"/> + <menu:menuitem menu:id=".uno:LeaveGroup"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:ObjectTitleDescription"/> <menu:menuitem menu:id=".uno:NameGroup"/> + <menu:menuitem menu:id=".uno:ObjectTitleDescription"/> + <menu:menuseparator/> <menu:menuitem menu:id=".uno:AnimationEffects"/> <menu:menuitem menu:id=".uno:EditStyle"/> </menu:menupopup> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 33f3df379ddb..f4c47622ca8f 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -496,89 +496,107 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="HelpIndexD"> + <object class="GtkMenuItem" id="MenuHelp-HelpIndex"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HelpIndex</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtendedHelpD"> + <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtendedHelp</property> </object> </child> <child> - <object class="GtkMenuItem" id="DocumentationD"> + <object class="GtkMenuItem" id="MenuHelp-Documentation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Documentation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator94"> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="QuestionAnswersD1"> + <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:QuestionAnswers</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendFeedbackD1"> + <object class="GtkMenuItem" id="MenuHelp-SendFeedback"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendFeedback</property> </object> </child> <child> - <object class="GtkMenuItem" id="DonationD1"> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Donation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator100"> + <object class="GtkMenuItem" id="MenuHelp-SafeMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:SafeMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="SafeModeD1"> + <object class="GtkMenuItem" id="MenuHelp-GetInvolved"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SafeMode</property> + <property name="action_name">.uno:GetInvolved</property> </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD"> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="impressnotebookbar|Help">_Check for Updates...</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator113"> + <object class="GtkMenuItem" id="MenuHelp-Donation"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Donation</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowLicenseD1"> + <object class="GtkMenuItem" id="MenuHelp-ShowLicense"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowLicense</property> </object> </child> <child> - <object class="GtkMenuItem" id="AboutD"> + <object class="GtkMenuItem" id="MenuHelp-UpdateMenu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHelp-About"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:About</property> @@ -844,6 +862,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuImage-OriginalSize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OriginalSize</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuImage-ImageMapDialog"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -871,10 +896,16 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuImage-GraphicDialog"> + <object class="GtkSeparatorMenuItem" id="separator10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-AnimationEffects"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicDialog</property> + <property name="action_name">.uno:AnimationEffects</property> </object> </child> </object> |