From b66fc78553323b0855950b404873b9d8a8598c8b Mon Sep 17 00:00:00 2001 From: songwentao Date: Thu, 25 Aug 2022 17:39:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BD=AC=E7=A7=BB=E7=8E=B2=E7=8F=91?= =?UTF-8?q?=E5=8C=85=E5=90=8E=E7=BC=80=E6=8F=90=E4=BE=9B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=E5=88=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 玲珑包后缀提供配置功能的实现转移到启动器 Log: Influence: 默认隐藏后缀,开启,玲珑应用则显示,否则,隐藏. Bug: https://pms.uniontech.com/bug-view-154585.html Change-Id: I50f727eec1d815f39206780ae76ef774d17e5023 --- misc/dconf/com.deepin.dde.launcher.json | 10 ---------- src/modules/launcher/common.h | 1 - src/modules/launcher/dbusadaptorlauncher.cpp | 1 - src/modules/launcher/dbusadaptorlauncher.h | 1 - src/modules/launcher/launcher.cpp | 12 ------------ src/modules/launcher/launcher.h | 2 -- src/modules/launcher/launchersettings.cpp | 17 ----------------- src/modules/launcher/launchersettings.h | 4 ---- 8 files changed, 48 deletions(-) diff --git a/misc/dconf/com.deepin.dde.launcher.json b/misc/dconf/com.deepin.dde.launcher.json index dcd474c..696cd65 100644 --- a/misc/dconf/com.deepin.dde.launcher.json +++ b/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" } } } diff --git a/src/modules/launcher/common.h b/src/modules/launcher/common.h index d47e81e..9773942 100644 --- a/src/modules/launcher/common.h +++ b/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"; diff --git a/src/modules/launcher/dbusadaptorlauncher.cpp b/src/modules/launcher/dbusadaptorlauncher.cpp index 75b1379..5cdb9df 100644 --- a/src/modules/launcher/dbusadaptorlauncher.cpp +++ b/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); } } diff --git a/src/modules/launcher/dbusadaptorlauncher.h b/src/modules/launcher/dbusadaptorlauncher.h index b195c78..0930e5e 100644 --- a/src/modules/launcher/dbusadaptorlauncher.h +++ b/src/modules/launcher/dbusadaptorlauncher.h @@ -147,7 +147,6 @@ Q_SIGNALS: // SIGNALS void DisplayModeChanged(int mode); // 该接口与1050 dbus服务接口签名保持一致 void FullscreenChanged(); - void AppSuffixChanged(); }; #endif diff --git a/src/modules/launcher/launcher.cpp b/src/modules/launcher/launcher.cpp index adc0d36..b1d92d1 100644 --- a/src/modules/launcher/launcher.cpp +++ b/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 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()) { diff --git a/src/modules/launcher/launcher.h b/src/modules/launcher/launcher.h index 3fc8d25..cb0f7b5 100644 --- a/src/modules/launcher/launcher.h +++ b/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); diff --git a/src/modules/launcher/launchersettings.cpp b/src/modules/launcher/launchersettings.cpp index 79f99d7..da876f4 100644 --- a/src/modules/launcher/launchersettings.cpp +++ b/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 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); -} diff --git a/src/modules/launcher/launchersettings.h b/src/modules/launcher/launchersettings.h index 8b8a781..240c6dd 100644 --- a/src/modules/launcher/launchersettings.h +++ b/src/modules/launcher/launchersettings.h @@ -64,14 +64,10 @@ public: QVector 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