kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13:33:50 +03:00
Code Issues Projects Releases Wiki Activity

reject duplicate layout names in settings

Browse Source
This commit is contained in:
Michail Vourlakos 2020-03-16 12:36:43 +02:00
parent 880ed9638e
commit 37cac2ca81
4 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/settings/controllers/layoutscontroller.cpp
View File

@ -39,6 +39,7 @@
#include <QDir>
#include <QFile>
#include <QHeaderView>
#include <QItemSelection>
#include <QMessageBox>
#include <QStringList>
#include <QTemporaryDir>
@ -57,7 +58,7 @@ namespace Controller {
Layouts::Layouts(QDialog *parent, Latte::Corona *corona, QTableView *view)
: QObject(parent),
m_parent(parent),
m_parentDialog(parent),
m_corona(corona),
m_model(new Model::Layouts(this, corona)),
m_proxyModel(new QSortFilterProxyModel(this)),
@ -72,6 +73,7 @@ Layouts::Layouts(QDialog *parent, Latte::Corona *corona, QTableView *view)
connect(m_model, &QAbstractItemModel::dataChanged, this, &Layouts::dataChanged);
connect(m_model, &Model::Layouts::rowsInserted, this, &Layouts::dataChanged);
connect(m_model, &Model::Layouts::nameDuplicated, this, &Layouts::on_nameDuplicatedFrom);
}
Layouts::~Layouts()
@ -230,7 +232,7 @@ QString Layouts::uniqueTempDirectory()
QString Layouts::uniqueLayoutName(QString name)
{
int pos_ = name.lastIndexOf(QRegExp(QString("[-][0-9]+")));
int pos_ = name.lastIndexOf(QRegExp(QString(" [-][0-9]+")));
if (m_model->containsCurrentName(name) && pos_ > 0) {
name = name.left(pos_);
@ -241,7 +243,7 @@ QString Layouts::uniqueLayoutName(QString name)
QString namePart = name;
while (m_model->containsCurrentName(name)) {
name = namePart + "-" + QString::number(i);
name = namePart + " - " + QString::number(i);
i++;
}
@ -289,7 +291,7 @@ void Layouts::toggleSharedForSelected()
if (selected.isShared()) {
m_proxyModel->setData(m_proxyModel->index(m_view->currentIndex().row(), Model::Layouts::SHAREDCOLUMN), QStringList(), Qt::UserRole);
} else {
/* bool assigned{false};
/* bool assigned{false};
QStringList assignedList;
QStringList availableShares = availableSharesFor(row);
@ -447,7 +449,7 @@ void Layouts::loadLayouts()
//! there are broken layouts and the user must be informed!
if (brokenLayouts.count() > 0) {
auto msg = new QMessageBox(m_parent);
auto msg = new QMessageBox(m_parentDialog);
msg->setIcon(QMessageBox::Warning);
msg->setWindowTitle(i18n("Layout Warning"));
msg->setText(i18n("The layout(s) <b>%0</b> have <i>broken configuration</i>!!! Please <b>remove them</b> to improve the system stability...").arg(brokenLayouts.join(",")));
@ -502,7 +504,7 @@ void Layouts::addLayoutForFile(QString file, QString layoutName, bool newTempDir
m_model->appendLayout(copied);
// ui->layoutsView->selectRow(row);
// ui->layoutsView->selectRow(row);
if (showNotification) {
//NOTE: The pointer is automatically deleted when the event is closed
@ -835,6 +837,39 @@ void Layouts::saveColumnWidths()
m_corona->universalSettings()->setLayoutsColumnWidths(columnWidths);
}
void Layouts::on_nameDuplicatedFrom(const QString &provenId, const QString &trialId)
{
//! duplicated layout name
auto msg = new QMessageBox(m_parentDialog);
msg->setIcon(QMessageBox::Warning);
msg->setWindowTitle(i18n("Layout Warning"));
msg->setText(i18n("There are layouts with the same name, that is not permitted!!! Please update these names to re-apply the changes..."));
msg->setStandardButtons(QMessageBox::Ok);
connect(msg, &QMessageBox::finished, this, [ &, provenId, trialId](int result) {
int pRow = rowForId(provenId);
int tRow = rowForId(trialId);
if (pRow >= 0) {
QItemSelectionModel::SelectionFlags flags = QItemSelectionModel::ClearAndSelect;
QItemSelection rowSelection;
QModelIndex pIndexS = m_proxyModel->index(pRow, Model::Layouts::BACKGROUNDCOLUMN);
QModelIndex pIndexE = m_proxyModel->index(pRow, Model::Layouts::SHAREDCOLUMN);
rowSelection.select(pIndexS, pIndexE);
m_view->selectionModel()->select(rowSelection, flags);
}
QModelIndex tIndex = m_proxyModel->index(tRow, Model::Layouts::NAMECOLUMN);
m_view->edit(tIndex);
});
msg->open();
}
}
}
}

3
app/settings/controllers/layoutscontroller.h
View File

@ -86,6 +86,7 @@ signals:
private slots:
void saveColumnWidths();
void on_nameDuplicatedFrom(const QString &provenId, const QString &trialId);
private:
void initView();
@ -98,7 +99,7 @@ private:
QString uniqueLayoutName(QString name);
private:
QDialog *m_parent{nullptr};
QDialog *m_parentDialog{nullptr};
Latte::Corona *m_corona{nullptr};
QTableView *m_view{nullptr};

14
app/settings/models/layoutsmodel.cpp
View File

@ -570,9 +570,17 @@ bool Layouts::setData(const QModelIndex &index, const QVariant &value, int role)
break;
case NAMECOLUMN:
if (role == Qt::DisplayRole) {
m_layoutsTable[row].setCurrentName(value.toString());
emit dataChanged(index, index, roles);
return true;
QString provenId = m_layoutsTable.idForCurrentName(value.toString());
if (!provenId.isEmpty() && provenId != m_layoutsTable[row].id /*not the same row*/ ){
//! duplicate name should be rejected
emit nameDuplicated(provenId, m_layoutsTable[row].id);
return false;
} else {
m_layoutsTable[row].setCurrentName(value.toString());
emit dataChanged(index, index, roles);
return true;
}
}
break;
case MENUCOLUMN:

1
app/settings/models/layoutsmodel.h
View File

@ -101,6 +101,7 @@ public:
signals:
void inMultipleModeChanged();
void nameDuplicated(const QString &provenId, const QString &trialId);
void rowsInserted();
private slots: