1.4.2

Updated components support.

Former-commit-id: f5c482f

AndroidManifest.xml

@@ -46,10 +46,6 @@
             android:icon="@drawable/ic_launcher_profiles"
             android:label="@string/title_activity_profiles" >
         </activity>
-        <activity
-            android:name="ru.meefik.linuxdeploy.ComponentsActivity"
-            android:label="@string/title_activity_components" >
-        </activity>
         <activity
             android:name="ru.meefik.linuxdeploy.ScriptsActivity"
             android:label="@string/title_activity_scripts" >

res/values-ru/arrays.xml

@@ -24,5 +24,71 @@
         <item>KDE</item>
         <item>Другое</item>
     </string-array>
+
+
+    <!-- Debian -->
+
+    <string-array name="debian_components_entries">
+        <item>Окружение рабочего стола</item>
+        <item>SSH сервер</item>
+        <item>VNC сервер</item>
+        <item>X сервер</item>
+    </string-array>
+
+    <!-- Ubuntu -->
+
+    <string-array name="ubuntu_components_entries">
+        <item>Окружение рабочего стола</item>
+        <item>SSH сервер</item>
+        <item>VNC сервер</item>
+        <item>X сервер</item>
+    </string-array>
+
+    <!-- Arch Linux -->
+
+    <string-array name="archlinux_components_entries">
+        <item>Окружение рабочего стола</item>
+        <item>SSH сервер</item>
+        <item>VNC сервер</item>
+        <item>X сервер</item>
+    </string-array>
+
+    <!-- Fedora -->
+
+    <string-array name="fedora_components_entries">
+        <item>Окружение рабочего стола</item>
+        <item>SSH сервер</item>
+        <item>VNC сервер</item>
+        <item>X сервер</item>
+    </string-array>
+
+    <!-- openSUSE -->
+
+    <string-array name="opensuse_components_entries">
+        <item>Окружение рабочего стола</item>
+        <item>SSH сервер</item>
+        <item>VNC сервер</item>
+        <item>X сервер</item>
+    </string-array>
+
+    <!-- Kali Linux -->
+
+    <string-array name="kali_components_entries">
+        <item>Окружение рабочего стола</item>
+        <item>SSH сервер</item>
+        <item>VNC сервер</item>
+        <item>X сервер</item>
+        <item>Компоненты Kali</item>
+    </string-array>
+
+    <!-- Gentoo -->
+
+    <string-array name="gentoo_components_entries">
+        <item>Окружение рабочего стола</item>
+        <item>SSH сервер</item>
+        <item>VNC сервер</item>
+        <item>X сервер</item>
+    </string-array>
+
 
 </resources>

res/values-ru/strings.xml

@@ -24,7 +24,6 @@
     <string name="title_activity_settings">Настройки</string>
     <string name="title_activity_properties">Параметры</string>
     <string name="title_activity_profiles">Профили</string>
-    <string name="title_activity_components">Компоненты</string>
     <string name="title_activity_scripts">Сценарии</string>
     <string name="title_activity_mounts">Монтирование</string>
     <string name="confirm_start_title">Запустить</string>
@@ -122,8 +121,9 @@
     <string name="dialog_title_desktopenv_preference">Окружение рабочего стола</string>
     <string name="title_installgui_preference">Установить GUI</string>
     <string name="summary_installgui_preference">Включить установку окружения рабочего стола и VNC сервера</string>
-    <string name="title_componentseditor_preference">Выбрать компоненты</string>
-    <string name="summary_componentseditor_preference">Выбрать компоненты для установки</string>
+    <string name="dialog_title_components_preference">Компоненты</string>
+    <string name="summary_components_preference">Выбрать компоненты для установки</string>
+    <string name="title_components_preference">Выбрать компоненты</string>
     <string name="startup_preferences">Запуск</string>
     <string name="title_sshstartup_preference">SSH</string>
     <string name="summary_sshstartup_preference">Разрешить запуск SSH сервера</string>

res/values/arrays.xml

