core/desktopentry: fix OnlyShowIn and NotShowIn, they are similar to NoDisplay, not Hidden, expose as bindable

Author: RGBCube

.claude/scheduled_tasks.lock

@@ -0,0 +1 @@
+{"sessionId":"a2f2f313-f472-4e0f-8a6d-6a1bc4fe14a7","pid":62266,"acquiredAt":1773841457406}

CLAUDE.md

@@ -226,6 +226,8 @@ void DesktopEntry::updateState(const ParsedDesktopEntryData& newState) {
 	this->bGenericName = newState.genericName;
 	this->bStartupClass = newState.startupClass;
 	this->bNoDisplay = newState.noDisplay;
+	this->bOnlyShowIn = newState.onlyShowIn;
+	this->bNotShowIn = newState.notShowIn;
 	this->bComment = newState.comment;
 	this->bIcon = newState.icon;
 	this->bExecString = newState.execString;
@@ -611,51 +613,20 @@ void DesktopEntryManager::onScanCompleted(const QList<ParsedDesktopEntryData>& s
 	auto newLowercaseEntries = QHash<QString, DesktopEntry*>();
 	auto desktopNames = qEnvironmentVariable("XDG_CURRENT_DESKTOP").split(':', Qt::SkipEmptyParts);
 
-	auto maskEntry = [&](const QString& id, const QString& lowerId, const char* reason) {
-		if (auto* victim = newEntries.take(id)) victim->deleteLater();
-		newLowercaseEntries.remove(lowerId);
-
-		if (auto it = oldEntries.find(id); it != oldEntries.end()) {
-			it.value()->deleteLater();
-			oldEntries.erase(it);
-		}
-
-		qCDebug(logDesktopEntry) << reason << id;
-	};
-
 	for (const auto& data: scanResults) {
 		auto lowerId = data.id.toLower();
 
 		if (data.hidden) {
-			maskEntry(data.id, lowerId, "Masking hidden desktop entry");
-			continue;
-		}
-
-		if (data.onlyShowIn.has_value() && data.notShowIn.has_value()) {
-			qCWarning(logDesktopEntry) << "Desktop entry" << data.id
-			                           << "defines both OnlyShowIn and NotShowIn, skipping";
-			maskEntry(data.id, lowerId, "Masking invalid desktop entry");
-			continue;
-		}
+			if (auto* victim = newEntries.take(data.id)) victim->deleteLater();
+			newLowercaseEntries.remove(lowerId);
 
-		if (data.onlyShowIn.has_value()) {
-			auto found = std::ranges::any_of(desktopNames, [&](const QString& name) {
-				return data.onlyShowIn->contains(name);
-			});
-			if (!found) {
-				maskEntry(data.id, lowerId, "Masking desktop entry (OnlyShowIn)");
-				continue;
+			if (auto it = oldEntries.find(data.id); it != oldEntries.end()) {
+				it.value()->deleteLater();
+				oldEntries.erase(it);
 			}
-		}
 
-		if (data.notShowIn.has_value()) {
-			auto dominated = std::ranges::any_of(desktopNames, [&](const QString& name) {
-				return data.notShowIn->contains(name);
-			});
-			if (dominated) {
-				maskEntry(data.id, lowerId, "Masking desktop entry (NotShowIn)");
-				continue;
-			}
+			qCDebug(logDesktopEntry) << "Masking hidden desktop entry" << data.id;
+			continue;
 		}
 
 		DesktopEntry* dentry = nullptr;
@@ -705,8 +676,27 @@ void DesktopEntryManager::onScanCompleted(const QList<ParsedDesktopEntryData>& s
 	this->lowercaseDesktopEntries = newLowercaseEntries;
 
 	auto newApplications = QVector<DesktopEntry*>();
-	for (auto* entry: this->desktopEntries.values())
-		if (!entry->bNoDisplay) newApplications.append(entry);
+	for (auto* entry: this->desktopEntries.values()) {
+		if (entry->bNoDisplay) continue;
+
+		auto& onlyShowIn = entry->bOnlyShowIn.value();
+		auto& notShowIn = entry->bNotShowIn.value();
+		if (onlyShowIn.has_value() && notShowIn.has_value()) {
+			qCWarning(logDesktopEntry) << "Desktop entry" << entry->mId
+			                           << "defines both OnlyShowIn and NotShowIn (skipping display)";
+			continue;
+		}
+		if (onlyShowIn.has_value() && !std::ranges::any_of(desktopNames, [&](const QString& name) {
+			    return onlyShowIn->contains(name);
+		    }))
+			continue;
+		if (notShowIn.has_value() && std::ranges::any_of(desktopNames, [&](const QString& name) {
+			    return notShowIn->contains(name);
+		    }))
+			continue;
+
+		newApplications.append(entry);
+	}
 
 	this->mApplications.diffUpdate(newApplications);
 

src/core/desktopentry.cpp

@@ -34,9 +34,9 @@ struct ParsedDesktopEntryData {
 	QString genericName;
 	QString startupClass;
 	bool noDisplay = false;
-	bool hidden = false;
 	std::optional<QVector<QString>> onlyShowIn;
 	std::optional<QVector<QString>> notShowIn;
+	bool hidden = false;
 	QString comment;
 	QString icon;
 	QString execString;
@@ -173,6 +173,8 @@ class DesktopEntry: public QObject {
 	void runInTerminalChanged();
 	void categoriesChanged();
 	void keywordsChanged();
+	void onlyShowInChanged();
+	void notShowInChanged();
 
 public:
 	QString mId;
@@ -182,6 +184,8 @@ class DesktopEntry: public QObject {
 	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bGenericName, &DesktopEntry::genericNameChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bStartupClass, &DesktopEntry::startupClassChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, bool, bNoDisplay, &DesktopEntry::noDisplayChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, std::optional<QVector<QString>>, bOnlyShowIn, &DesktopEntry::onlyShowInChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, std::optional<QVector<QString>>, bNotShowIn, &DesktopEntry::notShowInChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bComment, &DesktopEntry::commentChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bIcon, &DesktopEntry::iconChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bExecString, &DesktopEntry::execStringChanged);