kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-10 04:58:16 +03:00
Code Issues Projects Releases Wiki Activity

storage:use knownErrors both for errors and warns

Browse Source
This commit is contained in:
Michail Vourlakos 2021-04-30 19:03:33 +03:00
parent c33623a809
commit c5c61dffe3
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/layouts/storage.cpp
View File

@ -57,12 +57,11 @@ Storage::Storage()
{ {
qDebug() << " >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> LAYOUTS::STORAGE, TEMP DIR ::: " << m_storageTmpDir.path(); qDebug() << " >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> LAYOUTS::STORAGE, TEMP DIR ::: " << m_storageTmpDir.path();
//! Known Errors //! Known Errors / Warnings
s_knownErrors << Data::Generic(Data::Error::APPLETSWITHSAMEID, i18n("Different Applets With Same Id")); s_knownErrors << Data::Generic(Data::Error::APPLETSWITHSAMEID, i18n("Different Applets With Same Id"));
s_knownErrors << Data::Generic(Data::Error::ORPHANEDPARENTAPPLETOFSUBCONTAINMENT, i18n("Orphaned Parent Applet Of Subcontainment")); s_knownErrors << Data::Generic(Data::Error::ORPHANEDPARENTAPPLETOFSUBCONTAINMENT, i18n("Orphaned Parent Applet Of Subcontainment"));
//! Known Warnings s_knownErrors<< Data::Generic(Data::Warning::APPLETANDCONTAINMENTWITHSAMEID, i18n("Different Applet And Containment With Same Id"));
s_knownWarnings << Data::Generic(Data::Warning::APPLETANDCONTAINMENTWITHSAMEID, i18n("Different Applet And Containment With Same Id")); s_knownErrors << Data::Generic(Data::Warning::ORPHANEDSUBCONTAINMENT, i18n("Orphaned Subcontainment"));
s_knownWarnings << Data::Generic(Data::Warning::ORPHANEDSUBCONTAINMENT, i18n("Orphaned Subcontainment"));
//! Known SubContainment Families //! Known SubContainment Families
@ -935,8 +934,8 @@ bool Storage::hasAppletsAndContainmentsWithSameId(const Layout::GenericLayout *l
return false; return false;
} }
warning.id = s_knownWarnings[Data::Error::APPLETANDCONTAINMENTWITHSAMEID].id; warning.id = s_knownErrors[Data::Error::APPLETANDCONTAINMENTWITHSAMEID].id;
warning.name = s_knownWarnings[Data::Error::APPLETANDCONTAINMENTWITHSAMEID].name; warning.name = s_knownErrors[Data::Error::APPLETANDCONTAINMENTWITHSAMEID].name;
if (layout->isActive()) { // active layout if (layout->isActive()) { // active layout
QStringList registeredcontainments; QStringList registeredcontainments;
@ -1128,8 +1127,8 @@ bool Storage::hasOrphanedSubContainments(const Layout::GenericLayout *layout, Da
return false; return false;
} }
warning.id = s_knownWarnings[Data::Error::ORPHANEDSUBCONTAINMENT].id; warning.id = s_knownErrors[Data::Error::ORPHANEDSUBCONTAINMENT].id;
warning.name = s_knownWarnings[Data::Error::ORPHANEDSUBCONTAINMENT].name; warning.name = s_knownErrors[Data::Error::ORPHANEDSUBCONTAINMENT].name;
Data::ViewsTable views = Layouts::Storage::self()->views(layout); Data::ViewsTable views = Layouts::Storage::self()->views(layout);

1
app/layouts/storage.h
View File

@ -146,7 +146,6 @@ private:
QTemporaryDir m_storageTmpDir; QTemporaryDir m_storageTmpDir;
Data::GenericTable<Data::Generic> s_knownErrors; Data::GenericTable<Data::Generic> s_knownErrors;
Data::GenericTable<Data::Generic> s_knownWarnings;
QList<SubContaimentIdentityData> m_subIdentities; QList<SubContaimentIdentityData> m_subIdentities;
}; };