From 70fc8a7df407743397dde8db8b3f193870564341 Mon Sep 17 00:00:00 2001
From: Aleksey Saprunov <sa@altlinux.org>
Date: Mon, 20 Sep 2021 16:54:14 +0400
Subject: [PATCH] Add user package settings

---
 BaseALTPackages.admx       | 62 +++++++++++++++++++++++++++++++++++---
 en-US/basealtpackages.adml | 21 +++++++++++--
 ru-RU/basealtpackages.adml | 23 ++++++++++++--
 3 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/BaseALTPackages.admx b/BaseALTPackages.admx
index 06df957..bfc2109 100644
--- a/BaseALTPackages.admx
+++ b/BaseALTPackages.admx
@@ -14,21 +14,39 @@
   </categories>
 
   <policies>
-    <policy class="Machine" displayName="$(string.packages_install)" explainText="$(string.packages_install_help)" key="Software\BaseALT\Policies\Packages" name="InstallPackages" presentation="$(presentation.InstallPackages)">
+    <policy class="Machine" displayName="$(string.packages_install)" explainText="$(string.packages_install_help)" key="Software\BaseALT\Policies\Packages" name="InstallPackagesMachine" presentation="$(presentation.InstallPackagesMachine)">
       <parentCategory ref="ALT_Packages"/>
       <supportedOn ref="system:SUPPORTED_AltP8"/>
       <elements>
-        <list id="InstallPackagesList" key="Software\BaseALT\Policies\Packages\Install" valuePrefix="" />
+        <list id="InstallPackagesList" key="Software\BaseALT\Policies\Packages\Install" additive="true"/>
       </elements>
     </policy>
-    <policy class="Machine" displayName="$(string.packages_remove)" explainText="$(string.packages_remove_help)" key="Software\BaseALT\Policies\Packages" name="RemovePackages" presentation="$(presentation.RemovePackages)">
+
+    <policy class="User" displayName="$(string.packages_install)" explainText="$(string.packages_install_help)" key="Software\BaseALT\Policies\Packages" name="InstallPackagesUser" presentation="$(presentation.InstallPackagesUser)">
       <parentCategory ref="ALT_Packages"/>
       <supportedOn ref="system:SUPPORTED_AltP8"/>
       <elements>
-        <list id="RemovePackagesList" key="Software\BaseALT\Policies\Packages\Remove" valuePrefix="" />
+        <list id="InstallPackagesList" key="Software\BaseALT\Policies\Packages\Install" additive="true"/>
       </elements>
     </policy>
-    <policy class="Machine" displayName="$(string.packages_upgrade)" explainText="$(string.packages_upgrade_help)" key="Software\BaseALT\Policies\Packages" name="UpgradePackages" valueName="UpgradePackages">
+
+    <policy class="Machine" displayName="$(string.packages_remove)" explainText="$(string.packages_remove_help)" key="Software\BaseALT\Policies\Packages" name="RemovePackagesMachine" presentation="$(presentation.RemovePackagesMachine)">
+      <parentCategory ref="ALT_Packages"/>
+      <supportedOn ref="system:SUPPORTED_AltP8"/>
+      <elements>
+        <list id="RemovePackagesList" key="Software\BaseALT\Policies\Packages\Remove" additive="true"/>
+      </elements>
+    </policy>
+
+    <policy class="User" displayName="$(string.packages_remove)" explainText="$(string.packages_remove_help)" key="Software\BaseALT\Policies\Packages" name="RemovePackagesUser" presentation="$(presentation.RemovePackagesUser)">
+      <parentCategory ref="ALT_Packages"/>
+      <supportedOn ref="system:SUPPORTED_AltP8"/>
+      <elements>
+        <list id="RemovePackagesList" key="Software\BaseALT\Policies\Packages\Remove" additive="true"/>
+      </elements>
+    </policy>
+
+    <policy class="Machine" displayName="$(string.packages_upgrade)" explainText="$(string.packages_upgrade_help)" key="Software\BaseALT\Policies\Packages" name="UpgradePackagesMachine" valueName="UpgradePackages" >
       <parentCategory ref="ALT_Packages"/>
       <supportedOn ref="system:SUPPORTED_AltP8"/>
       <enabledValue>
