This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ed48461284515f1f37d33634b8842c7f0262150a Author: Matthias Seidel <[email protected]> AuthorDate: Wed Jul 31 15:21:55 2019 +0000 Added high contrast icon for sidebar menu git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1864074 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 73fd191affbfce02dad58c0e98f095cbd616994a) --- .../sfx2/res/symphony/open_more_hc.png | Bin 0 -> 2930 bytes main/sfx2/source/sidebar/Sidebar.src | 25 +++++++++-------- main/sfx2/source/sidebar/Theme.cxx | 30 +++++++++++---------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/main/default_images/sfx2/res/symphony/open_more_hc.png b/main/default_images/sfx2/res/symphony/open_more_hc.png new file mode 100644 index 0000000..63c10cc Binary files /dev/null and b/main/default_images/sfx2/res/symphony/open_more_hc.png differ diff --git a/main/sfx2/source/sidebar/Sidebar.src b/main/sfx2/source/sidebar/Sidebar.src index f95cfaa..a4923c9 100644 --- a/main/sfx2/source/sidebar/Sidebar.src +++ b/main/sfx2/source/sidebar/Sidebar.src @@ -19,6 +19,8 @@ * *************************************************************/ + + #include "Sidebar.hrc" Resource RID_SIDEBAR_RESOURCE @@ -27,47 +29,47 @@ Resource RID_SIDEBAR_RESOURCE { ImageBitmap = Bitmap { File = "plus.png" ;}; }; - + Image IMAGE_SIDEBAR_PLUS_HC { ImageBitmap = Bitmap { File = "plus_hc.png" ;}; }; - + Image IMAGE_SIDEBAR_MINUS { ImageBitmap = Bitmap { File = "minus.png" ;}; }; - + Image IMAGE_SIDEBAR_MINUS_HC { ImageBitmap = Bitmap { File = "minus_hc.png" ;}; }; - + Image IMAGE_SIDEBAR_GRIP { ImageBitmap = Bitmap { File = "grip.png" ;}; }; - + Image IMAGE_SIDEBAR_GRIP_HC { ImageBitmap = Bitmap { File = "grip_hc.png" ;}; }; - + Image IMAGE_SIDEBAR_MENU { ImageBitmap = Bitmap { File = "symphony/open_more.png" ;}; }; - + Image IMAGE_SIDEBAR_MENU_HC { - ImageBitmap = Bitmap { File = "menu_hc.png" ;}; + ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;}; }; Image IMAGE_SIDEBAR_DETAIL_DIALOG { ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;}; }; - + Image IMAGE_SIDEBAR_DETAIL_DIALOG_HC { ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;}; @@ -284,11 +286,11 @@ Resource RID_SIDEBAR_RESOURCE String STRING_CUSTOMIZATION { - Text [en-US] = "Customization"; + Text [en-US] = "Customization"; }; String STRING_RESTORE { - Text [en-US] = "Restore Default"; + Text [en-US] = "Restore Default"; }; }; @@ -307,3 +309,4 @@ String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX Text [en-US] = "Panel: "; }; +// ********************************************************************** EOF diff --git a/main/sfx2/source/sidebar/Theme.cxx b/main/sfx2/source/sidebar/Theme.cxx index 19b51cf..f19cbe3 100644 --- a/main/sfx2/source/sidebar/Theme.cxx +++ b/main/sfx2/source/sidebar/Theme.cxx @@ -19,6 +19,8 @@ * *************************************************************/ + + #include "precompiled_sfx2.hxx" #include "sfx2/sidebar/Theme.hxx" @@ -225,7 +227,7 @@ void Theme::UpdateTheme (void) aBorderColor.DecreaseLuminance(15); Color aSecondColor (aBaseBackgroundColor); aSecondColor.DecreaseLuminance(15); - + setPropertyValue( maPropertyIdToNameMap[Paint_DeckBackground], Any(sal_Int32(aBaseBackgroundColor.GetRGBColor()))); @@ -266,7 +268,7 @@ void Theme::UpdateTheme (void) setPropertyValue( maPropertyIdToNameMap[Paint_PanelBackground], Any(sal_Int32(aBaseBackgroundColor.GetRGBColor()))); - + setPropertyValue( maPropertyIdToNameMap[Paint_PanelTitleBarBackground], Any(Tools::VclToAwtGradient(Gradient( @@ -308,7 +310,7 @@ void Theme::UpdateTheme (void) setPropertyValue( maPropertyIdToNameMap[Int_TabMenuSeparatorPadding], Any(sal_Int32(7))); - + setPropertyValue( maPropertyIdToNameMap[Int_TabItemWidth], Any(sal_Int32(32))); @@ -345,7 +347,7 @@ void Theme::UpdateTheme (void) setPropertyValue( maPropertyIdToNameMap[Paint_HorizontalBorder], Any(sal_Int32(aBorderColor.GetRGBColor()))); - // mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4))); + // mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4))); setPropertyValue( maPropertyIdToNameMap[Paint_VerticalBorder], Any(sal_Int32(aBorderColor.GetRGBColor()))); @@ -373,7 +375,7 @@ void Theme::UpdateTheme (void) maPropertyIdToNameMap[Image_TabBarMenu], Any( mbIsHighContrastMode - ? A2S("private:graphicrepository/sfx2/res/menu_hc.png") + ? A2S("private:graphicrepository/sfx2/res/symphony/open_more_hc.png") : A2S("private:graphicrepository/sfx2/res/symphony/open_more.png"))); setPropertyValue( maPropertyIdToNameMap[Image_PanelMenu], @@ -479,7 +481,7 @@ void SAL_CALL Theme::disposing (void) maChangeListeners.swap(aListeners); const lang::EventObject aEvent (static_cast<XWeak*>(this)); - + for (ChangeListeners::const_iterator iContainer(maChangeListeners.begin()), iContainerEnd(maChangeListeners.end()); @@ -537,7 +539,7 @@ void SAL_CALL Theme::setPropertyValue ( throw beans::UnknownPropertyException(rsPropertyName, NULL); const ThemeItem eItem (iId->second); - + if (rValue == maRawValues[eItem]) { // Value is not different from the one in the property @@ -554,12 +556,12 @@ void SAL_CALL Theme::setPropertyValue ( eItem, aOldValue, rValue); - + if (DoVetoableListenersVeto(GetVetoableListeners(__AnyItem, false), aEvent)) return; if (DoVetoableListenersVeto(GetVetoableListeners(eItem, false), aEvent)) return; - + maRawValues[eItem] = rValue; ProcessNewValue(rValue, eItem, eType); @@ -742,7 +744,7 @@ cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) 0); aProperties.push_back(aProperty); } - + return cssu::Sequence<css::beans::Property>( &aProperties.front(), aProperties.size()); @@ -801,9 +803,9 @@ void Theme::SetupPropertyMaps (void) maIntegers.resize(__Int_Bool - __Paint_Int - 1); maBooleans.resize(__Bool_Rect - __Int_Bool - 1); maRectangles.resize(__Post_Rect - __Bool_Rect - 1); - + #define AddEntry(e) maPropertyNameToIdMap[A2S(#e)]=e; maPropertyIdToNameMap[e]=A2S(#e) - + AddEntry(Image_Grip); AddEntry(Image_Expand); AddEntry(Image_Collapse); @@ -861,7 +863,7 @@ void Theme::SetupPropertyMaps (void) AddEntry(Rect_ToolBoxPadding); AddEntry(Rect_ToolBoxBorder); - + #undef AddEntry maRawValues.resize(maPropertyIdToNameMap.size()); @@ -937,7 +939,7 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem) case Rect_ToolBoxBorder: case Rect_ToolBoxPadding: return PT_Rectangle; - + default: return PT_Invalid; }
