Merge pull request #42 from altlinux/Fix_authetication_method_bug

Fixed list authetication-method bug

BaseALTGsettings.admx

@@ -1033,12 +1033,22 @@
         displayName="$(string.org-gnome-vino-authentication-methods)"
         explainText="$(string.org-gnome-vino-authentication-methods_help)"
         key="Software\BaseALT\Policies\gsettings"
-        valueName="org.gnome.Vino.authentication-methods"
         presentation="$(presentation.OrgGnomeVinoAuthenticationMethodsUser-pr)">
       <parentCategory ref="system:ALT_Remote_Access_Vino_Gnome" />
       <supportedOn ref="system:SUPPORTED_AltP9" />
       <elements>
-        <list id="OrgGnomeVinoAuthenticationMethods_setter" key="org.gnome.Vino.authentication-methods" additive="true" />
+        <enum id="OrgGnomeVinoAuthenticationMethods_setter" required="true" valueName="org.gnome.Vino.authentication-methods">
+          <item displayName="$(string.org-gnome-vino-authentication-methods-none)">
+            <value>
+              <string>none</string>
+            </value>
+          </item>
+          <item displayName="$(string.org-gnome-vino-authentication-methods-vnc)">
+            <value>
+              <string>vnc</string>
+            </value>
+          </item>
+        </enum>
       </elements>
     </policy>
 
@@ -1046,12 +1056,22 @@
         displayName="$(string.org-gnome-vino-authentication-methods)"
         explainText="$(string.org-gnome-vino-authentication-methods_help)"
         key="Software\BaseALT\Policies\gsettings"
-        valueName="org.gnome.Vino.authentication-methods"
         presentation="$(presentation.OrgGnomeVinoAuthenticationMethodsMachine-pr)">
       <parentCategory ref="system:ALT_Remote_Access_Vino_Gnome" />
       <supportedOn ref="system:SUPPORTED_AltP9" />
       <elements>
-        <list id="OrgGnomeVinoAuthenticationMethods_setter" key="org.gnome.Vino.authentication-methods" additive="true" />
+        <enum id="OrgGnomeVinoAuthenticationMethods_setter" required="true" valueName="org.gnome.Vino.authentication-methods">
+          <item displayName="$(string.org-gnome-vino-authentication-methods-none)">
+            <value>
+              <string>none</string>
+            </value>
+          </item>
+          <item displayName="$(string.org-gnome-vino-authentication-methods-vnc)">
+            <value>
+              <string>vnc</string>
+            </value>
+          </item>
+        </enum>
         <boolean id="OrgGnomeVinoAuthenticationMethods_setter_blocker" key="Software\BaseALT\Policies\GSettingsLocks" valueName="org.gnome.Vino.authentication-methods">
           <trueValue>
             <decimal value="1" />

en-US/basealtgsettings.adml

@@ -93,6 +93,8 @@
 
       <string id="org-gnome-vino-authentication-methods">Authentication methods</string>
       <string id="org-gnome-vino-authentication-methods_help">Lists the authentication methods with which remote users may access the desktop.  There are two possible authentication methods; "vnc" causes the remote user to be prompted for a password (the password is specified by the vnc-password key) before connecting and "none" which allows any remote user to connect.</string>
+      <string id="org-gnome-vino-authentication-methods-none">none</string>
+      <string id="org-gnome-vino-authentication-methods-vnc">vnc</string>
 
       <string id="org-gnome-vino-vnc-password">Password for remote access</string>
       <string id="org-gnome-vino-vnc-password_help">The password which the remote user will be prompted for if the "vnc" authentication method is used. The password specified by the key is base64 encoded.  The special value of 'keyring' (which is not valid base64) means that the password is stored in the GNOME keyring.</string>
@@ -289,11 +291,11 @@
       </presentation>
 
       <presentation id="OrgGnomeVinoAuthenticationMethodsUser-pr">
-        <listBox refId="OrgGnomeVinoAuthenticationMethods_setter">Authentication methods:</listBox>
+        <dropdownList noSort="true" defaultItem="0" refId="OrgGnomeVinoAuthenticationMethods_setter">Method:</dropdownList>
       </presentation>
 
       <presentation id="OrgGnomeVinoAuthenticationMethodsMachine-pr">
-        <listBox refId="OrgGnomeVinoAuthenticationMethods_setter">Authentication methods:</listBox>
+        <dropdownList noSort="true" defaultItem="0" refId="OrgGnomeVinoAuthenticationMethods_setter">Method:</dropdownList>
         <checkBox refId="OrgGnomeVinoAuthenticationMethods_setter_blocker">lock</checkBox>
         <text>Lock changes to this setting. User policies for this setting will be ignored.</text>
       </presentation>

ru-RU/basealtgsettings.adml

@@ -93,6 +93,8 @@
 
       <string id="org-gnome-vino-authentication-methods">Методы аутентификации</string>
       <string id="org-gnome-vino-authentication-methods_help">Методы аутентификации пользователей, подключающихся к удаленному рабочему столу. Есть два метода аутентификации: "vnc" - для подключения необходим пароль и "none" - пароль не требуется.</string>
+      <string id="org-gnome-vino-authentication-methods-none">none</string>
+      <string id="org-gnome-vino-authentication-methods-vnc">vnc</string>
 
       <string id="org-gnome-vino-vnc-password">Пароль для подключения</string>
       <string id="org-gnome-vino-vnc-password_help">Пароль, который удаленному пользователю будет предложено ввести, если используется метод аутентификации "vnc". Пароль, указанный ключом, закодирован в кодировке base64.</string>
@@ -289,11 +291,11 @@
       </presentation>
 
       <presentation id="OrgGnomeVinoAuthenticationMethodsUser-pr">
-        <listBox refId="OrgGnomeVinoAuthenticationMethods_setter">Методы аутентификации:</listBox>
+        <dropdownList noSort="true" defaultItem="0" refId="OrgGnomeVinoAuthenticationMethods_setter">Метод:</dropdownList>
       </presentation>
 
       <presentation id="OrgGnomeVinoAuthenticationMethodsMachine-pr">
-        <listBox refId="OrgGnomeVinoAuthenticationMethods_setter">Методы аутентификации:</listBox>
+        <dropdownList noSort="true" defaultItem="0" refId="OrgGnomeVinoAuthenticationMethods_setter">Метод:</dropdownList>
         <checkBox refId="OrgGnomeVinoAuthenticationMethods_setter_blocker">блокировать</checkBox>
         <text>Блокировка изменений данной настройки пользователем. Пользовательские политики для этой настройки будут проигнорированы.</text>
       </presentation>