@@ -38,5 +56,39 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+
+    <policy class="User" displayName="$(string.packages_upgrade)" explainText="$(string.packages_upgrade_help)" key="Software\BaseALT\Policies\Packages" name="UpgradePackagesUser" valueName="UpgradePackages" >
+      <parentCategory ref="ALT_Packages"/>
+      <supportedOn ref="system:SUPPORTED_AltP8"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+
+    <policy class="Machine" displayName="$(string.sync_packages_work_machine)" explainText="$(string.sync_packages_work_machine_help)" key="Software\BaseALT\Policies\Packages" name="SyncPackagesWorkMachine" valueName="Sync" >
+      <parentCategory ref="ALT_Packages"/>
+      <supportedOn ref="system:SUPPORTED_AltP8"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+
+    <policy class="User" displayName="$(string.sync_packages_work_user)" explainText="$(string.sync_packages_work_user_help)" key="Software\BaseALT\Policies\Packages" name="SyncPackagesWorkUser" valueName="Sync">
+      <parentCategory ref="ALT_Packages"/>
+      <supportedOn ref="system:SUPPORTED_AltP8"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+
   </policies>
 </policyDefinitions>
diff --git a/en-US/basealtpackages.adml b/en-US/basealtpackages.adml
index 164fd33..e4b503a 100644
--- a/en-US/basealtpackages.adml
+++ b/en-US/basealtpackages.adml
@@ -29,14 +29,31 @@ Disabled - Don't update OS automatically
 
 Enabled - Update OS automatically
       </string>
+
+      <string id="sync_packages_work_machine">Synchronous work with packages</string>
+      <string id="sync_packages_work_machine_help">Enable this setting for synchronous work with packages</string>
+
+      <string id="sync_packages_work_user">Synchronous work with packages</string>
+      <string id="sync_packages_work_user_help">Enable this setting for synchronous work with packages</string>
+
     </stringTable>
     <presentationTable>
-      <presentation id="InstallPackages">
+      <presentation id="InstallPackagesMachine">
         <listBox refId="InstallPackagesList">List of packages to install</listBox>
       </presentation>
-      <presentation id="RemovePackages">
+
+      <presentation id="InstallPackagesUser">
+        <listBox refId="InstallPackagesList">List of packages to install</listBox>
+      </presentation>
+
+      <presentation id="RemovePackagesMachine">
         <listBox refId="RemovePackagesList">List of packages to remove</listBox>
       </presentation>
+
+      <presentation id="RemovePackagesUser">
+        <listBox refId="RemovePackagesList">List of packages to remove</listBox>
+      </presentation>
+
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/ru-RU/basealtpackages.adml b/ru-RU/basealtpackages.adml
index 25da7f2..21e521b 100644
--- a/ru-RU/basealtpackages.adml
+++ b/ru-RU/basealtpackages.adml
@@ -28,15 +28,32 @@
 Отключено — не обновлять операционную систему автоматически
 
 Включено — обновлять операционную систему автоматически
-      </string>
+      </string>
+
+      <string id="sync_packages_work_machine">Cинхронная работа с пакетами</string>
+      <string id="sync_packages_work_machine_help">Включите данную настройку, для синхронной работы с пакетами</string>
+
+      <string id="sync_packages_work_user">Синхронная работа с пакетами</string>
+      <string id="sync_packages_work_user_help">Включите данную настройку, для синхронной работы с пакетами</string>
+
     </stringTable>
     <presentationTable>
-      <presentation id="InstallPackages">
+      <presentation id="InstallPackagesMachine">
         <listBox refId="InstallPackagesList">Список пакетов для установки</listBox>
       </presentation>
-      <presentation id="RemovePackages">
+
+      <presentation id="InstallPackagesUser">
+        <listBox refId="InstallPackagesList">Список пакетов для установки</listBox>
+      </presentation>
+
+      <presentation id="RemovePackagesMachine">
         <listBox refId="RemovePackagesList">Список пакетов для удаления</listBox>
       </presentation>
+
+      <presentation id="RemovePackagesUser">
+        <listBox refId="RemovePackagesList">Список пакетов для удаления</listBox>
+      </presentation>
+
     </presentationTable>
   </resources>
 </policyDefinitionResources>