Skip to content

Commit

Permalink
cinnamon-settings.py: Additional modules when Mint modules are absent (…
Browse files Browse the repository at this point in the history 
…#11664)

* cinnamon-settings.py: Additional modules when Mint modules are absent

In installations of Cinnamon outside of Mint, additional modules are not
present that otherwise could be. This attempts to address those gaps
while also avoiding potential conflicts e.g. duplicate package names.

* cinnamon-settings.py: Remove trailing whitespace
  • Loading branch information
@rcalixte
rcalixte authored Apr 5, 2024
1 parent 8214ed1 commit 44fc3cb
Showing 1 changed file with 41 additions and 26 deletions.
67 changes: 41 additions & 26 deletions files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,35 @@ class SidePageData(typing.NamedTuple):
]

STANDALONE_MODULES = [
# Label Executable Icon Category Keywords for filter
[_("Printers"), "system-config-printer", "cs-printer", "hardware", _("printers, laser, inkjet")],
[_("Firewall"), "gufw", "cs-firewall", "admin", _("firewall, block, filter, programs")],
[_("Firewall"), "firewall-config", "cs-firewall", "admin", _("firewall, block, filter, programs")],
[_("Languages"), "mintlocale", "cs-language", "prefs", _("language, install, foreign")],
[_("Input Method"), "mintlocale-im", "cs-input-method", "prefs", _("language, install, foreign, input, method, chinese, korean, japanese, typing")],
[_("Login Window"), "pkexec lightdm-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")],
[_("Login Window"), "lightdm-gtk-greeter-settings-pkexec", "cs-login", "admin", _("login, lightdm, manager, settings, editor")],
[_("Driver Manager"), "cinnamon-driver-manager", "cs-drivers", "admin", _("video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, fglrx")],
[_("Nvidia Settings"), "nvidia-settings", "cs-drivers", "admin", _("video, driver, proprietary, nvidia, settings")],
[_("Software Sources"), "pkexec mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")],
[_("Package Management"), "dnfdragora", "cs-sources", "admin", _("update, install, repository, package, source, download")],
[_("Package Management"), "yumex-dnf", "cs-sources", "admin", _("update, install, repository, package, source, download")],
[_("Users and Groups"), "cinnamon-settings-users", "cs-user-accounts", "admin", _("user, users, account, accounts, group, groups, password")],
[_("Bluetooth"), "blueberry", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")],
[_("Bluetooth"), "blueman-manager", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")],
[_("Manage Services and Units"), "systemd-manager-pkexec", "cs-sources", "admin", _("systemd, units, services, systemctl, init")],
[_("Disks"), "gnome-disks", "org.gnome.DiskUtility", "hardware", _("disks, manage, hardware, management, hard, hdd, pendrive, format, erase, test, create, iso, ISO, disk, image")],
[_("Online Accounts"), "gnome-online-accounts-gtk", "gnome-online-accounts-gtk", "prefs", "google, microsoft, nextcloud, owncloud"]
# Label Executable Icon Category Keywords for filter
[_("Printers"), "system-config-printer", "cs-printer", "hardware", _("printers, laser, inkjet")],
[_("Firewall"), "gufw", "cs-firewall", "admin", _("firewall, block, filter, programs")],
[_("Firewall"), "firewall-config", "cs-firewall", "admin", _("firewall, block, filter, programs")],
[_("Languages"), "mintlocale", "cs-language", "prefs", _("language, install, foreign")],
[_("Input Method"), "mintlocale-im", "cs-input-method", "prefs", _("language, install, foreign, input, method, chinese, korean, japanese, typing")],
[_("Login Window"), "pkexec lightdm-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")],
[_("Login Window"), "lightdm-gtk-greeter-settings-pkexec", "cs-login", "admin", _("login, lightdm, manager, settings, editor")],
[_("Login Window"), "gdm-settings", "gdm-settings", "admin", _("login, gdm, manager, user, startup, switch")],
[_("Driver Manager"), "cinnamon-driver-manager", "cs-drivers", "admin", _("video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, fglrx")],
[_("Nvidia Settings"), "nvidia-settings", "cs-drivers", "admin", _("video, driver, proprietary, nvidia, settings")],
[_("Software Sources"), "pkexec mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")],
[_("Package Management"), "dnfdragora", "dnfdragora", "admin", _("update, install, repository, package, source, download")],
[_("Package Management"), "gpk-application", "gpk-prefs", "admin", _("update, install, repository, package, source, download")],
[_("Package Management"), "/usr/bin/octopi", "octopi", "admin", _("update, install, repository, package, source, download")],
[_("Package Management"), "pamac-manager", "system-software-install", "admin", _("update, install, repository, package, source, download")],
[_("Package Management"), "pkexec synaptic", "synaptic", "admin", _("update, install, repository, package, source, download")],
[_("Package Management"), "yumex", "yumex", "admin", _("update, install, repository, package, source, download")],
[_("Users and Groups"), "cinnamon-settings-users", "cs-user-accounts", "admin", _("user, users, account, accounts, group, groups, password")],
[_("Bluetooth"), "blueberry", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")],
[_("Bluetooth"), "blueman-manager", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")],
[_("Manage Services and Units"), "systemd-manager-pkexec", "cs-sources", "admin", _("systemd, units, services, systemctl, init")],
[_("Disks"), "gnome-disks", "org.gnome.DiskUtility", "hardware", _("disks, manage, hardware, management, hard, hdd, pendrive, format, erase, test, create, iso, ISO, disk, image")],
[_("Online Accounts"), "gnome-online-accounts-gtk", "gnome-online-accounts-gtk", "prefs", _("google, microsoft, nextcloud, owncloud")]
]

ALTERNATE_MODULES = [
# Label Executable Icon Category Keywords for filter
[_("Software Sources"), "software-properties-gtk", "software-properties-gtk", "admin", _("ppa, repository, package, source, download, video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, fglrx")]
]

TABS = {
Expand Down Expand Up @@ -173,7 +183,7 @@ def _on_sidepage_show_stack(self):

def go_to_sidepage(self, sidePage: SettingsWidgets.SidePage, user_action=True):
sidePage.build()

if sidePage.is_standalone:
return # we're done

Expand Down Expand Up @@ -310,18 +320,21 @@ def __init__(self):

# load CCC and standalone modules, but not python modules yet
self.load_ccc_modules()
self.load_standalone_modules()
self.has_mintsources = False
self.load_standalone_modules(STANDALONE_MODULES)
if not self.has_mintsources:
self.load_standalone_modules(ALTERNATE_MODULES)

# if a certain sidepage is given via arguments, try to load only it
if len(sys.argv) > 1:
if self.load_sidepage_as_standalone():
return

self.init_settings_overview()

def init_settings_overview(self):
"""Load the system settings overview (default)
This requires to initialize all settings modules.
"""
# 1. load all python modules
Expand Down Expand Up @@ -468,12 +481,14 @@ def load_ccc_modules(self):
else:
print("warning: failed to process CCC module", item[1])

def load_standalone_modules(self):
def load_standalone_modules(self, MODULES: list) -> None:
"""Loads all standalone settings modules."""
for item in STANDALONE_MODULES:
for item in MODULES:
samodule = SettingsWidgets.SAModule(item[0], item[1], item[2], item[3], item[4], self.content_box)
if samodule.process():
self.sidePages.append(SidePageData(samodule.sidePage, samodule.name, samodule.category))
if 'mintsources' in samodule.name:
self.has_mintsources = True
# else:
# print(f"note: skipped standalone module {samodule.name} (not found in PATH).")

Expand All @@ -490,7 +505,7 @@ def load_python_modules(self, only_module: str = None) -> bool:
return False

to_import = [os.path.splitext(os.path.basename(x))[0] for x in mod_files]

if only_module is not None:
to_import = filter(lambda mod: only_module.replace("-", "_") in mod, to_import)

Expand Down

0 comments on commit 44fc3cb

Please sign in to comment.