@@ -118,6 +118,12 @@
         <item>vnc</item>
         <item>xserver</item>
     </string-array>
+    <string-array name="debian_components_entries">
+        <item>Desktop Environment</item>
+        <item>SSH server</item>
+        <item>VNC server</item>
+        <item>X server</item>
+    </string-array>
 
     <!-- Ubuntu -->
 
@@ -138,6 +144,18 @@
         <item>vnc</item>
         <item>xserver</item>
     </string-array>
+    <string-array name="ubuntu_components_values" translatable="false">
+        <item>desktop</item>
+        <item>ssh</item>
+        <item>vnc</item>
+        <item>xserver</item>
+    </string-array>
+    <string-array name="ubuntu_components_entries">
+        <item>Desktop Environment</item>
+        <item>SSH server</item>
+        <item>VNC server</item>
+        <item>X server</item>
+    </string-array>
 
     <!-- Arch Linux -->
 
@@ -155,6 +173,12 @@
         <item>vnc</item>
         <item>xserver</item>
     </string-array>
+    <string-array name="archlinux_components_entries">
+        <item>Desktop Environment</item>
+        <item>SSH server</item>
+        <item>VNC server</item>
+        <item>X server</item>
+    </string-array>
 
     <!-- Fedora -->
 
@@ -173,6 +197,12 @@
         <item>vnc</item>
         <item>xserver</item>
     </string-array>
+    <string-array name="fedora_components_entries">
+        <item>Desktop Environment</item>
+        <item>SSH server</item>
+        <item>VNC server</item>
+        <item>X server</item>
+    </string-array>
 
     <!-- openSUSE -->
 
@@ -189,6 +219,12 @@
         <item>vnc</item>
         <item>xserver</item>
     </string-array>
+    <string-array name="opensuse_components_entries">
+        <item>Desktop Environment</item>
+        <item>SSH server</item>
+        <item>VNC server</item>
+        <item>X server</item>
+    </string-array>
 
     <!-- Kali Linux -->
 
@@ -206,6 +242,13 @@
         <item>xserver</item>
         <item>kali-linux</item>
     </string-array>
+    <string-array name="kali_components_entries">
+        <item>Desktop Environment</item>
+        <item>SSH server</item>
+        <item>VNC server</item>
+        <item>X server</item>
+        <item>Kali components</item>
+    </string-array>
 
     <!-- Gentoo -->
 
@@ -226,5 +269,11 @@
         <item>vnc</item>
         <item>xserver</item>
     </string-array>
+    <string-array name="gentoo_components_entries">
+        <item>Desktop Environment</item>
+        <item>SSH server</item>
+        <item>VNC server</item>
+        <item>X server</item>
+    </string-array>
 
 </resources>

res/values/preferences.xml

@@ -48,6 +48,12 @@
     <string name="fbdev" translatable="false">/dev/graphics/fb0</string>
     <string name="fbinput" translatable="false">/dev/input/event2</string>
     <string name="fbfreeze" translatable="false">false</string>
+
+    <string-array name="default_components" translatable="false">
+        <item>desktop</item>
+        <item>ssh</item>
+        <item>vnc</item>
+    </string-array>
 
     <!-- Debian -->
     <string name="debian_suite" translatable="false">wheezy</string>

res/values/strings.xml

@@ -24,7 +24,6 @@
     <string name="title_activity_settings">Settings</string>
     <string name="title_activity_properties">Properties</string>
     <string name="title_activity_profiles">Profiles</string>
-	<string name="title_activity_components">Components</string>
 	<string name="title_activity_scripts">Scripts</string>
 	<string name="title_activity_mounts">Mounts</string>
     <string name="confirm_start_title">Start</string>
@@ -122,8 +121,9 @@
     <string name="dialog_title_desktopenv_preference">Desktop environment</string>
     <string name="title_installgui_preference">Install GUI</string>
     <string name="summary_installgui_preference">Include installation of desktop environment and VNC server</string>
