android_calculator-15: Add numeral systems

This commit is contained in:
serso
2011-12-06 16:32:10 +04:00
parent c81530a495
commit 47080454ed
7 changed files with 50 additions and 4 deletions

View File

@@ -102,7 +102,14 @@
<string name="p_rad">Радианы</string>
<string name="p_grad">Грады</string>
<string name="p_turns">Обороты</string>
<string name="c_angle_units_summary">Определяет единицы измерения углов.</string>
<string name="c_angle_units_summary">Устанавливает единицы измерения углов.</string>
<string name="c_calc_numeral_bases">Системы счичления</string>
<string name="c_numeral_bases_summary">Устанавливает систему счисления для всех вводимых чисел.</string>
<string name="p_dec">Десятичная</string>
<string name="p_hex">Шестнадцатеричная</string>
<string name="p_oct">Восьмиричная</string>
<string name="p_bin">Бинарная</string>
<string name="c_calc_theme">Тема оформления</string>
<string name="p_default_theme">По умолчанию</string>

View File

@@ -60,4 +60,17 @@
<item>turns</item>
</string-array>
<string-array name="p_numeral_bases_names">
<item>@string/p_dec</item>
<item>@string/p_hex</item>
<item>@string/p_oct</item>
<item>@string/p_bin</item>
</string-array>
<string-array name="p_numeral_bases">
<item>dec</item>
<item>hex</item>
<item>oct</item>
<item>bin</item>
</string-array>
</resources>

View File

@@ -30,6 +30,9 @@
<string name="p_calc_angle_units_key">org.solovyev.android.calculator.CalculatorActivity_angle_units</string>
<string name="p_calc_angle_units">deg</string>
<string name="p_calc_numeral_bases_key">org.solovyev.android.calculator.CalculatorActivity_numeral_bases</string>
<string name="p_calc_numeral_bases">dec</string>
<string name="p_calc_theme_key">org.solovyev.android.calculator.CalculatorActivity_calc_theme</string>
<string name="p_calc_theme">default_theme</string>

View File

@@ -105,6 +105,13 @@
<string name="p_turns">Turns</string>
<string name="c_angle_units_summary">Defines the default units for angles.</string>
<string name="c_calc_numeral_bases">Numeral systems</string>
<string name="c_numeral_bases_summary">Defines the default numeral system for all input numbers.</string>
<string name="p_dec">Decimal</string>
<string name="p_hex">Hexadecimal</string>
<string name="p_oct">Octal</string>
<string name="p_bin">Binary</string>
<string name="c_calc_theme">Theme</string>
<string name="p_default_theme">Default</string>
<string name="p_violet_theme">Violet</string>

View File

@@ -29,6 +29,12 @@
a:summary="@string/c_angle_units_summary"
a:entryValues="@array/p_angle_units"/>
<ListPreference a:key="@string/p_calc_numeral_bases_key"
a:title="@string/c_calc_numeral_bases"
a:entries="@array/p_numeral_bases_names"
a:summary="@string/c_numeral_bases_summary"
a:entryValues="@array/p_numeral_bases"/>
</PreferenceCategory>