From 98ecb80ad8601b03509cb791b2db845350ac8d2d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 7 Oct 2016 11:17:16 +0100 Subject: sidebar theme loads pngs by name that are not picked up automatically anywhere else, so explicitly list them here in an auxillary ilst some are mentioned in sfx2/source/sidebar/Theme.cxx, and some are mentioned in *IconURL properties in officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu Change-Id: I0cf3919c20277d4c88783f06da53c5e889049a06 --- sfx2/source/sidebar/Sidebar.hrc | 30 ---------- sfx2/source/sidebar/Sidebar.src | 125 --------------------------------------- sfx2/source/sidebar/Theme.cxx | 27 +-------- sfx2/source/sidebar/sidebar.ilst | 29 +++++++++ 4 files changed, 30 insertions(+), 181 deletions(-) create mode 100644 sfx2/source/sidebar/sidebar.ilst (limited to 'sfx2') diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc index 79d5a81554e5..2ab5e73b2202 100644 --- a/sfx2/source/sidebar/Sidebar.hrc +++ b/sfx2/source/sidebar/Sidebar.hrc @@ -20,36 +20,6 @@ #define RID_SIDEBAR_RESOURCE (RID_SFX_SIDEBAR_START + 0) -#define IMAGE_SIDEBAR_PLUS 1 -#define IMAGE_SIDEBAR_MINUS 3 -#define IMAGE_SIDEBAR_GRIP 5 -#define IMAGE_SIDEBAR_MENU 7 -#define IMAGE_SIDEBAR_DETAIL_DIALOG 9 -#define IMAGE_SIDEBAR_DECK_3D_LARGE 20 -#define IMAGE_SIDEBAR_DECK_3D_SMALL 22 -#define IMAGE_SIDEBAR_DECK_ANIMATION_LARGE 30 -#define IMAGE_SIDEBAR_DECK_ANIMATION_SMALL 32 -#define IMAGE_SIDEBAR_DECK_COLORS_LARGE 40 -#define IMAGE_SIDEBAR_DECK_COLORS_SMALL 42 -#define IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE 50 -#define IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL 52 -#define IMAGE_SIDEBAR_DECK_GALLERY_LARGE 60 -#define IMAGE_SIDEBAR_DECK_GALLERY_SMALL 62 -#define IMAGE_SIDEBAR_DECK_IMGANIM_LARGE 70 -#define IMAGE_SIDEBAR_DECK_IMGANIM_SMALL 72 -#define IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE 80 -#define IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL 82 -#define IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE 90 -#define IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL 92 -#define IMAGE_SIDEBAR_DECK_STYLE_LARGE 100 -#define IMAGE_SIDEBAR_DECK_STYLE_SMALL 102 -#define IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE 110 -#define IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL 112 -#define IMAGE_SIDEBAR_DECK_TRANSITION_LARGE 120 -#define IMAGE_SIDEBAR_DECK_TRANSITION_SMALL 122 -#define IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE 130 -#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL 132 - #define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1) #define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2) #define SFX_STR_SIDEBAR_SETTINGS (RID_SFX_SIDEBAR_START + 3) diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src index 9179a2fb4de1..6af475e25e66 100644 --- a/sfx2/source/sidebar/Sidebar.src +++ b/sfx2/source/sidebar/Sidebar.src @@ -18,131 +18,6 @@ */ #include "Sidebar.hrc" -Resource RID_SIDEBAR_RESOURCE -{ - Image IMAGE_SIDEBAR_PLUS - { - ImageBitmap = Bitmap { File = "plus.png" ;}; - }; - - Image IMAGE_SIDEBAR_MINUS - { - ImageBitmap = Bitmap { File = "minus.png" ;}; - }; - - Image IMAGE_SIDEBAR_GRIP - { - ImageBitmap = Bitmap { File = "grip.png" ;}; - }; - - Image IMAGE_SIDEBAR_MENU - { - ImageBitmap = Bitmap { File = "symphony/open_more.png" ;}; - }; - - Image IMAGE_SIDEBAR_DETAIL_DIALOG - { - ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;}; - }; - - Image IMAGE_SIDEBAR_DECK_3D_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_3D_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_COLORS_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_COLORS_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small.png" ;}; - }; - Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-property-large.png" ;}; - }; - Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-property-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_STYLE_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-style-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_STYLE_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-style-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-template-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-template-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE - { - ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large.png" ;}; - }; - Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL - { - ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png" ;}; - }; -}; - String SFX_STR_SIDEBAR_MORE_OPTIONS { Text [en-US] = "More Options"; diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index b821f4f74d69..17f7b19eaff4 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -250,7 +250,6 @@ void Theme::UpdateTheme() setPropertyValue( maPropertyIdToNameMap[Color_TabItemBorder], Any(sal_Int32(rStyle.GetActiveBorderColor().GetRGBColor()))); - // mbIsHighContrastMode ? 0x00ff00 : 0xbfbfbf))); setPropertyValue( maPropertyIdToNameMap[Paint_DropDownBackground], @@ -272,12 +271,11 @@ void Theme::UpdateTheme() setPropertyValue( maPropertyIdToNameMap[Paint_TabItemBackgroundHighlight], Any(sal_Int32(rStyle.GetActiveTabColor().GetRGBColor()))); - // mbIsHighContrastMode ? 0x000000 : 0x00ffffff))); setPropertyValue( maPropertyIdToNameMap[Paint_HorizontalBorder], Any(sal_Int32(aBorderColor.GetRGBColor()))); - // mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4))); + setPropertyValue( maPropertyIdToNameMap[Paint_VerticalBorder], Any(sal_Int32(aBorderColor.GetRGBColor()))); @@ -303,29 +301,6 @@ void Theme::UpdateTheme() maPropertyIdToNameMap[Image_CloseIndicator], Any(OUString("private:graphicrepository/cmd/lc_decrementlevel.png"))); - // ToolBox - - /* - // Separator style - setPropertyValue( - maPropertyIdToNameMap[Paint_ToolBoxBackground], - Any(sal_Int32(rStyle.GetMenuColor().GetRGBColor()))); - setPropertyValue( - maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft], - Any()); - setPropertyValue( - maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners], - Any()); - setPropertyValue( - maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight], - Any()); - setPropertyValue( - maPropertyIdToNameMap[Rect_ToolBoxPadding], - Any(awt::Rectangle(2,2,2,2))); - setPropertyValue( - maPropertyIdToNameMap[Rect_ToolBoxBorder], - Any(awt::Rectangle(0,0,0,0))); - */ // Gradient style Color aGradientStop2 (aBaseBackgroundColor); aGradientStop2.IncreaseLuminance(17); diff --git a/sfx2/source/sidebar/sidebar.ilst b/sfx2/source/sidebar/sidebar.ilst new file mode 100644 index 000000000000..bc112a03b0a6 --- /dev/null +++ b/sfx2/source/sidebar/sidebar.ilst @@ -0,0 +1,29 @@ +%MODULE%/cmd/lc_decrementlevel.png +%MODULE%/sfx2/res/closedoc.png +%MODULE%/sfx2/res/grip.png +%MODULE%/sfx2/res/symphony/open_more.png +%MODULE%/sfx2/res/symphony/morebutton.png +%MODULE%/sfx2/res/symphony/sidebar-3d-large.png +%MODULE%/sfx2/res/symphony/sidebar-3d-small.png +%MODULE%/sfx2/res/symphony/sidebar-animation-large.png +%MODULE%/sfx2/res/symphony/sidebar-animation-small.png +%MODULE%/sfx2/res/symphony/sidebar-colors-large.png +%MODULE%/sfx2/res/symphony/sidebar-colors-small.png +%MODULE%/sfx2/res/symphony/sidebar-eyedropper-large.png +%MODULE%/sfx2/res/symphony/sidebar-eyedropper-small.png +%MODULE%/sfx2/res/symphony/sidebar-gallery-large.png +%MODULE%/sfx2/res/symphony/sidebar-gallery-small.png +%MODULE%/sfx2/res/symphony/sidebar-imganim-large.png +%MODULE%/sfx2/res/symphony/sidebar-imganim-small.png +%MODULE%/sfx2/res/symphony/sidebar-navigator-large.png +%MODULE%/sfx2/res/symphony/sidebar-navigator-small.png +%MODULE%/sfx2/res/symphony/sidebar-property-large.png +%MODULE%/sfx2/res/symphony/sidebar-property-small.png +%MODULE%/sfx2/res/symphony/sidebar-style-large.png +%MODULE%/sfx2/res/symphony/sidebar-style-small.png +%MODULE%/sfx2/res/symphony/sidebar-template-large.png +%MODULE%/sfx2/res/symphony/sidebar-template-small.png +%MODULE%/sfx2/res/symphony/sidebar-transition-large.png +%MODULE%/sfx2/res/symphony/sidebar-transition-small.png +%MODULE%/sfx2/res/symphony/sidebar-functions-large.png +%MODULE%/sfx2/res/symphony/sidebar-functions-small.png -- cgit