-    <string name="title_componentseditor_preference">Select components</string>
-    <string name="summary_componentseditor_preference">Select components to install</string>
+    <string name="dialog_title_components_preference">Components</string>
+    <string name="summary_components_preference">Select components to install</string>
+    <string name="title_components_preference">Select components</string>
     <string name="startup_preferences">Startup</string>
     <string name="title_sshstartup_preference">SSH</string>
     <string name="summary_sshstartup_preference">Allow startup a SSH server</string>

res/xml/properties.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-    
+
     <PreferenceCategory android:title="@string/action_preferences" >
         <PreferenceScreen
             android:key="install"
@@ -11,7 +11,6 @@
             android:summary="@string/summary_reconfigure_preference"
             android:title="@string/title_reconfigure_preference" />
     </PreferenceCategory>
-
     <PreferenceCategory android:title="@string/deploy_preferences" >
         <ListPreference
             android:defaultValue="@string/distribution"
@@ -107,66 +106,73 @@
             android:summary="@string/desktopenv"
             android:title="@string/title_desktopenv_preference" />
 
-        <PreferenceScreen
-            android:key="componentseditor"
-            android:summary="@string/summary_componentseditor_preference"
-            android:title="@string/title_componentseditor_preference" />
+        <MultiSelectListPreference
+            android:defaultValue="@array/default_components"
+            android:dialogTitle="@string/dialog_title_components_preference"
+            android:entries="@array/debian_components_entries"
+            android:entryValues="@array/debian_components_values"
+            android:key="components"
+            android:summary="@string/summary_components_preference"
+            android:title="@string/title_components_preference" />
     </PreferenceCategory>
-
     <PreferenceCategory android:title="@string/startup_preferences" >
         <CheckBoxPreference
-            android:key="sshstartup"
             android:defaultValue="@string/sshstartup"
+            android:key="sshstartup"
             android:summary="@string/summary_sshstartup_preference"
             android:title="@string/title_sshstartup_preference" />
+
         <PreferenceScreen
-            android:key="sshproperties"
             android:dependency="sshstartup"
+            android:key="sshproperties"
             android:summary="@string/summary_sshproperties_preference"
             android:title="@string/title_sshproperties_preference" />
-        
+
         <CheckBoxPreference
-            android:key="guistartup"
             android:defaultValue="@string/guistartup"
+            android:key="guistartup"
             android:summary="@string/summary_guistartup_preference"
             android:title="@string/title_guistartup_preference" />
+
         <ListPreference
-            android:key="guitype"
-            android:dependency="guistartup"
             android:defaultValue="@string/guitype"
+            android:dependency="guistartup"
             android:dialogTitle="@string/dialog_title_guitype_preference"
             android:entries="@array/guitype_entries"
             android:entryValues="@array/guitype_values"
+            android:key="guitype"
             android:summary="@string/guitype"
             android:title="@string/title_guitype_preference" />
+
         <PreferenceScreen
-            android:key="guiproperties"
             android:dependency="guistartup"
+            android:key="guiproperties"
             android:summary="@string/summary_guiproperties_preference"
             android:title="@string/title_guiproperties_preference" />
-        
+
         <CheckBoxPreference
-            android:key="customstartup"
             android:defaultValue="@string/customstartup"
+            android:key="customstartup"
             android:summary="@string/summary_customstartup_preference"
             android:title="@string/title_customstartup_preference" />
+
         <PreferenceScreen
-            android:key="scriptseditor"
             android:dependency="customstartup"
+            android:key="scriptseditor"
             android:summary="@string/summary_scriptseditor_preference"
             android:title="@string/title_scriptseditor_preference" />
-        
+
         <CheckBoxPreference
-			android:key="custommount"
             android:defaultValue="@string/custommount"
+            android:key="custommount"
             android:summary="@string/summary_custommount_preference"
             android:title="@string/title_custommount_preference" />
+
         <PreferenceScreen
-            android:key="mountseditor"
             android:dependency="custommount"
+            android:key="mountseditor"
             android:summary="@string/summary_mountseditor_preference"
             android:title="@string/title_mountseditor_preference" />
-
     </PreferenceCategory>
 
 </PreferenceScreen>