From 3c40bd24c538cb2e5fddae7176002d8a970bbc41 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Mon, 22 Dec 2014 14:31:25 -0200 Subject: Enhance OpenCL options UI dialog 1) HIG-ification of blacklist and whitelist, using frames 2) handle Use OpenCL checkbox to enable/disable OpenCL blacklist and whitelist changes Change-Id: Iae132d09d2dd0436fa1aa2a64e902ee5aed7cf47 Reviewed-on: https://gerrit.libreoffice.org/13602 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- cui/source/options/optopencl.cxx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'cui/source/options/optopencl.cxx') diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 179edf85718f..f283f908072a 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -42,14 +42,18 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) { get(mpUseOpenCL, "useopencl"); get(mpBlackList, "blacklist"); + get(mpBlackListFrame,"blacklistframe"); get(mpBlackListEdit, "bledit"); get(mpBlackListAdd, "bladd"); get(mpBlackListDelete, "bldelete"); get(mpWhiteList, "whitelist"); + get(mpWhiteListFrame,"whitelistframe"); get(mpWhiteListEdit, "wledit"); get(mpWhiteListAdd, "wladd"); get(mpWhiteListDelete, "wldelete"); + mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl)); + mpBlackListEdit->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListEditHdl)); mpBlackListAdd->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListAddHdl)); mpBlackListDelete->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListDeleteHdl)); @@ -60,6 +64,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) mpBlackList->set_height_request(4 * mpBlackList->GetTextHeight()); mpWhiteList->set_height_request(4 * mpWhiteList->GetTextHeight()); + } SvxOpenCLTabPage::~SvxOpenCLTabPage() @@ -273,6 +278,10 @@ long SvxOpenCLTabPage::DeleteHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet return 0; } +void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable) +{ + pFrame->Enable(aEnable); +} IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListEditHdl) { @@ -304,4 +313,13 @@ IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListDeleteHdl) return DeleteHdl(mpWhiteList, maConfig.maWhiteList); } +IMPL_LINK_NOARG(SvxOpenCLTabPage, EnableOpenCLHdl) +{ + EnableOpenCLHdl(mpBlackListFrame, mpUseOpenCL->IsChecked()); + EnableOpenCLHdl(mpWhiteListFrame, mpUseOpenCL->IsChecked()); + return 0; +} + + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit