df4309c · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Minimal implementation of new API

df4309cAlbert Astals Cid11 years ago

tests/mocks/Unity/CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -7,7 +7,7 @@ add_subdirectory(Notifications)

7add_subdirectory(DashCommunicator)

9pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

10−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=7)

10+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=8)

12include_directories(

13 ${CMAKE_CURRENT_BINARY_DIR}

tests/mocks/Unity/fake_navigation.cpp+1−6

@@ -32,7 +32,6 @@ Navigation::Navigation(const QString& navigationId, const QString& label, const

32{

33 QTimer::singleShot(1500, this, &Navigation::slotLoaded);

34 connect(scope, &Scope::currentNavigationIdChanged, this, &Navigation::slotCurrentNavigationChanged);

35− connect(scope, &Scope::currentAltNavigationIdChanged, this, &Navigation::slotCurrentNavigationChanged);

36}

35}

38QString Navigation::navigationId() const

37QString Navigation::navigationId() const

@@ -107,11 +106,7 @@ QVariant Navigation::data(const QModelIndex &index, int role) const

107 case RoleHasChildren:

106 case RoleHasChildren:

108 return m_navigationId == "root" && index.row() != 3;

107 return m_navigationId == "root" && index.row() != 3;

109 case RoleIsActive:

108 case RoleIsActive:

110− if (m_navigationId.startsWith("alt")) {

111− return m_scope->currentAltNavigationId() == data(index, RoleNavigationId);

112− } else {

113− return m_scope->currentNavigationId() == data(index, RoleNavigationId);

109+ return m_scope->currentNavigationId() == data(index, RoleNavigationId);

114− }

115 }

110 }

116 return QVariant();

111 return QVariant();

117}

112}

tests/mocks/Unity/fake_scope.cpp+23−29

@@ -38,7 +38,6 @@ Scope::Scope(QString const& id, QString const& name, bool favorite, Scopes* pare

38 , m_favorite(favorite)

39 , m_isActive(false)

40 , m_currentNavigationId("root")

41− , m_currentAltNavigationId("altrootChild1")

42 , m_previewRendererName("preview-generic")

41 , m_previewRendererName("preview-generic")

43 , m_categories(new Categories(categories, this))

42 , m_categories(new Categories(categories, this))

44 , m_openScope(nullptr)

43 , m_openScope(nullptr)

@@ -229,16 +228,6 @@ bool Scope::hasNavigation() const

229 return true;

228 return true;

230}

229}

231

230

232−QString Scope::currentAltNavigationId() const

233−{

234− return m_currentAltNavigationId;

235−}

236−

237−bool Scope::hasAltNavigation() const

238−{

239− return true;

240−}

241−

242Scope::Status Scope::status() const

231Scope::Status Scope::status() const

243{

232{

244 return Status::Okay;

233 return Status::Okay;

@@ -290,29 +279,34 @@ unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& i

290 return new Navigation(id, id, "all"+id, parentId, parentLabel, this);

279 return new Navigation(id, id, "all"+id, parentId, parentLabel, this);

291}

280}

292

281

293−unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const& id)

282+void Scope::setNavigationState(const QString &navigationId)

294{

283{

295− if (id.isEmpty())

284+ m_currentNavigationId = navigationId;

296− return nullptr;

285+ Q_EMIT currentNavigationIdChanged();

286+}

297

287

298− QString parentId;

288+unity::shell::scopes::FilterBaseInterface* Scope::primaryNavigationFilter() const

299− QString parentLabel;

289+{

300− if (id != "altroot") {

290+ return nullptr;

301− parentId = "altroot";

302− parentLabel = "altroot";

303− }

304− return new Navigation(id, id, "all"+id, parentId, parentLabel, this);

305}

291}

306

292

307−void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)

293+unity::shell::scopes::FiltersInterface* Scope::filters() const

294+{

295+ return nullptr;

296+}

297+

298+QString Scope::primaryNavigationTag() const

299+{

300+ return QString();

301+}

302+

303+int Scope::activeFiltersCount() const

304+{

305+ return 0;

306+}

307+

308+void Scope::resetPrimaryNavigationTag()

308{

309{

309− if (isAltNavigation) {

310− m_currentAltNavigationId = navigationId;

311− Q_EMIT currentAltNavigationIdChanged();

312− } else {

313− m_currentNavigationId = navigationId;

314− Q_EMIT currentNavigationIdChanged();

315− }

316}

310}

317

311

318void Scope::performQuery(const QString& query)

312void Scope::performQuery(const QString& query)

tests/mocks/Unity/fake_scope.h+8−5

@@ -67,11 +67,15 @@ public:

68 QString currentNavigationId() const override;

69 bool hasNavigation() const override;

70− QString currentAltNavigationId() const override;

71− bool hasAltNavigation() const override;

72 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

70 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

73− Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;

74− Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;

71+ Q_INVOKABLE void setNavigationState(const QString &navigationId) override;

72+

73+ unity::shell::scopes::FilterBaseInterface* primaryNavigationFilter() const override;

74+ unity::shell::scopes::FiltersInterface* filters() const override;

75+ QString primaryNavigationTag() const override;

76+ int activeFiltersCount() const override;

77+ Q_INVOKABLE void resetPrimaryNavigationTag() override;

78+

75 void performQuery(const QString& query) override;

79 void performQuery(const QString& query) override;

77 Status status() const override;

81 Status status() const override;

@@ -97,7 +101,6 @@ protected:

97 bool m_favorite;

101 bool m_favorite;

98 bool m_isActive;

102 bool m_isActive;

99 QString m_currentNavigationId;

103 QString m_currentNavigationId;

100− QString m_currentAltNavigationId;

101

104

102 QString m_previewRendererName;

105 QString m_previewRendererName;

103

106