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 ++ cui/source/options/optopencl.hxx | 5 + cui/uiconfig/ui/optopenclpage.ui | 513 +++++++++++++++++++++------------------ 3 files changed, 301 insertions(+), 235 deletions(-) (limited to 'cui') 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: */ diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index 818eec45f739..662ac28a631a 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -33,11 +33,13 @@ private: CheckBox* mpUseOpenCL; + VclFrame* mpBlackListFrame; ListBox* mpBlackList; PushButton* mpBlackListEdit; PushButton* mpBlackListAdd; PushButton* mpBlackListDelete; + VclFrame* mpWhiteListFrame; ListBox* mpWhiteList; PushButton* mpWhiteListEdit; PushButton* mpWhiteListAdd; @@ -51,9 +53,12 @@ private: DECL_LINK(WhiteListAddHdl, void*); DECL_LINK(WhiteListDeleteHdl, void*); + DECL_LINK(EnableOpenCLHdl, void*); + long EditHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag); long AddHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag); long DeleteHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet& rSet); + void EnableOpenCLHdl(VclFrame* pFrame, bool aEnable); public: SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/uiconfig/ui/optopenclpage.ui b/cui/uiconfig/ui/optopenclpage.ui index f4f6349f5afc..d135e22cd372 100644 --- a/cui/uiconfig/ui/optopenclpage.ui +++ b/cui/uiconfig/ui/optopenclpage.ui @@ -41,290 +41,336 @@ - + True False - 0 - OpenCL blacklist: - True - blacklist - - - False - True - 1 - - - - - True - False - True - True - 12 + 0 + none - + True False - vertical - 12 - start - - - _Edit... - True - True - True - True - - - False - True - 0 - - + 6 + 12 - - _Add... + True - True - True - True - - - False - True - 1 - - - - - _Delete... - True - True - True - True - - - False - True - 2 - - - - - 1 - 0 - - - - - True - False - True - True - - False - True - 6 - - - True - False - 0 - OS - - - 0 - 1 - - + True + True + 12 - + True False - 0 - OS Version + vertical + 12 + start + + + _Edit... + True + True + True + True + + + False + True + 0 + + + + + _Add... + True + True + True + True + + + False + True + 1 + + + + + _Delete... + True + True + True + True + + + False + True + 2 + + 1 - 1 + 0 - + True False - 0 - Platform vendor + True + True + + + False + True + 6 + + + True + False + 0 + OS + + + 0 + 1 + + + + + True + False + 0 + OS Version + + + 1 + 1 + + + + + True + False + 0 + Platform vendor + + + 3 + 1 + + + + + True + False + 0 + Device + + + 2 + 1 + + + + + True + False + 0 + Driver version + + + 4 + 1 + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + True + True + True + True + + + + + + 0 + 1 + + - 3 - 1 - - - - - True - False - 0 - Device - - - 2 - 1 - - - - - True - False - 0 - Driver version - - - 4 - 1 + 0 + 0 - - 0 - 0 - - - - - True - False - True - True - - - 0 - 1 - - - 0 - 0 - + + + + True + False + OpenCL blacklist + + + + False True - 2 - - - - - True - False - 0 - OpenCL whitelist: - True - blacklist - - - False - True - 3 + 5 - + True False - True - True - 12 + 0 + none - + True False - vertical - 12 - start - - - _Edit... - True - True - True - True - - - False - True - 0 - - + 6 + 12 - - _Add... + True - True - True - True - - - False - True - 1 - - - - - _Delete... - True - True - True - True + False + True + True + 12 + + + True + False + vertical + 12 + start + + + _Edit... + True + True + True + True + + + False + True + 0 + + + + + _Add... + True + True + True + True + + + False + True + 1 + + + + + _Delete... + True + True + True + True + + + False + True + 2 + + + + + 1 + 0 + + + + + True + False + True + True + + + True + True + True + True + + + + + + 0 + 1 + + + + + + + + 0 + 0 + + - - False - True - 2 - - - 1 - 0 - - - + + True False - True - True - - - True - False - True - True - - - 0 - 1 - - + OpenCL whitelist + + + - - 0 - 0 - False True - 4 + 6 @@ -342,8 +388,5 @@ - - - - + -- cgit