summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-12-16 13:14:39 +0100
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-12-16 14:34:07 +0100
commit270fdd6b788974fa5d8e1ce01cc5358a0824fb99 (patch)
tree5c69aaf57d5a18964e4ebf7d2cda503139ffea0e /cui
parent1990c75175118c4b1ff0f020c13213627b6adcb0 (diff)
add two options for OpenGL rendering
Change-Id: I1b37d8332e9a5b779c27373b2ec038ccdf2b90df
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/optgdlg.cxx2
-rw-r--r--cui/source/options/optgdlg.hxx2
-rw-r--r--cui/uiconfig/ui/optviewpage.ui30
3 files changed, 33 insertions, 1 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e41c2473ab06..ca5af8d941b7 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -570,6 +570,8 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pFontHistoryCB, "showfonthistory");
get(m_pUseHardwareAccell, "useaccel");
get(m_pUseAntiAliase, "useaa");
+ get(m_pUseOpenGL, "useopengl");
+ get(m_pForceOpenGL, "forceopengl");
get(m_pMousePosLB, "mousepos");
get(m_pMouseMiddleLB, "mousemiddle");
// #i97672#
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 9a78d532b3b4..2d102899260b 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -97,6 +97,8 @@ private:
CheckBox* m_pUseHardwareAccell;
CheckBox* m_pUseAntiAliase;
+ CheckBox* m_pUseOpenGL;
+ CheckBox* m_pForceOpenGL;
ListBox* m_pMousePosLB;
ListBox* m_pMouseMiddleLB;
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 67105b99e0a2..d433c6f1e22e 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -82,6 +82,34 @@
<property name="top_attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="useopengl">
+ <property name="label" translatable="yes">Use OpenGL for all rendering</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="forceopengl">
+ <property name="label" translatable="yes">Force OpenGL even if blacklisted (might expose driver bugs)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -139,7 +167,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="text" translatable="no">75</property>
+ <property name="text">75</property>
<property name="adjustment">adjustment3</property>
<property name="value">75</property>
</object>