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

'Show status bar when menu becomes visible' option

Browse source
This commit is contained in:
Nikolay Pultsin 2011-02-05 23:51:35 +00:00
parent af8cd0f2a1
commit 30e55f73db
16 changed files with 101 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
===== 0.99.12 (Feb ??, 2011) =====
* Added support for more dictionaries (by Steffen Siebert)
* Option 'show status bar when menu becomes visible'
===== 0.99.11 (Feb 01, 2011) =====
* Galician translation has been added (by Miguel Anxo Bouzada)
* Czech translation has been updated (by Marek Pavelka)

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="Zobrazit stavový řádek v režimu čtení"/>
<node name="summaryOff" value="Skrýt stavový řádek v režimu čtení"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Text">
<node name="summary" value="Písmo, dělení slov atd."/>

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

@ -241,6 +241,10 @@
<node name="summaryOn" value="Statusbar im Lesemodus anzeigen."/>
<node name="summaryOff" value="Statusbar im Lesemodus verstecken."/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Text Darstellung">
<node name="summary" value="Zeichensatz, Silbentrennung, etc."/>

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

@ -239,6 +239,10 @@
<node name="summaryOn" value="Show status bar in reading mode"/>
<node name="summaryOff" value="Hide status bar in reading mode"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active">
<node name="summaryOn" value="Show status bar when menu becomes active"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active"/>
</node>
</node>
<node name="text" value="Text">
<node name="summary" value="Font, hyphenations, etc."/>

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

@ -243,6 +243,10 @@
<node name="summaryOn" value="Afficher la barre de statut en mode lecture"/>
<node name="summaryOff" value="Cacher la barre de statut en mode lecture"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Texte">
<node name="summary" value="Polices, césures, etc."/>

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="Mostrar a barra de estado en modo de lectura"/>
<node name="summaryOff" value="Agochar a barra de estado en modo de lectura"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Texto">
<node name="summary" value="Tipo de letra, guionizado, etc."/>

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="Az állapotsor látszik olvasás közben"/>
<node name="summaryOff" value="Az állapotsor nem látszik olvasás közben"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Szöveg">
<node name="summary" value="Betűtípus, elválasztás stb."/>

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="Mostra barra di stato in modalità lettura"/>
<node name="summaryOff" value="Nascondi barra di stato in modalità lettura"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Text" toBeTranslated="true">
<node name="summary" value="Font, hyphenations, etc." toBeTranslated="true"/>

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="Toon statusbalk tijdens lezen"/>
<node name="summaryOff" value="Verberg statusbalk tijdens lezen"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Tekst">
<node name="summary" value="Lettertype, Afbreken, etc."/>

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

@ -239,6 +239,10 @@
<node name="summaryOn" value="Строка состояния видна во время чтения"/>
<node name="summaryOff" value="Строка состояния не видна во время чтения"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Показывать строку состояния при активации меню">
<node name="summaryOn" value="Показывать строку состояния, когда меню появляется на экране"/>
<node name="summaryOff" value="Не показывать строку состояния, когда меню появляется на экране"/>
</node>
</node>
<node name="text" value="Текст">
<node name="summary" value="Шрифты, переносы, и т.д."/>

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="Рядок стану видно під час читання"/>
<node name="summaryOff" value="Рядок стану не видно під час читання"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Text" toBeTranslated="true">
<node name="summary" value="Font, hyphenations, etc." toBeTranslated="true"/>

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="Hiện thanh trạng thái khi đọc"/>
<node name="summaryOff" value=" Ẩn thanh trạng thía khi đọc"/>
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="Văn bản">
<node name="summary" value="Phông, tách chữ, v..v."/>

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

@ -240,6 +240,10 @@
<node name="summaryOn" value="阅读模式下显示状态栏" />
<node name="summaryOff" value="阅读模式下隐藏状态栏" />
</node>
<node name="showStatusBarWhenMenuIsActive" value="Show status bar when menu is active" toBeTranslated="true">
<node name="summaryOn" value="Show status bar when menu becomes active" toBeTranslated="true"/>
<node name="summaryOff" value="Don't show status bar when menu becomes active" toBeTranslated="true"/>
</node>
</node>
<node name="text" value="文字">
<node name="summary" value="字体, 断字等等。"/>

