Merge lp:~mardy/unity-2d/conf-opengl into lp:unity-2d

[Alberto Mardegan]

[launcher, dash, workspace switcher] Added a configuration key to enable QML's OpenGL backend

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2011-08-22 09:17:03 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2011-09-07 12:15:24 +0000
@@ -1,4 +1,14 @@
 <schemalist>
+  <schema path="/com/canonical/unity-2d/" id="com.canonical.Unity2d" gettext-domain="unity-2d">
+    <key type="b" name="use-opengl">
+      <default>false</default>
+      <summary>Use OpenGL viewport.</summary>
+      <description>
+        Whether to render the graphics into an OpenGL viewport.
+        When set to false, the raster engine is used.
+      </description>
+    </key>
+  </schema>
   <schema path="/com/canonical/unity-2d/launcher/" id="com.canonical.Unity2d.Launcher" gettext-domain="unity-2d">
     <key type="b" name="super-key-enable">
       <default>true</default>

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-08-09 13:33:24 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-09-07 12:15:24 +0000
@@ -1,19 +1,53 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "unity2ddeclarativeview.h"
+
 #include <QDebug>
 #include <QGLWidget>
+#include <QVariant>
 #include <QX11Info>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include "qconf.h"
+
 #include <debug_p.h>
 
+static const char* UNITY2D_DCONF_SCHEMA = "com.canonical.Unity2d";
+
 Unity2DDeclarativeView::Unity2DDeclarativeView(QWidget *parent) :
-    QDeclarativeView(parent), m_useOpenGL(false), m_transparentBackground(false), m_last_focused_window(None)
+    QDeclarativeView(parent),
+    m_useOpenGL(false),
+    m_transparentBackground(false),
+    m_last_focused_window(None),
+    m_conf(new QConf(UNITY2D_DCONF_SCHEMA))
 {
+    m_useOpenGL = m_conf->property("useOpengl").toBool();
+
     setupViewport();
 }
 
+Unity2DDeclarativeView::~Unity2DDeclarativeView()
+{
+    delete m_conf;
+    m_conf = 0;
+}
+
 bool Unity2DDeclarativeView::useOpenGL() const
 {
     return m_useOpenGL;

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	2011-08-09 13:33:24 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2011-09-07 12:15:24 +0000
@@ -1,8 +1,26 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef UNITY2DDECLARATIVEVIEW_H
 #define UNITY2DDECLARATIVEVIEW_H
 
 #include <QDeclarativeView>
 
+class QConf;
+
 class Unity2DDeclarativeView : public QDeclarativeView
 {
     Q_OBJECT
@@ -13,6 +31,7 @@
 
 public:
     Unity2DDeclarativeView(QWidget *parent = 0);
+    ~Unity2DDeclarativeView();
 
     // getters
     bool useOpenGL() const;
@@ -43,6 +62,7 @@
     bool m_useOpenGL;
     bool m_transparentBackground;
     WId m_last_focused_window;
+    QConf* m_conf;
 };
 
 Q_DECLARE_METATYPE(Unity2DDeclarativeView*)