Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libs: read launcher items as a list of QUrl

Browse source 
because KUrl passes the URL as-is when it is constructed from string (char
array, QString, etc.) query items (intentionally) are not splitted, fixes
restoration of task manager launchers

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-09-01 22:27:52 +03:00
parent f584f4dbbd
commit a42f25b004
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/taskmanager/groupmanager.cpp
View file

@ -104,7 +104,7 @@ public:
void unsaveLauncher(LauncherItem *launcher);
void saveLauncherConfig();
void saveLauncherConfig(KConfigGroup &cg);
QList<KUrl> readLauncherConfig(KConfigGroup &cg);
QList<QUrl> readLauncherConfig(KConfigGroup &cg);
int launcherIndex(const KUrl &url);
KConfigGroup launcherConfig(const KConfigGroup &config = KConfigGroup());
@ -779,17 +779,18 @@ void GroupManager::readLauncherConfig(const KConfigGroup &cg)
return;
}
QList<KUrl> launchers = d->readLauncherConfig(conf);
QList<QUrl> launchers = d->readLauncherConfig(conf);
// prevents re-writing the results out
d->readingLauncherConfig = true;
QSet<KUrl> urls;
foreach (KUrl l, launchers) {
foreach (QUrl l, launchers) {
QString wmClass(l.queryItemValue("wmClass"));
l.setQuery(QString());
if (addLauncher(l, QIcon(), QString(), QString(), wmClass)) {
urls << l;
KUrl k(l);
if (addLauncher(k, QIcon(), QString(), QString(), wmClass)) {
urls << k;
}
}
@ -1051,14 +1052,14 @@ void GroupManagerPrivate::saveLauncherConfig(KConfigGroup &cg)
emit q->configChanged();
}
QList<KUrl> GroupManagerPrivate::readLauncherConfig(KConfigGroup &cg)
QList<QUrl> GroupManagerPrivate::readLauncherConfig(KConfigGroup &cg)
{
QStringList items = cg.readEntry("Items", QStringList());
QList<KUrl> details;
QList<QUrl> details;
foreach (QString item, items) {
foreach (const QString &item, items) {
if (!item.isEmpty()) {
details.append(KUrl(item));
details.append(QUrl(item));
}
}