[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cui/source cui/uiconfig

[Markus Mohrhard]

 cui/source/options/optgdlg.cxx |    2 ++
 cui/source/options/optgdlg.hxx |    2 ++
 cui/uiconfig/ui/optviewpage.ui |   30 +++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 2a29dd4aa7a1959d92ce6fe928577962917966d9
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Dec 16 13:14:39 2014 +0100

    add two options for OpenGL rendering
    
    Change-Id: I1b37d8332e9a5b779c27373b2ec038ccdf2b90df

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 29e1387..d66fc74 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -582,6 +582,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 3353457..18e4297 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -98,6 +98,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 f302b5c..9536667 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>