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

viewsdialog:report for W205

Browse Source 
--that is same applet and containment id
This commit is contained in:
Michail Vourlakos 2021-05-02 00:17:26 +03:00
parent 72924004bc
commit 9834d39e66
3 changed files with 77 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/data/errordata.h
View File

@ -37,10 +37,11 @@ namespace Data {
class Error : public Data::Generic
{
public:
static constexpr const char* APPLETSWITHSAMEID = "103";
static constexpr const char* ORPHANEDPARENTAPPLETOFSUBCONTAINMENT = "107";
static constexpr const char* APPLETANDCONTAINMENTWITHSAMEID = "202";
static constexpr const char* ORPHANEDSUBCONTAINMENT = "204";
//!errors and warnings use a step of four between them
static constexpr const char* APPLETSWITHSAMEID = "E103";
static constexpr const char* ORPHANEDPARENTAPPLETOFSUBCONTAINMENT = "E107";
static constexpr const char* ORPHANEDSUBCONTAINMENT = "W201";
static constexpr const char* APPLETANDCONTAINMENTWITHSAMEID = "W205";
Error();
Error(Error &&o);

70
app/settings/viewsdialog/viewscontroller.cpp
View File

@ -507,6 +507,8 @@ void Views::messagesForErrorsWarnings(const Latte::CentralLayout *centralLayout)
for (int i=0; i< warnings.count(); ++i) {
if (warnings[i].id == Data::Warning::ORPHANEDSUBCONTAINMENT) {
messageForWarningOrphanedSubContainments(warnings[i]);
} else if (warnings[i].id == Data::Warning::APPLETANDCONTAINMENTWITHSAMEID) {
messageForWarningAppletAndContainmentWithSameId(warnings[i]);
}
}
}
@ -647,6 +649,74 @@ void Views::messageForErrorOrphanedParentAppletOfSubContainment(const Data::Erro
actions);
}
void Views::messageForWarningAppletAndContainmentWithSameId(const Data::Warning &warning)
{
if (warning.id != Data::Warning::APPLETANDCONTAINMENTWITHSAMEID) {
return;
}
//! construct message
QString message = i18nc("warning id and title", "<b>Warning #%0: %1</b> <br/><br/>").arg(warning.id).arg(warning.name);
message += i18n("In your layout there are applets and containments with the same id. Such situation is not dangerous but it should not occur.<br/>");
message += "<br/>";
message += i18n("<b>Applets:</b><br/>");
for (int i=0; i<warning.information.rowCount(); ++i) {
if (!warning.information[i].applet.isValid()) {
continue;
}
QString appletname = warning.information[i].applet.visibleName();
QString appletstorageid = warning.information[i].applet.storageId;
QString viewname = visibleViewName(warning.information[i].containment.storageId);
QString containmentname = viewname.isEmpty() ? warning.information[i].containment.visibleName() : viewname;
QString containmentstorageid = warning.information[i].containment.storageId;
message += i18nc("applets, applet name, applet id, containment name, containment id",
"&nbsp;&nbsp;• <b>%0</b> [#%1] inside <b>%2</b> [#%3]<br/>").arg(appletname).arg(appletstorageid).arg(containmentname).arg(containmentstorageid);
}
message += "<br/>";
message += i18n("<b>Containments:</b><br/>");
for (int i=0; i<warning.information.rowCount(); ++i) {
if (warning.information[i].applet.isValid()) {
continue;
}
QString viewname = visibleViewName(warning.information[i].containment.storageId);
QString containmentname = viewname.isEmpty() ? warning.information[i].containment.visibleName() : viewname;
QString containmentstorageid = warning.information[i].containment.storageId;
message += i18nc("containments, containment name, containment id",
"&nbsp;&nbsp;• <b>%0</b> [#%1] <br/>").arg(containmentname).arg(containmentstorageid);
}
message += "<br/>";
message += i18n("<b>Possible Solutions:</b><br/>");
message += i18n("&nbsp;&nbsp;1. Try to fix the situation by updating manually the containments or applets id <br/>");
message += i18n("&nbsp;&nbsp;2. Remove any of the containments or applets that conflict with each other<br/>");
//! add actions
QAction *openlayoutaction = new QAction(i18n("Open Layout"), this);
Data::Layout currentlayout = m_handler->currentData();
openlayoutaction->setData(currentlayout.id);
QList<QAction *> actions;
actions << openlayoutaction;
connect(openlayoutaction, &QAction::triggered, this, [&, openlayoutaction]() {
QString file = openlayoutaction->data().toString();
if (!file.isEmpty()) {
auto job = new KIO::OpenUrlJob(QUrl::fromLocalFile(file), QStringLiteral("text/plain"), this);
job->start();
}
});
//! show message
m_handler->showInlineMessage(message,
KMessageWidget::Warning,
true,
actions);
}
void Views::messageForWarningOrphanedSubContainments(const Data::Warning &warning)
{
if (warning.id != Data::Warning::ORPHANEDSUBCONTAINMENT) {

2
app/settings/viewsdialog/viewscontroller.h
View File

@ -113,6 +113,7 @@ private:
void messageForErrorAppletsWithSameId(const Data::Error &error);
void messageForErrorOrphanedParentAppletOfSubContainment(const Data::Error &error);
void messageForWarningOrphanedSubContainments(const Data::Warning &warning);
void messageForWarningAppletAndContainmentWithSameId(const Data::Warning &warning);
private slots:
void loadConfig();
@ -158,3 +159,4 @@ private:
}
#endif