[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/uiconfig
sd/uiconfig/sdraw/toolbar/standardbar.xml |6 -- sd/uiconfig/sdraw/toolbar/toolbar.xml | 19 ++- 2 files changed, 14 insertions(+), 11 deletions(-) New commits: commit 5be82d9765e5fc9bf072f588d02ffa4994ac0312 Author: Yousuf Philips philip...@hotmail.com Date: Thu Jul 9 04:37:30 2015 +0400 tdf#84909 Draw: Drawing toolbar exclusive to shapes Change-Id: I0ac457840a1d9df6d075bdd4e8205c19c5055204 Reviewed-on: https://gerrit.libreoffice.org/16875 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com (cherry picked from commit 240d6c9fb84be66500136e3a2fb8e1ff309d2a54) Reviewed-on: https://gerrit.libreoffice.org/16876 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Jan Holesovsky ke...@collabora.com diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml index 5a6de30..5dcb170 100644 --- a/sd/uiconfig/sdraw/toolbar/standardbar.xml +++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml @@ -49,10 +49,12 @@ toolbar:toolbaritem xlink:href=.uno:GridVisible/ toolbar:toolbaritem xlink:href=.uno:HelplinesMove/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:InsertGraphic toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:FontworkGalleryFloater toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:InsertTable toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertGraphic/ toolbar:toolbaritem xlink:href=.uno:InsertObjectChart toolbar:helpid=10140 toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:Text toolbar:style=radio/ + toolbar:toolbaritem xlink:href=.uno:VerticalText toolbar:style=radio/ + toolbar:toolbaritem xlink:href=.uno:FontworkGalleryFloater/ toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog toolbar:helpid=5678 toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:AdvancedMode toolbar:style=radio dropdown/ diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml index ee1ef3d..79c1c7d 100644 --- a/sd/uiconfig/sdraw/toolbar/toolbar.xml +++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml @@ -18,32 +18,33 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar - toolbar:toolbaritem xlink:href=.uno:SelectObject toolbar:style=radio toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:SelectObject toolbar:style=radio/ toolbar:toolbaritem xlink:href=.uno:ZoomMode/ toolbar:toolbaritem xlink:href=.uno:ZoomObjects toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:ZoomToolBox toolbar:visible=false/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:Text toolbar:style=radio/ - toolbar:toolbaritem xlink:href=.uno:VerticalText toolbar:style=radio/ - toolbar:toolbaritem xlink:href=.uno:InsertGraphic/ + toolbar:toolbaritem xlink:href=.uno:Text toolbar:style=radio toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:VerticalText toolbar:style=radio toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertGraphic toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:InsertToolbox toolbar:style=radio dropdown toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:FontworkGalleryFloater/ + toolbar:toolbaritem xlink:href=.uno:FontworkGalleryFloater toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:XLineColor/ toolbar:toolbaritem xlink:href=.uno:FillColor/ toolbar:toolbaritem xlink:href=.uno:FillStyle toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:Line toolbar:style=radio/ - toolbar:toolbaritem xlink:href=.uno:ArrowsToolbox toolbar:style=radio dropdown/ toolbar:toolbaritem xlink:href=.uno:Freeline_Unfilled toolbar:style=radio toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:Bezier_Unfilled toolbar:style=radio toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:LineToolbox toolbar:style=radio dropdown/ - toolbar:toolbaritem xlink:href=.uno:ConnectorToolbox toolbar:style=radio dropdown/ - toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:BasicShapes.rectangle toolbar:style=radio/ toolbar:toolbaritem xlink:href=.uno:Rect toolbar:helpid=10104 toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:BasicShapes.ellipse toolbar:style=radio/ toolbar:toolbaritem xlink:href=.uno:Ellipse toolbar:helpid=10110 toolbar:visible=false/ + toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:ArrowsToolbox toolbar:style=radio dropdown/ + toolbar:toolbaritem xlink:href=.uno:LineToolbox toolbar:style=radio dropdown/ + toolbar:toolbaritem xlink:href=.uno:ConnectorToolbox toolbar:style=radio dropdown/ + toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:BasicShapes toolbar:style=radio
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/uiconfig
sd/uiconfig/simpress/toolbar/commontaskbar.xml |1 + sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit b3589a30121a30f290e212ee1dcc2773e8bd277d Author: Yousuf Philips philip...@hotmail.com Date: Sun Jun 28 04:34:27 2015 +0400 tdf#84909 Hide rename master slide button in toolbar Change-Id: I1cdfc8495dbc54b71d5971b7aef396b7a34c6de9 Reviewed-on: https://gerrit.libreoffice.org/16555 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com (cherry picked from commit 605f2233ecce4be022d8fcdcab7b9e169efde393) Reviewed-on: https://gerrit.libreoffice.org/16559 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Philippe Jung phil.j...@free.fr diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml index 8fc0c0e..1d46442 100644 --- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml +++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml @@ -20,6 +20,7 @@ toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:toolbaritem xlink:href=.uno:InsertPage toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:DuplicatePage toolbar:helpid=27342/ + toolbar:toolbaritem xlink:href=.uno:RenamePage toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:DeletePage/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:AssignLayout toolbar:style=dropdownonly/ diff --git a/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml b/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml index 79a0d29..56b4ffb 100644 --- a/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml +++ b/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml @@ -19,8 +19,8 @@ -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar toolbar:toolbaritem xlink:href=.uno:InsertMasterPage/ + toolbar:toolbaritem xlink:href=.uno:RenameMasterPage toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:DeleteMasterPage/ - toolbar:toolbaritem xlink:href=.uno:RenameMasterPage/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:CloseMasterView/ /toolbar:toolbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/uiconfig
sd/uiconfig/simpress/toolbar/outlinetoolbar.xml | 13 --- sd/uiconfig/simpress/toolbar/standardbar.xml| 18 ++--- sd/uiconfig/simpress/toolbar/textobjectbar.xml | 32 ++--- sd/uiconfig/simpress/toolbar/toolbar.xml| 44 +--- 4 files changed, 65 insertions(+), 42 deletions(-) New commits: commit 3138a31154ae064a01c718d25e346a1efd6707a7 Author: Yousuf Philips philip...@hotmail.com Date: Sat Jun 20 20:45:02 2015 +0400 tdf#84909 Additional tweaks to the standard, draw and text toolbars Change-Id: If644b80870c82b786168c67390cd440030e2d841 Reviewed-on: https://gerrit.libreoffice.org/16389 Reviewed-by: Jan Holesovsky ke...@collabora.com Tested-by: Jan Holesovsky ke...@collabora.com diff --git a/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml b/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml index f9d6be8..fd110a5 100644 --- a/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml +++ b/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml @@ -18,11 +18,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar - toolbar:toolbaritem xlink:href=.uno:OutlineCollapseAll/ - toolbar:toolbaritem xlink:href=.uno:OutlineExpandAll/ - toolbar:toolbaritem xlink:href=.uno:OutlineCollapse/ - toolbar:toolbaritem xlink:href=.uno:OutlineExpand/ + toolbar:toolbaritem xlink:href=.uno:OutlineRight/ + toolbar:toolbaritem xlink:href=.uno:OutlineLeft/ + toolbar:toolbaritem xlink:href=.uno:OutlineDown/ + toolbar:toolbaritem xlink:href=.uno:OutlineUp/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:OutlineFormat/ toolbar:toolbaritem xlink:href=.uno:ColorView/ + toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:OutlineCollapseAll/ + toolbar:toolbaritem xlink:href=.uno:OutlineExpandAll/ + toolbar:toolbaritem xlink:href=.uno:OutlineCollapse toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:OutlineExpand toolbar:visible=false/ /toolbar:toolbar diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index d4d2edc..b50a57d 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -40,22 +40,23 @@ toolbar:toolbaritem xlink:href=.uno:Undo/ toolbar:toolbaritem xlink:href=.uno:Redo/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:SearchDialog/ toolbar:toolbaritem xlink:href=.uno:SpellDialog/ toolbar:toolbaritem xlink:href=.uno:SpellOnline toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:ZoomMode/ + toolbar:toolbaritem xlink:href=.uno:ZoomMode toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:ZoomToolBox toolbar:style=dropdown toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:InsertTable/ toolbar:toolbaritem xlink:href=.uno:InsertGraphic/ - toolbar:toolbaritem xlink:href=.uno:InsertObjectChart/ toolbar:toolbaritem xlink:href=.uno:InsertAVMedia/ + toolbar:toolbaritem xlink:href=.uno:InsertObjectChart/ + toolbar:toolbaritem xlink:href=.uno:Text toolbar:style=radio/ + toolbar:toolbaritem xlink:href=.uno:VerticalText toolbar:style=radio/ + toolbar:toolbaritem xlink:href=.uno:FontworkGalleryFloater/ toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:GridVisible toolbar:style=auto toolbar:visible=false/ - toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:HelpIndex toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:ExtendedHelp toolbar:visible=false/ - toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:GridVisible/ + toolbar:toolbaritem xlink:href=.uno:HelplinesMove toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:AnimationEffects/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:PageSetup/ @@ -63,4 +64,7 @@ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:Presentation toolbar:helpid=10157/ toolbar:toolbaritem xlink:href=.uno:PresentationCurrentSlide/ + toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:HelpIndex toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:ExtendedHelp toolbar:visible=false/ /toolbar:toolbar diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml index 6a59382..fce8e53 100644 --- a/sd/uiconfig/simpress/toolbar/textobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/textobjectbar.xml @@ -27,8 +27,15 @@ toolbar:toolbaritem xlink:href=.uno:Bold toolbar:helpid=10009/ toolbar:toolbaritem xlink:href=.uno:Italic toolbar:helpid=10008/ toolbar:toolbaritem xlink:href=.uno:Underline toolbar:helpid=10014/ + toolbar:toolbaritem xlink:href=.uno:UnderlineDouble toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:Strikeout/ +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/uiconfig
sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) New commits: commit 15ba43a052a5e5cc842feed221e8e1cb43575731 Author: Rishabh Kumar kris.kr...@gmail.com Date: Mon Jun 8 20:51:54 2015 +0530 tdf#91890:Impress Crash when click on Transition icon in sidebar Change-Id: I8ea350b97fcbf914b60ba580a72df967fdcfadef Reviewed-on: https://gerrit.libreoffice.org/16164 Reviewed-by: Philippe Jung phil.j...@free.fr Tested-by: Philippe Jung phil.j...@free.fr diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index 9e046fe..3870b74 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -20,16 +20,15 @@ property name=orientationvertical/property property name=spacing12/property child - object class=GtkFrame id=frame3 + object class=GtkBox id=box4 property name=visibleTrue/property property name=can_focusFalse/property property name=vexpandTrue/property -property name=label_xalign0/property -property name=shadow_typenone/property child object class=GtkAlignment id=alignment3 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=vexpandTrue/property child object class=GtkTreeView id=transitions_list:border @@ -42,9 +41,11 @@ /object /child /object -/child -child type=label_item - placeholder/ + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing /child /object packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
