From d6b9a6f701371347006cdf05eaf666289d883a3a Mon Sep 17 00:00:00 2001 From: ppvnf <73800734+ppvnf@users.noreply.github.com> Date: Sat, 31 Dec 2022 09:17:19 -0300 Subject: [PATCH 1/2] identify ubisoft connect --- wingetui/storeEngine.py | 2 +- wingetui/uiSections.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wingetui/storeEngine.py b/wingetui/storeEngine.py index 8258dedc37..a7cf53ce53 100644 --- a/wingetui/storeEngine.py +++ b/wingetui/storeEngine.py @@ -427,7 +427,7 @@ def runInstallation(self) -> None: self.progressbar.setValue(0) if self.progressbar.invertedAppearance(): self.progressbar.setInvertedAppearance(False) self.finishedInstallation = False - if(self.store == "winget" or self.store.lower() in ("local pc", "microsoft store", "steam", "gog")): + if(self.store == "winget" or self.store.lower() in ("local pc", "microsoft store", "steam", "gog", "ubisoft connect")): self.p = subprocess.Popen(self.adminstr + [wingetHelpers.winget, "uninstall", "-e"] + (["--id", self.packageId] if self.useId else ["--name", self.programName]) + wingetHelpers.common_params + self.cmdline_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, shell=True, cwd=sudoLocation, env=os.environ) self.t = KillableThread(target=wingetHelpers.uninstallAssistant, args=(self.p, self.finishInstallation, self.addInfoLine, self.counterSignal)) self.t.start() diff --git a/wingetui/uiSections.py b/wingetui/uiSections.py index d71090f7de..eab3910719 100644 --- a/wingetui/uiSections.py +++ b/wingetui/uiSections.py @@ -1392,7 +1392,7 @@ def showMenu(pos: QPoint): contextMenu.addSeparator() else: contextMenu.addAction(ins5) - if self.packageList.currentItem().text(4).lower() not in ("local pc", "microsoft store", "steam", "gog"): + if self.packageList.currentItem().text(4).lower() not in ("local pc", "microsoft store", "steam", "gog", "ubisoft connect"): contextMenu.addAction(ins4) contextMenu.exec(QCursor.pos()) @@ -1431,7 +1431,7 @@ def showMenu(pos: QPoint): def showInfo(): item = self.packageList.currentItem() - if item.text(4).lower() in ("local pc", "microsoft store", "steam", "gog"): + if item.text(4).lower() in ("local pc", "microsoft store", "steam", "gog", "ubisoft connect"): self.err = ErrorMessage(self.window()) errorData = { "titlebarTitle": _("Unable to load informarion"), @@ -1557,6 +1557,7 @@ def setAllSelected(checked: bool) -> None: self.MSStoreIcon = QIcon(getMedia("msstore")) self.SteamIcon = QIcon(getMedia("steam")) self.GOGIcon = QIcon(getMedia("gog")) + self.UPLAYIcon = QIcon(getMedia("uplay")) if not getSettings("DisableWinget"): @@ -1734,6 +1735,8 @@ def addItem(self, name: str, id: str, version: str, store: str) -> None: if store.lower() == "local pc": if id == "Steam": store = "Steam" + if id == "Uplay": + store = "Ubisoft Connect" if id.count("_is1") == 1: store = "GOG" for letter in id: @@ -1767,6 +1770,8 @@ def addItem(self, name: str, id: str, version: str, store: str) -> None: item.setIcon(4, self.SteamIcon) elif "gog" in store.lower(): item.setIcon(4, self.GOGIcon) + elif "ubisoft connect" in store.lower(): + item.setIcon(4, self.UPLAYIcon) else: item.setIcon(4, self.MSStoreIcon) item.setText(4, store) From 4b7ad5c7d7ddb564fb1a8331eb4b7619dc417254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Climent?= Date: Sat, 31 Dec 2022 15:44:00 +0100 Subject: [PATCH 2/2] candidate icons for ubisoft --- wingetui/resources/uplay_black.png | Bin 0 -> 3405 bytes wingetui/resources/uplay_white.png | Bin 0 -> 3542 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 wingetui/resources/uplay_black.png create mode 100644 wingetui/resources/uplay_white.png diff --git a/wingetui/resources/uplay_black.png b/wingetui/resources/uplay_black.png new file mode 100644 index 0000000000000000000000000000000000000000..efc7620cd4afca636369732be35c7430998f582c GIT binary patch literal 3405 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 literal 0 HcmV?d00001 diff --git a/wingetui/resources/uplay_white.png b/wingetui/resources/uplay_white.png new file mode 100644 index 0000000000000000000000000000000000000000..334d276c0ffe49a8a1ded5c48acf5517fd28018d GIT binary patch literal 3542 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