68b30f3 · unity8 · git.iko.soy

plugins/Unity/Launcher/launchermodel.cpp+19−17

compare with xenial

unifiedsplit

@@ -92,25 +92,27 @@ void LauncherModel::move(int oldIndex, int newIndex)

92 pin(m_list.at(newIndex)->appId());

93}

94

95−void LauncherModel::pin(const QString &appId)

95+void LauncherModel::pin(const QString &appId, int index)

96{

97− int index = findApplication(appId);

97+ int currentIndex = findApplication(appId);

98− if (index < 0) {

99− return;

100− }

101−

102− LauncherItem *item = m_list.at(index);

103− if (!item->pinned()) {

104

98

99+ if (currentIndex >= 0) {

100+ if (index == -1 || index == currentIndex) {

101+ m_list.at(currentIndex)->setPinned(true);

102+ QModelIndex modelIndex = this->index(currentIndex);

103+ Q_EMIT dataChanged(modelIndex, modelIndex);

104+ } else {

105+ move(currentIndex, index);

106+ }

107+ } else {

108+ beginInsertRows(QModelIndex(), index, index);

109+ LauncherItem *item = new LauncherItem(appId,

110+ m_backend->desktopFile(appId),

111+ m_backend->displayName(appId),

112+ m_backend->icon(appId));

105 item->setPinned(true);

113 item->setPinned(true);

106− item->setRecent(false);

114+ m_list.insert(index, item);

107−

115+ endInsertRows();

108− m_backend->setPinned(item->appId(), true);

109−

110− QModelIndex modelIndex = this->index(index);

111− Q_EMIT dataChanged(modelIndex, modelIndex);

112−

113− storeAppList();

114 }

116 }

115}

117}

116

118

@@ -128,7 +130,7 @@ void LauncherModel::requestRemove(const QString &appId)

128 storeAppList();

130 storeAppList();

129}

131}

130

132

131−void LauncherModel::triggerQuickListAction(const QString &appId, int quickListIndex)

133+void LauncherModel::quickListActionInvoked(const QString &appId, int quickListIndex)

132{

134{

133 int index = findApplication(appId);

135 int index = findApplication(appId);

134 if (index < 0) {

136 if (index < 0) {

plugins/Unity/Launcher/launchermodel.h+2−2

@@ -45,9 +45,9 @@ public:

45

46 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;

47 Q_INVOKABLE void move(int oldIndex, int newIndex);

48− Q_INVOKABLE void pin(const QString &appId);

48+ Q_INVOKABLE void pin(const QString &appId, int index = -1);

49 Q_INVOKABLE void requestRemove(const QString &appId);

50− Q_INVOKABLE void triggerQuickListAction(const QString &appId, int quickListIndex);

50+ Q_INVOKABLE void quickListActionInvoked(const QString &appId, int quickListIndex);

51

52private:

53 void storeAppList();

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+19−6

@@ -100,13 +100,26 @@ void MockLauncherModel::move(int oldIndex, int newIndex)

100 endMoveRows();

101}

102

103−void MockLauncherModel::pin(const QString &appId)

103+void MockLauncherModel::pin(const QString &appId, int index)

104{

105− int index = findApp(appId);

105+ int currentIndex = findApp(appId);

106− if (index >= 0) {

106+

107+ if (currentIndex >= 0) {

108+ if (index == -1 || index == currentIndex) {

109+ m_list.at(currentIndex)->setPinned(true);

110+ QModelIndex modelIndex = this->index(currentIndex);

111+ Q_EMIT dataChanged(modelIndex, modelIndex);

112+ } else {

113+ move(currentIndex, index);

114+ }

115+ } else {

116+ beginInsertRows(QModelIndex(), index, index);

117+ m_list.insert(index, new MockLauncherItem(appId,

118+ appId + ".desktop",

119+ appId,

120+ appId + ".png"));

107 m_list.at(index)->setPinned(true);

121 m_list.at(index)->setPinned(true);

108− QModelIndex modelIndex = this->index(index);

122+ endInsertRows();

109− Q_EMIT dataChanged(modelIndex, modelIndex);

110 }

123 }

111}

124}

112

125

@@ -120,7 +133,7 @@ void MockLauncherModel::requestRemove(const QString &appId)

120 }

133 }

121}

134}

122

135

123−void MockLauncherModel::triggerQuickListAction(const QString &appId, int quickListIndex)

136+void MockLauncherModel::quickListActionInvoked(const QString &appId, int quickListIndex)

124{

137{

125 Q_UNUSED(appId)

138 Q_UNUSED(appId)

126 Q_UNUSED(quickListIndex)

139 Q_UNUSED(quickListIndex)

tests/mocks/Unity/Launcher/MockLauncherModel.h+2−2

@@ -40,9 +40,9 @@ public:

40

41 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const;

42 Q_INVOKABLE void move(int oldIndex, int newIndex);

43− Q_INVOKABLE void pin(const QString &appId);

43+ Q_INVOKABLE void pin(const QString &appId, int index = -1);

44 Q_INVOKABLE void requestRemove(const QString &appId);

45− Q_INVOKABLE void triggerQuickListAction(const QString &appId, int quickListIndex);

45+ Q_INVOKABLE void quickListActionInvoked(const QString &appId, int quickListIndex);

46

47private:

48 int findApp(const QString &appId);