df4309c · unity8 · git.iko.soy

git.iko.soy/unity8

Minimal implementation of new API

commitdf4309c28449a2c3441d646da21077111eb9f7ab authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 3 Sep 2015, 14:50 (11 years ago) parente0112a4

4 files changed+33−41

compare with xenial

unifiedsplit

tests/mocks/Unity/CMakeLists.txt+1−1 tests/mocks/Unity/fake_navigation.cpp+1−6 tests/mocks/Unity/fake_scope.cpp+23−29 tests/mocks/Unity/fake_scope.h+8−5

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

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

77add_subdirectory(DashCommunicator)

99pkg_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)

1111

1212include_directories(

1313 ${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

3232{

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

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

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

3635}

3736

3837QString Navigation::navigationId() const

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

107106 case RoleHasChildren:

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

109108 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);

114− }

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

115110 }

116111 return QVariant();

117112}

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

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

3838 , m_favorite(favorite)

3939 , m_isActive(false)

4040 , m_currentNavigationId("root")

41− , m_currentAltNavigationId("altrootChild1")

4241 , m_previewRendererName("preview-generic")

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

4443 , m_openScope(nullptr)

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

229228 return true;

230229}

231230

232−QString Scope::currentAltNavigationId() const

233−{

234− return m_currentAltNavigationId;

235−}

236−

237−bool Scope::hasAltNavigation() const

238−{

239− return true;

240−}

241−

242231Scope::Status Scope::status() const

243232{

244233 return Status::Okay;

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

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

291280}

292281

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

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

294283{

295− if (id.isEmpty())

296− return nullptr;

284+ m_currentNavigationId = navigationId;

285+ Q_EMIT currentNavigationIdChanged();

286+}

297287

298− QString parentId;

299− QString parentLabel;

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

301− parentId = "altroot";

302− parentLabel = "altroot";

303− }

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

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

289+{

290+ return nullptr;

305291}

306292

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()

308309{

309− if (isAltNavigation) {

310− m_currentAltNavigationId = navigationId;

311− Q_EMIT currentAltNavigationIdChanged();

312− } else {

313− m_currentNavigationId = navigationId;

314− Q_EMIT currentNavigationIdChanged();

315− }

316310}

317311

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

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

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

6767

6868 QString currentNavigationId() const override;

6969 bool hasNavigation() const override;

70− QString currentAltNavigationId() const override;

71− bool hasAltNavigation() const override;

7270 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+

7579 void performQuery(const QString& query) override;

7680

7781 Status status() const override;

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

97101 bool m_favorite;

98102 bool m_isActive;

99103 QString m_currentNavigationId;

100− QString m_currentAltNavigationId;

101104

102105 QString m_previewRendererName;

103106