Prepare for version 2.8

elevenclock/elevenclock.py

@@ -823,7 +823,6 @@ def mouseReleaseEvent(self, ev: QMouseEvent) -> None:
 
     def eventFilter(self, watched: QObject, event: QEvent) -> bool:
         if event.type() == event.Paint:
-            print(self.minimumSizeHint().width())
             w = self.minimumSizeHint().width()
             if w<self.window().getPx(self.window().preferedwidth) and not getSettings("ClockOnTheLeft"):
                 self.move(self.window().getPx(self.window().preferedwidth)-self.minimumSizeHint().width(), 0)

elevenclock/lang/LOCALE_UPDATER.py

@@ -3,17 +3,19 @@
 
 
 
-OLDSTR = b"lang2_7 = {"
-
-NEWSTR = b"""lang2_7_bis = {
-    "Use a custom font": "",
-    "Use a custom font size": "",
-    "Enable hide when multi-monitor fullscreen apps are running": "",
-    "<b>{0}</b> needs to be enabled to change this setting": "",
-    "<b>{0}</b> needs to be disabled to change this setting": "",
+OLDSTR = b"lang2_7_bis = {"
+
+NEWSTR = b"""lang_2_8 = {
+    "Force the clock to be at the top of the screen": "",
+    "Show the clock on the primary screen": "",
+    "Use a custom font color": "",
+    "Use a custom background color": "",
+    "Align the clock text to the center": "",
+    "Select custom color": "",
+    "Hide the clock when a program occupies all screens": "",
 }
 
-lang2_7 = lang2_7_bis | {"""
+lang2_7_bis = lang_2_8 | {"""
 
 input(f"Path is \"{os.getcwd()}\" Press [INTRO] to contniue")
 print()

elevenclock/settings.py

@@ -115,7 +115,11 @@ def restartElevenClockByLangChange():
         self.legacyHideOnFullScreen.setChecked(not getSettings("DisableHideOnFullScreen"))
         self.legacyHideOnFullScreen.stateChanged.connect(lambda i: setSettings("DisableHideOnFullScreen", not bool(i)))
         layout.addWidget(self.legacyHideOnFullScreen)
-        self.legacyRDPHide = QSettingsCheckBox(_("Hide the clock when RDP Client or Citrix Workspace are running").replace("RDP", "RDP, VMWare Horizon"))
+        self.newFullScreenHide = QSettingsCheckBox(_("Hide the clock when a program occupies all screens"))
+        self.newFullScreenHide.setChecked(getSettings("NewFullScreenMethod"))
+        self.newFullScreenHide.stateChanged.connect(lambda i: setSettings("NewFullScreenMethod", bool(i)))
+        layout.addWidget(self.newFullScreenHide)
+        self.legacyRDPHide = QSettingsCheckBox(_("Hide the clock when RDP Client or Citrix Workspace are running")+" (Old method)".replace("RDP", "RDP, VMWare Horizon"))
         self.legacyRDPHide.setChecked(getSettings("EnableHideOnRDP"))
         self.legacyRDPHide.stateChanged.connect(lambda i: setSettings("EnableHideOnRDP", bool(i)))
         layout.addWidget(self.legacyRDPHide)
@@ -135,7 +139,7 @@ def restartElevenClockByLangChange():
         self.clockAtLeft.setChecked(getSettings("ClockOnTheLeft"))
         self.clockAtLeft.stateChanged.connect(lambda i: setSettings("ClockOnTheLeft", bool(i)))
         layout.addWidget(self.clockAtLeft)
-        self.primaryScreen = QSettingsCheckBox(_("Show the clock on the primary screen (Useful if clock is set on the left)"))
+        self.primaryScreen = QSettingsCheckBox(_("Show the clock on the primary screen"))
         self.primaryScreen.setStyleSheet(f"QWidget#stChkBg{{border-bottom-left-radius: {self.getPx(6)}px;border-bottom-right-radius: {self.getPx(6)}px;border-bottom: 1px;}}")
         self.primaryScreen.setChecked(getSettings("ForceClockOnFirstMonitor"))
         self.primaryScreen.stateChanged.connect(lambda i: setSettings("ForceClockOnFirstMonitor", bool(i)))
@@ -226,10 +230,6 @@ def restartElevenClockByLangChange():
 
         self.experimentalTitle = QIconLabel(_("Fixes and other experimental features: (Use ONLY if something is not working)"), getPath(f"experiment_{self.iconMode}.png"))
         layout.addWidget(self.experimentalTitle)
-        self.newFullScreenHide = QSettingsCheckBox(_("Enable hide when multi-monitor fullscreen apps are running"))
-        self.newFullScreenHide.setChecked(getSettings("NewFullScreenMethod"))
-        self.newFullScreenHide.stateChanged.connect(lambda i: setSettings("NewFullScreenMethod", bool(i)))
-        layout.addWidget(self.newFullScreenHide)
         self.fixDash = QSettingsCheckBox(_("Fix the hyphen/dash showing over the month"))
         self.fixDash.setChecked(getSettings("EnableHyphenFix"))
         self.fixDash.stateChanged.connect(lambda i: setSettings("EnableHyphenFix", bool(i)))
@@ -1387,7 +1387,7 @@ def __init__(self, text: str, parent=None):
         self.colorDialog.setOptions(QColorDialog.DontUseNativeDialog)
         self.button = QPushButton(self)
         self.button.setObjectName("stCmbbx")
-        self.button.setText("Select custom color")
+        self.button.setText(_("Select custom color"))
         self.button.clicked.connect(self.colorDialog.show)
         self.colorDialog.colorSelected.connect(self.valuechangedEvent)
         self.checkbox.stateChanged.connect(self.stateChangedEvent)

elevenclock/tools.py

@@ -11,8 +11,8 @@
 import globals
 from languages import *
 
-version = 2.79
-versionName = "2.8.0-beta"
+version = 2.8
+versionName = "2.8.0"
 
 def _(s): #Translate function
     global lang