kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-11 13:18:13 +03:00
Code Issues Projects Releases Wiki Activity

fixes for update Switch and Remove Buttons

Browse Source 
-- changing name of layouts should have a visual
indicator and at the same time the Switch and
Remove buttons should update their states
properly. A Switch or Remove action shouldnt
be allowed after a layout rename until the user
has confirmed the new name for the layout.
This commit is contained in:
Michail Vourlakos 2018-03-21 19:18:39 +02:00
parent 48a788c33d
commit 7dae5e6f41
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/settingsdialog.cpp
View File

@ -998,7 +998,23 @@ void SettingsDialog::itemChanged(QStandardItem *item)
if (item->column() == ACTIVITYCOLUMN) {
//! recalculate the available activities
recalculateAvailableActivities();
} else if (item->column() == NAMECOLUMN) {
int currentRow = ui->layoutsView->currentIndex().row();
QString id = m_model->data(m_model->index(currentRow, IDCOLUMN), Qt::DisplayRole).toString();
QString name = m_model->data(m_model->index(currentRow, NAMECOLUMN), Qt::DisplayRole).toString();
QFont font = qvariant_cast<QFont>(m_model->data(m_model->index(currentRow, NAMECOLUMN), Qt::FontRole));
if (m_layouts[id]->name() != name) {
font.setItalic(true);
m_model->setData(m_model->index(currentRow, NAMECOLUMN), font, Qt::FontRole);
} else {
font.setItalic(false);
m_model->setData(m_model->index(currentRow, NAMECOLUMN), font, Qt::FontRole);
}
}
updateApplyButtonsState();
}
void SettingsDialog::updateApplyButtonsState()
@ -1056,10 +1072,14 @@ void SettingsDialog::updateApplyButtonsState()
void SettingsDialog::updatePerLayoutButtonsState()
{
QString id = m_model->data(m_model->index(ui->layoutsView->currentIndex().row(), IDCOLUMN), Qt::DisplayRole).toString();
int currentRow = ui->layoutsView->currentIndex().row();
QString id = m_model->data(m_model->index(currentRow, IDCOLUMN), Qt::DisplayRole).toString();
QString nameInModel = m_model->data(m_model->index(currentRow, NAMECOLUMN), Qt::DisplayRole).toString();
QString originalName = m_layouts.contains(id) ? m_layouts[id]->name() : "";
//! Switch Button
if (id.startsWith("/tmp/")) {
if (id.startsWith("/tmp/") || originalName != nameInModel) {
ui->switchButton->setEnabled(false);
} else {
ui->switchButton->setEnabled(true);
@ -1071,7 +1091,7 @@ void SettingsDialog::updatePerLayoutButtonsState()
} else if (m_corona->layoutManager()->memoryUsage() == Dock::MultipleLayouts) {
ui->pauseButton->setVisible(true);
QStringList lActivities = m_model->data(m_model->index(ui->layoutsView->currentIndex().row(), ACTIVITYCOLUMN), Qt::UserRole).toStringList();
QStringList lActivities = m_model->data(m_model->index(currentRow, ACTIVITYCOLUMN), Qt::UserRole).toStringList();
Layout *layout = m_layouts[id];
@ -1083,9 +1103,9 @@ void SettingsDialog::updatePerLayoutButtonsState()
}
//! Remove Layout Button
QString name = m_layouts[id]->name();
if (name == m_corona->layoutManager()->currentLayoutName() || m_corona->layoutManager()->activeLayout(name)) {
if (originalName != nameInModel
|| (originalName == m_corona->layoutManager()->currentLayoutName())
|| (m_corona->layoutManager()->activeLayout(originalName))) {
ui->removeButton->setEnabled(false);
} else {
ui->removeButton->setEnabled(true);