diff --git a/elevenclock/__init__.py b/elevenclock/__init__.py index 9b248d6d..2cf07529 100644 --- a/elevenclock/__init__.py +++ b/elevenclock/__init__.py @@ -124,7 +124,7 @@ def updateIfPossible(force = False): with open(os.path.join(tempDir, "elevenclock-updater.exe"), 'wb') as f: f.write(datatowrite) filename = f.name - if(hashlib.sha256(datatowrite).hexdigest().lower() == provided_hash): + if hashlib.sha256(datatowrite).hexdigest().lower() == provided_hash: print("🔵 Hash: ", provided_hash) print("🟢 Hash ok, starting update") if(getSettings("EnableSilentUpdates") and not(force)): @@ -908,7 +908,7 @@ def __init__(self, dpix: float, dpiy: float, screen: QScreen, index: int, isCove self.CopilotButton: CopilotButton = None - if(not self.IS_COVER and getSettings("EnableCopilotIcon")): + if not self.IS_COVER and IsCopilotEnabled(): self.CopilotButton = CopilotButton(self) self.CopilotButton.setFixedHeight(self.preferedHeight) self.CopilotButton.setFixedWidth(40) @@ -1127,7 +1127,7 @@ def checkAndUpdateBackground(self) -> None: if ENABLE_AUTOMATIC_BACKGROUND_COLOR or ENABLE_AUTOMATIC_TEXT_COLOR: screen = self.screen().geometry() - BackgroundIntegerColor = self.screen().grabWindow(0, self.x() - screen.x() + self.label.x() + (self.label.width() + 1 if self.CLOCK_ON_THE_LEFT else - 1), self.y()-screen.y(), 1, 1).toImage().pixel(0, 0) + BackgroundIntegerColor = self.screen().grabWindow(0, self.x() - screen.x() + self.label.x() + (self.label.width() + 1 if self.CLOCK_ON_THE_LEFT else - 2), self.y()-screen.y(), 1, 1).toImage().pixel(0, 0) if globals.trayIcon: diff --git a/elevenclock/tools.py b/elevenclock/tools.py index 53d59ec9..b995401e 100644 --- a/elevenclock/tools.py +++ b/elevenclock/tools.py @@ -138,6 +138,9 @@ def readRegedit(aKey, sKey, default, storage=winreg.HKEY_CURRENT_USER): return default +def IsCopilotEnabled(): + return readRegedit(r"Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "ShowCopilotButton", 0) == 1 ^ getSettings("EnableCopilotIcon") + if winver == 22621: if readRegedit(r"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "UBR", 0, winreg.HKEY_LOCAL_MACHINE) >= 2361: isMoment4 = True @@ -628,7 +631,7 @@ def execMenu(self, pos: QPoint, clockInstance: '__init__.Clock'): if clockInstance: self.enableCopilot.setEnabled(True) - self.enableCopilot.setText(_("Enable Copilot button") if not getSettings("EnableCopilotIcon") else _("Disable Copilot button")) + self.enableCopilot.setText(_("Enable Copilot button") if not IsCopilotEnabled() else _("Disable Copilot button")) else: self.enableCopilot.setEnabled(False)