remove old code for activities in settings window

--remove relevant deprecated code that is not needed
in the new implementation
pull/11/head
Michail Vourlakos 5 years ago
parent 43de9b509b
commit 5f7bcf565d

@ -349,16 +349,6 @@ QString SettingsDialog::freeActivities_id() const
return FREEACTIVITIESID; return FREEACTIVITIESID;
} }
QStringList SettingsDialog::activities()
{
return m_corona->layoutsManager()->synchronizer()->activities();
}
QStringList SettingsDialog::availableActivities()
{
return m_availableActivities;
}
QStringList SettingsDialog::activitiesList() QStringList SettingsDialog::activitiesList()
{ {
QStringList result; QStringList result;
@ -1068,8 +1058,6 @@ void SettingsDialog::loadSettings()
} }
} }
recalculateAvailableActivities();
m_model->setHorizontalHeaderItem(IDCOLUMN, new QStandardItem(QString("#path"))); m_model->setHorizontalHeaderItem(IDCOLUMN, new QStandardItem(QString("#path")));
m_model->setHorizontalHeaderItem(COLORCOLUMN, new QStandardItem(QIcon::fromTheme("games-config-background"), m_model->setHorizontalHeaderItem(COLORCOLUMN, new QStandardItem(QIcon::fromTheme("games-config-background"),
QString(i18nc("column for layout background", "Background")))); QString(i18nc("column for layout background", "Background"))));
@ -1361,8 +1349,7 @@ void SettingsDialog::itemChanged(QStandardItem *item)
updatePerLayoutButtonsState(); updatePerLayoutButtonsState();
if (item->column() == ACTIVITYCOLUMN) { if (item->column() == ACTIVITYCOLUMN) {
//! recalculate the available activities //! do nothing
recalculateAvailableActivities();
} else if (item->column() == NAMECOLUMN) { } else if (item->column() == NAMECOLUMN) {
int currentRow = ui->layoutsView->currentIndex().row(); int currentRow = ui->layoutsView->currentIndex().row();
@ -1574,23 +1561,6 @@ void SettingsDialog::updateSharedLayoutsUiElements()
} }
} }
void SettingsDialog::recalculateAvailableActivities()
{
QStringList tempActivities = m_corona->layoutsManager()->synchronizer()->activities();
for (int i = 0; i < m_model->rowCount(); ++i) {
QStringList assigned = m_model->data(m_model->index(i, ACTIVITYCOLUMN), Qt::UserRole).toStringList();
for (const auto &activity : assigned) {
if (tempActivities.contains(activity)) {
tempActivities.removeAll(activity);
}
}
}
m_availableActivities = tempActivities;
}
bool SettingsDialog::dataAreAccepted() bool SettingsDialog::dataAreAccepted()
{ {
for (int i = 0; i < m_model->rowCount(); ++i) { for (int i = 0; i < m_model->rowCount(); ++i) {
@ -1698,7 +1668,7 @@ bool SettingsDialog::saveAllChanges()
m_corona->themeExtended()->setOutlineWidth(ui->outlineSpinBox->value()); m_corona->themeExtended()->setOutlineWidth(ui->outlineSpinBox->value());
//! Update Layouts //! Update Layouts
QStringList knownActivities = activities(); QStringList knownActivities = m_corona->layoutsManager()->synchronizer()->activities();
QTemporaryDir layoutTempDir; QTemporaryDir layoutTempDir;

@ -84,9 +84,7 @@ public:
QString freeActivities_icon() const; QString freeActivities_icon() const;
QString freeActivities_id() const; QString freeActivities_id() const;
QStringList activities();
QStringList activitiesList(); QStringList activitiesList();
QStringList availableActivities();
QStringList availableSharesFor(int row); QStringList availableSharesFor(int row);
void requestImagesDialog(int row); void requestImagesDialog(int row);
@ -154,7 +152,6 @@ private:
private: private:
int m_currentFreeActivitiesLayout{-1}; int m_currentFreeActivitiesLayout{-1};
QStringList m_availableActivities;
QStringList m_tempDirectories; QStringList m_tempDirectories;
QStringList m_initLayoutPaths; QStringList m_initLayoutPaths;

Loading…
Cancel
Save