Merge pull request #27 from kloptops/main

PortMaster-GUI Stable 8.5.0

PortMaster/pugwash

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
 ## -- BEGIN PORTMASTER INFO --
-PORTMASTER_VERSION = '8.4.24'
-PORTMASTER_RELEASE_CHANNEL = 'beta'
+PORTMASTER_VERSION = '8.5.0'
+PORTMASTER_RELEASE_CHANNEL = 'stable'
 ## -- END PORTMASTER INFO --
 
 PORTMASTER_RELEASE_CHANNELS = {

PortMaster/pylibs/harbourmaster/harbour.py

@@ -41,6 +41,7 @@ class HarbourMaster():
         'first-run': True,
         'ports_info_checked': None,
         'porters_checked': None,
+        'show_experimental': False,
         }
 
     INFO_CHECK_INTERVAL = (60 * 60 * 1)
@@ -131,6 +132,8 @@ def __init__(self, config, *, tools_dir=None, ports_dir=None, temp_dir=None, cal
             if 'theme' not in self.cfg_data:
                 self.cfg_data['theme'] = 'default_theme'
 
+            self.cfg_data.setdefault('show_experimental', False)
+
             if self.cfg_data.get('version', 1) != self.CONFIG_VERSION:
                 self.update_config()
                 self.cfg_data['version'] = self.CONFIG_VERSION
@@ -790,6 +793,9 @@ def port_info_attrs(self, port_info):
     def match_filters(self, port_filters, port_info):
         port_attrs = self.port_info_attrs(port_info)
 
+        if not self.cfg_data['show_experimental'] and 'exp' in port_attrs:
+            return False
+
         for port_filter in port_filters:
             if port_filter.casefold() not in port_attrs:
                 return False

PortMaster/pylibs/locales/de_DE/LC_MESSAGES/messages.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: portmaster\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-30 18:11+0800\n"
-"PO-Revision-Date: 2023-11-01 10:19\n"
+"POT-Creation-Date: 2023-11-05 10:40+0800\n"
+"PO-Revision-Date: 2023-11-05 02:40\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
 "Language: de_DE\n"
@@ -98,12 +98,12 @@ msgstr "Installiert"
 msgid "Missing"
 msgstr "Fehlt"
 
-#: PortMaster/pugwash:890 PortMaster/pylibs/harbourmaster/harbour.py:1304
+#: PortMaster/pugwash:890 PortMaster/pylibs/harbourmaster/harbour.py:1314
 #: PortMaster/pylibs/pugscene.py:1453
 msgid "Update Available"
 msgstr "Update verfügbar"
 
-#: PortMaster/pugwash:891 PortMaster/pylibs/harbourmaster/harbour.py:1303
+#: PortMaster/pugwash:891 PortMaster/pylibs/harbourmaster/harbour.py:1313
 #: PortMaster/pylibs/pugscene.py:714 PortMaster/pylibs/pugscene.py:1452
 msgid "Not Installed"
 msgstr "Nicht installiert"
@@ -165,173 +165,173 @@ msgstr "PortMaster neu installieren?\n\n"
 msgid "No network connection available."
 msgstr "Keine Netzwerkverbindung verfügbar."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:111
+#: PortMaster/pylibs/harbourmaster/harbour.py:112
 msgid "Loading..."
 msgstr "Lädt..."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:200
+#: PortMaster/pylibs/harbourmaster/harbour.py:203
 msgid "Loading Info."
 msgstr "Lade Informationen."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:228
+#: PortMaster/pylibs/harbourmaster/harbour.py:231
 msgid "Fetching latest featured ports."
 msgstr "Lade neueste Ports."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:237
-#: PortMaster/pylibs/harbourmaster/harbour.py:255
+#: PortMaster/pylibs/harbourmaster/harbour.py:240
+#: PortMaster/pylibs/harbourmaster/harbour.py:258
 msgid "Fetching latest info."
 msgstr "Lade neuste Informationen"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:271
+#: PortMaster/pylibs/harbourmaster/harbour.py:274
 msgid "Fetching latest porters."
 msgstr "Lade neuste Porters"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:283
+#: PortMaster/pylibs/harbourmaster/harbour.py:286
 msgid "Loading Sources."
 msgstr "Lade Quellen"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:449
+#: PortMaster/pylibs/harbourmaster/harbour.py:452
 msgid "Loading Ports."
 msgstr "Lade Ports."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1068
+#: PortMaster/pylibs/harbourmaster/harbour.py:1078
 #, python-brace-format
 msgid "Installing Theme {download_name}."
 msgstr "Installiere Theme {download_name}."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1075
-#: PortMaster/pylibs/harbourmaster/harbour.py:1113
-#: PortMaster/pylibs/harbourmaster/harbour.py:1172
+#: PortMaster/pylibs/harbourmaster/harbour.py:1085
+#: PortMaster/pylibs/harbourmaster/harbour.py:1123
+#: PortMaster/pylibs/harbourmaster/harbour.py:1182
 msgid "Installing"
 msgstr "Wird installiert"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1085
+#: PortMaster/pylibs/harbourmaster/harbour.py:1095
 msgid "Theme {download_name!r} installed successfully."
 msgstr "Theme {download_name!r} erfolgreich installiert."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1104
-#: PortMaster/pylibs/harbourmaster/harbour.py:1163
+#: PortMaster/pylibs/harbourmaster/harbour.py:1114
+#: PortMaster/pylibs/harbourmaster/harbour.py:1173
 #, python-brace-format
 msgid "Installing {download_name}."
 msgstr "Installiere {download_name}."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1129
-#: PortMaster/pylibs/harbourmaster/harbour.py:1277
+#: PortMaster/pylibs/harbourmaster/harbour.py:1139
+#: PortMaster/pylibs/harbourmaster/harbour.py:1287
 msgid "Port {download_name!r} installed successfully."
 msgstr "Port {download_name!r} erfolgreich installiert."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1243
+#: PortMaster/pylibs/harbourmaster/harbour.py:1253
 msgid "Installation failed, removing files..."
 msgstr "Installation fehlgeschlagen, entferne Dateien..."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1255
+#: PortMaster/pylibs/harbourmaster/harbour.py:1265
 #, python-brace-format
 msgid "Port {download_name} installed failed."
 msgstr "Port {download_name} Installation fehlgeschlagen."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1267
+#: PortMaster/pylibs/harbourmaster/harbour.py:1277
 msgid "Port {download_name!r} and {runtime_name!r} installed successfully."
 msgstr "Port {download_name!r} und {runtime_name!r} erfolgreich installiert."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1272
+#: PortMaster/pylibs/harbourmaster/harbour.py:1282
 msgid "Port {download_name!r} installed sucessfully, but {runtime_name!r} failed to install!!\n\n"
 "Either reinstall to try again, or check the wiki for help."
 msgstr "Port {download_name!r} wurde erfolgreich installiert, Installation von {runtime_name!r} ist fehlgeschlagen\n"
 "Installiere den Port erneut um es nochmal zu versuchen oder besuche das Wiki für Hilfe."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1287
+#: PortMaster/pylibs/harbourmaster/harbour.py:1297
 #, python-brace-format
 msgid "Port {runtime} contains a bad runtime, game may not run correctly."
 msgstr "Port {runtime} enthält eine fehlerhafte Runtime, möglicherweise funktioniert das Spiel nicht korrekt."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1305
+#: PortMaster/pylibs/harbourmaster/harbour.py:1315
 msgid "Verified"
 msgstr "Überprüft"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1306
+#: PortMaster/pylibs/harbourmaster/harbour.py:1316
 msgid "Unverified"
 msgstr "Nicht verifiziert"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1307
+#: PortMaster/pylibs/harbourmaster/harbour.py:1317
 msgid "Broken"
 msgstr "Fehlerhaft"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1313
+#: PortMaster/pylibs/harbourmaster/harbour.py:1323
 msgid "Unable do download a runtime when in offline mode."
 msgstr "Runtimes lassen sich nicht im Offline Modus herunterladen."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1317
+#: PortMaster/pylibs/harbourmaster/harbour.py:1327
 #, python-brace-format
 msgid "Verifying runtime {runtime}"
 msgstr "Überprüfe Runtime {runtime}"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1326
-#: PortMaster/pylibs/harbourmaster/harbour.py:1333
+#: PortMaster/pylibs/harbourmaster/harbour.py:1336
+#: PortMaster/pylibs/harbourmaster/harbour.py:1343
 msgid "Verifying"
 msgstr "Überprüfe"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1381
+#: PortMaster/pylibs/harbourmaster/harbour.py:1391
 #, python-brace-format
 msgid "Verified {runtime} successfully."
 msgstr "{runtime} erfolgreich überprüft."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1384
+#: PortMaster/pylibs/harbourmaster/harbour.py:1394
 #, python-brace-format
 msgid "Verified {runtime}."
 msgstr "{runtime} verifiziert."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1390
+#: PortMaster/pylibs/harbourmaster/harbour.py:1400
 #, python-brace-format
 msgid "Updating {runtime}."
 msgstr "Aktualisiere {runtime}."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1394
+#: PortMaster/pylibs/harbourmaster/harbour.py:1404
 #, python-brace-format
 msgid "Runtime {runtime} is broken, reinstalling."
 msgstr "Laufzeit- {runtime} ist defekt, Installiere neu."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1398
+#: PortMaster/pylibs/harbourmaster/harbour.py:1408
 #, python-brace-format
 msgid "Downloading runtime {runtime}."
 msgstr "Lade runtime {runtime} herunter"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1418
 #: PortMaster/pylibs/harbourmaster/harbour.py:1428
+#: PortMaster/pylibs/harbourmaster/harbour.py:1438
 #, python-brace-format
 msgid "Unable to download {runtime}, game may not run correctly."
 msgstr "Runtime konnte nicht runtergeladen werden, öglicherweise funktioniert das Spiel nicht korrekt."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1437
+#: PortMaster/pylibs/harbourmaster/harbour.py:1447
 #, python-brace-format
 msgid "Successfully downloaded {runtime}."
 msgstr "Erfolgreich {runtime} heruntergeladen"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1443
+#: PortMaster/pylibs/harbourmaster/harbour.py:1453
 #, python-brace-format
 msgid "Unable to find a download for {runtime}."
 msgstr "Es konnte kein Download für {runtime} gefunden werden."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1453
-#: PortMaster/pylibs/harbourmaster/harbour.py:1532
+#: PortMaster/pylibs/harbourmaster/harbour.py:1463
+#: PortMaster/pylibs/harbourmaster/harbour.py:1542
 msgid "Unable do download a port when in offline mode."
 msgstr "Ports lassen sich nicht im Offline Modus herunterladen."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1550
+#: PortMaster/pylibs/harbourmaster/harbour.py:1560
 #, python-brace-format
 msgid "Unable to find a source for {port_name}"
 msgstr "Es konnte keine Quelle für {port_name} gefunden werden."
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1564
+#: PortMaster/pylibs/harbourmaster/harbour.py:1574
 #, python-brace-format
 msgid "Unknown port {port_name}"
 msgstr "Unbekannter Port {port_name}"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1597
+#: PortMaster/pylibs/harbourmaster/harbour.py:1607
 #, python-brace-format
 msgid "Removing {port_name}"
 msgstr "Entferne {port_name}"
 
-#: PortMaster/pylibs/harbourmaster/harbour.py:1629
+#: PortMaster/pylibs/harbourmaster/harbour.py:1639
 #, python-brace-format
 msgid "Successfully uninstalled {port_name}"
 msgstr "Erfolgreich {port_name} deinstalliert"