diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-07-01 18:24:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-07-01 19:02:57 +0000 |
| commit | ef47ce2397d4ed453fe01d994d13a13f442ec3bb (patch) | |
| tree | 8055cdc3a1fe6e60d61cbe0171f0ff0c60afd2ef /cui | |
| parent | 3ebfc5b95559a9bcb2fc0508b51fd00e8eb20260 (diff) | |
tdf#90336 - further cleanup of OpenCL options page.
Still problematic; since we only show OpenCL as being available
if it has already been initialized and used.
Change-Id: I5e82a3f778f4f2025408330b6d9da51402d01e79
Reviewed-on: https://gerrit.libreoffice.org/26866
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optopencl.cxx | 13 | ||||
| -rw-r--r-- | cui/source/options/optopencl.hxx | 3 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optopenclpage.ui | 23 |
3 files changed, 14 insertions, 25 deletions
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index ec8f432816eb..cbe37dd6ed54 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -47,20 +47,17 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) { get(mpUseSwInterpreter, "useswinterpreter"); get(mpUseOpenCL, "useopencl"); - get(clUsed,"openclused"); + get(mpOclUsed,"openclused"); + get(mpOclNotUsed,"openclnotused"); mpUseSwInterpreter->Check(officecfg::Office::Common::Misc::UseSwInterpreter::get()); mpUseOpenCL->Check(maConfig.mbUseOpenCL); mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl)); - cl_device_id idTest=opencl::gpuEnv.mpDevID; - if(!idTest) - { - clUsed->SetText("Yes"); - }else{ - clUsed->SetText("No"); - } + bool bCLUsed = opencl::GPUEnv::isOpenCLEnabled(); + mpOclUsed->Show(bCLUsed); + mpOclNotUsed->Show(!bCLUsed); } SvxOpenCLTabPage::~SvxOpenCLTabPage() diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index d6379682c310..ab628932632f 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -34,7 +34,8 @@ private: VclPtr<CheckBox> mpUseSwInterpreter; VclPtr<CheckBox> mpUseOpenCL; - VclPtr<FixedText> clUsed; + VclPtr<FixedText> mpOclUsed; + VclPtr<FixedText> mpOclNotUsed; DECL_STATIC_LINK_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void); diff --git a/cui/uiconfig/ui/optopenclpage.ui b/cui/uiconfig/ui/optopenclpage.ui index 6b78e67a3862..86eee5774d6e 100644 --- a/cui/uiconfig/ui/optopenclpage.ui +++ b/cui/uiconfig/ui/optopenclpage.ui @@ -58,25 +58,22 @@ </packing> </child> <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> + <object class="GtkLabel" id="openclused"> + <property name="visible">False</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Will OpenCL be used?</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="label" translatable="yes">OpenCL is available for use.</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkLabel" id="openclused"> - <property name="visible">True</property> + <object class="GtkLabel" id="openclnotused"> + <property name="visible">False</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">OpenCL is not used.</property> </object> <packing> <property name="expand">False</property> @@ -84,12 +81,6 @@ <property name="position">3</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object> |