Merge lp:~aacid/unity-2d/lenses_shortcuts into lp:unity-2d

[Albert Astals Cid]

[Dash] Obey the shortcut property of the lenses

[Dash] Obey the shortcut property of the lenses

[lp:~aacid/unity-2d/lenses_shortcuts]

1032. By Albert Astals Cid on 2012-04-04

Use UQ_WARNING instead of qWarning

[Paweł Stołowski (stolowski)]

Works great!

review: Approve

=== modified file 'libunity-2d-private/src/lenses.cpp'
--- libunity-2d-private/src/lenses.cpp	2012-02-22 08:45:31 +0000
+++ libunity-2d-private/src/lenses.cpp	2012-04-04 09:44:20 +0000
@@ -21,9 +21,13 @@
 #include "lenses.h"
 
 // Local
+#include "debug_p.h"
 #include "lens.h"
+#include "hotkey.h"
+#include "hotkeymonitor.h"
 
 // Qt
+#include <QKeySequence>
 
 // libunity-core
 #include <UnityCore/FilesystemLenses.h>
@@ -44,6 +48,8 @@
     m_homeLens->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
     unity::dash::HomeLens::Ptr homeLensPtr(m_homeLens);
     addUnityLens(homeLensPtr, 0);
+
+    connect(&m_shortcutMapper, SIGNAL(mapped(QString)), this, SIGNAL(activateLensRequested(QString)));
 }
 
 Lenses::~Lenses()
@@ -115,12 +121,48 @@
     /* DOCME */
     QObject::connect(lens, SIGNAL(visibleChanged(bool)), this, SLOT(onLensPropertyChanged()));
     m_lenses.insert(index, lens);
+
+    setLensShortcut(lens);
+    connect(lens, SIGNAL(shortcutChanged(std::string)), this, SLOT(onLensShortcutChanged()));
 }
 
 void Lenses::removeUnityLens(int index)
 {
     Lens* lens = m_lenses.takeAt(index);
+
+    Hotkey *hk = m_lensShorcuts.take(lens);
+    if (hk != NULL) {
+        m_shortcutMapper.removeMappings(hk);
+    }
+
     delete lens;
 }
 
+void Lenses::onLensShortcutChanged()
+{
+    Lens *lens = qobject_cast<Lens*>(sender());
+    Q_ASSERT(lens != 0);
+    if (lens != 0) {
+        setLensShortcut(lens);
+    }
+}
+
+void Lenses::setLensShortcut(Lens *lens)
+{
+    Hotkey *hk = m_lensShorcuts.take(lens);
+    if (hk != NULL) {
+        m_shortcutMapper.removeMappings(hk);
+    }
+    if (!lens->shortcut().isEmpty()) {
+        const QKeySequence ks(lens->shortcut());
+        if (ks.count() == 1) {
+            hk = HotkeyMonitor::instance().getHotkeyFor((Qt::Key)ks[0], Qt::MetaModifier);
+            m_shortcutMapper.setMapping(hk, lens->id());
+            connect(hk, SIGNAL(pressed()), &m_shortcutMapper, SLOT(map()));
+        } else {
+            UQ_WARNING << "Couldn't parse shortcut for Lens. Shorcut is " << lens->shortcut();
+        }
+    }
+}
+
 #include "lenses.moc"
 
=== modified file 'libunity-2d-private/src/lenses.h'
--- libunity-2d-private/src/lenses.h	2012-01-27 17:48:24 +0000
+++ libunity-2d-private/src/lenses.h	2012-04-04 09:44:20 +0000
@@ -23,6 +23,7 @@
 // Qt
 #include <QAbstractListModel>
 #include <QList>
+#include <QSignalMapper>
 
 // libunity-core
 #include <UnityCore/Lens.h>
@@ -36,6 +37,7 @@
 }
 }
 
+class Hotkey;
 class Lens;
 
 class Lenses : public QAbstractListModel
@@ -59,15 +61,22 @@
     Q_INVOKABLE QVariant get(int row) const;
     Q_INVOKABLE QVariant get(const QString& lens_id) const;
 
+Q_SIGNALS:
+    void activateLensRequested(const QString& lens_id);
+
 private Q_SLOTS:
     void onLensAdded(unity::dash::Lens::Ptr& lens);
     void onLensPropertyChanged();
+    void onLensShortcutChanged();
 
 private:
     unity::dash::Lenses* m_unityLenses;
     unity::dash::HomeLens* m_homeLens;
     QList<Lens*> m_lenses;
+    QHash<Lens*, Hotkey*> m_lensShorcuts;
+    QSignalMapper m_shortcutMapper;
 
+    void setLensShortcut(Lens *lens);
     void addUnityLens(unity::dash::Lens::Ptr unity_lens, int index);
     void removeUnityLens(int index);
 };
 
=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-04-03 10:10:02 +0000
+++ shell/dash/Dash.qml	2012-04-04 09:44:20 +0000
@@ -226,6 +226,7 @@
                 }
             }
         }
+        onActivateLensRequested: activateLens(lens_id)
     }
 
     Background {