← Back to branch summary

~jbicha/unity-2d/fix-launcher-quicklist-naming-lp949636

« back to all changes in this revision

Viewing changes to launcher/app/launcherview.h

  • Committer: Florian Boucault
  • Date: 2011-07-14 14:36:53 UTC
  • mto: (574.1.60 unity-2d)
  • mto: This revision was merged to the branch mainline in revision 604.
  • Revision ID: florian@boucault.net-20110714143653-ktnzxuo4ngss40t2
https://launchpad.net/bugs/810509
[launcher] Migrated GConf key /desktop/unity-2d/launcher/super_key_enable to dconf

Added a GSettings schemas file and a GConf-to-GSettings conversion file.

Packaging changes:
* debian/unity-2d.install:
  - install GSettings schemas into usr/share/glib-2.0/schemas
  - install GConf to GSettings conversion into usr/share/GConf/gsettings
* debian/gconf/schemas/unity-2d.schemas:
  - remove GConf schema for /desktop/unity-2d/launcher/super_key_enable
* debian/control:
  - add dependency on libdconf-qt-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/app/launcherview.h
24
24
#include <QList>
25
25
#include <QUrl>
26
26
#include <QTimer>
27
 
 
28
 
#include "gconfitem-qml-wrapper.h"
 
27
#include <QVariant>
29
28
 
30
29
#include <unity2ddeclarativeview.h>
31
30
 
32
31
class DeclarativeDragDropEvent;
33
32
class LauncherDBus;
 
33
class QConf;
34
34
 
35
35
class LauncherView : public Unity2DDeclarativeView
36
36
{
40
40
 
41
41
public:
42
42
    explicit LauncherView(QWidget* parent = NULL);
 
43
    ~LauncherView();
43
44
 
44
45
    bool superKeyHeld() const { return m_superKeyHeld; }
45
46
 
66
67
    void focusOutEvent(QFocusEvent* event);
67
68
 
68
69
private:
69
 
    GConfItemQmlWrapper m_enableSuperKey;
 
70
    QConf* m_dconf_launcher;
70
71
    bool m_superKeyPressed;
71
72
    bool m_superKeyHeld;
72
73
    QTimer m_superKeyHoldTimer;