3d5a8e6 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

share some little duplicated code

3d5a8e6Michael Zanetti12 years ago

plugins/Unity/Launcher/launchermodel.cpp+20−28

compare with xenial

unifiedsplit

@@ -162,23 +162,7 @@ void LauncherModel::pin(const QString &appId, int index)

162

163void LauncherModel::requestRemove(const QString &appId)

164{

165− int index = findApplication(appId);

165+ unpin(appId);

166− if (index < 0) {

167− return;

168− }

169−

170− if (m_appManager->findApplication(appId)) {

171− m_list.at(index)->setPinned(false);

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

173− Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);

174− storeAppList();

175− return;

176− }

177−

178− beginRemoveRows(QModelIndex(), index, index);

179− m_list.takeAt(index)->deleteLater();

180− endRemoveRows();

181−

182 storeAppList();

166 storeAppList();

183}

167}

184

168

@@ -289,6 +273,24 @@ void LauncherModel::storeAppList()

289 m_settings->setStoredApplications(appIds);

273 m_settings->setStoredApplications(appIds);

290}

274}

291

275

276+void LauncherModel::unpin(const QString &appId)

277+{

278+ int index = findApplication(appId);

279+ if (index < 0) {

280+ return;

281+ }

282+

283+ if (m_appManager->findApplication(appId)) {

284+ m_list.at(index)->setPinned(false);

285+ QModelIndex modelIndex = this->index(index);

286+ Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);

287+ } else {

288+ beginRemoveRows(QModelIndex(), index, index);

289+ m_list.takeAt(index)->deleteLater();

290+ endRemoveRows();

291+ }

292+}

293+

292int LauncherModel::findApplication(const QString &appId)

294int LauncherModel::findApplication(const QString &appId)

293{

295{

294 for (int i = 0; i < m_list.count(); ++i) {

296 for (int i = 0; i < m_list.count(); ++i) {

@@ -370,18 +372,8 @@ void LauncherModel::refresh()

370 }

372 }

371 }

373 }

372

374

373− // If running, just unpin, otherwise really remove

374 Q_FOREACH (LauncherItem* item, toBeRemoved) {

375 Q_FOREACH (LauncherItem* item, toBeRemoved) {

375− int index = m_list.indexOf(item);

376+ unpin(item->appId());

376− if (m_appManager->findApplication(item->appId())) {

377− item->setPinned(false);

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

379− Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);

380− } else {

381− beginRemoveRows(QModelIndex(), index, index);

382− m_list.takeAt(index)->deleteLater();

383− endRemoveRows();

384− }

385 }

377 }

386

378

387 // This brings the Launcher into sync with the settings backend again. There's an issue though:

379 // This brings the Launcher into sync with the settings backend again. There's an issue though:

plugins/Unity/Launcher/launchermodel.h+2

@@ -62,6 +62,8 @@ public Q_SLOTS:

62private:

63 void storeAppList();

65+ void unpin(const QString &appId);

66+

65private Q_SLOTS:

67private Q_SLOTS:

66 void countChanged(const QString &appId, int count);

68 void countChanged(const QString &appId, int count);

67 void countVisibleChanged(const QString &appId, int count);

69 void countVisibleChanged(const QString &appId, int count);