android:key="exit_application"
android:icon="@drawable/ic_power_settings_new_black_24dp"
android:title="@string/pref_exit_power_off_canon" />
-
+<!--
<ListPreference
android:title="@string/pref_connection_method"
android:entryValues="@array/connection_method_value"
android:key="wifi_settings"
android:title="@string/pref_wifi_settings"
android:summary="@string/pref_summary_wifi_settings" />
-
+-->
+ <PreferenceScreen
+ android:key="dialog_message_send"
+ android:icon="@drawable/ic_linked_camera_black_24dp"
+ android:title="@string/pref_open_send_command_dialog"
+ />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_cat_camera">
<EditTextPreference
+ android:key="canon_zoom_magnification"
+ android:title="@string/pref_canon_zoom_magnification"
+ android:defaultValue="0"
+ android:summary="@string/pref_summary_canon_zoom_magnification" />
+
+ <EditTextPreference
+ android:key="canon_zoom_resolution"
+ android:title="@string/pref_canon_zoom_resolution"
+ android:defaultValue="25"
+ android:summary="@string/pref_summary_canon_zoom_resolution" />
+
+ <EditTextPreference
android:key="canon_focus_xy"
android:title="@string/pref_canon_focus_xy"
android:defaultValue="6000,4000"
android:summary="@string/pref_summary_canon_focus_xy" />
+ <EditTextPreference
+ android:key="canon_host_ip"
+ android:title="@string/pref_canon_host_ip"
+ android:defaultValue="192.168.0.1"
+ android:summary="@string/pref_summary_canon_host_ip" />
+
+ <EditTextPreference
+ android:key="canon_liveview_wait"
+ android:title="@string/pref_canon_liveview_wait"
+ android:defaultValue="25"
+ android:summary="@string/pref_summary_canon_liveview_wait" />
+
+ <ListPreference
+ android:title="@string/pref_canon_connection_mode"
+ android:summary="@string/pref_summary_canon_connection_mode"
+ android:entryValues="@array/canon_connection_mode_value"
+ android:entries="@array/canon_connection_mode"
+ android:key="canon_connection_mode"
+ android:defaultValue="0"/>
+
+<!--
<CheckBoxPreference
android:key="capture_both_camera_and_live_view"
android:title="@string/pref_capture_both_camera_and_live_view" />
-
+-->
</PreferenceCategory>
-
+<!--
<PreferenceCategory
android:title="@string/pref_cat_initialize">
android:summary="@string/pref_summary_debug_info" />
</PreferenceCategory>
+-->
</PreferenceScreen>