meson: Allow users settings to be excluded

This allows distributions to provide their own user configuration.

Author: clefebvre

debian/rules

@@ -19,6 +19,7 @@ override_dh_auto_configure:
 		-D docs=true \
 		-D deprecated_warnings=false \
 		-D exclude_info_settings=true \
+		-D exclude_users_settings=true \
 		-D py3modules_dir=/usr/lib/python3/dist-packages
 
 # workaround for fix lmde4 build

files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py

@@ -9,6 +9,7 @@
 import locale
 import os
 from setproctitle import setproctitle
+import subprocess
 import sys
 import time
 import traceback
@@ -82,6 +83,7 @@ class SidePageData(typing.NamedTuple):
     [_("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")],
+    [_("Account Details"),            "mintsysadm-settings-user",             "preferences-desktop-user",  "prefs",      _("user, account, password")],
     [_("System Information"),         "mintreport",                           "mintreport",                "hardware",   _("info, usb, pci, gpu, bios, report, crash, system")],
     [_("System Administration"),      "pkexec mintsysadm",                    "mintsysadm",                "admin",      _("adminitration, grub, boot, system")],
     [_("Login Window"),               "pkexec lightdm-settings",              "cs-login",                  "admin",      _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")],
@@ -96,6 +98,7 @@ class SidePageData(typing.NamedTuple):
     [_("Package Management"),         "pamac-manager",                        "system-software-install",   "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")],
+    [_("Users"),                      "mintsysadm --user",                    "system-config-users",       "admin",      _("user, users, account, accounts, 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")],
@@ -793,6 +796,11 @@ def find_module_name(name):
         return f"cs_{name}" in PYTHON_CS_MODULES or name in [item[1] for item in CONTROL_CENTER_MODULES]
 
     if args.module is not None and not find_module_name(args.module):
+        if args.module == "user":
+            subprocess.Popen(["cinnamon-settings-user"])
+            sys.exit(0)
+
+
         new_mod = CS_MODULE_ALIASES.get(args.module, None)
         if not find_module_name(new_mod):
             print(f"warning: settings module {args.module} not found. Ignoring any remaining arguments.")

files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py

@@ -35,7 +35,7 @@ class Module:
 
     def __init__(self, content_box):
         keywords = _("user, account, information, details, password")
-        sidePage = SidePage(_("Account details"), "cs-user", keywords, content_box, module=self)
+        sidePage = SidePage(_("Account Details"), "cs-user", keywords, content_box, module=self)
         self.sidePage = sidePage
         self.window = None
 
@@ -49,7 +49,7 @@ def on_module_selected(self):
             page = SettingsPage()
             self.sidePage.add_widget(page)
 
-            settings = page.add_section(_("Account details"))
+            settings = page.add_section(_("Account Details"))
 
             self.scale = self.window.get_scale_factor()
 

meson.build

@@ -175,6 +175,15 @@ if get_option('exclude_info_settings')
     excluded_files += ['usr/share/applications/cinnamon-settings-info.desktop']
     excluded_files += ['usr/share/cinnamon/cinnamon-settings/modules/cs_info.py']
 endif
+if get_option('exclude_users_settings')
+    excluded_files += ['usr/bin/cinnamon-settings-users']
+    excluded_files += ['usr/share/applications/cinnamon-settings-user.desktop']
+    excluded_files += ['usr/share/applications/cinnamon-settings-users.desktop']
+    excluded_files += ['usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py']
+    excluded_files += ['usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.ui']
+    excluded_files += ['usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.svg']
+    excluded_files += ['usr/share/cinnamon/cinnamon-settings/modules/cs_user.py']
+endif
 
 install_subdir(
     'files',

meson_options.txt

@@ -34,4 +34,9 @@ option('exclude_info_settings',
     value : false,
     description: 'Exclude Info settings'
 )
+option('exclude_users_settings',
+    type : 'boolean',
+    value : false,
+    description: 'Exclude Users settings'
+)