TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calculation fixable messages

Browse Source
This commit is contained in:
Sergey Solovyev
2012-11-17 23:53:56 +04:00
parent 1ab714b044
commit ef11120244
14 changed files with 192 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
calculatorpp/res/layout/calculation_messages_dialog.xml → calculatorpp/res/layout/calculator_messages_dialog.xml
View File

4
calculatorpp/res/layout/calculation_messages_dialog_message.xml → calculatorpp/res/layout/calculator_messages_dialog_message.xml
View File

@@ -8,13 +8,15 @@
<TextView a:id="@+id/calculation_messages_text_view"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="5"/>
a:layout_weight="5"
a:layout_gravity="top|left"/>
<Button
a:id="@+id/fix_button"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:layout_gravity="top|right"
a:text="@string/fix" />
</LinearLayout>

8
calculatorpp/res/values/text_strings.xml
View File

@@ -257,4 +257,12 @@
</string>
<string name="fix">Fix</string>
<string name="p_preferred_numeral_base_title">Preferred numeral base</string>
<string name="p_preferred_numeral_base_summary">Defines the preferred numeral base</string>
<string name="preferred_numeral_base_message">Preferred numeral base \'%1$s\' differs from current numeral base \'%2$s\'. Forgot to change back?</string>
<string name="p_preferred_angle_units_title">Preferred angle units</string>
<string name="p_preferred_angle_units_summary">Defines the preferred angle units</string>
<string name="preferred_angle_units_message">Preferred angle units \'%1$s\' differs from current angle units \'%2$s\'. Forgot to change back?</string>
</resources>

14
calculatorpp/res/xml/calculations_preferences.xml
View File

@@ -32,12 +32,26 @@
a:summary="@string/c_calc_grouping_separator_summary"
a:entryValues="@array/p_grouping_separator_values"/>
<ListPreference
a:key="preferred_angle_units"
a:title="@string/p_preferred_angle_units_title"
a:summary="@string/p_preferred_angle_units_summary"
a:entries="@array/p_angle_units_names"
a:entryValues="@array/p_angle_units" />
<ListPreference a:key="@string/p_calc_angle_units_key"
a:title="@string/c_calc_angle_units"
a:entries="@array/p_angle_units_names"
a:summary="@string/c_angle_units_summary"
a:entryValues="@array/p_angle_units"/>
<ListPreference
a:key="preferred_numeral_base"
a:title="@string/p_preferred_numeral_base_title"
a:summary="@string/p_preferred_numeral_base_summary"
a:entries="@array/p_numeral_bases_names"
a:entryValues="@array/p_numeral_bases" />
<ListPreference a:key="@string/p_calc_numeral_bases_key"
a:title="@string/c_calc_numeral_bases"
a:entries="@array/p_numeral_bases_names"