[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry svx/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |6 ++ svx/source/sidebar/SelectionAnalyzer.cxx |4 2 files changed, 10 insertions(+) New commits: commit 3c33a28233dfbb0db44553f13511107976f18363 Author: Armin Le Grand a...@apache.org Date: Wed May 15 16:20:13 2013 + Resolves: i122145 Multiselection with mix of DrawObjects and OLE... will allow LineStyle and FillStyle panel, single selection of OLE offers these, too, but in default closed state (cherry picked from commit 8a2531d3d98ad3afb2b233be2d5dd7b67febeba6) Change-Id: Iba8f99afb4324d33be0469e3b0835f08fe142b0a diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index b0c669e..a92643a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -317,10 +317,13 @@ prop oor:name=ContextList value oor:separator=; Calc, Draw, visible ; +Calc, OLE,hidden ; DrawImpress,3DObject, visible ; DrawImpress,Draw, visible ; DrawImpress,TextObject, hidden ; +DrawImpress,OLE,hidden ; WriterVariants, Draw, visible ; +WriterVariants, OLE,hidden, .uno:FrameDialog ; /value /prop prop oor:name=ImplementationURL oor:type=xs:string @@ -348,11 +351,14 @@ value oor:separator=; Calc, Draw, visible ; Calc, Graphic,visible ; +Calc, OLE,hidden ; DrawImpress,3DObject, visible ; DrawImpress,Draw, visible ; DrawImpress,Graphic,visible ; DrawImpress,TextObject, hidden ; +DrawImpress,OLE,hidden ; WriterVariants, Draw, visible ; +WriterVariants, OLE,hidden, .uno:FrameDialog ; /value /prop prop oor:name=ImplementationURL oor:type=xs:string diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index 384f5f6..5924c6f 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -449,6 +449,10 @@ bool SelectionAnalyzer::IsShapeType (const sal_uInt16 nType) case OBJ_POLY: case OBJ_FREELINE: case OBJ_FREEFILL: + +// #122145# adding OBJ_OLE2 since these also allow line/fill style and may +// be multiselected/grouped with normal draw objects, e.g. math OLE objects +case OBJ_OLE2: return true; default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5603091e77ea3931d4361bfdfd5977b1fd69a137 Author: Andre Fischer a...@apache.org Date: Tue Apr 30 11:52:08 2013 + Related: #i122131# Fixed typo in cmd name for cell appearance 'more' dialog (cherry picked from commit d465ec90c0626857a9c30523daba63d7b713f9e6) Change-Id: Icb5389074faf5cf7d1b03f1203f0036f2eccb73a diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 9c9ff63..de9cadd 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -712,7 +712,7 @@ valuePropertyDeck/value /prop prop oor:name=DefaultMenuCommand - value.uno:FormatCellDialg/value + value.uno:FormatCellDialog/value /prop prop oor:name=ContextList value oor:separator=; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs | 28 ++ sfx2/source/sidebar/Deck.hxx |2 sfx2/source/sidebar/DeckDescriptor.hxx |2 sfx2/source/sidebar/PanelDescriptor.hxx|2 sfx2/source/sidebar/ResourceManager.cxx|8 + sfx2/source/sidebar/SidebarController.cxx | 46 ++ sfx2/source/sidebar/SidebarController.hxx |6 + sfx2/source/sidebar/TitleBar.cxx | 33 ++- sfx2/source/sidebar/TitleBar.hxx |2 9 files changed, 127 insertions(+), 2 deletions(-) New commits: commit 2d14c42e77b6706208cc38ccb692237e0ff1275a Author: Andre Fischer a...@apache.org Date: Tue Apr 23 14:08:04 2013 + Resolves: #i122086# Show icons in decks and titles (optionally) (cherry picked from commit 80b53edb04ed2d4b4f27f8256b754593902f0c23) Change-Id: Ic9aafce182b96aa44956d9ddbf165f4cc736e41b diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs index 49d6118..f7a35a3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs @@ -53,6 +53,20 @@ /info value/value /prop + prop oor:name=TitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the deck. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop + prop oor:name=HighContrastTitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the deck when high contrast mode is active. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop prop oor:name=HelpURL oor:type=xs:string info descHelp about the sidebar deck./desc @@ -142,6 +156,20 @@ /info value/value /prop + prop oor:name=TitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the panel. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop + prop oor:name=HighContrastTitleBarIconURL oor:type=xs:string +info + descThis icon is displayed in the title bar of the panel when high contrast mode is active. + Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here./desc +/info +value/value + /prop prop oor:name=HelpURL oor:type=xs:string info descHelp about the sidebar content panel./desc diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index ae1cf19..07cdaec 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -93,6 +93,8 @@ private: ::boost::scoped_ptrScrollBar mpVerticalScrollBar; DECL_LINK(HandleVerticalScrollBarChange,void*); + + }; diff --git a/sfx2/source/sidebar/DeckDescriptor.hxx b/sfx2/source/sidebar/DeckDescriptor.hxx index 2c5a3d4..c7dc627 100644 --- a/sfx2/source/sidebar/DeckDescriptor.hxx +++ b/sfx2/source/sidebar/DeckDescriptor.hxx @@ -32,6 +32,8 @@ public: ::rtl::OUString msId; ::rtl::OUString msIconURL; ::rtl::OUString msHighContrastIconURL; +::rtl::OUString msTitleBarIconURL; +::rtl::OUString msHighContrastTitleBarIconURL; ::rtl::OUString msHelpURL; ::rtl::OUString msHelpText; ContextList maContextList; diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx index a9b3445..cb39dbb 100644 --- a/sfx2/source/sidebar/PanelDescriptor.hxx +++ b/sfx2/source/sidebar/PanelDescriptor.hxx @@ -32,6 +32,8 @@ public: sal_Bool mbIsTitleBarOptional; ::rtl::OUString msId; ::rtl::OUString msDeckId; +::rtl::OUString msTitleBarIconURL; +::rtl::OUString msHighContrastTitleBarIconURL; ::rtl::OUString msHelpURL; ContextList maContextList; ::rtl::OUString msImplementationURL; diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index c29ef9a..070bb1c 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -269,6 +269,10 @@ void ResourceManager::ReadDeckList (void) aDeckNode.getNodeValue(IconURL)); rDeckDescriptor.msHighContrastIconURL = ::comphelper::getString( aDeckNode.getNodeValue(HighContrastIconURL)); +rDeckDescriptor.msTitleBarIconURL = ::comphelper::getString( +
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) New commits: commit bc95e32c38d79a654e75ac167b0b70f6e7e89b8d Author: Jürgen Schmidt j...@apache.org Date: Fri Apr 19 16:35:12 2013 + minor change in syntax to make localize happy (cherry picked from commit e271ee33bd29cb8e5a7bbecdcdac71596ee2442f) Change-Id: I2079c019575c32bca0323515e51ec166c36ef94e diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs index dc76c59..a5b9ee3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs @@ -17,13 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- !DOCTYPE oor:component-schema SYSTEM ../../../../../component-schema.dtd -oor:component-schema -xmlns:oor=http://openoffice.org/2001/registry; -xmlns:xs=http://www.w3.org/2001/XMLSchema; -xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; -oor:name=Sidebar -oor:package=org.openoffice.Office.UI -xml:lang=en-US +oor:component-schema xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; oor:name=Sidebar oor:package=org.openoffice.Office.UI xml:lang=en-US info authorAndre Fischer/author descSpecification of decks and content panels of the sidebar./desc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 127 - 1 file changed, 47 insertions(+), 80 deletions(-) New commits: commit 37686d17025f73d281bb0e6da876e4a9499fa3ea Author: Armin Le Grand a...@apache.org Date: Tue Apr 16 16:09:17 2013 + Related: #i122041# Adapted the descriptions in Common.xcs slightly (cherry picked from commit df8441aab1ea0d6df5619f2c7403a65dfacad125) Conflicts: officecfg/registry/schema/org/openoffice/Office/Common.xcs Change-Id: Ia107a029b431d54739fc5524c6978bb53b53a785 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 8233795..560c0a9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -618,86 +618,6 @@ /constraints value1/value /prop - prop oor:name=ColorValueSetMaximumRowCount oor:type=xs:short -info - authorALG/author - descDefines the maximum row count for ColorValueSets. If more rows are needed, a Scrollbar will be used./desc - labelA Scrollbar will be used when more rows are needed./label -/info -constraints - minInclusive oor:value=10 -info - descSpecifies the minimum number of rows before a Scrollbar will be used./desc -/info - /minInclusive - maxInclusive oor:value=99 -info - descSpecifies the maximum number of rows before a Scrollbar will be used./desc -/info - /maxInclusive -/constraints -value40/value - /prop - prop oor:name=ColorValueSetEntryEdgeLength oor:type=xs:short -info - authorALG/author - descDefines the EdgeLength in Pixels for Entries generated inside of ColorValueSets. The Entries are quadratic for Colors./desc - labelEntries in ColorValueSets will have this quadratic size in Pixels./label -/info -constraints - minInclusive oor:value=8 -info - descSpecifies the minimum EdgeLength for Entries in ColorValueSets./desc -/info - /minInclusive - maxInclusive oor:value=18 -info - descSpecifies the minimum EdgeLength for Entries in ColorValueSets./desc -/info - /maxInclusive -/constraints -value14/value - /prop - prop oor:name=ColorValueSetColumnCount oor:type=xs:short -info - authorALG/author - descDefines how many colums are to be used in ColorValueSets. The idea is to use this defined count to have a good visualisation in ColorValueSets which offers the used ColorTable schema nicely layouted to the User./desc - labelThe ColumnCount used in ColorValueSets./label -/info -constraints - minInclusive oor:value=12 -info - descSpecifies the perfect number of columns for ColorValueSet layout./desc -/info - /minInclusive - maxInclusive oor:value=24 -info - descSpecifies a maximum number of columns for ColorValueSet layout./desc -/info - /maxInclusive -/constraints -value12/value - /prop - prop oor:name=EdgeBlending oor:type=xs:short -info - authorALG/author - descOption to use EdgeBlending for previews in the UI (for ColorValueSet, ColorDropDown, FillStyle/LineStyle previews, etc...). EdgeBlending will visualize a one pixel border on the preview object so that a noce 3D effect is shown. It is a percent value describing how strong the effect shall be. The value 0% switches it off, while the value 100% will cover the preview object completely on it's borders./desc - labelDefines the EdgeBlending for Previews in percent./label -/info -constraints - minInclusive oor:value=0 -info - descSpecifies that no EdgeBlending shall happen./desc -/info - /minInclusive - maxInclusive oor:value=99 -info - descSpecifies that EdgeBlending will cover the edges of Previews completely./desc -/info - /maxInclusive -/constraints -value35/value - /prop /group group oor:name=ObjectNames info @@ -6317,6 +6237,53 @@ /info valuefalse/value /prop + prop oor:name=ColorValueSetMaximumRowCount oor:type=xs:short +info + authorALG/author + desc +Defines the maximum row count for ColorValueSets. If more rows are needed, a Scrollbar will be used. + /desc + labelA Scrollbar will be used when more rows are needed./label +/info +value40/value + /prop + prop
