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

copyView considers multiple systrays

Browse Source 
--when copying a view and the view contains
muliple systrays in it this is NOW taken
into account and accomplished accordingly
This commit is contained in:
Michail Vourlakos 2019-07-14 21:27:56 +03:00
parent 3412b13148
commit 8f50131088
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/layout/storage.cpp
View File

@ -198,15 +198,13 @@ void Storage::copyView(Plasma::Containment *containment)
KSharedConfigPtr newFile = KSharedConfig::openConfig(temp1File);
KConfigGroup copied_conts = KConfigGroup(newFile, "Containments");
KConfigGroup copied_c1 = KConfigGroup(&copied_conts, QString::number(containment->id()));
KConfigGroup copied_systray;
// toCopyContainmentIds << QString::number(containment->id());
// toCopyAppletIds << containment->config().group("Applets").groupList();
containment->config().copyTo(&copied_c1);
//!investigate if there is a systray in the containment to copy also
int systrayId = -1;
QString systrayAppletId;
//!investigate if there multiple systray(s) in the containment to copy also
//! systrayId, systrayAppletId
QHash<int, QString> systraysInfo;
auto applets = containment->config().group("Applets");
for (const auto &applet : applets.groupList()) {
@ -215,31 +213,28 @@ void Storage::copyView(Plasma::Containment *containment)
int tSysId = appletSettings.readEntry("SystrayContainmentId", -1);
if (tSysId != -1) {
systrayId = tSysId;
systrayAppletId = applet;
qDebug() << "systray was found in the containment... ::: " << tSysId;
break;
systraysInfo[tSysId] = applet;
qDebug() << "systray with id "<< tSysId << " was found in the containment... ::: " << tSysId;
}
}
if (systrayId != -1) {
Plasma::Containment *systray{nullptr};
if (systraysInfo.count() > 0) {
for(const auto systrayId : systraysInfo.keys()) {
Plasma::Containment *systray{nullptr};
for (const auto containment : m_layout->corona()->containments()) {
if (containment->id() == systrayId) {
systray = containment;
break;
for (const auto containment : m_layout->corona()->containments()) {
if (containment->id() == systrayId) {
systray = containment;
break;
}
}
if (systray) {
KConfigGroup copied_systray = KConfigGroup(&copied_conts, QString::number(systray->id()));
systray->config().copyTo(&copied_systray);
}
}
if (systray) {
copied_systray = KConfigGroup(&copied_conts, QString::number(systray->id()));
// toCopyContainmentIds << QString::number(systray->id());
// toCopyAppletIds << systray->config().group("Applets").groupList();
systray->config().copyTo(&copied_systray);
}
}
//! end of systray specific code
//! update ids to unique ones
@ -400,8 +395,9 @@ QString Storage::newUniqueIdsLayoutFromFile(QString file)
QFile copyFile(tempFile);
if (copyFile.exists())
if (copyFile.exists()) {
copyFile.remove();
}
//! BEGIN updating the ids in the temp file
QStringList allIds;
@ -426,7 +422,6 @@ QString Storage::newUniqueIdsLayoutFromFile(QString file)
KSharedConfigPtr filePtr = KSharedConfig::openConfig(file);
KConfigGroup investigate_conts = KConfigGroup(filePtr, "Containments");
//KConfigGroup copied_c1 = KConfigGroup(&copied_conts, QString::number(containment->id()));
//! Record the containment and applet ids
for (const auto &cId : investigate_conts.groupList()) {