You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/07/31 15:21:55 UTC
svn commit: r1864074 - in /openoffice/trunk/main:
default_images/sfx2/res/symphony/open_more_hc.png
sfx2/source/sidebar/Sidebar.src sfx2/source/sidebar/Theme.cxx
Author: mseidel
Date: Wed Jul 31 15:21:55 2019
New Revision: 1864074
URL: http://svn.apache.org/viewvc?rev=1864074&view=rev
Log:
Added high contrast icon for sidebar menu
Added:
openoffice/trunk/main/default_images/sfx2/res/symphony/open_more_hc.png (with props)
Modified:
openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src
openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx
Added: openoffice/trunk/main/default_images/sfx2/res/symphony/open_more_hc.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/sfx2/res/symphony/open_more_hc.png?rev=1864074&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/default_images/sfx2/res/symphony/open_more_hc.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src?rev=1864074&r1=1864073&r2=1864074&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src Wed Jul 31 15:21:55 2019
@@ -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_PAN
Text [en-US] = "Panel: ";
};
+// ********************************************************************** EOF
Modified: openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx?rev=1864074&r1=1864073&r2=1864074&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx Wed Jul 31 15:21:55 2019
@@ -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
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::GetPropertyTy
case Rect_ToolBoxBorder:
case Rect_ToolBoxPadding:
return PT_Rectangle;
-
+
default:
return PT_Invalid;
}