You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/05/07 11:37:01 UTC
svn commit: r1479829 - in /openoffice/trunk/main:
officecfg/registry/schema/org/openoffice/Office/ svtools/inc/svtools/
svtools/source/config/ svtools/source/inc/configitems/ svx/source/dialog/
svx/source/gallery2/ svx/source/tbxctrls/ svx/source/xoutd...
Author: alg
Date: Tue May 7 09:37:01 2013
New Revision: 1479829
URL: http://svn.apache.org/r1479829
Log:
i122120 corrected flag for drawing checkerboards, adapted previews, added to configuration
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
openoffice/trunk/main/svtools/inc/svtools/accessibilityoptions.hxx
openoffice/trunk/main/svtools/source/config/accessibilityoptions.cxx
openoffice/trunk/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx
openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx
openoffice/trunk/main/svx/source/gallery2/galctrl.cxx
openoffice/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx
openoffice/trunk/main/svx/source/xoutdev/xtabdash.cxx
openoffice/trunk/main/svx/source/xoutdev/xtabhtch.cxx
openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx
openoffice/trunk/main/vcl/inc/vcl/settings.hxx
openoffice/trunk/main/vcl/source/app/settings.cxx
Modified: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs (original)
+++ openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs Tue May 7 09:37:01 2013
@@ -6198,6 +6198,19 @@
</info>
<value>12</value>
</prop>
+ <prop oor:name="PreviewUsesCheckeredBackground" oor:type="xs:boolean">
+ <info>
+ <author>ALG</author>
+ <desc>
+ This option allows to make previews (e.g. UI previews for object attirbutes) show the content with a checkeded
+ background to allow simple identification and better preview of transparent content, e.g. when a draw object
+ is filled with a transparent graphic (SVG or bitmap) the preview will show the checkered background shine
+ through, so the user can identify that the fill has transparency with a single look.
+ </desc>
+ <label>Shows previews with shining through checkered background to visualize transparency.</label>
+ </info>
+ <value>false</value>
+ </prop>
</group>
<set oor:name="OfficeObjects" oor:node-type="ObjectNames">
<info>
Modified: openoffice/trunk/main/svtools/inc/svtools/accessibilityoptions.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/inc/svtools/accessibilityoptions.hxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/inc/svtools/accessibilityoptions.hxx (original)
+++ openoffice/trunk/main/svtools/inc/svtools/accessibilityoptions.hxx Tue May 7 09:37:01 2013
@@ -69,6 +69,10 @@ public:
// only be changed when the color palette is changed from the default
sal_Int16 GetColorValueSetColumnCount() const;
+ // option to make previews show the content with a checkeded background to allow
+ // simple identification and better preview of transparent content
+ sal_Bool GetPreviewUsesCheckeredBackground() const;
+
void SetIsForPagePreviews(sal_Bool bSet);
void SetIsHelpTipsDisappear(sal_Bool bSet);
void SetIsAllowAnimatedGraphics(sal_Bool bSet);
@@ -82,6 +86,7 @@ public:
void SetEdgeBlending(sal_Int16 nSet);
void SetListBoxMaximumLineCount(sal_Int16 nSet);
void SetColorValueSetColumnCount(sal_Int16 nSet);
+ void SetPreviewUsesCheckeredBackground(sal_Bool bSet);
sal_Bool IsModified() const;
void Commit();
Modified: openoffice/trunk/main/svtools/source/config/accessibilityoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/config/accessibilityoptions.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/config/accessibilityoptions.cxx (original)
+++ openoffice/trunk/main/svtools/source/config/accessibilityoptions.cxx Tue May 7 09:37:01 2013
@@ -89,6 +89,7 @@ public:
sal_Int16 GetEdgeBlending() const;
sal_Int16 GetListBoxMaximumLineCount() const;
sal_Int16 GetColorValueSetColumnCount() const;
+ sal_Bool GetPreviewUsesCheckeredBackground() const;
void SetAutoDetectSystemHC(sal_Bool bSet);
void SetIsForPagePreviews(sal_Bool bSet);
@@ -102,6 +103,7 @@ public:
void SetEdgeBlending(sal_Int16 nSet);
void SetListBoxMaximumLineCount(sal_Int16 nSet);
void SetColorValueSetColumnCount(sal_Int16 nSet);
+ void SetPreviewUsesCheckeredBackground(sal_Bool bSet);
sal_Bool IsModified() const { return bIsModified; };
};
@@ -360,6 +362,24 @@ sal_Int16 SvtAccessibilityOptions_Impl::
return nRet;
}
+sal_Bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
+{
+ css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
+ sal_Bool bRet = sal_False;
+
+ try
+ {
+ if(xNode.is())
+ xNode->getPropertyValue(s_sPreviewUsesCheckeredBackground) >>= bRet;
+ }
+ catch(const css::uno::Exception& ex)
+ {
+ LogHelper::logIt(ex);
+ }
+
+ return bRet;
+}
+
void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -586,6 +606,14 @@ void SvtAccessibilityOptions_Impl::SetVC
StyleSettingsChanged = true;
}
+ const bool bPreviewUsesCheckeredBackground(GetPreviewUsesCheckeredBackground());
+
+ if(aStyleSettings.GetPreviewUsesCheckeredBackground() != bPreviewUsesCheckeredBackground)
+ {
+ aStyleSettings.SetPreviewUsesCheckeredBackground(bPreviewUsesCheckeredBackground);
+ StyleSettingsChanged = true;
+ }
+
if(StyleSettingsChanged)
{
aAllSettings.SetStyleSettings(aStyleSettings);
@@ -655,6 +683,26 @@ void SvtAccessibilityOptions_Impl::SetCo
}
}
+void SvtAccessibilityOptions_Impl::SetPreviewUsesCheckeredBackground(sal_Bool bSet)
+{
+ css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
+
+ try
+ {
+ if(xNode.is() && xNode->getPropertyValue(s_sPreviewUsesCheckeredBackground)!=bSet)
+ {
+ xNode->setPropertyValue(s_sPreviewUsesCheckeredBackground, css::uno::makeAny(bSet));
+ ::comphelper::ConfigurationHelper::flush(m_xCfg);
+
+ bIsModified = sal_True;
+ }
+ }
+ catch(const css::uno::Exception& ex)
+ {
+ LogHelper::logIt(ex);
+ }
+}
+
// -----------------------------------------------------------------------
// class SvtAccessibilityOptions --------------------------------------------------
@@ -769,6 +817,10 @@ sal_Int16 SvtAccessibilityOptions::GetCo
{
return sm_pSingleImplConfig->GetColorValueSetColumnCount();
}
+sal_Bool SvtAccessibilityOptions::GetPreviewUsesCheckeredBackground() const
+{
+ return sm_pSingleImplConfig->GetPreviewUsesCheckeredBackground();
+}
// -----------------------------------------------------------------------
void SvtAccessibilityOptions::SetAutoDetectSystemHC(sal_Bool bSet)
@@ -823,5 +875,9 @@ void SvtAccessibilityOptions::SetColorVa
{
sm_pSingleImplConfig->SetColorValueSetColumnCount(nSet);
}
+void SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(sal_Bool bSet)
+{
+ sm_pSingleImplConfig->SetPreviewUsesCheckeredBackground(bSet);
+}
// -----------------------------------------------------------------------
Modified: openoffice/trunk/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx (original)
+++ openoffice/trunk/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx Tue May 7 09:37:01 2013
@@ -31,19 +31,20 @@
namespace
{
- static const ::rtl::OUString s_sAccessibility = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Accessibility");
- static const ::rtl::OUString s_sAutoDetectSystemHC = ::rtl::OUString::createFromAscii("AutoDetectSystemHC");
- static const ::rtl::OUString s_sIsForPagePreviews = ::rtl::OUString::createFromAscii("IsForPagePreviews");
- static const ::rtl::OUString s_sIsHelpTipsDisappear = ::rtl::OUString::createFromAscii("IsHelpTipsDisappear");
- static const ::rtl::OUString s_sHelpTipSeconds = ::rtl::OUString::createFromAscii("HelpTipSeconds");
- static const ::rtl::OUString s_sIsAllowAnimatedGraphics = ::rtl::OUString::createFromAscii("IsAllowAnimatedGraphics");
- static const ::rtl::OUString s_sIsAllowAnimatedText = ::rtl::OUString::createFromAscii("IsAllowAnimatedText");
- static const ::rtl::OUString s_sIsAutomaticFontColor = ::rtl::OUString::createFromAscii("IsAutomaticFontColor");
- static const ::rtl::OUString s_sIsSystemFont = ::rtl::OUString::createFromAscii("IsSystemFont");
- static const ::rtl::OUString s_sIsSelectionInReadonly = ::rtl::OUString::createFromAscii("IsSelectionInReadonly");
- static const ::rtl::OUString s_sEdgeBlending = ::rtl::OUString::createFromAscii("EdgeBlending");
- static const ::rtl::OUString s_sListBoxMaximumLineCount = ::rtl::OUString::createFromAscii("ListBoxMaximumLineCount");
- static const ::rtl::OUString s_sColorValueSetColumnCount = ::rtl::OUString::createFromAscii("ColorValueSetColumnCount");
+ static const ::rtl::OUString s_sAccessibility = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Accessibility");
+ static const ::rtl::OUString s_sAutoDetectSystemHC = ::rtl::OUString::createFromAscii("AutoDetectSystemHC");
+ static const ::rtl::OUString s_sIsForPagePreviews = ::rtl::OUString::createFromAscii("IsForPagePreviews");
+ static const ::rtl::OUString s_sIsHelpTipsDisappear = ::rtl::OUString::createFromAscii("IsHelpTipsDisappear");
+ static const ::rtl::OUString s_sHelpTipSeconds = ::rtl::OUString::createFromAscii("HelpTipSeconds");
+ static const ::rtl::OUString s_sIsAllowAnimatedGraphics = ::rtl::OUString::createFromAscii("IsAllowAnimatedGraphics");
+ static const ::rtl::OUString s_sIsAllowAnimatedText = ::rtl::OUString::createFromAscii("IsAllowAnimatedText");
+ static const ::rtl::OUString s_sIsAutomaticFontColor = ::rtl::OUString::createFromAscii("IsAutomaticFontColor");
+ static const ::rtl::OUString s_sIsSystemFont = ::rtl::OUString::createFromAscii("IsSystemFont");
+ static const ::rtl::OUString s_sIsSelectionInReadonly = ::rtl::OUString::createFromAscii("IsSelectionInReadonly");
+ static const ::rtl::OUString s_sEdgeBlending = ::rtl::OUString::createFromAscii("EdgeBlending");
+ static const ::rtl::OUString s_sListBoxMaximumLineCount = ::rtl::OUString::createFromAscii("ListBoxMaximumLineCount");
+ static const ::rtl::OUString s_sColorValueSetColumnCount = ::rtl::OUString::createFromAscii("ColorValueSetColumnCount");
+ static const ::rtl::OUString s_sPreviewUsesCheckeredBackground = ::rtl::OUString::createFromAscii("PreviewUsesCheckeredBackground");
}
#endif // INCLUDE_CONFIGITEMS_ACCESSIBILITYOPTIONS_CONST_HXX
Modified: openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx Tue May 7 09:37:01 2013
@@ -1416,7 +1416,7 @@ namespace
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- if(rStyleSettings.GetUIPreviewUsesCheckeredBackground())
+ if(rStyleSettings.GetPreviewUsesCheckeredBackground())
{
const Point aNull(0, 0);
static const sal_uInt32 nLen(8);
@@ -1924,7 +1924,24 @@ void SvxPreviewBase::LocalPrePaint()
mpBufferDevice->SetMapMode(GetMapMode());
}
- mpBufferDevice->Erase();
+ const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+
+ if(rStyleSettings.GetPreviewUsesCheckeredBackground())
+ {
+ const Point aNull(0, 0);
+ static const sal_uInt32 nLen(8);
+ static const Color aW(COL_WHITE);
+ static const Color aG(0xef, 0xef, 0xef);
+ const bool bWasEnabled(mpBufferDevice->IsMapModeEnabled());
+
+ mpBufferDevice->EnableMapMode(false);
+ mpBufferDevice->DrawCheckered(aNull, mpBufferDevice->GetOutputSizePixel(), nLen, aW, aG);
+ mpBufferDevice->EnableMapMode(bWasEnabled);
+ }
+ else
+ {
+ mpBufferDevice->Erase();
+ }
}
void SvxPreviewBase::LocalPostPaint()
Modified: openoffice/trunk/main/svx/source/gallery2/galctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/gallery2/galctrl.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/gallery2/galctrl.cxx (original)
+++ openoffice/trunk/main/svx/source/gallery2/galctrl.cxx Tue May 7 09:37:01 2013
@@ -304,7 +304,7 @@ void drawTransparenceBackground(OutputDe
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- if(rStyleSettings.GetUIPreviewUsesCheckeredBackground())
+ if(rStyleSettings.GetPreviewUsesCheckeredBackground())
{
// draw checkered background
static const sal_uInt32 nLen(8);
Modified: openoffice/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx (original)
+++ openoffice/trunk/main/svx/source/tbxctrls/fontworkgallery.cxx Tue May 7 09:37:01 2013
@@ -137,7 +137,7 @@ void FontWorkGalleryDialog::initFavorite
aVDev.SetOutputSizePixel(aSize);
- if(rStyleSettings.GetUIPreviewUsesCheckeredBackground())
+ if(rStyleSettings.GetPreviewUsesCheckeredBackground())
{
static const sal_uInt32 nLen(8);
static const Color aW(COL_WHITE);
Modified: openoffice/trunk/main/svx/source/xoutdev/xtabdash.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/xoutdev/xtabdash.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/xoutdev/xtabdash.cxx (original)
+++ openoffice/trunk/main/svx/source/xoutdev/xtabdash.cxx Tue May 7 09:37:01 2013
@@ -205,7 +205,7 @@ Bitmap XDashList::ImpCreateBitmapForXDas
? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
: DRAWMODE_DEFAULT);
- if(rStyleSettings.GetUIPreviewUsesCheckeredBackground())
+ if(rStyleSettings.GetPreviewUsesCheckeredBackground())
{
const Point aNull(0, 0);
static const sal_uInt32 nLen(8 * nFactor);
Modified: openoffice/trunk/main/svx/source/xoutdev/xtabhtch.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/xoutdev/xtabhtch.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/xoutdev/xtabhtch.cxx (original)
+++ openoffice/trunk/main/svx/source/xoutdev/xtabhtch.cxx Tue May 7 09:37:01 2013
@@ -207,7 +207,7 @@ Bitmap XHatchList::CreateBitmapForUI( lo
? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
: DRAWMODE_DEFAULT);
- if(rStyleSettings.GetUIPreviewUsesCheckeredBackground())
+ if(rStyleSettings.GetPreviewUsesCheckeredBackground())
{
const Point aNull(0, 0);
static const sal_uInt32 nLen(8);
Modified: openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx (original)
+++ openoffice/trunk/main/svx/source/xoutdev/xtablend.cxx Tue May 7 09:37:01 2013
@@ -194,7 +194,7 @@ Bitmap XLineEndList::CreateBitmapForUI(
? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
: DRAWMODE_DEFAULT);
- if(rStyleSettings.GetUIPreviewUsesCheckeredBackground())
+ if(rStyleSettings.GetPreviewUsesCheckeredBackground())
{
const Point aNull(0, 0);
static const sal_uInt32 nLen(8);
Modified: openoffice/trunk/main/vcl/inc/vcl/settings.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/settings.hxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/settings.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/settings.hxx Tue May 7 09:37:01 2013
@@ -440,7 +440,7 @@ private:
Size maListBoxPreviewDefaultLogicSize;
Size maListBoxPreviewDefaultPixelSize;
sal_uInt16 mnListBoxPreviewDefaultLineWidth;
- sal_Bool mbUIPreviewUsesCheckeredBackground;
+ sal_Bool mbPreviewUsesCheckeredBackground;
};
#define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
@@ -972,8 +972,8 @@ public:
// defines if previews which containn potentially transparent objects (e.g. the dash/line/LineStartEnd previews and others)
// use the default transparent visualization background (checkered background) as it has got standard in graphic programs nowadays
- void SetUIPreviewUsesCheckeredBackground(bool bNew) { CopyData(); mpData->mbUIPreviewUsesCheckeredBackground = bNew; }
- bool GetUIPreviewUsesCheckeredBackground() const { return mpData->mbUIPreviewUsesCheckeredBackground; }
+ void SetPreviewUsesCheckeredBackground(bool bNew) { CopyData(); mpData->mbPreviewUsesCheckeredBackground = bNew; }
+ bool GetPreviewUsesCheckeredBackground() const { return mpData->mbPreviewUsesCheckeredBackground; }
void SetStandardStyles();
Modified: openoffice/trunk/main/vcl/source/app/settings.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/settings.cxx?rev=1479829&r1=1479828&r2=1479829&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/app/settings.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/settings.cxx Tue May 7 09:37:01 2013
@@ -441,7 +441,7 @@ ImplStyleData::ImplStyleData()
maListBoxPreviewDefaultLogicSize = Size(15, 7);
maListBoxPreviewDefaultPixelSize = Size(0, 0); // on-demand calculated in GetListBoxPreviewDefaultPixelSize()
mnListBoxPreviewDefaultLineWidth = 1;
- mbUIPreviewUsesCheckeredBackground = true;
+ mbPreviewUsesCheckeredBackground = true;
SetStandardStyles();
}
@@ -554,7 +554,7 @@ ImplStyleData::ImplStyleData( const Impl
maListBoxPreviewDefaultLogicSize = rData.maListBoxPreviewDefaultLogicSize;
maListBoxPreviewDefaultPixelSize = rData.maListBoxPreviewDefaultPixelSize;
mnListBoxPreviewDefaultLineWidth = rData.mnListBoxPreviewDefaultLineWidth;
- mbUIPreviewUsesCheckeredBackground = rData.mbUIPreviewUsesCheckeredBackground;
+ mbPreviewUsesCheckeredBackground = rData.mbPreviewUsesCheckeredBackground;
}
// -----------------------------------------------------------------------
@@ -1075,7 +1075,7 @@ sal_Bool StyleSettings::operator ==( con
(mpData->maListBoxPreviewDefaultLogicSize == rSet.mpData->maListBoxPreviewDefaultLogicSize) &&
(mpData->maListBoxPreviewDefaultPixelSize == rSet.mpData->maListBoxPreviewDefaultPixelSize) &&
(mpData->mnListBoxPreviewDefaultLineWidth == rSet.mpData->mnListBoxPreviewDefaultLineWidth) &&
- (mpData->mbUIPreviewUsesCheckeredBackground == rSet.mpData->mbUIPreviewUsesCheckeredBackground))
+ (mpData->mbPreviewUsesCheckeredBackground == rSet.mpData->mbPreviewUsesCheckeredBackground))
return sal_True;
else
return sal_False;