Redacted policy IconTheme

2025-03-21 18:50:06 +03:00 · 2023-08-01 18:45:06 +04:00 · 2023-08-01 18:45:06 +04:00 · 0d5467c101
commit 0d5467c101
parent 1b5e595170
3 changed files with 82 additions and 46 deletions
--- a/BaseALTKDE.admx
+++ b/BaseALTKDE.admx
@ -87,7 +87,7 @@
          </item>
          <item displayName="$(string.kde-win-rend-MostHigh)">
            <value>
-              <string>{"NONE":{"NONE":"NONE"}}</string>
+              <string>{"Compositing":{"LatencyPolicy":"NONE"}}</string>
            </value>
          </item>
        </enum>
@ -108,7 +108,7 @@
    <parentCategory ref="system:ALT_Settings_KDE" />
    <supportedOn ref="system:SUPPORTED_AltP10" />
      <elements>
-        <enum id="kde-language_setter" valueName="plasma.localerc.Language" required="true">
+        <enum id="kde-language_setter" valueName="plasma-localerc.Language" required="true">
          <item displayName="$(string.kde-language-ru)">
            <value>
              <string>{"Formats":{"LANG":"ru_RU.UTF-8"}, "Translations":{"LANGUAGE":"ru"}}</string>
@ -191,7 +191,7 @@
    <parentCategory ref="system:ALT_Settings_KDE" />
    <supportedOn ref="system:SUPPORTED_AltP10" />
      <elements>
-        <enum id="kde-automount_setter" valueName="kwinrc.AutoMount" required="true">
+        <enum id="kde-automount_setter" valueName="kded_device_automounterrc.AutoMount" required="true">
          <item displayName="$(string.kde-automount-in-login)">
            <value>
              <string>{"General":{"AutomountEnabled":"true", "AutomountOnLogin":"true"}}</string>
@ -257,6 +257,50 @@
          </boolean>
      </elements>
    </policy>
+    <policy name="kde-iconstheme" class="User" displayName="$(string.kde-iconstheme)"
+    explainText="$(string.kde-iconstheme_help)"
+    presentation="$(presentation.kde-iconstheme-user-pr)"
+    key="Software\BaseALT\Policies\KDE">
+    <parentCategory ref="system:ALT_Appearance_KDE" />
+    <supportedOn ref="system:SUPPORTED_AltP10" />
+      <elements>
+        <enum  id="kde-iconstheme-setter" valueName="kdeglobals.Icons" required="true">
+          <item displayName="$(string.kde-icons-breeze)">
+            <value>
+              <string>{"Icons":{"Theme":"breeze"}}</string>
+            </value>
+          </item>
+          <item displayName="$(string.kde-icons-breeze-dark)">
+            <value>
+              <string>{"Icons":{"Theme":"breeze-dark"}}</string>
+            </value>
+          </item>
+          <item displayName="$(string.kde-icons-Adwaita)">
+            <value>
+              <string>{"Icons":{"Theme":"Adwaita"}}</string>
+            </value>
+          </item>
+          <item displayName="$(string.kde-icons-oxygen)">
+            <value>
+              <string>{"Icons":{"Theme":"oxygen"}}</string>
+            </value>
+          </item>
+          <item displayName="$(string.kde-icons-gnome)">
+            <value>
+              <string>{"Icons":{"Theme":"gnome"}}</string>
+            </value>
+          </item>
+        </enum>
+        <boolean id="kde-iconstheme_blocker" key="Software\BaseALT\Policies\KDELocks" valueName="kdeglobals.Icons" >
+          <trueValue>
+            <decimal value="1" />
+          </trueValue>
+          <falseValue>
+            <decimal value="0" />
+          </falseValue>
+          </boolean>
+      </elements>
+    </policy>
    <policy name="kde-wallpaper" class="User" displayName="$(string.kde-wallpaper)"
    explainText="$(string.kde-wallpaper_help)"
    presentation="$(presentation.kde-wallpaper-user-pr)"
