yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

2-column mode options

Browse source
This commit is contained in:
Nikolay Pultsin 2013-04-28 21:37:03 +02:00
parent 08c3b469d4
commit 15acd7c439
33 changed files with 175 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,5 +1,6 @@
===== 1.8 (May ??, 2013) =====
* 2 column text view (in horizontal mode, optional, enabled by default on devices with diagonal > 7")
* Fixed series index representation: 10 instead 1E+1
===== 1.7.9 (Apr 23, 2013) =====

7
TODO.2pages Normal file
View file

@ -0,0 +1,7 @@
* FIRST RELEASE
** fix end-of-section processing
* OPTIONAL
** 3d animation
** more animation types
** footer/header

5
assets/resources/application/be.xml
View file

@ -319,6 +319,10 @@
<node name="summaryOn" value="Выключаць сьвятло кнопак (не працуе на некаторых прыладах)"/>
<node name="summaryOff" value="Не спрабаваць выключаць сьвятло кнопак"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Рэґуляваньне яркасьці экрану">
<node name="summaryOn" value="Перасоўваньнем пальца ўверх-уніз па левым баку экрану"/>
<node name="summaryOff" value="Выключана"/>
@ -551,6 +555,7 @@
<node name="right" value="Правае поле"/>
<node name="top" value="Верхняе поле"/>
<node name="bottom" value="Ніжняе поле"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Паказальнік праґрэсу">
<node name="summary" value="Налады гартача і прыпятка"/>

5
assets/resources/application/bg.xml
View file

@ -318,6 +318,10 @@
<node name="summaryOn" value="Изключване на светещите бутони (не работи на всички устройства)"/>
<node name="summaryOff" value="Не изключвай светещите бутони"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Настройка на яркостта на екрана">
<node name="summaryOn" value="С приплъзване нагоре/надолу по левия край на екрана"/>
<node name="summaryOff" value="Изключена"/>
@ -550,6 +554,7 @@
<node name="right" value="Дясна граница"/>
<node name="top" value="Горна граница"/>
<node name="bottom" value="Долна граница"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Скрол бар">
<node name="summary" value="Индикатор на прочетените страници"/>

5
assets/resources/application/ca.xml
View file

@ -317,6 +317,10 @@
<node name="summaryOn" value="Deshabilitar luz de botones (no funciona para algunos dispositivos)" toBeTranslated="true"/>
<node name="summaryOff" value="No intentar deshabilitar luz de botones" toBeTranslated="true"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Ajuste de brillo de la pantalla" toBeTranslated="true">
<node name="summaryOn" value="Al arrastrar el dedo arriba/abajo en el borde izquierdo de la pantalla" toBeTranslated="true"/>
<node name="summaryOff" value="Desactivat"/>
@ -549,6 +553,7 @@
<node name="right" value="Margen derecho" toBeTranslated="true"/>
<node name="top" value="Margen superior" toBeTranslated="true"/>
<node name="bottom" value="Margen inferior" toBeTranslated="true"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Indicador de progreso" toBeTranslated="true">
<node name="summary" value="Preferencias de barra de desplazamiento y pie de página" toBeTranslated="true"/>

5
assets/resources/application/cs.xml
View file

@ -322,6 +322,10 @@
<node name="summaryOn" value="Zakázat tlačítka osvětlení (nefunguje pro některá zařízení)"/>
<node name="summaryOff" value="Nezakazovat tlačítka osvětlení"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Nastavení jasu obrazovky">
<node name="summaryOn" value="Tahem prstu nahoru nebo dolů podél levého okraje obrazovky"/>
<node name="summaryOff" value="Zakázáno"/>
@ -554,6 +558,7 @@
<node name="right" value="Pravý okraj"/>
<node name="top" value="Horní okraj"/>
<node name="bottom" value="Dolní okraj"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Posuvník">
<node name="summary" value="Nastavení posuvníku"/>

5
assets/resources/application/de.xml
View file

@ -307,6 +307,10 @@
<node name="summaryOn" value="Tastenbeleuchtung abschalten (Funktioniert auf einigen Geräten nicht)"/>
<node name="summaryOff" value="Tastenbeleuchtung nicht abschalten"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Helligkeitsanpassung">
<node name="summaryOn" value="Mit dem Finger durch hoch/runter-schieben am linken Bildschirmrand."/>
<node name="summaryOff" value="Abgeschaltet"/>
@ -539,6 +543,7 @@
<node name="right" value="Rechter Rand"/>
<node name="top" value="Oberer Rand"/>
<node name="bottom" value="Unterer Rand"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Bildlaufleiste">
<node name="summary" value="Einstellungen für Bildlaufleiste (Scrollbar) &amp; Fußleiste."/>

5
assets/resources/application/en.xml
View file

@ -313,6 +313,10 @@
<node name="summaryOn" value="Disable button lights (does not work for some devices)"/>
<node name="summaryOff" value="Don't try to disable button lights"/>
</node>
<node name="twoColumnView" value="Two column view">
<node name="summaryOn" value="Display text in two columns when device is held horizontally"/>
<node name="summaryOff" value="Always display text in one column"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Screen brightness adjustment">
<node name="summaryOn" value="By dragging finger up/down along left side of the screen"/>
<node name="summaryOff" value="Disabled"/>
@ -545,6 +549,7 @@
<node name="right" value="Right margin"/>
<node name="top" value="Top margin"/>
<node name="bottom" value="Bottom margin"/>
<node name="spaceBetweenColumns" value="Space between columns"/>
</node>
<node name="scrollBar" value="Progress indicator">
<node name="summary" value="Scrollbar &amp; footer settings"/>

5
assets/resources/application/es.xml
View file

@ -317,6 +317,10 @@
<node name="summaryOn" value="Deshabilitar luz de botones (no funciona para algunos dispositivos)"/>
<node name="summaryOff" value="No intentar deshabilitar luz de botones"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Ajuste de brillo de la pantalla">
<node name="summaryOn" value="Al arrastrar el dedo arriba/abajo en el borde izquierdo de la pantalla"/>
<node name="summaryOff" value="Desactivado"/>
@ -549,6 +553,7 @@
<node name="right" value="Margen derecho"/>
<node name="top" value="Margen superior"/>
<node name="bottom" value="Margen inferior"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Indicador de progreso">
<node name="summary" value="Preferencias de barra de desplazamiento y pie de página"/>

5
assets/resources/application/fr.xml
View file

@ -306,6 +306,10 @@
<node name="summaryOn" value="Désactive la lumière des boutons (ne fonctionne pas sur certains appareils)"/>
<node name="summaryOff" value="Ne pas essayer de désactiver la lumière des boutons"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Contrôle de la luminosité">
<node name="summaryOn" value="Ajuste la luminosité en déplaçant le doigt verticalement sur le bord gauche de l'écran"/>
<node name="summaryOff" value="Contrôle désactivé"/>
@ -538,6 +542,7 @@
<node name="right" value="Marge de droite"/>
<node name="top" value="Marge du haut"/>
<node name="bottom" value="Marge du bas"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Barre de défilement">
<node name="summary" value="Configuration de la barre &amp; pied de page"/>

5
assets/resources/application/gl.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Disable button lights (that does not for some devices)" toBeTranslated="true"/>
<node name="summaryOff" value="Don't try to disable button lights" toBeTranslated="true"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Axuste do brillo da pantalla">
<node name="summaryOn" value="Ao arrastrar o dedo cara arriba/abaixo no bordo esquerdo da pantalla"/>
<node name="summaryOff" value="Desactivado"/>
@ -535,6 +539,7 @@
<node name="right" value="Marxe dereita"/>
<node name="top" value="Marxe superior"/>
<node name="bottom" value="Marxe inferior"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Barra de desprazamento">
<node name="summary" value="Barra de desprazamento e preferencias dos rodapés"/>

5
assets/resources/application/hu.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Megvilágítás kikapcsolása olvasás közben (nem minden eszköznél működik)"/>
<node name="summaryOff" value="Ne próbálja kikapcsolni a gombok háttérvilágítását"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Fényerő beállítása">
<node name="summaryOn" value="Felfelé/lefelé csúsztatás a képernyő bal oldalán"/>
<node name="summaryOff" value="Kikapcsolva"/>
@ -535,6 +539,7 @@
<node name="right" value="Jobb margó"/>
<node name="top" value="Felső margó"/>
<node name="bottom" value="Alsó margó"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Gördítősáv">
<node name="summary" value="A gördítősáv és a lábléc beállításai"/>

5
assets/resources/application/it.xml
View file

@ -304,6 +304,10 @@
<node name="summaryOn" value="Disabilita pulsanti luce (potrebbe non funzionare per alcuni dispositivi"/>
<node name="summaryOff" value="Non tentare di disabilitare i pulsanti luce"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Regolazione della luminosità dello schermo">
<node name="summaryOn" value="Trascinando il dito su / giù lungo il lato sinistro dello schermo"/>
<node name="summaryOff" value="Disabilitato"/>
@ -536,6 +540,7 @@
<node name="right" value="Margine destro"/>
<node name="top" value="Margine superiore"/>
<node name="bottom" value="Margine inferiore"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Barra di scorrimento">
<node name="summary" value="Impostazioni barra di scorrimento &amp; piè di pagina"/>

5
assets/resources/application/ka.xml
View file

@ -318,6 +318,10 @@
<node name="summaryOn" value="განათების გამორთვა (მუშაობს ყველა მოწყობილობაზე)"/>
<node name="summaryOff" value="არ სცადოთ განათების გამორთვა"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="ეკრანის სიკაშკაშის რეგულირება">
<node name="summaryOn" value="თითის მოძრაობით ზევიდან ქვევით ეკრანის მარცხენა კუთხეში"/>
<node name="summaryOff" value="გამორთულია"/>
@ -550,6 +554,7 @@
<node name="right" value="დაშორება მარჯვნიდან"/>
<node name="top" value="დაშორება ზემოდან"/>
<node name="bottom" value="დაშორება ქვემოდან"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="გადახვევის ბარი">
<node name="summary" value="წაკითხულის ინდიკატორი"/>

5
assets/resources/application/nb.xml
View file

@ -313,6 +313,10 @@
<node name="summaryOn" value="Skru av knappelys (virker ikke på alle enheter)"/>
<node name="summaryOff" value="Ikke prøv å skru av knappelys"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Juster skjermens lysstyrke">
<node name="summaryOn" value="Ved å dra fingeren opp/ned langs venstre side av skjermen"/>
<node name="summaryOff" value="Av"/>
@ -545,6 +549,7 @@
<node name="right" value="Høyre marg"/>
<node name="top" value="Toppmarg"/>
<node name="bottom" value="Bunnmarg"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Fremgangsindikator">
<node name="summary" value="Innstillinger for rullefelt og bunntekst"/>

5
assets/resources/application/nl.xml
View file

@ -313,6 +313,10 @@
<node name="summaryOn" value="Disable button lights (that does not for some devices)" toBeTranslated="true"/>
<node name="summaryOff" value="Don't try to disable button lights" toBeTranslated="true"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Helderheid scherm aanpassen">
<node name="summaryOn" value="Door vinger op/neer te slepen over linkerkant scherm"/>
<node name="summaryOff" value="Uitgeschakeld"/>
@ -545,6 +549,7 @@
<node name="right" value="Rechtermarge"/>
<node name="top" value="Bovenmarge"/>
<node name="bottom" value="Ondermarge"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Schuifbalk">
<node name="summary" value="Schuif- en onderbalkinstellingen"/>

5
assets/resources/application/pl.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Wyłącz podświetlenie przycisków (nie wszystkie urządzenia respektują to ustawienie)"/>
<node name="summaryOff" value="Nie próbuj wyłączyć podświetlenia przycisków"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Dostosowywanie jasności">
<node name="summaryOn" value="Przesuwając palcem w górę/dół wzdłuż lewej krawędzi ekranu"/>
<node name="summaryOff" value="Wyłączone"/>
@ -535,6 +539,7 @@
<node name="right" value="Prawy margines"/>
<node name="top" value="Górny margines"/>
<node name="bottom" value="Dolny margines"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Pasek postępu">
<node name="summary" value="Ustawienia paska postępu i przewijania"/>

5
assets/resources/application/pt.xml
View file

@ -315,6 +315,10 @@
<node name="summaryOn" value="Desativar luzes das teclas (não funciona em alguns dispositivos)"/>
<node name="summaryOff" value="Não tente desabilitar as luzes das teclas"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Ajuste de brilho da tela">
<node name="summaryOn" value="Arrastando dedo para cima/para baixo ao longo do lado esquerdo da tela"/>
<node name="summaryOff" value="Desativado"/>
@ -547,6 +551,7 @@
<node name="right" value="Margem direita"/>
<node name="top" value="Margem superior"/>
<node name="bottom" value="Margem inferior"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Indicador de progresso">
<node name="summary" value="Configurações de barra de rolagem &amp; rodapé"/>

5
assets/resources/application/ro.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Dezactiveaza lumina butonului (nu functioneaza pentru unele dispozitive)"/>
<node name="summaryOff" value="Nu dezactivati lumina butonului"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Reglarea luminozitatii ecranului">
<node name="summaryOn" value="Glisând degetul în sus / jos de-a lungul partii stângi a ecranului"/>
<node name="summaryOff" value="Dezactivat"/>
@ -535,6 +539,7 @@
<node name="right" value="Marginea din dreapta"/>
<node name="top" value="Marginea de sus"/>
<node name="bottom" value="Marginea de jos"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Indicator de progres">
<node name="summary" value="Setarile scrollbar &amp; subsol"/>

5
assets/resources/application/ru.xml
View file

@ -318,6 +318,10 @@
<node name="summaryOn" value="Выключать подсветку (работает не на всех устройствах)"/>
<node name="summaryOff" value="Не пытаться выключать подсветку"/>
</node>
<node name="twoColumnView" value="Текст в две колонки">
<node name="summaryOn" value="Показывать текст в две колонки, когда экран горизонтален"/>
<node name="summaryOff" value="Всегда показывать текст в одну колонку"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Регулировка яркости экрана">
<node name="summaryOn" value="Движением пальца вверх/вниз по левому краю экрана"/>
<node name="summaryOff" value="Выключена"/>
@ -550,6 +554,7 @@
<node name="right" value="Отступ справа"/>
<node name="top" value="Отступ сверху"/>
<node name="bottom" value="Отступ снизу"/>
<node name="spaceBetweenColumns" value="Расстояние между колонками"/>
</node>
<node name="scrollBar" value="Полоса прокрутки">
<node name="summary" value="Индикатор количества прочитанного"/>

5
assets/resources/application/sr.xml
View file

@ -313,6 +313,10 @@
<node name="summaryOn" value="Онемогућава осветљење дугмади (не ради на неким уређајима)."/>
<node name="summaryOff" value="Омогућава осветљење дугмади."/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Прилагоди осветљење екрана">
<node name="summaryOn" value="Превлачењем прста нагоре/надоле дуж леве стране екрана."/>
<node name="summaryOff" value="Онемогућено."/>
@ -545,6 +549,7 @@
<node name="right" value="Десна маргина"/>
<node name="top" value="Горња маргина"/>
<node name="bottom" value="Доња маргина"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Показатељ напретка">
<node name="summary" value="Подешавања клизача и подножја."/>

5
assets/resources/application/th.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Disable button lights (that does not for some devices)" toBeTranslated="true"/>
<node name="summaryOff" value="Don't try to disable button lights" toBeTranslated="true"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="การปรับความสว่างหน้าจอ">
<node name="summaryOn" value="ลากนิ้วขึ้นลงด้านซ้ายของหน้าจอ"/>
<node name="summaryOff" value="ปิดการใช้งาน"/>
@ -535,6 +539,7 @@
<node name="right" value="ขอบขวา"/>
<node name="top" value="ขอบบน"/>
<node name="bottom" value="ขอบล่าง"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="แถบเลื่อน">
<node name="summary" value="แถบเลื่อน &amp; การตั้งค่าข้อความท้ายหน้า"/>

5
assets/resources/application/tr.xml
View file

@ -313,6 +313,10 @@
<node name="summaryOn" value="Düğme ışıklarını kapat (bazı cihazlarda çalışmamaktadır)"/>
<node name="summaryOff" value="Düğme ışıklarına müdahale etme"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Ekran parlaklığı ayarı">
<node name="summaryOn" value="Parmağınızı ekranın sol yanında yukarı aşağı sürükleyerek parlaklığı ayarlayın"/>
<node name="summaryOff" value="Devre dışı"/>
@ -545,6 +549,7 @@
<node name="right" value="Sağ kenar"/>
<node name="top" value="Üst kenar"/>
<node name="bottom" value="Alt kenar"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="İlerleme göstergesi">
<node name="summary" value="Kaydırma Çubuğu &amp; altbilgi ayarları"/>

5
assets/resources/application/uk.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Вимкнути підсвічування (не для всіх пристроїв)"/>
<node name="summaryOff" value="Не намагатись вимикати підсвічування"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Керування яскравістю екрану">
<node name="summaryOn" value="Жестом догори-донизу в лівій частині екрану"/>
<node name="summaryOff" value="Вимкнути"/>
@ -535,6 +539,7 @@
<node name="right" value="Відступ зправа"/>
<node name="top" value="Відступ зверху"/>
<node name="bottom" value="Відступ знизу"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Смуга прокрутки">
<node name="summary" value="Смуга прокрутки &amp; налаштування підвалу"/>

5
assets/resources/application/vi.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Disable button lights (that does not for some devices)" toBeTranslated="true"/>
<node name="summaryOff" value="Don't try to disable button lights" toBeTranslated="true"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="Điều chỉnh độ sáng màn hình">
<node name="summaryOn" value="Bằng việc rê ngón tay lên/xuống dọc cạnh trái màn hình"/>
<node name="summaryOff" value="Tắt"/>
@ -535,6 +539,7 @@
<node name="right" value="Lề Phải"/>
<node name="top" value="Lề Trên"/>
<node name="bottom" value="Lề Dưới"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="Thanh cuộn">
<node name="summary" value="Thiết lập thanh cuộn &amp; cuối trang"/>

5
assets/resources/application/zh.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="禁用设备系统按键发亮 (对某些设备无效)"/>
<node name="summaryOff" value="不要尝试禁用系统按键发亮"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="屏幕亮度调整">
<node name="summaryOn" value="通过在屏幕左侧上下滑动手指来调整"/>
<node name="summaryOff" value="禁用屏幕亮度调整"/>
@ -535,6 +539,7 @@
<node name="right" value="右边距"/>
<node name="top" value="顶边距"/>
<node name="bottom" value="底边距"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="滚动条">
<node name="summary" value="滚动条 &amp; 页脚设定"/>

5
assets/resources/application/zh_TW.xml
View file

@ -303,6 +303,10 @@
<node name="summaryOn" value="Disable button lights (that does not for some devices)" toBeTranslated="true"/>
<node name="summaryOff" value="Don't try to disable button lights" toBeTranslated="true"/>
</node>
<node name="twoColumnView" value="Two column view" toBeTranslated="true">
<node name="summaryOn" value="Display text in two columns when device is held horizontally" toBeTranslated="true"/>
<node name="summaryOff" value="Always display text in one column" toBeTranslated="true"/>
</node>
<node name="allowScreenBrightnessAdjustment" value="調整屏幕亮度">
<node name="summaryOn" value="通過於屏幕左方上下拉動調整"/>
<node name="summaryOff" value="關閉"/>
@ -535,6 +539,7 @@
<node name="right" value="右邊距"/>
<node name="top" value="頂邊距"/>
<node name="bottom" value="底邊距"/>
<node name="spaceBetweenColumns" value="Space between columns" toBeTranslated="true"/>
</node>
<node name="scrollBar" value="滾動條">
<node name="summary" value="滾動條及頁尾設定"/>

10
src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
View file

@ -107,6 +107,12 @@ public class PreferenceActivity extends ZLPreferenceActivity {
this, appearanceScreen.Resource, "screenOrientation",
androidLibrary.getOrientationOption(), androidLibrary.allOrientations()
));
appearanceScreen.addPreference(new ZLBooleanPreference(
this,
fbReader.TwoColumnViewOption,
appearanceScreen.Resource,
"twoColumnView"
));
appearanceScreen.addPreference(new ZLBooleanPreference(
this,
fbReader.AllowScreenBrightnessAdjustmentOption,
@ -341,6 +347,10 @@ public class PreferenceActivity extends ZLPreferenceActivity {
this, marginsScreen.Resource.getResource("bottom"),
fbReader.BottomMarginOption
));
marginsScreen.addPreference(new ZLIntegerRangePreference(
this, marginsScreen.Resource.getResource("spaceBetweenColumns"),
fbReader.SpaceBetweenColumnsOption
));
final Screen statusLineScreen = createPreferenceScreen("scrollBar");

9
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -64,21 +64,26 @@ public final class FBReaderApp extends ZLApplication {
public final ZLEnumOption<ImageTappingAction> ImageTappingActionOption =
new ZLEnumOption<ImageTappingAction>("Options", "ImageTappingAction", ImageTappingAction.openImageView);
public final ZLBooleanOption TwoColumnViewOption;
public final ZLIntegerRangeOption LeftMarginOption;
public final ZLIntegerRangeOption RightMarginOption;
public final ZLIntegerRangeOption TopMarginOption;
public final ZLIntegerRangeOption BottomMarginOption;
public final ZLIntegerRangeOption IntercolumnSpaceOption;
public final ZLIntegerRangeOption SpaceBetweenColumnsOption;
{
final int dpi = ZLibrary.Instance().getDisplayDPI();
final int x = ZLibrary.Instance().getPixelWidth();
final int y = ZLibrary.Instance().getPixelHeight();
TwoColumnViewOption = new ZLBooleanOption(
"Options", "TwoColumnView",
x * x + y * y >= 50 * dpi * dpi
);
final int horMargin = Math.min(dpi / 5, Math.min(x, y) / 30);
LeftMarginOption = new ZLIntegerRangeOption("Options", "LeftMargin", 0, 100, horMargin);
RightMarginOption = new ZLIntegerRangeOption("Options", "RightMargin", 0, 100, horMargin);
TopMarginOption = new ZLIntegerRangeOption("Options", "TopMargin", 0, 100, 0);
BottomMarginOption = new ZLIntegerRangeOption("Options", "BottomMargin", 0, 100, 4);
IntercolumnSpaceOption = new ZLIntegerRangeOption("Options", "IntercolumnSpace", 0, 100, 3 * horMargin);
SpaceBetweenColumnsOption = new ZLIntegerRangeOption("Options", "SpaceBetweenColumns", 0, 100, 3 * horMargin);
}
public final ZLIntegerRangeOption ScrollbarTypeOption =

9
src/org/geometerplus/fbreader/fbreader/FBView.java
View file

@ -353,8 +353,13 @@ public final class FBView extends ZLTextView {
}
@Override
public int getIntercolumnSpace() {
return myReader.IntercolumnSpaceOption.getValue();
public int getSpaceBetweenColumns() {
return myReader.SpaceBetweenColumnsOption.getValue();
}
@Override
public boolean twoColumnView() {
return getContextHeight() <= getContextWidth() && myReader.TwoColumnViewOption.getValue();
}
@Override

10
src/org/geometerplus/zlibrary/text/view/ZLTextPage.java
View file

@ -32,14 +32,16 @@ final class ZLTextPage {
private int myWidth;
private int myHeight;
private boolean myTwoColumnView;
private int myColumnWidth;
void setSize(int width, int height, int columnWidth, boolean keepEndNotStart) {
if (myWidth == width && myHeight == height && myColumnWidth == columnWidth) {
void setSize(int width, int height, boolean twoColumnView, int columnWidth, boolean keepEndNotStart) {
if (myWidth == width && myHeight == height && myTwoColumnView == twoColumnView && myColumnWidth == columnWidth) {
return;
}
myWidth = width;
myHeight = height;
myTwoColumnView = twoColumnView;
myColumnWidth = columnWidth;
if (PaintState != PaintStateEnum.NOTHING_TO_PAINT) {
@ -105,6 +107,10 @@ final class ZLTextPage {
PaintState = PaintStateEnum.END_IS_KNOWN;
}
boolean twoColumnView() {
return myTwoColumnView;
}
boolean isEmptyPage() {
for (ZLTextLineInfo info : LineInfos) {
if (info.IsVisible) {

8
src/org/geometerplus/zlibrary/text/view/ZLTextView.java
View file

@ -442,7 +442,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
labels[++index] = page.TextElementMap.size();
if (index == page.Column0Height) {
y = getTopMargin();
x += getTextColumnWidth() + getIntercolumnSpace();
x += getTextColumnWidth() + getSpaceBetweenColumns();
}
}
@ -455,7 +455,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
++index;
if (index == page.Column0Height) {
y = getTopMargin();
x += getTextColumnWidth() + getIntercolumnSpace();
x += getTextColumnWidth() + getSpaceBetweenColumns();
}
}
@ -858,7 +858,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
info = processTextLine(paragraphCursor, info.EndElementIndex, info.EndCharIndex, endIndex);
textAreaHeight -= info.Height + info.Descent;
if (textAreaHeight < 0 && page.LineInfos.size() > page.Column0Height) {
if (columnCounter == 0) {
if (columnCounter == 0 && page.twoColumnView()) {
++columnCounter;
textAreaHeight = getTextAreaHeight();
textAreaHeight -= info.Height + info.Descent;
@ -1238,7 +1238,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
}
private synchronized void preparePaintInfo(ZLTextPage page) {
page.setSize(getTextAreaWidth(), getTextAreaHeight(), getTextColumnWidth(), page == myPreviousPage);
page.setSize(getTextAreaWidth(), getTextAreaHeight(), twoColumnView(), getTextColumnWidth(), page == myPreviousPage);
if (page.PaintState == PaintStateEnum.NOTHING_TO_PAINT || page.PaintState == PaintStateEnum.READY) {
return;

8
src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
View file

@ -81,7 +81,9 @@ abstract class ZLTextViewBase extends ZLView {
public abstract int getRightMargin();
public abstract int getTopMargin();
public abstract int getBottomMargin();
public abstract int getIntercolumnSpace();
public abstract int getSpaceBetweenColumns();
public abstract boolean twoColumnView();
public abstract ZLFile getWallpaperFile();
public abstract ZLPaintContext.WallpaperMode getWallpaperMode();
@ -104,7 +106,9 @@ abstract class ZLTextViewBase extends ZLView {
}
int getTextColumnWidth() {
return (getContextWidth() - getLeftMargin() - getRightMargin() - getIntercolumnSpace()) / 2;
return twoColumnView()
? (getTextAreaWidth() - getSpaceBetweenColumns()) / 2
: getTextAreaWidth();
}
final ZLTextStyle getTextStyle() {