sfx2/source/sidebar/Sidebar.src | 128 ++++++++++++++++++++--------------------
sfx2/source/sidebar/Theme.cxx | 12 +--
2 files changed, 70 insertions(+), 70 deletions(-)
New commits:
commit b953e761e3527193baf421a27f6048b06cc26c0a
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Wed Jul 31 18:49:25 2019 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Wed Jul 31 18:49:25 2019 +0000
Cleaned up whitespace. Use correct icon for high contrast.
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index f47a895550fe..ce1230f61163 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -27,286 +27,286 @@ Resource RID_SIDEBAR_RESOURCE
{
Image IMAGE_SIDEBAR_PLUS
{
- ImageBitmap = Bitmap { File = "plus.png" ;};
+ ImageBitmap = Bitmap { File = "plus.png" ;} ;
};
Image IMAGE_SIDEBAR_PLUS_HC
{
- ImageBitmap = Bitmap { File = "plus_hc.png" ;};
+ ImageBitmap = Bitmap { File = "plus_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_MINUS
{
- ImageBitmap = Bitmap { File = "minus.png" ;};
+ ImageBitmap = Bitmap { File = "minus.png" ;} ;
};
Image IMAGE_SIDEBAR_MINUS_HC
{
- ImageBitmap = Bitmap { File = "minus_hc.png" ;};
+ ImageBitmap = Bitmap { File = "minus_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_GRIP
{
- ImageBitmap = Bitmap { File = "grip.png" ;};
+ ImageBitmap = Bitmap { File = "grip.png" ;} ;
};
Image IMAGE_SIDEBAR_GRIP_HC
{
- ImageBitmap = Bitmap { File = "grip_hc.png" ;};
+ ImageBitmap = Bitmap { File = "grip_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_MENU
{
- ImageBitmap = Bitmap { File = "symphony/open_more.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/open_more.png" ;} ;
};
Image IMAGE_SIDEBAR_MENU_HC
{
- ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DETAIL_DIALOG
{
- ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;} ;
};
Image IMAGE_SIDEBAR_DETAIL_DIALOG_HC
{
- ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;} ;
};
Image IMAGE_SIDEBAR_TOOLBOX_SEPARATOR
{
- ImageBitmap = Bitmap { File = "separator.png" ;};
+ ImageBitmap = Bitmap { File = "separator.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_LARGE_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large-hc.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_SMALL_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small-hc.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-large-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-small-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-small-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_COLORS_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_COLORS_LARGE_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_COLORS_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_COLORS_SMALL_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-eyedropper-large-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-eyedropper-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-eyedropper-small-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-eyedropper-small-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-navigator-large-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-navigator-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-navigator-small-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-navigator-small-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-property-large.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-property-large.png" ;}
;
};
Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-property-large-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-property-large-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-property-small.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-property-small.png" ;}
;
};
Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-property-small-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-property-small-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_STYLE_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-style-large.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-style-large.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_STYLE_LARGE_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-style-large-hc.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-style-large-hc.png" ;}
;
};
Image IMAGE_SIDEBAR_DECK_STYLE_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-style-small.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-style-small.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_STYLE_SMALL_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-style-small-hc.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-style-small-hc.png" ;}
;
};
Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-template-large.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-template-large.png" ;}
;
};
Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-template-large-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-template-large-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-template-small.png" ;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-template-small.png" ;}
;
};
Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL_HC
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-template-small-hc.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-template-small-hc.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-transition-large-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-transition-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-transition-small-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-transition-small-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-functions-large-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-functions-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL
{
- ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png"
;};
+ ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL_HC
{
- ImageBitmap = Bitmap { File =
"symphony/sidebar-functions-small-hc.png" ;};
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-functions-small-hc.png" ;} ;
};
String STRING_CUSTOMIZATION
{
- Text [en-US] = "Customization";
+ Text [en-US] = "Customization" ;
};
String STRING_RESTORE
{
- Text [en-US] = "Restore Default";
+ Text [en-US] = "Restore Default" ;
};
};
String SFX_STR_SIDEBAR_MORE_OPTIONS
{
- Text [en-US] = "More Options";
+ Text [en-US] = "More Options" ;
};
String SFX_STR_SIDEBAR_CLOSE_DECK
{
- Text [en-US] = "Close Sidebar Deck";
+ Text [en-US] = "Close Sidebar Deck" ;
};
String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX
{
- Text [en-US] = "Panel: ";
+ Text [en-US] = "Panel: " ;
};
// ********************************************************************** EOF
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 317a2a68b199..75dfa3e91dc9 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -320,7 +320,7 @@ void Theme::UpdateTheme (void)
setPropertyValue(
maPropertyIdToNameMap[Color_TabItemBorder],
Any(sal_Int32(rStyle.GetActiveBorderColor().GetRGBColor())));
- // mbIsHighContrastMode ? 0x00ff00 : 0xbfbfbf)));
+ // mbIsHighContrastMode ? 0x00ff00 : 0xbfbfbf)));
setPropertyValue(
maPropertyIdToNameMap[Paint_DropDownBackground],
@@ -342,16 +342,16 @@ void Theme::UpdateTheme (void)
setPropertyValue(
maPropertyIdToNameMap[Paint_TabItemBackgroundHighlight],
Any(sal_Int32(rStyle.GetActiveTabColor().GetRGBColor())));
- // mbIsHighContrastMode ? 0x000000 : 0x00ffffff)));
+ // mbIsHighContrastMode ? 0x000000 : 0x00ffffff)));
setPropertyValue(
maPropertyIdToNameMap[Paint_HorizontalBorder],
Any(sal_Int32(aBorderColor.GetRGBColor())));
- // mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
+ // mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
setPropertyValue(
maPropertyIdToNameMap[Paint_VerticalBorder],
Any(sal_Int32(aBorderColor.GetRGBColor())));
- // mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
+ // mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
setPropertyValue(
maPropertyIdToNameMap[Image_Grip],
@@ -381,8 +381,8 @@ void Theme::UpdateTheme (void)
maPropertyIdToNameMap[Image_PanelMenu],
Any(
mbIsHighContrastMode
- ?
A2S("private:graphicrepository/sfx2/res/symphony/morebutton.png")
- :
A2S("private:graphicrepository/sfx2/res/symphony/morebutton_h.png")));
+ ?
A2S("private:graphicrepository/sfx2/res/symphony/morebutton_h.png")
+ :
A2S("private:graphicrepository/sfx2/res/symphony/morebutton.png")));
setPropertyValue(
maPropertyIdToNameMap[Image_Closer],
Any(A2S("private:graphicrepository/sfx2/res/closedoc.png")));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