@ -277,14 +321,14 @@
        <text id="kde-colorscheme-setter" valueName="plasma.colorscheme"/>
      </elements>
    </policy>
-    <policy name="kde-cursortheme" class="User" displayName="$(string.kde-cursortheme)"
+  <policy name="kde-cursortheme" class="User" displayName="$(string.kde-cursortheme)"
    explainText="$(string.kde-cursortheme_help)"
    presentation="$(presentation.kde-cursortheme-user-pr)"
    key="Software\BaseALT\Policies\KDE">
    <parentCategory ref="system:ALT_Appearance_KDE" />
    <supportedOn ref="system:SUPPORTED_AltP10" />
      <elements>
-        <text id="kde-cursortheme-setter" valueName="kdeglobals.Icons"/>
+        <text id="kde-cursortheme-setter" valueName="kdeglobals.Curcor"/>
      </elements>
    </policy>
    <policy name="kde-graphic-effects" class="User" displayName="$(string.kde-graphic-effects)"
@ -301,7 +345,7 @@
    </policy>
    <policy name="kde-showdelete" class="User" displayName="$(string.kde-showdelete)"
      explainText="$(string.kde-showdelete_help)"
-      key="Software\BaseALT\Policies\KDE" valueName="kde.globals">
+      key="Software\BaseALT\Policies\KDE" valueName="kdeglobals.Dolphin">
      <parentCategory ref="system:ALT_Settings_KDE"/>
      <supportedOn ref="system:SUPPORTED_AltP10"/>
      <enabledValue>
@ -313,7 +357,7 @@
      </policy>
      <policy name="kde-singleclick" class="User" displayName="$(string.kde-singleclick)"
      explainText="$(string.kde-singleclick_help)"
-      key="Software\BaseALT\Policies\KDE" valueName="kde.globals.singleclick">
+      key="Software\BaseALT\Policies\KDE" valueName="kdeglobals.singleclick">
      <parentCategory ref="system:ALT_Settings_KDE"/>
      <supportedOn ref="system:SUPPORTED_AltP10"/>
      <enabledValue>
@ -323,15 +367,5 @@
        <string>{"KDE":{"SingleClick":"false"}}</string>
      </disabledValue>
    </policy>
-    <policy name="kde-iconstheme" class="User" displayName="$(string.kde-iconstheme)"
-    explainText="$(string.kde-iconstheme_help)"
-    presentation="$(presentation.kde-iconstheme-user-pr)"
-    key="Software\BaseALT\Policies\KDE">
-    <parentCategory ref="system:ALT_Appearance_KDE" />
-    <supportedOn ref="system:SUPPORTED_AltP10" />
-      <elements>
-        <text id="kde-iconstheme-setter" valueName="plasma.iconstheme"/>
-      </elements>
-    </policy>
  </policies>
 </policyDefinitions>
--- a/en-US/basealtkde.adml
+++ b/en-US/basealtkde.adml
@ -133,20 +133,15 @@ If the policy is disabled, clicking on the file or folder will highlight it.
      - breeze_cursors
      </string>

-      <string id="kde-iconstheme">Icons theme</string>
-      <string id="kde-iconstheme_help">This policy allows you to select a icons theme by specifying its name (for example: Oxygen_Black). Icons themes available in /usr/share/icons are used. Valid parameter value:
+      <string id="kde-iconstheme">Тема значков</string>
+      <string id="kde-iconstheme_help">Данная политика позволяет выбрать тему.  Допустимые значения параметра:

      - Adwaita
-      - Breeze_Wnow
-      - KDE_Classic
-      - Oxygen_Black
-      - Oxygen_Blue
-      - Oxygen_White
-      - Oxygen_Yellow
-      - Oxygen_Zion
-      - breeze
-      - breeze_dark
-      - breeze_cursors
+      - Oxygen
+      - Breeze
+      - Breeze_dark
+      - Gnome
+
      </string>

      <string id="kde-win-act-Click_to_focus">Click to focus</string>
