openlp-android team mailing list archive
-
openlp-android team
-
Mailing list archive
-
Message #00078
[Merge] lp:~trb143/openlp/android_03 into lp:openlp/android
Tim Bentley has proposed merging lp:~trb143/openlp/android_03 into lp:openlp/android.
Requested reviews:
Jonathan Corwin (j-corwin)
Tim Bentley (trb143)
For more details, see:
https://code.launchpad.net/~trb143/openlp/android_03/+merge/87959
Fix up strings and start to add translation files
--
https://code.launchpad.net/~trb143/openlp/android_03/+merge/87959
Your team OpenLP Android Developers is subscribed to branch lp:openlp/android.
=== modified file 'OpenLP.apk'
Binary files OpenLP.apk 2011-12-24 15:08:47 +0000 and OpenLP.apk 2012-01-09 17:08:04 +0000 differ
=== modified file 'res/layout/group_parent.xml'
--- res/layout/group_parent.xml 2011-05-24 19:17:02 +0000
+++ res/layout/group_parent.xml 2012-01-09 17:08:04 +0000
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android";
- android:layout_width="fill_parent" android:baselineAligned="false" android:orientation="horizontal" android:layout_height="wrap_content">
- <TextView
- android:id="@+id/groupParentText"
- android:layout_height="wrap_content"
- android:paddingLeft="5dip"
- android:minLines="3"
- android:focusable="false"
- android:gravity="center_vertical|right" android:layout_width="fill_parent" android:layout_weight="1"
- />
- <TextView
- android:id="@+id/parentChildCount"
- android:width="40dip"
- android:paddingRight="5dip"
- android:layout_width="fill_parent"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:gravity="center_vertical|right"
- />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+ android:layout_width="fill_parent"
+ android:baselineAligned="false"
+ android:orientation="horizontal"
+ android:layout_height="wrap_content">
+ <TextView android:id="@+id/groupParentText"
+ android:layout_height="wrap_content"
+ android:paddingLeft="5dip"
+ android:minLines="3"
+ android:focusable="false"
+ android:gravity="center_vertical|right"
+ android:layout_width="fill_parent"
+ android:layout_weight="1" />
+ <TextView android:id="@+id/parentChildCount"
+ android:width="40dip"
+ android:paddingRight="5dip"
+ android:layout_width="fill_parent"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical|right" />
</LinearLayout>
\ No newline at end of file
=== added directory 'res/values-af'
=== added directory 'res/values-cs'
=== added file 'res/values-cs/strings.xml'
--- res/values-cs/strings.xml 1970-01-01 00:00:00 +0000
+++ res/values-cs/strings.xml 2012-01-09 17:08:04 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">OpenLP</string>
+ <string name="settings">Nastavení</string>
+ <string name="preferences">Nastavení</string>
+ <string name="exit">Ukončit</string>
+ <string name="prev">Předchozí</string>
+ <string name="next">Další</string>
+ <string name="previousServiceItem">Předchozí položka</string>
+ <string name="nextServiceItem">Další položka</string>
+ <string name="previousSlide">Předchozí snímek</string>
+ <string name="nextSlide">Další snímek</string>
+ <string name="blank">Prázdný</string>
+ <string name="unblank">Neprázdný</string>
+ <string name="alert">Upozornění:</string>
+ <string name="alertHint">Zadat zprávu upozornění</string>
+ <string name="alertTextNull">Zadejte prosím zprávu k odeslání.</string>
+ <string name="send">Odeslat</string>
+ <string name="Slide">Snímek</string>
+ <string name="slides">Snímky</string>
+ <string name="Service">Služba</string>
+ <string name="misc">Různé</string>
+ <string name="preferenceCategoryTitleServer">Server</string>
+ <string name="url">Server</string>
+ <string name="urlHint">Jméno počítače nebo IP</string>
+ <string name="port">Port</string>
+ <string name="enableCustomTimeouts">Zapnout uživatelský časový limit</string>
+ <string name="displayType">Zobrazit prázdný typ</string>
+ <string name="displayBlankType">Zobrazit prázdný typ</string>
+ <string name="displayBlankSummary">Vybrat požadovaný prázdný typ</string>
+ <string name="displayScreen">Obrazovka</string>
+ <string name="displayTheme">Motiv</string>
+ <string name="displayDesktop">Pracovní plocha</string>
+ <string name="displayBlankOn">Obnovit zobrazení z</string>
+ <string name="displayBlankOff">Prázdné zobrazení na</string>
+ <string name="customTimeoutsSummary">Ověřit změny nastavení časového limitu</string>
+ <string name="customTimeout">Uživatelský časový limit</string>
+ <string name="socketTimeout">Časový limit socketu</string>
+ <string name="socketTimeoutSummary">Vybrat hodnotu (milisekundy)</string>
+ <string name="connectionTimeout">Časový limit spojení</string>
+ <string name="connectionTimedout">Spojení vypršelo</string>
+ <string name="connectionTimeoutSummary">Vybrat hodnotu (milisekundy)</string>
+ <string name="save">Uložit</string>
+ <string name="unable">Není možno načíst stránku -</string>
+ <string name="fail">Spojení selhalo</string>
+ <string name="jsonfail">JSON selhal</string>
+ <string name="loading">Připojuji se...</string>
+ <string name="searching">Hledám...</string>
+ <string name="loadingServiceItems">Načítám položky služby...</string>
+ <string name="loadingSlideItems">Načítám položky snímku...</string>
+ <string name="loadingStatusInfo">Načítám stavové info...</string>
+ <string name="searchHint">Hledat OpenLP</string>
+ <string name="searchResults">Výsledky hledání</string>
+ <string name="showingResults">Zobrazuji výsledky pro \'%s\'</string>
+</resources>
=== added directory 'res/values-de'
=== added file 'res/values-de/strings.xml'
--- res/values-de/strings.xml 1970-01-01 00:00:00 +0000
+++ res/values-de/strings.xml 2012-01-09 17:08:04 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">OpenLP</string>
+ <string name="settings"></string>
+ <string name="preferences"></string>
+ <string name="exit"></string>
+ <string name="prev"></string>
+ <string name="next"></string>
+ <string name="previousServiceItem"></string>
+ <string name="nextServiceItem"></string>
+ <string name="previousSlide"></string>
+ <string name="nextSlide"></string>
+ <string name="blank"></string>
+ <string name="unblank"></string>
+ <string name="alert">Hinweis:</string>
+ <string name="alertHint"></string>
+ <string name="alertTextNull"></string>
+ <string name="send"></string>
+ <string name="Slide">Folie</string>
+ <string name="slides">Folien</string>
+ <string name="Service">Ablauf</string>
+ <string name="misc"></string>
+ <string name="preferenceCategoryTitleServer">Server</string>
+ <string name="url">Server</string>
+ <string name="urlHint">Hostname oder IP</string>
+ <string name="port">Port</string>
+ <string name="enableCustomTimeouts"></string>
+ <string name="displayType"></string>
+ <string name="displayBlankType"></string>
+ <string name="displayBlankSummary"></string>
+ <string name="displayScreen"></string>
+ <string name="displayTheme">Design</string>
+ <string name="displayDesktop"></string>
+ <string name="displayBlankOn"></string>
+ <string name="displayBlankOff"></string>
+ <string name="customTimeoutsSummary"></string>
+ <string name="customTimeout"></string>
+ <string name="socketTimeout"></string>
+ <string name="socketTimeoutSummary"></string>
+ <string name="connectionTimeout"></string>
+ <string name="connectionTimedout"></string>
+ <string name="connectionTimeoutSummary"></string>
+ <string name="save">Speichern</string>
+ <string name="unable"></string>
+ <string name="fail"></string>
+ <string name="jsonfail"></string>
+ <string name="loading">Verbinde...</string>
+ <string name="searching">Suche...</string>
+ <string name="loadingServiceItems"></string>
+ <string name="loadingSlideItems"></string>
+ <string name="loadingStatusInfo"></string>
+ <string name="searchHint"></string>
+ <string name="searchResults"></string>
+ <string name="showingResults"></string>
+</resources>
=== removed directory 'res/values-en'
=== added directory 'res/values-en-rZA'
=== added file 'res/values-en-rZA/strings.xml'
--- res/values-en-rZA/strings.xml 1970-01-01 00:00:00 +0000
+++ res/values-en-rZA/strings.xml 2012-01-09 17:08:04 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">OpenLP</string>
+ <string name="settings">Settings</string>
+ <string name="preferences">Preferences</string>
+ <string name="exit">Exit</string>
+ <string name="prev">Previous</string>
+ <string name="next">Next</string>
+ <string name="previousServiceItem">Previous Item</string>
+ <string name="nextServiceItem">Next Item</string>
+ <string name="previousSlide">Previous Slide</string>
+ <string name="nextSlide">Next Slide</string>
+ <string name="blank">Blank</string>
+ <string name="unblank">Unblank</string>
+ <string name="alert">Alert:</string>
+ <string name="alertHint">Enter alert message</string>
+ <string name="alertTextNull">Please enter a message to send.</string>
+ <string name="send">Send</string>
+ <string name="Slide">Slide</string>
+ <string name="slides">Slides</string>
+ <string name="Service">Service</string>
+ <string name="misc">Miscellaneous</string>
+ <string name="preferenceCategoryTitleServer">Server</string>
+ <string name="url">Server</string>
+ <string name="urlHint">Hostname or IP</string>
+ <string name="port">Port</string>
+ <string name="enableCustomTimeouts">Enable Custom Timeouts</string>
+ <string name="displayType">Display Blank Type</string>
+ <string name="displayBlankType">Display Blank Type</string>
+ <string name="displayBlankSummary">Select the required blank type</string>
+ <string name="displayScreen">Screen</string>
+ <string name="displayTheme">Theme</string>
+ <string name="displayDesktop">Desktop</string>
+ <string name="displayBlankOn">Reset display from</string>
+ <string name="displayBlankOff">Blank display to</string>
+ <string name="customTimeoutsSummary">Check to modify timeout settings</string>
+ <string name="customTimeout">Custom Timeout</string>
+ <string name="socketTimeout">Socket Timeout</string>
+ <string name="socketTimeoutSummary">Select a value (milliseconds)</string>
+ <string name="connectionTimeout">Connection Timeout</string>
+ <string name="connectionTimedout">Connection timed out</string>
+ <string name="connectionTimeoutSummary">Select a value (milliseconds)</string>
+ <string name="save">Save</string>
+ <string name="unable">Unable to load page -</string>
+ <string name="fail">Connection failed</string>
+ <string name="jsonfail">JSON failed</string>
+ <string name="loading">Connecting...</string>
+ <string name="searching">Searching...</string>
+ <string name="loadingServiceItems">Loading Service Items...</string>
+ <string name="loadingSlideItems">Loading Slide Items...</string>
+ <string name="loadingStatusInfo">Loading Status Info...</string>
+ <string name="searchHint">Search OpenLP</string>
+ <string name="searchResults">Search Results</string>
+ <string name="showingResults">Showing Results for \'%s\'</string>
+</resources>
=== removed file 'res/values-en/colors.xml'
--- res/values-en/colors.xml 2011-05-27 19:46:14 +0000
+++ res/values-en/colors.xml 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<resources>
- <color name="lightGreen">#ff66ff33</color>
- <color name="white">#ffffffff</color>
-</resources>
\ No newline at end of file
=== removed file 'res/values-en/defaultValues.xml'
--- res/values-en/defaultValues.xml 2011-12-17 09:11:59 +0000
+++ res/values-en/defaultValues.xml 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<resources>
- <!-- STRING -->
- <string name="hostDefaultValue">192.168.1.1</string>
- <string name="portDefaultValue">4316</string>
- <string name="displayTypeValue">Blank</string>
-
- <!-- INTEGER -->
- <integer name="socketTimeoutDefaultValue">3000</integer>
- <integer name="connectionTimeoutDefaultValue">3000</integer>
-</resources>
\ No newline at end of file
=== removed file 'res/values-en/httpClientTimeoutValues.xml'
--- res/values-en/httpClientTimeoutValues.xml 2011-05-05 19:30:01 +0000
+++ res/values-en/httpClientTimeoutValues.xml 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<resources>
- <string-array name="socketValueEntries">
- <item>3000</item>
- <item>4000</item>
- <item>5000</item>
- <item>8000</item>
- <item>10000</item>
- </string-array>
- <string-array name="socketValues">
- <item>3000</item>
- <item>4000</item>
- <item>5000</item>
- <item>8000</item>
- <item>10000</item>
- </string-array>
-</resources>
\ No newline at end of file
=== removed file 'res/values-en/keyStrings.xml'
--- res/values-en/keyStrings.xml 2011-12-17 09:11:59 +0000
+++ res/values-en/keyStrings.xml 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<resources>
- <string name="keyEnableCustomTimeout">enableCustomTimeout</string>
- <string name="keyConnectionTimeout">connectionTimeout</string>
- <string name="keyDisplayBlankType">blankType</string>
- <string name="keySocketTimeout">socketTimeout</string>
- <string name="keyHost">keyHost</string>
- <string name="keyPort">keyPort</string>
- <string name="keySharedPreferences">keySharedPreferences</string>
-</resources>
\ No newline at end of file
=== removed file 'res/values-en/strings.xml'
--- res/values-en/strings.xml 2011-12-17 09:11:59 +0000
+++ res/values-en/strings.xml 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_name">OpenLP</string>
- <string name="settings">Settings</string>
- <string name="preferences">Preferences</string>
- <string name="exit">Exit</string>
- <string name="prev">Previous</string>
- <string name="next">Next</string>
- <string name="previousServiceItem">Previous Item</string>
- <string name="nextServiceItem">Next Item</string>
- <string name="previousSlide">Previous Slide</string>
- <string name="nextSlide">Next Slide</string>
- <string name="blank">Blank</string>
- <string name="unblank">Unblank</string>
- <string name="alert">Alert:</string>
- <string name="alertHint">Enter alert message</string>
- <string name="alertTextNull">Please enter a message to send.</string>
- <string name="send">Send</string>
- <string name="Slide">Slide</string>
- <string name="slides">Slides</string>
- <string name="Service">Service</string>
- <string name="misc">Miscellaneous</string>
- <string name="preferenceCategoryTitleServer">Server</string>
- <string name="url">Server</string>
- <string name="urlHint">Hostname or IP</string>
- <string name="port">Port</string>
- <string name="enableCustomTimeouts">Enable Custom Timeouts</string>
- <string name="displayType">Display Blank Type</string>
- <string name="displayBlankType">Display Blank Type</string>
- <string name="displayBlankSummary">Select the required blank type</string>
- <string name="customTimeoutsSummary">Check to modify timeout settings</string>
- <string name="customTimeout">Custom Timeout</string>
- <string name="socketTimeout">Socket Timeout</string>
- <string name="socketTimeoutSummary">Select a value (milliseconds)</string>
- <string name="connectionTimeout">Connection Timeout</string>
- <string name="connectionTimedout">Connection timed out</string>
- <string name="connectionTimeoutSummary">Select a value (milliseconds)</string>
- <string name="save">Save</string>
- <string name="unable">Unable to load page -</string>
- <string name="fail">Connection failed</string>
- <string name="jsonfail">JSON failed</string>
- <string name="loading">Connecting...</string>
- <string name="searching">Searching...</string>
- <string name="toggleBlankOn">Blank to </string>
- <string name="toggleBlankOff">Show Display</string>
- <string name="loadingServiceItems">Loading Service Items...</string>
- <string name="loadingSlideItems">Loading Slide Items...</string>
- <string name="loadingStatusInfo">Loading Status Info...</string>
- <string name="searchHint">Search OpenLP</string>
- <string name="searchResults">Search Results</string>
- <string name="showingResults">Showing Results for \'%s\'</string>
-
-</resources>
=== added directory 'res/values-es'
=== added directory 'res/values-et'
=== added file 'res/values-et/strings.xml'
--- res/values-et/strings.xml 1970-01-01 00:00:00 +0000
+++ res/values-et/strings.xml 2012-01-09 17:08:04 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">OpenLP</string>
+ <string name="settings">Sätted</string>
+ <string name="preferences">Eelistused</string>
+ <string name="exit">Välju</string>
+ <string name="prev">Eelmine</string>
+ <string name="next">Järgmine</string>
+ <string name="previousServiceItem">Eelmine element</string>
+ <string name="nextServiceItem">Järgmine element</string>
+ <string name="previousSlide">Eelmine slaid</string>
+ <string name="nextSlide">Järgmine slaid</string>
+ <string name="blank">Tühjenda</string>
+ <string name="unblank">Näita</string>
+ <string name="alert">Teade:</string>
+ <string name="alertHint">Sisesta teade</string>
+ <string name="alertTextNull">Palun sisesta teade, mida saata.</string>
+ <string name="send">Saada</string>
+ <string name="Slide">Slaid</string>
+ <string name="slides">Slaidid</string>
+ <string name="Service">Teenistus</string>
+ <string name="misc">Muud</string>
+ <string name="preferenceCategoryTitleServer">Server</string>
+ <string name="url">Server</string>
+ <string name="urlHint">Hostinimi või IP</string>
+ <string name="port">Port</string>
+ <string name="enableCustomTimeouts">Kohandatud aegumisegade kasutamine</string>
+ <string name="displayType">Kuva tühjendamise liik</string>
+ <string name="displayBlankType">Kuva tühjendamise liik</string>
+ <string name="displayBlankSummary">Vali kuva tühjendamise liik</string>
+ <string name="displayScreen">Ekraan</string>
+ <string name="displayTheme">Kujundus</string>
+ <string name="displayDesktop">Töölaud</string>
+ <string name="displayBlankOn">Kuvavormi lähtestamine</string>
+ <string name="displayBlankOff">Kuva tühjendamisel kuvatakse</string>
+ <string name="customTimeoutsSummary">Märgi, et muuta aegumise sätteid</string>
+ <string name="customTimeout">Kohandatud aegumine</string>
+ <string name="socketTimeout">Pesa aegumine</string>
+ <string name="socketTimeoutSummary">Vali kestus (millisekundid)</string>
+ <string name="connectionTimeout">Ühenduse aegumine</string>
+ <string name="connectionTimedout">Ühendus aegus</string>
+ <string name="connectionTimeoutSummary">Vali kestus (millisekundid)</string>
+ <string name="save">Salvesta</string>
+ <string name="unable">Lehe laadimine pole võimalik -</string>
+ <string name="fail">Ühendus nurjus</string>
+ <string name="jsonfail">JSON nurjus</string>
+ <string name="loading">Ühendumine...</string>
+ <string name="searching">Otsimine...</string>
+ <string name="loadingServiceItems">Teenistuse elementide laadimine...</string>
+ <string name="loadingSlideItems">Slaidi elementide laadimine...</string>
+ <string name="loadingStatusInfo">Olekuinfo laadimine...</string>
+ <string name="searchHint">OpenLP otsing</string>
+ <string name="searchResults">Otsingu tulemused</string>
+ <string name="showingResults">Tulemused otsingule \'%s\' </string>
+</resources>
=== added directory 'res/values-fr'
=== added directory 'res/values-hu'
=== added file 'res/values-hu/strings.xml'
--- res/values-hu/strings.xml 1970-01-01 00:00:00 +0000
+++ res/values-hu/strings.xml 2012-01-09 17:08:04 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">OpenLP</string>
+ <string name="settings">Beállítások</string>
+ <string name="preferences">Beállítások</string>
+ <string name="exit">Kilépés</string>
+ <string name="prev">Előző</string>
+ <string name="next">Következő</string>
+ <string name="previousServiceItem">Előző elem</string>
+ <string name="nextServiceItem">Következő elem</string>
+ <string name="previousSlide">Előző dia</string>
+ <string name="nextSlide">Következő dia</string>
+ <string name="blank">Elsötétítés</string>
+ <string name="unblank">Elsötétítés visszavonása</string>
+ <string name="alert">Értesítés:</string>
+ <string name="alertHint">Értesítés megadása</string>
+ <string name="alertTextNull">Kérem, adj meg egy értesítő üzenetet.</string>
+ <string name="send">Küldés</string>
+ <string name="Slide">Dia</string>
+ <string name="slides">Diák</string>
+ <string name="Service">Sorrend</string>
+ <string name="misc">Egyebek</string>
+ <string name="preferenceCategoryTitleServer">Kiszolgáló</string>
+ <string name="url">Kiszolgáló</string>
+ <string name="urlHint">Gépnév vagy IP-cím</string>
+ <string name="port">Portszám</string>
+ <string name="enableCustomTimeouts">Egyéni időtúllépés engedélyezése</string>
+ <string name="displayType">Képernyő elsötétítési mód</string>
+ <string name="displayBlankType">Képernyő elsötétítési mód</string>
+ <string name="displayBlankSummary">Válaszd ki a kívánt elsötétítési módot</string>
+ <string name="displayScreen">Képernyő</string>
+ <string name="displayTheme">Téma</string>
+ <string name="displayDesktop">Asztalra</string>
+ <string name="displayBlankOn">Képernyő alaphelyzetbe állítása erről</string>
+ <string name="displayBlankOff">Képernyő elsötétítése erre</string>
+ <string name="customTimeoutsSummary">Jelöld be az időtúllépési beállítások módosításához</string>
+ <string name="customTimeout">Egyéni időtúllépés</string>
+ <string name="socketTimeout">Socket időtúllépés</string>
+ <string name="socketTimeoutSummary">Válassz egy értéket (milliszekundum)</string>
+ <string name="connectionTimeout">Kapcsolódási időtúllépés</string>
+ <string name="connectionTimedout">Időtúllépés miatt a kapcsolat megszakadt</string>
+ <string name="connectionTimeoutSummary">Válassz egy értéket (milliszekundum)</string>
+ <string name="save">Mentés</string>
+ <string name="unable">Az oldal nem tölthető be -</string>
+ <string name="fail">A kapcsolat megszakadt</string>
+ <string name="jsonfail">JSON feldolgozás sikertelen</string>
+ <string name="loading">Kapcsolódás…</string>
+ <string name="searching">Keresés…</string>
+ <string name="loadingServiceItems">Sorrend elemeinek betöltése…</string>
+ <string name="loadingSlideItems">Dia elemeinek betöltése…</string>
+ <string name="loadingStatusInfo">Állapotinformációk betöltése…</string>
+ <string name="searchHint">OpenLP keresés</string>
+ <string name="searchResults">Keresési eredmények</string>
+ <string name="showingResults">Keresési eredmények: %s </string>
+</resources>
=== added directory 'res/values-ja'
=== added directory 'res/values-ko'
=== added directory 'res/values-nb'
=== added directory 'res/values-nl'
=== added directory 'res/values-pt-rBR'
=== added directory 'res/values-ru'
=== added directory 'res/values-zh-rCN'
=== modified file 'res/values/defaultValues.xml'
--- res/values/defaultValues.xml 2011-12-16 15:37:31 +0000
+++ res/values/defaultValues.xml 2012-01-09 17:08:04 +0000
@@ -2,7 +2,7 @@
<!-- STRING -->
<string name="hostDefaultValue">192.168.1.1</string>
<string name="portDefaultValue">4316</string>
- <string name="displayTypeValue">Blank</string>
+ <string name="displayTypeValue">@string/displayScreen</string>
<!-- INTEGER -->
<integer name="socketTimeoutDefaultValue">3000</integer>
=== modified file 'res/values/misc.xml'
--- res/values/misc.xml 2011-12-16 15:37:31 +0000
+++ res/values/misc.xml 2012-01-09 17:08:04 +0000
@@ -1,12 +1,12 @@
<resources>
<string-array name="displayTypeValueEntries">
- <item>Blank</item>
- <item>Theme</item>
- <item>Display</item>
+ <item>@string/displayScreen</item>
+ <item>@string/displayTheme</item>
+ <item>@string/displayDesktop</item>
</string-array>
<string-array name="displayTypeValues">
- <item>Blank</item>
- <item>Theme</item>
- <item>Display</item>
+ <item>@string/displayScreen</item>
+ <item>@string/displayTheme</item>
+ <item>@string/displayDesktop</item>
</string-array>
</resources>
\ No newline at end of file
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml 2011-12-24 15:06:31 +0000
+++ res/values/strings.xml 2012-01-09 17:08:04 +0000
@@ -28,7 +28,7 @@
<string name="displayType">Display Blank Type</string>
<string name="displayBlankType">Display Blank Type</string>
<string name="displayBlankSummary">Select the required blank type</string>
- <string name="displayBlank">Blank</string>
+ <string name="displayScreen">Screen</string>
<string name="displayTheme">Theme</string>
<string name="displayDesktop">Desktop</string>
<string name="displayBlankOn">Reset display from</string>
=== modified file 'src/org/openlp/android/activity/Misc.java'
--- src/org/openlp/android/activity/Misc.java 2011-12-24 15:06:31 +0000
+++ src/org/openlp/android/activity/Misc.java 2012-01-09 17:08:04 +0000
@@ -102,16 +102,16 @@
}
else {
Log.d(LOG_TAG, "onCLick Display Type = " + displayType);
- if (displayType.equals("Blank")){
- Log.d(LOG_TAG, "Blank called");
- new WebCallAsyncTask(context).execute(DISPLAY_HIDE_BLANK);
+ if (displayType.equals(getString(R.string.displayScreen))){
+ Log.d(LOG_TAG, "Blank matched");
+ new WebCallAsyncTask(context).execute(DISPLAY_HIDE_SCREEN);
}
- else if (displayType.equals("Theme")){
- Log.d(LOG_TAG, "Theme called");
+ else if (displayType.equals(getString(R.string.displayTheme))){
+ Log.d(LOG_TAG, "Theme matched");
new WebCallAsyncTask(context).execute(DISPLAY_HIDE_THEME);
}
else {
- Log.d(LOG_TAG, "Desktop called");
+ Log.d(LOG_TAG, "Desktop matched");
new WebCallAsyncTask(context).execute(DISPLAY_HIDE_DESKTOP);
}
}
@@ -120,6 +120,8 @@
Toast.makeText(context, String.format("%s: %s", e.getClass().getSimpleName(), e.getMessage()),
Toast.LENGTH_SHORT).show();
}
+ PollStatusTask poll = new PollStatusTask(misc);
+ poll.execute(POLL_STATUS);
}
});
@@ -197,42 +199,74 @@
return null;
}
- @Override
- protected void onPostExecute(Poll poll) {
- super.onPostExecute(poll);
- final ToggleButton toggleButton = (ToggleButton) findViewById(R.id.toggleDisplayButton);
- if (poll == null){
- toggleButton.setEnabled(false);
- }
- else {
- displayType = prefs.getString(getApplicationContext().getString(R.string.keyDisplayBlankType), getApplicationContext().getString(R.string.displayTypeValue));
- Log.d(LOG_TAG, "onPostExecute Display Type = " + displayType + " " + poll.isDisplayHidden());
- if (displayType.equals("Blank")){
- Log.d(LOG_TAG, "Blank called");
- toggleButton.setTextOn(context.getString(R.string.displayBlankOn) + " "+ context.getString(R.string.displayBlank));
- toggleButton.setTextOff(context.getString(R.string.displayBlankOff) + " "+ context.getString(R.string.displayBlank));
- }
- else if (displayType.equals("Theme")){
- Log.d(LOG_TAG, "Theme called");
- toggleButton.setTextOn(context.getString(R.string.displayBlankOn) + " "+ context.getString(R.string.displayTheme));
- toggleButton.setTextOff(context.getString(R.string.displayBlankOff) + " "+ context.getString(R.string.displayTheme));
- }
- else {
- Log.d(LOG_TAG, "Desktop called");
- toggleButton.setTextOn(context.getString(R.string.displayBlankOn) + " "+ context.getString(R.string.displayDesktop));
- toggleButton.setTextOff(context.getString(R.string.displayBlankOff) + " "+ context.getString(R.string.displayDesktop));
- }
- toggleButton.setEnabled(true);
- toggleButton.setChecked(false);
- if (poll.isDisplayHidden()){
- toggleButton.setChecked(true);
- }
- }
- progressDialog.dismiss();
- if (error != null && error.trim().length() > 0) {
- Toast.makeText(context, error, Toast.LENGTH_LONG).show();
- }
- }
+ @Override
+ protected void onPostExecute(Poll poll) {
+ super.onPostExecute(poll);
+ final ToggleButton toggleButton = (ToggleButton) findViewById(R.id.toggleDisplayButton);
+ if (poll == null) {
+ toggleButton.setEnabled(false);
+ }
+ else {
+ String onText = "";
+ String offText = "";
+
+ displayType = prefs.getString(
+ getApplicationContext().getString(
+ R.string.keyDisplayBlankType),
+ getApplicationContext().getString(
+ R.string.displayTypeValue));
+ Log.d(LOG_TAG, "onPostExecute Display Type = " + displayType
+ + " " + poll.isDisplayHidden());
+ /*
+ * Set display blanking to the preferences value
+ */
+ if (displayType.equals(getString(R.string.displayScreen))) {
+ Log.d(LOG_TAG, "Blank called");
+ onText = context.getString(R.string.displayScreen);
+ offText = context.getString(R.string.displayScreen);
+ }
+ else if (displayType.equals(getString(R.string.displayTheme))) {
+ Log.d(LOG_TAG, "Theme called");
+ onText = context.getString(R.string.displayTheme);
+ offText = context.getString(R.string.displayTheme);
+ }
+ else {
+ Log.d(LOG_TAG, "Desktop called");
+ onText = context.getString(R.string.displayDesktop);
+ offText = context.getString(R.string.displayDesktop);
+ }
+ /*
+ * Set display blanked to the off value to that of the screen
+ */
+ if (poll.isDisplayHidden()) {
+ if (poll.isBlankedDisplayed()) {
+ Log.d(LOG_TAG, "Blank called");
+ onText = context.getString(R.string.displayScreen);
+ }
+ else if (poll.isThemeDisplayed()) {
+ Log.d(LOG_TAG, "Theme called");
+ onText = context.getString(R.string.displayTheme);
+ }
+ else {
+ Log.d(LOG_TAG, "Desktop called");
+ onText = context.getString(R.string.displayDesktop);
+ }
+ }
+ toggleButton.setTextOn(context
+ .getString(R.string.displayBlankOn) + " " + onText);
+ toggleButton.setTextOff(context
+ .getString(R.string.displayBlankOff) + " " + offText);
+ toggleButton.setEnabled(true);
+ toggleButton.setChecked(false);
+ if (poll.isDisplayHidden()) {
+ toggleButton.setChecked(true);
+ }
+ }
+ progressDialog.dismiss();
+ if (error != null && error.trim().length() > 0) {
+ Toast.makeText(context, error, Toast.LENGTH_LONG).show();
+ }
+ }
class FetchItemsException extends Exception {
/**
=== modified file 'src/org/openlp/android/api/Api.java'
--- src/org/openlp/android/api/Api.java 2011-12-24 15:06:31 +0000
+++ src/org/openlp/android/api/Api.java 2012-01-09 17:08:04 +0000
@@ -102,7 +102,7 @@
public final String SERVICE_LIST = "/api/service/list";
public final String SERVICE_SET = "/api/service/set?data=";
- public final String DISPLAY_HIDE_BLANK = "/api/display/blank";
+ public final String DISPLAY_HIDE_SCREEN = "/api/display/blank";
public final String DISPLAY_HIDE_THEME = "/api/display/theme";
public final String DISPLAY_HIDE_DESKTOP = "/api/display/desktop";
public final String DISPLAY_SHOW = "/api/display/show";
Follow ups
