diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-11-04 21:17:17 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-11-05 09:49:36 +0000 |
commit | b3f78806942d4e562b5f0f3ff866eca2f953ef4f (patch) | |
tree | 24ab838a16dd53561ef5591284cbe24db30246a3 /cui/source | |
parent | 87f0fa6b57bab798c5c6c2acfa619a8ea9f1b2aa (diff) |
OpenGL options: clarify setting descriptions, and provide a live status.
Hopefully this will un-confuse users about whether GL is enabled; the
settings only take effect on re-start, so show a current status line too.
Change-Id: I82832fd8d35bc76ab2cf1f394f11a881fde80774
Reviewed-on: https://gerrit.libreoffice.org/19790
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 14 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e4811b902b3e..ca895cc5e9b6 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -635,6 +635,8 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pUseAntiAliase, "useaa"); get(m_pUseOpenGL, "useopengl"); get(m_pForceOpenGL, "forceopengl"); + get(m_pOpenGLStatusEnabled, "openglenabled"); + get(m_pOpenGLStatusDisabled, "opengldisabled"); get(m_pMousePosLB, "mousepos"); get(m_pMouseMiddleLB, "mousemiddle"); @@ -676,6 +678,8 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pUseOpenGL->Enable(false); if (officecfg::Office::Common::VCL::ForceOpenGL::isReadOnly()) m_pForceOpenGL->Enable(false); + + UpdateOGLStatus(); } OfaViewTabPage::~OfaViewTabPage() @@ -703,6 +707,8 @@ void OfaViewTabPage::dispose() m_pUseAntiAliase.clear(); m_pUseOpenGL.clear(); m_pForceOpenGL.clear(); + m_pOpenGLStatusEnabled.clear(); + m_pOpenGLStatusDisabled.clear(); m_pMousePosLB.clear(); m_pMouseMiddleLB.clear(); SfxTabPage::dispose(); @@ -972,6 +978,14 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) #endif } +void OfaViewTabPage::UpdateOGLStatus() +{ + // Easier than a custom translation string. + bool bEnabled = OpenGLWrapper::isVCLOpenGLEnabled(); + m_pOpenGLStatusEnabled->Show(bEnabled); + m_pOpenGLStatusDisabled->Show(!bEnabled); +} + struct LanguageConfig_Impl { SvtLanguageOptions aLanguageOptions; diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 658b89c91434..5f12c5dbf4d8 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -97,6 +97,9 @@ private: VclPtr<CheckBox> m_pUseOpenGL; VclPtr<CheckBox> m_pForceOpenGL; + VclPtr<FixedText> m_pOpenGLStatusEnabled; + VclPtr<FixedText> m_pOpenGLStatusDisabled; + VclPtr<ListBox> m_pMousePosLB; VclPtr<ListBox> m_pMouseMiddleLB; @@ -113,6 +116,7 @@ private: #if defined( UNX ) DECL_LINK_TYPED( OnAntialiasingToggled, CheckBox&, void ); #endif + void UpdateOGLStatus(); public: OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); |