@ -182,6 +177,12 @@ If the policy is disabled, clicking on the file or folder will highlight it.
      <string id="kde-filesearch-folders">Enable search service and indexing of hidden files and folders</string>
      <string id="kde-filesearch-folders-and-indexing">Enable search service, indexing hidden folders, files and their contents</string>

+      <string id="kde-icons-breeze">Breeze</string>
+      <string id="kde-icons-breeze-dark">Breeze-dark</string>
+      <string id="kde-icons-Adwaita">Adwaita</string>
+      <string id="kde-icons-oxygen">Oxygen</string>
+      <string id="kde-icons-gnome">Gnome</string>
+
      </stringTable>
    <presentationTable>
      <presentation id="kde-win-activate-user-pr">
@ -230,9 +231,9 @@ If the policy is disabled, clicking on the file or folder will highlight it.
        </textBox>
      </presentation>
      <presentation id="kde-iconstheme-user-pr">
-        <textBox refId="kde-iconstheme-setter">
-          <label>Icons theme:</label>
-        </textBox>
+        <dropdownList noSort="true" defaultItem="0" refId="kde-iconstheme-setter">Icons theme:</dropdownList>
+        <checkBox refId="kde-iconstheme_blocker">Block</checkBox>
+        <text>Blocking changes to this setting by the user. After restarting the device, the user's changes to the settings are not saved.</text>
      </presentation>
     </presentationTable>
  </resources>
--- a/ru-RU/basealtkde.adml
+++ b/ru-RU/basealtkde.adml
@ -134,19 +134,14 @@
      </string>

      <string id="kde-iconstheme">Тема значков</string>
-      <string id="kde-iconstheme_help">Данная политика позволяет выбрать тему значков, указав её название  (например: Oxygen_Black). Используются темы курсоров, доступные в /usr/share/icons. Допустимые значения параметра:
+      <string id="kde-iconstheme_help">Данная политика позволяет выбрать тему.  Допустимые значения параметра:

      - Adwaita
-      - Breeze_Wnow
-      - KDE_Classic
-      - Oxygen_Black
-      - Oxygen_Blue
-      - Oxygen_White
-      - Oxygen_Yellow
-      - Oxygen_Zion
-      - breeze
-      - breeze_dark
-      - breeze_cursors
+      - Oxygen
+      - Breeze
+      - Breeze_dark
+      - Gnome
+
      </string>

      <string id="kde-win-act-Click_to_focus">Фокус по щелчку</string>
@ -182,6 +177,12 @@
      <string id="kde-filesearch-folders">Включить службу поиска и индексацию скрытых файлов и папок</string>
      <string id="kde-filesearch-folders-and-indexing">Включить службу поиска, индексацию скрытых папок, файлов и их содержимого</string>

+      <string id="kde-icons-breeze">Breeze</string>
+      <string id="kde-icons-breeze-dark">Breeze-dark</string>
+      <string id="kde-icons-Adwaita">Adwaita</string>
+      <string id="kde-icons-oxygen">Oxygen</string>
+      <string id="kde-icons-gnome">Gnome</string>
+
      </stringTable>
    <presentationTable>
      <presentation id="kde-win-activate-user-pr">
@ -230,9 +231,9 @@
        </textBox>
      </presentation>
      <presentation id="kde-iconstheme-user-pr">
-        <textBox refId="kde-iconstheme-setter">
-          <label>Тема значков:</label>
-        </textBox>
+        <dropdownList noSort="true" defaultItem="0" refId="kde-iconstheme-setter">Тема значков:</dropdownList>
+        <checkBox refId="kde-iconstheme_blocker">Блокировать</checkBox>
+        <text>Блокировка изменений данной настройки пользователем. После перезагрузки устройства внесённые пользователем изменения настройки не сохраняются.</text>
      </presentation>
     </presentationTable>
  </resources>