scientific notation format

2012-02-12 00:38:14 +04:00
parent b7f7e82634
commit 8b23c532da
6 changed files with 78 additions and 57 deletions
--- a/res/values-ru/text_strings.xml
+++ b/res/values-ru/text_strings.xml
@@ -20,6 +20,7 @@
 	<string name="c_prefs_main_category">Основные настройки</string>
 	<string name="c_prefs_calculations_category">Настройки вычислений</string>
 	<string name="c_prefs_appearance_category">Настройки внешнего вида</string>
+	<string name="c_prefs_other_category">Другие настройки</string>
 	<string name="c_prefs_drag_button_category">Настройки кнопок</string>


@@ -41,6 +42,8 @@
 	<string name="c_calc_color_display_title">Подсветка выражений</string>
 	<string name="c_calc_round_result_title">Округление результата</string>
 	<string name="c_calc_round_result_summary">Включает/выключает округление результата</string>
+	<string name="c_calc_science_notation_title">Результат в научной форме</string>
+	<string name="c_calc_science_notation_summary">Если включено - результат будет всегда записан в научной форме (12.34E-12)</string>
 	<string name="p_calc_result_precision_title">Точность результата</string>
 	<string name="c_exit">Выход</string>
 	<string name="c_add">Добавить</string>
--- a/res/values/preferences.xml
+++ b/res/values/preferences.xml
@@ -33,6 +33,9 @@
 	<string name="p_calc_round_result_key">org.solovyev.android.calculator.CalculatorModel_round_result</string>
 	<string name="p_calc_round_result">true</string>

+	<string name="p_calc_science_notation_key">calculation.output.science_notation</string>
+	<string name="p_calc_science_notation">false</string>
+
 	<string name="p_calc_functions">org.solovyev.android.calculator.CalculatorModel_functions</string>
 	<string name="p_calc_vars">org.solovyev.android.calculator.CalculatorModel_vars</string>
 	<string name="p_calc_history">org.solovyev.android.calculator.CalculatorModel_history</string>
--- a/res/values/text_strings.xml
+++ b/res/values/text_strings.xml
@@ -20,6 +20,7 @@
 	<string name="c_prefs_main_category">Main settings</string>
 	<string name="c_prefs_calculations_category">Calculation settings</string>
 	<string name="c_prefs_appearance_category">Appearance settings</string>
+	<string name="c_prefs_other_category">Other settings</string>
 	<string name="c_prefs_drag_button_category">Drag buttons settings</string>


@@ -41,6 +42,8 @@
 	<string name="c_calc_color_display_title">Highlight expressions</string>
 	<string name="c_calc_round_result_title">Round result</string>
 	<string name="c_calc_round_result_summary">Toggles rounding of the result</string>
+	<string name="c_calc_science_notation_title">Always scientific notation</string>
+	<string name="c_calc_science_notation_summary">If turned on forces to use only scientific notation of output (12.34E-12)</string>
 	<string name="p_calc_result_precision_title">Precision of result</string>
 	<string name="c_exit">Exit</string>
 	<string name="c_add">Add</string>
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -8,13 +8,13 @@
 			a:title="@string/c_calc_ad_free_title"
 			a:summary="@string/c_calc_ad_free_summary"
 			a:defaultValue="false"
-		/>
+			/>

-	<PreferenceCategory a:title="@string/c_prefs_calculations_category">
+	<org.solovyev.android.ads.AdViewPreference
+			a:key="admob_01"
+			a:layout="@layout/admob_pref"/>

-		<org.solovyev.android.ads.AdViewPreference
-			 a:key="admob_01"
-			 a:layout="@layout/admob_pref"/>
+	<PreferenceScreen a:title="@string/c_prefs_calculations_category">

 		<android.preference.CheckBoxPreference
 				a:key="@string/p_calc_round_result_key"
@@ -29,18 +29,18 @@
 				a:defaultValue="5"
 				range:boundaries="0;16"/>

+		<android.preference.CheckBoxPreference
+				a:key="@string/p_calc_science_notation_key"
+				a:summary="@string/c_calc_science_notation_summary"
+				a:title="@string/c_calc_science_notation_title"
+				a:defaultValue="false"/>
+
 		<ListPreference a:key="@string/p_calc_grouping_separator_key"
 						a:title="@string/c_calc_grouping_separator"
 						a:entries="@array/p_grouping_separator_names"
 						a:summary="@string/c_calc_grouping_separator_summary"
 						a:entryValues="@array/p_grouping_separator_values"/>

-		<ListPreference a:key="@string/p_calc_multiplication_sign_key"
-						a:title="@string/c_calc_multiplication_sign"
-						a:entries="@array/p_multiplication_sign_values"
-						a:summary="@string/c_calc_multiplication_sign_summary"
-						a:entryValues="@array/p_multiplication_sign_values"/>
-
 		<ListPreference a:key="@string/p_calc_angle_units_key"
 						a:title="@string/c_calc_angle_units"
 						a:entries="@array/p_angle_units_names"
@@ -53,14 +53,10 @@
 						a:summary="@string/c_numeral_bases_summary"
 						a:entryValues="@array/p_numeral_bases"/>

-	</PreferenceCategory>
+	</PreferenceScreen>

-
-	<PreferenceCategory a:title="@string/c_prefs_appearance_category">
-
-		<org.solovyev.android.ads.AdViewPreference
-			 a:key="admob_02"
-			 a:layout="@layout/admob_pref"/>
+	<PreferenceScreen
+			a:title="@string/c_prefs_appearance_category">

 		<android.preference.CheckBoxPreference
 				a:key="@string/p_calc_color_display_key"
@@ -80,6 +76,12 @@
 						a:summary="@string/p_calc_haptic_feedback_duration_summary"
 						a:entryValues="@array/p_calc_haptic_feedback_duration_values"/>

+		<ListPreference a:key="@string/p_calc_multiplication_sign_key"
+						a:title="@string/c_calc_multiplication_sign"
+						a:entries="@array/p_multiplication_sign_values"
+						a:summary="@string/c_calc_multiplication_sign_summary"
+						a:entryValues="@array/p_multiplication_sign_values"/>
+
 		<ListPreference a:key="@string/p_calc_theme_key"
 						a:title="@string/c_calc_theme"
 						a:entries="@array/p_theme_names"
@@ -102,6 +104,26 @@
 				range:steps="10"
 				range:boundaries="10;500"/>

+		<!--	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
+									  a:key="@string/p_drag_duration_key"
+									  a:title="Duration of drag event"
+									  a:text=" ms"
+									  a:defaultValue="40;2500"
+									  range:steps="10"
+									  range:boundaries="5;4000"/>
+						
+							  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
+									  a:key="@string/p_drag_angle_key"
+									  a:title="Angle of drag event"
+									  a:text=" degrees"
+									  a:defaultValue="0;45"
+									  range:steps="5"
+									  range:boundaries="0;45"/>-->
+	</PreferenceScreen>
+
+	<PreferenceScreen
+			a:title="@string/c_prefs_other_category">
+
 		<android.preference.CheckBoxPreference
 				a:key="@string/p_calc_show_release_notes_key"
 				a:summary="@string/c_calc_show_release_notes_summary"
@@ -114,21 +136,6 @@
 				a:title="@string/c_calc_use_back_button_as_prev_title"
 				a:defaultValue="false"/>

-<!--	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
-			  a:key="@string/p_drag_duration_key"
-			  a:title="Duration of drag event"
-			  a:text=" ms"
-			  a:defaultValue="40;2500"
-			  range:steps="10"
-			  range:boundaries="5;4000"/>
-
-	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
-			  a:key="@string/p_drag_angle_key"
-			  a:title="Angle of drag event"
-			  a:text=" degrees"
-			  a:defaultValue="0;45"
-			  range:steps="5"
-			  range:boundaries="0;45"/>-->
-	</PreferenceCategory>
+	</PreferenceScreen>

 </PreferenceScreen>