@@ -17,36 +17,21 @@
17#ifndef FAKE_SCOPE_H
17#ifndef FAKE_SCOPE_H
18#define FAKE_SCOPE_H
18#define FAKE_SCOPE_H
20+#include <unity/shell/scopes/ScopeInterface.h>
20#include "fake_categories.h"
22#include "fake_categories.h"
21#include "fake_previewstack.h"
23#include "fake_previewstack.h"
24#include <QTimer>
25#include <QTimer>
26class Department;
27class Department;
27class Preview;
28class Preview;
29−class Scope : public QObject
30+class Scope : public unity::shell::scopes::ScopeInterface
33− Q_PROPERTY(QString id READ id NOTIFY idChanged)
34− Q_PROPERTY(QString name READ name NOTIFY nameChanged)
35− Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
36− Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
37− Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
38− Q_PROPERTY(bool searchInProgress READ searchInProgress WRITE setSearchInProgress NOTIFY searchInProgressChanged)
39− Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
40− Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
41− Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
42− //Q_PROPERTY(Filters* filters READ filters NOTIFY filtersChanged)
44− Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
45− Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
46− Q_PROPERTY(QString formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)
47− Q_PROPERTY(bool isActive READ isActive WRITE setActive NOTIFY isActiveChanged)
50 Q_PROPERTY(QString currentDepartment READ currentDepartment NOTIFY currentDepartmentChanged)
35 Q_PROPERTY(QString currentDepartment READ currentDepartment NOTIFY currentDepartmentChanged)
51 Q_PROPERTY(bool hasDepartments READ hasDepartments NOTIFY hasDepartmentsChanged)
36 Q_PROPERTY(bool hasDepartments READ hasDepartments NOTIFY hasDepartmentsChanged)
52// END TODO
37// END TODO
@@ -56,35 +41,33 @@ public:
56 Scope(QString const& id, QString const& name, bool visible, QObject* parent = 0);
41 Scope(QString const& id, QString const& name, bool visible, QObject* parent = 0);
58 /* getters */
43 /* getters */
59− QString id() const;
44+ QString id() const override;
60− QString name() const;
45+ QString name() const override;
61− QString iconHint() const;
46+ QString iconHint() const override;
62− QString description() const;
47+ QString description() const override;
63− QString searchHint() const;
48+ QString searchHint() const override;
64− bool visible() const;
49+ bool visible() const override;
65− QString shortcut() const;
50+ QString shortcut() const override;
66− bool connected() const;
67− bool searchInProgress() const;
51+ bool searchInProgress() const override;
68− Categories* categories() const;
52+ unity::shell::scopes::CategoriesInterface* categories() const override;
69− QString searchQuery() const;
53+ QString searchQuery() const override;
70− QString noResultsHint() const;
54+ QString noResultsHint() const override;
71− QString formFactor() const;
55+ QString formFactor() const override;
72− bool isActive() const;
56+ bool isActive() const override;
74 /* setters */
58 /* setters */
75− void setName(const QString& name);
76− void setSearchQuery(const QString& search_query);
59+ void setSearchQuery(const QString& search_query) override;
77− void setNoResultsHint(const QString& hint);
60+ void setNoResultsHint(const QString& hint) override;
78− void setFormFactor(const QString& form_factor);
61+ void setFormFactor(const QString& form_factor) override;
79− void setActive(const bool);
62+ void setActive(const bool) override;
80− void setSearchInProgress(const bool inProg);
63+ Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits
82− Q_INVOKABLE void activate(QVariant const& result);
65+ Q_INVOKABLE void activate(QVariant const& result) override;
83− Q_INVOKABLE PreviewStack* preview(QVariant const& result);
66+ Q_INVOKABLE PreviewStack* preview(QVariant const& result) override;
84− Q_INVOKABLE void cancelActivation();
67+ Q_INVOKABLE void cancelActivation() override;
85− Q_INVOKABLE void closeScope(Scope* scope);
68+ Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
87− // TODO
70+ // TODO this will go to unity-api eventually
88 QString currentDepartment() const;
71 QString currentDepartment() const;
89 bool hasDepartments() const;
72 bool hasDepartments() const;
90 Q_INVOKABLE Department *getDepartment(const QString& id); // returns a Department with lazy-loaded children
73 Q_INVOKABLE Department *getDepartment(const QString& id); // returns a Department with lazy-loaded children
@@ -92,35 +75,10 @@ public:
92 // END TODO
75 // END TODO
95− // TODO
78+ // TODO this will go to unity-api eventually
96 void currentDepartmentChanged(const QString&);
79 void currentDepartmentChanged(const QString&);
97 void hasDepartmentsChanged(bool);
80 void hasDepartmentsChanged(bool);
98 // END TODO
81 // END TODO
100− void nameChanged(const QString&);
101− void iconHintChanged(const QString&);
102− void descriptionChanged(const QString&);
103− void searchHintChanged(const QString&);
104− void searchInProgressChanged();
105− void visibleChanged(bool);
106− void shortcutChanged(const QString&);
107− void categoriesChanged();
108− //void filtersChanged();
109− void searchQueryChanged();
110− void noResultsHintChanged();
111− void formFactorChanged();
112− void isActiveChanged(bool);
114− // signals triggered by activate(..) or preview(..) requests.
117− void gotoUri(const QString &uri);
119− void previewRequested(QVariant const& result);
120− void gotoScope(QString const& scopeId);
121− void openScope(Scope* scope);
123− void activateApplication(const QString &desktop);
125protected:
83protected: