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

'max number of TOC marks' option

Browse source
This commit is contained in:
Nikolay Pultsin 2015-09-25 13:22:17 +01:00
parent 5c1518fa93
commit c1df1ccc52
38 changed files with 73 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -9,7 +9,8 @@
* Simple widgets
===== 2.5.10 (Sep ??, 2015) =====
* Options for displaying current reading progress as percentage (by Danie Roux, danieroux@github)
* Option for displaying current reading progress as percentage (by Danie Roux, danieroux@github)
* Option for max number of TOC marks on progress indicator
===== 2.5.9 (Sep 11, 2015) =====
* Fixed cache access issue

1
assets/resources/application/ar.xml
View file

@ -708,6 +708,7 @@
<node name="summaryOn" value="عرض علامات الفهرس على شريط التقدم"/>
<node name="summaryOff" value="لا تعرض علامات الفهرس على شريط التقدم"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -710,6 +710,7 @@
<node name="summaryOn" value="Паказваць пазнакі зьместу ў прыпятку"/>
<node name="summaryOff" value="Не паказваць пазнакі зьместу ў прыпятку"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -716,6 +716,7 @@
<node name="summaryOn" value="Покажи съдържание по раздели в долния колонтитул"/>
<node name="summaryOff" value="Не показвай съдържание по раздели в долния колонтитул"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -716,6 +716,7 @@
<node name="summaryOn" value="Mostra les marques de contingut a la barra del peu de pàgina"/>
<node name="summaryOff" value="No mostris les marques de contingut a la barra del peu de pàgina"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -719,6 +719,7 @@
<node name="summaryOn" value="Zobrazit značky obsahu v patičce"/>
<node name="summaryOff" value="Nezobrazovat značky obsahu v patičce"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

1
assets/resources/application/da.xml
View file

@ -709,6 +709,7 @@
<node name="summaryOn" value="Vis indholdsfortegnelse-mærker i sidefoden"/>
<node name="summaryOff" value="Vis ikke indholdsfortegnelse-mærker i sidefoden"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -715,6 +715,7 @@
<node name="summaryOn" value="Kapitelmarken in der Fußzeile anzeigen"/>
<node name="summaryOff" value="Keine Kapitelmarken in der Fußzeile anzeigen"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

1
assets/resources/application/el.xml
View file

@ -700,6 +700,7 @@
<node name="summaryOn" value="Εμφάνιση Κεφάλαιου στο υποσέλιδο."/>
<node name="summaryOff" value="Μη εμφάνιση Κεφάλαιου στο υποσέλιδο."/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -710,6 +710,7 @@
<node name="summaryOn" value="Show TOC marks in the footer bar"/>
<node name="summaryOff" value="Don't show TOC marks in the footer bar"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display"/>
<node name="showProgress" value="Show reading progress">
<node name="dontDisplay" value="Do not show"/>
<node name="asPages" value="As page number"/>

1
assets/resources/application/en_US.xml
View file

@ -710,6 +710,7 @@
<node name="summaryOn" value="Show TOC marks in the footer bar"/>
<node name="summaryOff" value="Don't show TOC marks in the footer bar"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display"/>
<node name="showProgress" value="Show reading progress">
<node name="dontDisplay" value="Do not show"/>
<node name="asPages" value="As page number"/>

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

@ -716,6 +716,7 @@
<node name="summaryOn" value="Mostrar las marcas de la TDC en la barra del pie de página"/>
<node name="summaryOff" value="No mostrar las marcas de la TDC en la barra del pie de página"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

1
assets/resources/application/eu.xml
View file

@ -710,6 +710,7 @@
<node name="summaryOn" value="Erakutsi aurkibidearen laster-markak oin-barran"/>
<node name="summaryOff" value="Ez erakutsi aurkibidearen laster-markak oin-barran"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

1
assets/resources/application/fa.xml
View file

@ -709,6 +709,7 @@
<node name="summaryOn" value="نمايش علائم در نوار زيربرگ فهرست مطالب"/>
<node name="summaryOff" value="عدم نمايش علائم در نوار زيربرگ فهرست مطالب"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -703,6 +703,7 @@
<node name="summaryOn" value="Afficher les repères dans la barre du pied de page"/>
<node name="summaryOff" value="Ne pas afficher les repères dans la barre du pied de page"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -700,6 +700,7 @@
<node name="summaryOn" value="Mostrar as marcas do índice na barra do rodapé"/>
<node name="summaryOff" value="Non mostrar as marcas do índice na barra do rodapé"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -700,6 +700,7 @@
<node name="summaryOn" value="Mutassa a tartalomjegyzék elemeit a láblécen"/>
<node name="summaryOff" value="Ne mutassa a tartalomjegyzék elemeit a láblécen"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

1
assets/resources/application/hy.xml
View file

@ -716,6 +716,7 @@
<node name="summaryOn" value="Դրոշմները ցուցադրել էջատակում, գլխի սկզբում"/>
<node name="summaryOff" value="Էջատակերը առանց դրոշմների"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -701,6 +701,7 @@
<node name="summaryOn" value="Mostra segnalibri in basso"/>
<node name="summaryOff" value="Non mostrare segnalibri in basso"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

1
assets/resources/application/ja.xml
View file

@ -710,6 +710,7 @@
<node name="summaryOn" value="フッタのバーに目次項目の印を表示する"/>
<node name="summaryOff" value="フッタのバーに目次項目の印を表示しない"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -715,6 +715,7 @@
<node name="summaryOn" value="სარდაფზე ნიშნულის დახატვა თავის დასაწყისში"/>
<node name="summaryOff" value="სარდაფი ნიშნულების გარეშე"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

1
assets/resources/application/ko.xml
View file

@ -710,6 +710,7 @@
<node name="summaryOn" value="꼬리말 바에 TOC 표시 보이기"/>
<node name="summaryOff" value="꼬리말 바에 TOC 표시 보이지 않음"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -710,6 +710,7 @@
<node name="summaryOn" value="Vis merkene i innholdsfortegnelsen i bunntekstlinjen"/>
<node name="summaryOff" value="Ikke vis merkene i innholdsfortegnelsen i bunntekstlinjen"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -710,6 +710,7 @@
<node name="summaryOn" value="Toon inhoudsmarkeringen in onderbalk"/>
<node name="summaryOff" value="Verberg inhoudsmarkeringen in onderbalk"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -700,6 +700,7 @@
<node name="summaryOn" value="Pokazuj znaczniki w stopce"/>
<node name="summaryOff" value="Nie pokazuj znaczników w stopce"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -714,6 +714,7 @@
<node name="summaryOn" value="Mostrar marcas de TOC na barra de rodapé"/>
<node name="summaryOff" value="Não mostrar marcas de TOC na barra de rodapé"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -703,6 +703,7 @@
<node name="summaryOn" value="Arata favoritele curpinsului în bara de subsol"/>
<node name="summaryOff" value="Nu arata semne de cuprins în bara de subsol"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -715,6 +715,7 @@
<node name="summaryOn" value="Рисовать пометку на подвале в начале главы"/>
<node name="summaryOff" value="Подвал без пометок"/>
</node>
<node name="tocMarksMaxNumber" value="Максимальное число меток"/>
<node name="showProgress" value="Показывать, сколько прочитано">
<node name="dontDisplay" value="Не показывать"/>
<node name="asPages" value="В виде номеров страниц"/>

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

@ -710,6 +710,7 @@
<node name="summaryOn" value="Приказује ознаке садржаја у подножју."/>
<node name="summaryOff" value="Не приказује ознаке садржаја у подножју."/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -700,6 +700,7 @@
<node name="summaryOn" value="แสดงสารบัญท้ายหน้า"/>
<node name="summaryOff" value="ไม่แสดงสัญลักษณ์สารบัญท้ายหน้า"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -710,6 +710,7 @@
<node name="summaryOn" value="İçerik işaretlerini altbilgi kısmında göster"/>
<node name="summaryOff" value="İçerik işaretlerini altbilgi kısmında gösterme"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -700,6 +700,7 @@
<node name="summaryOn" value="Показувати відмітки TOC в підвалі"/>
<node name="summaryOff" value="Не показувати відмітки TOC в підвалі"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -701,6 +701,7 @@
<node name="summaryOn" value="Hiện đánh dấu mục lục ở thanh cuối trang"/>
<node name="summaryOff" value="Không Hiện đánh dấu mục lục ở thanh cuối trang"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -700,6 +700,7 @@
<node name="summaryOn" value="在页脚栏显示内容目录标志"/>
<node name="summaryOff" value="不在页脚栏显示内容目录标志"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -700,6 +700,7 @@
<node name="summaryOn" value="在頁尾顯示目錄標示"/>
<node name="summaryOff" value="不要在頁尾顯示目錄標示"/>
</node>
<node name="tocMarksMaxNumber" value="Maximum number of TOC marks to display" toBeTranslated="true"/>
<node name="showProgress" value="Show reading progress" toBeTranslated="true">
<node name="dontDisplay" value="Do not show" toBeTranslated="true"/>
<node name="asPages" value="As page number" toBeTranslated="true"/>

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

@ -509,6 +509,18 @@ public class PreferenceActivity extends ZLPreferenceActivity {
}
}
};
final PreferenceSet tocPreferences = new PreferenceSet.Enabler() {
@Override
protected Boolean detectState() {
switch (viewOptions.ScrollbarType.getValue()) {
case FBView.SCROLLBAR_SHOW_AS_FOOTER:
case FBView.SCROLLBAR_SHOW_AS_FOOTER_OLD_STYLE:
return footerOptions.ShowTOCMarks.getValue();
default:
return false;
}
}
};
final PreferenceSet oldStyleFooterPreferences = new PreferenceSet.Enabler() {
@Override
protected Boolean detectState() {
@ -542,6 +554,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
protected void onDialogClosed(boolean result) {
super.onDialogClosed(result);
footerPreferences.run();
tocPreferences.run();
oldStyleFooterPreferences.run();
newStyleFooterPreferences.run();
}
@ -555,7 +568,18 @@ public class PreferenceActivity extends ZLPreferenceActivity {
newStyleFooterPreferences.add(statusLineScreen.addOption(profile.FooterNGBackgroundOption, "footerBackgroundColor"));
newStyleFooterPreferences.add(statusLineScreen.addOption(profile.FooterNGForegroundOption, "footerForegroundColor"));
newStyleFooterPreferences.add(statusLineScreen.addOption(profile.FooterNGForegroundUnreadOption, "footerForegroundUnreadColor"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowTOCMarks, "tocMarks"));
footerPreferences.add(statusLineScreen.addPreference(new ZLBooleanPreference(
PreferenceActivity.this,
footerOptions.ShowTOCMarks,
statusLineScreen.Resource.getResource("tocMarks")
) {
@Override
protected void onClick() {
super.onClick();
tocPreferences.run();
}
}));
tocPreferences.add(statusLineScreen.addOption(footerOptions.MaxTOCMarks, "tocMarksMaxNumber"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowProgress, "showProgress"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowClock, "showClock"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowBattery, "showBattery"));
@ -564,6 +588,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
footerOptions.Font, false
)));
footerPreferences.run();
tocPreferences.run();
oldStyleFooterPreferences.run();
newStyleFooterPreferences.run();

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

@ -499,15 +499,14 @@ public final class FBView extends ZLTextView {
myTOCMarks = null;
}
private final int MAX_TOC_MARKS_NUMBER = 100;
protected synchronized void updateTOCMarks(BookModel model) {
protected synchronized void updateTOCMarks(BookModel model, int maxNumber) {
myTOCMarks = new ArrayList<TOCTree>();
TOCTree toc = model.TOCTree;
if (toc == null) {
return;
}
int maxLevel = Integer.MAX_VALUE;
if (toc.getSize() >= MAX_TOC_MARKS_NUMBER) {
if (toc.getSize() >= maxNumber) {
final int[] sizes = new int[10];
for (TOCTree tocItem : toc) {
if (tocItem.Level < 10) {
@ -518,7 +517,7 @@ public final class FBView extends ZLTextView {
sizes[i] += sizes[i - 1];
}
for (maxLevel = sizes.length - 1; maxLevel >= 0; --maxLevel) {
if (sizes[maxLevel] < MAX_TOC_MARKS_NUMBER) {
if (sizes[maxLevel] < maxNumber) {
break;
}
}
@ -645,9 +644,10 @@ public final class FBView extends ZLTextView {
context.setFillColor(fillColor);
context.fillRectangle(left + 1, height - 2 * lineWidth, gaugeInternalRight, lineWidth + 1);
if (myViewOptions.getFooterOptions().ShowTOCMarks.getValue()) {
final FooterOptions footerOptions = myViewOptions.getFooterOptions();
if (footerOptions.ShowTOCMarks.getValue()) {
if (myTOCMarks == null) {
updateTOCMarks(model);
updateTOCMarks(model, footerOptions.MaxTOCMarks.getValue());
}
final int fullLength = sizeOfFullText();
for (TOCTree tocItem : myTOCMarks) {
@ -706,12 +706,13 @@ public final class FBView extends ZLTextView {
}
// draw labels
if (myViewOptions.getFooterOptions().ShowTOCMarks.getValue()) {
final FooterOptions footerOptions = myViewOptions.getFooterOptions();
if (footerOptions.ShowTOCMarks.getValue()) {
final TreeSet<Integer> labels = new TreeSet<Integer>();
labels.add(left);
labels.add(gaugeRight);
if (myTOCMarks == null) {
updateTOCMarks(model);
updateTOCMarks(model, footerOptions.MaxTOCMarks.getValue());
}
final int fullLength = sizeOfFullText();
for (TOCTree tocItem : myTOCMarks) {

2
src/org/geometerplus/fbreader/fbreader/options/FooterOptions.java
View file

@ -30,6 +30,7 @@ public class FooterOptions {
}
public final ZLBooleanOption ShowTOCMarks;
public final ZLIntegerRangeOption MaxTOCMarks;
public final ZLBooleanOption ShowClock;
public final ZLBooleanOption ShowBattery;
public final ZLEnumOption<ProgressDisplayType> ShowProgress;
@ -37,6 +38,7 @@ public class FooterOptions {
public FooterOptions() {
ShowTOCMarks = new ZLBooleanOption("Options", "FooterShowTOCMarks", true);
MaxTOCMarks = new ZLIntegerRangeOption("Options", "FooterMaxTOCMarks", 10, 1000, 100);
ShowClock = new ZLBooleanOption("Options", "ShowClockInFooter", true);
ShowBattery = new ZLBooleanOption("Options", "ShowBatteryInFooter", true);
ShowProgress = new ZLEnumOption<ProgressDisplayType>(