28
src/org/geometerplus/android/fbreader/FBReader.java
View file

@ -25,7 +25,9 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.Menu;
import android.view.WindowManager;
import android.view.Window;
import android.widget.RelativeLayout;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
@ -102,6 +104,32 @@ public final class FBReader extends ZLAndroidActivity {
fbReader.addAction(ActionCode.CANCEL, new CancelAction(this, fbReader));
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
final ZLAndroidApplication application = ZLAndroidApplication.Instance();
if (!application.ShowStatusBarOption.getValue() &&
application.ShowStatusBarWhenMenuIsActiveOption.getValue()) {
final Window window = getWindow();
final WindowManager.LayoutParams attrs = window.getAttributes();
attrs.flags &= ~WindowManager.LayoutParams.FLAG_FULLSCREEN;
window.setAttributes(attrs);
}
return super.onPrepareOptionsMenu(menu);
}
@Override
public void onOptionsMenuClosed(Menu menu) {
super.onOptionsMenuClosed(menu);
final ZLAndroidApplication application = ZLAndroidApplication.Instance();
if (!application.ShowStatusBarOption.getValue() &&
application.ShowStatusBarWhenMenuIsActiveOption.getValue()) {
final Window window = getWindow();
final WindowManager.LayoutParams attrs = window.getAttributes();
attrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
window.setAttributes(attrs);
}
}
@Override
protected void onNewIntent(Intent intent) {
if (Intent.ACTION_SEARCH.equals(intent.getAction())) {

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

@ -51,9 +51,27 @@ public class PreferenceActivity extends ZLPreferenceActivity {
}
directoriesScreen.addOption(Paths.WallpapersDirectoryOption(), "wallpapers");
final ZLPreferenceSet statusBarPreferences = new ZLPreferenceSet();
final Screen appearanceScreen = createPreferenceScreen("appearance");
appearanceScreen.addOption(androidApp.AutoOrientationOption, "autoOrientation");
appearanceScreen.addOption(androidApp.ShowStatusBarOption, "showStatusBar");
appearanceScreen.addPreference(
new ZLBooleanPreference(
this, androidApp.ShowStatusBarOption, appearanceScreen.Resource, "showStatusBar"
) {
@Override
public void onClick() {
super.onClick();
statusBarPreferences.setEnabled(!isChecked());
}
}
);
statusBarPreferences.add(
appearanceScreen.addOption(
androidApp.ShowStatusBarWhenMenuIsActiveOption,
"showStatusBarWhenMenuIsActive"
)
);
statusBarPreferences.setEnabled(!androidApp.ShowStatusBarOption.getValue());
final Screen textScreen = createPreferenceScreen("text");
final ZLTextStyleCollection collection = ZLTextStyleCollection.Instance();

1
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
View file

@ -35,6 +35,7 @@ public class ZLAndroidApplication extends Application {
public final ZLBooleanOption AutoOrientationOption = new ZLBooleanOption("LookNFeel", "AutoOrientation", false);
public final ZLBooleanOption ShowStatusBarOption = new ZLBooleanOption("LookNFeel", "ShowStatusBar", hasNoHardwareMenuButton());
public final ZLBooleanOption ShowStatusBarWhenMenuIsActiveOption = new ZLBooleanOption("LookNFeel", "ShowStatusBarWithMenu", false);
public final ZLIntegerRangeOption BatteryLevelToTurnScreenOffOption = new ZLIntegerRangeOption("LookNFeel", "BatteryLevelToTurnScreenOff", 0, 100, 50);
public final ZLBooleanOption DontTurnScreenOffDuringChargingOption = new ZLBooleanOption("LookNFeel", "DontTurnScreenOffDuringCharging", true);
public final ZLIntegerRangeOption ScreenBrightnessLevelOption = new ZLIntegerRangeOption("LookNFeel", "ScreenBrightnessLevel", 0, 100, 0);