Kaydet (Commit) 3c40bd24 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Tor Lillqvist

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/13602Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
Tested-by: 's avatarTor Lillqvist <tml@collabora.com>
üst ed60d4b3
...@@ -42,14 +42,18 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) ...@@ -42,14 +42,18 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
{ {
get(mpUseOpenCL, "useopencl"); get(mpUseOpenCL, "useopencl");
get(mpBlackList, "blacklist"); get(mpBlackList, "blacklist");
get(mpBlackListFrame,"blacklistframe");
get(mpBlackListEdit, "bledit"); get(mpBlackListEdit, "bledit");
get(mpBlackListAdd, "bladd"); get(mpBlackListAdd, "bladd");
get(mpBlackListDelete, "bldelete"); get(mpBlackListDelete, "bldelete");
get(mpWhiteList, "whitelist"); get(mpWhiteList, "whitelist");
get(mpWhiteListFrame,"whitelistframe");
get(mpWhiteListEdit, "wledit"); get(mpWhiteListEdit, "wledit");
get(mpWhiteListAdd, "wladd"); get(mpWhiteListAdd, "wladd");
get(mpWhiteListDelete, "wldelete"); get(mpWhiteListDelete, "wldelete");
mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl));
mpBlackListEdit->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListEditHdl)); mpBlackListEdit->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListEditHdl));
mpBlackListAdd->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListAddHdl)); mpBlackListAdd->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListAddHdl));
mpBlackListDelete->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListDeleteHdl)); mpBlackListDelete->SetClickHdl(LINK(this, SvxOpenCLTabPage, BlackListDeleteHdl));
...@@ -60,6 +64,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) ...@@ -60,6 +64,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
mpBlackList->set_height_request(4 * mpBlackList->GetTextHeight()); mpBlackList->set_height_request(4 * mpBlackList->GetTextHeight());
mpWhiteList->set_height_request(4 * mpWhiteList->GetTextHeight()); mpWhiteList->set_height_request(4 * mpWhiteList->GetTextHeight());
} }
SvxOpenCLTabPage::~SvxOpenCLTabPage() SvxOpenCLTabPage::~SvxOpenCLTabPage()
...@@ -273,6 +278,10 @@ long SvxOpenCLTabPage::DeleteHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet ...@@ -273,6 +278,10 @@ long SvxOpenCLTabPage::DeleteHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet
return 0; return 0;
} }
void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable)
{
pFrame->Enable(aEnable);
}
IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListEditHdl) IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListEditHdl)
{ {
...@@ -304,4 +313,13 @@ IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListDeleteHdl) ...@@ -304,4 +313,13 @@ IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListDeleteHdl)
return DeleteHdl(mpWhiteList, maConfig.maWhiteList); 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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -33,11 +33,13 @@ private: ...@@ -33,11 +33,13 @@ private:
CheckBox* mpUseOpenCL; CheckBox* mpUseOpenCL;
VclFrame* mpBlackListFrame;
ListBox* mpBlackList; ListBox* mpBlackList;
PushButton* mpBlackListEdit; PushButton* mpBlackListEdit;
PushButton* mpBlackListAdd; PushButton* mpBlackListAdd;
PushButton* mpBlackListDelete; PushButton* mpBlackListDelete;
VclFrame* mpWhiteListFrame;
ListBox* mpWhiteList; ListBox* mpWhiteList;
PushButton* mpWhiteListEdit; PushButton* mpWhiteListEdit;
PushButton* mpWhiteListAdd; PushButton* mpWhiteListAdd;
...@@ -51,9 +53,12 @@ private: ...@@ -51,9 +53,12 @@ private:
DECL_LINK(WhiteListAddHdl, void*); DECL_LINK(WhiteListAddHdl, void*);
DECL_LINK(WhiteListDeleteHdl, void*); DECL_LINK(WhiteListDeleteHdl, void*);
DECL_LINK(EnableOpenCLHdl, void*);
long EditHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag); long EditHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag);
long AddHdl(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); long DeleteHdl(ListBox* pListBox, OpenCLConfig::ImplMatcherSet& rSet);
void EnableOpenCLHdl(VclFrame* pFrame, bool aEnable);
public: public:
SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment