feat: 转移玲珑包后缀提供配置功能实现到启动器

玲珑包后缀提供配置功能的实现转移到启动器

Log:
Influence: 默认隐藏后缀,开启,玲珑应用则显示,否则,隐藏.
Bug: https://pms.uniontech.com/bug-view-154585.html
Change-Id: I50f727eec1d815f39206780ae76ef774d17e5023

misc/dconf/com.deepin.dde.launcher.json

@@ -241,16 +241,6 @@
 			"description": "Launcher display mode.",
 			"permissions": "readwrite",
 			"visibility": "private"
-		},
-		"MagicaVoxelApp_Hide_SuffixName": {
-			"value": false,
-			"serial": 0,
-			"flags": [],
-			"name": "MagicaVoxelApp_Hide_SuffixName",
-			"name[zh_CN]": "玲珑包后缀提供配置，默认隐藏; 开启, 玲珑应用显示后缀, 关闭, 后缀隐藏",
-			"description": "***",
-			"permissions": "readwrite",
-			"visibility": "private"
 		}
 	}
 }

src/modules/launcher/common.h

@@ -37,7 +37,6 @@ const QString keyAppsUseProxy       = "Apps_Use_Proxy";
 const QString keyAppsDisableScaling = "Apps_Disable_Scaling";
 const QString keyAppsHidden         = "Apps_Hidden";
 const QString keyPackageNameSearch  = "Search_Package_Name";
-const QString keySuffixHidden       = "MagicaVoxelApp_Hide_SuffixName";
 
 // 应用配置
 const QString lastoreDataDir = "/var/lib/lastore";

src/modules/launcher/dbusadaptorlauncher.cpp

@@ -34,7 +34,6 @@ DBusAdaptorLauncher::DBusAdaptorLauncher(QObject *parent)
         connect(launcher, &Launcher::uninstallSuccess, this, &DBusAdaptorLauncher::UninstallSuccess);
         connect(launcher, &Launcher::displayModeChanged, this, &DBusAdaptorLauncher::DisplayModeChanged);
         connect(launcher, &Launcher::fullScreenChanged, this, &DBusAdaptorLauncher::FullscreenChanged);
-        connect(launcher, &Launcher::appSuffixChanged, this, &DBusAdaptorLauncher::AppSuffixChanged);
     }
 }
 

src/modules/launcher/dbusadaptorlauncher.h

@@ -147,7 +147,6 @@ Q_SIGNALS: // SIGNALS
     void DisplayModeChanged(int mode);
     // 该接口与1050 dbus服务接口签名保持一致
     void FullscreenChanged();
-    void AppSuffixChanged();
 };
 
 #endif

src/modules/launcher/launcher.cpp

@@ -431,13 +431,6 @@ void Launcher::handleFSWatcherEvents(QDBusMessage msg)
     }
 }
 
-void Launcher::onAppSuffixNameChanged(bool)
-{
-    initItems();
-
-    Q_EMIT appSuffixChanged();
-}
-
 void Launcher::onHandleUninstall(const QDBusMessage &message)
 {
     QList<QVariant> arguments = message.arguments();
@@ -469,7 +462,6 @@ void Launcher::initSettings()
     });
     connect(SETTING, &LauncherSettings::fullscreenChanged, this, &Launcher::fullScreenChanged);
     connect(SETTING, &LauncherSettings::hiddenAppsChanged, this, &Launcher::handleAppHiddenChanged);
-    connect(SETTING, &LauncherSettings::appSuffixNameChanged, this, &Launcher::onAppSuffixNameChanged);
 }
 
 /**
@@ -1198,10 +1190,6 @@ Item Launcher::NewItemWithDesktopInfo(DesktopInfo &info)
         item.info.icon = info.getIcon().c_str();
     }
 
-    // 玲珑应用添加后缀, 默认隐藏
-    if (SETTING->getMagicaVoxelSuffixHidden() && appFileName.startsWith("/persistent/linglong/entries/share/applications/"))
-        item.info.name = QString("%1(%2)").arg(appName).arg(tr("Linglong"));
-
     xDeepinCategory = xDeepinCategory.toLower();
 
     for (auto &keyWord : info.getKeywords()) {

src/modules/launcher/launcher.h

@@ -114,13 +114,11 @@ Q_SIGNALS:
 
     void displayModeChanged(int mode);
     void fullScreenChanged(bool isFull);
-    void appSuffixChanged();
 
     void uninstallStatusChanged(const bool status);
 
 private Q_SLOTS:
     void handleFSWatcherEvents(QDBusMessage msg);
-    void onAppSuffixNameChanged(bool hidden);
     void onCheckDesktopFile(const QString &filePath, int type = 0);
     void onNewAppLaunched(const QString &filePath);
     void onHandleUninstall(const QDBusMessage &message);

src/modules/launcher/launchersettings.cpp

@@ -42,8 +42,6 @@ LauncherSettings::LauncherSettings(QObject *parent)
             Q_EMIT fullscreenChanged(m_dconfig->value(key).toBool());
         } else if (key == keyAppsHidden) {
             Q_EMIT hiddenAppsChanged();
-        } else if (key == keySuffixHidden) {
-            Q_EMIT appSuffixNameChanged(m_dconfig->value(key).toBool());
         }
     });
 }
@@ -165,18 +163,3 @@ QVector<QString> LauncherSettings::getHiddenApps()
     }
     return ret;
 }
-
-bool LauncherSettings::getMagicaVoxelSuffixHidden() const
-{
-    return m_dconfig ? m_dconfig->value(keySuffixHidden, false).toBool() : false;
-}
-
-void LauncherSettings::setMagicaVoxelSuffixHidden(bool state)
-{
-    if (!m_dconfig) {
-        qInfo() << Q_FUNC_INFO << "set magicaVoxel suffix failed!";
-        return;
-    }
-
-    m_dconfig->setValue(keySuffixHidden, state);
-}

src/modules/launcher/launchersettings.h

@@ -64,14 +64,10 @@ public:
 
     QVector<QString> getHiddenApps();
 
-    bool getMagicaVoxelSuffixHidden() const;
-    void setMagicaVoxelSuffixHidden(bool hidden);
-
 Q_SIGNALS:
     void displayModeChanged(QString mode);
     void fullscreenChanged(bool isFull);
     void hiddenAppsChanged();
-    void appSuffixNameChanged(bool);
 };
 
 #endif // LAUNCHERSETTINGS_H