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

Merge branch 'master' into query

Browse source
This commit is contained in:
Nikolay Pultsin 2013-04-21 01:38:14 +02:00
commit a0a3d9f937
4 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,5 +1,6 @@
===== 1.7.9 (Apr ??, 2013) =====
* Fixed Ukrainian hyphenations
* Fixed missing paragraph before new section issue (in some book formats)
===== 1.7.8 (Mar 24, 2013) =====
* Fixed library scanning: all books are visible in the library

3
jni/NativeFormats/fbreader/src/bookmodel/BookReader.cpp
View file

@ -231,9 +231,10 @@ void BookReader::addImage(const std::string &id, shared_ptr<const ZLImage> image
}
void BookReader::insertEndParagraph(ZLTextParagraph::Kind kind) {
if ((myCurrentTextModel != 0) && mySectionContainsRegularContents) {
if (myCurrentTextModel != 0 && mySectionContainsRegularContents) {
std::size_t size = myCurrentTextModel->paragraphsNumber();
if ((size > 0) && (((*myCurrentTextModel)[(std::size_t)-1])->kind() != kind)) {
endParagraph();
((ZLTextPlainModel&)*myCurrentTextModel).createParagraph(kind);
mySectionContainsRegularContents = false;
}

22
src/org/geometerplus/android/fbreader/ShowBookmarksAction.java
View file

@ -25,6 +25,8 @@ import android.content.Intent;
import org.geometerplus.fbreader.book.SerializerUtil;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.util.PackageUtil;
class ShowBookmarksAction extends FBAndroidAction {
ShowBookmarksAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader);
@ -37,14 +39,18 @@ class ShowBookmarksAction extends FBAndroidAction {
@Override
protected void run(Object ... params) {
try {
startBookmarksActivity(
new Intent("android.fbreader.action.EXTERNAL_BOOKMARKS")
);
} catch (ActivityNotFoundException e) {
startBookmarksActivity(
new Intent(BaseActivity.getApplicationContext(), BookmarksActivity.class)
);
final Intent externalIntent =
new Intent("android.fbreader.action.EXTERNAL_BOOKMARKS");
final Intent internalIntent =
new Intent(BaseActivity.getApplicationContext(), BookmarksActivity.class);
if (PackageUtil.canBeStarted(BaseActivity, externalIntent, true)) {
try {
startBookmarksActivity(externalIntent);
} catch (ActivityNotFoundException e) {
startBookmarksActivity(internalIntent);
}
} else {
startBookmarksActivity(internalIntent);
}
}

21
src/org/geometerplus/android/fbreader/ShowLibraryAction.java
View file

@ -26,6 +26,7 @@ import org.geometerplus.fbreader.book.SerializerUtil;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.library.LibraryActivity;
import org.geometerplus.android.util.PackageUtil;
class ShowLibraryAction extends FBAndroidAction {
ShowLibraryAction(FBReader baseActivity, FBReaderApp fbreader) {
@ -34,14 +35,18 @@ class ShowLibraryAction extends FBAndroidAction {
@Override
protected void run(Object ... params) {
try {
startLibraryActivity(
new Intent("android.fbreader.action.EXTERNAL_LIBRARY")
);
} catch (ActivityNotFoundException e) {
startLibraryActivity(
new Intent(BaseActivity.getApplicationContext(), LibraryActivity.class)
);
final Intent externalIntent =
new Intent("android.fbreader.action.EXTERNAL_LIBRARY");
final Intent internalIntent =
new Intent(BaseActivity.getApplicationContext(), LibraryActivity.class);
if (PackageUtil.canBeStarted(BaseActivity, externalIntent, true)) {
try {
startLibraryActivity(externalIntent);
} catch (ActivityNotFoundException e) {
startLibraryActivity(internalIntent);
}
} else {
startLibraryActivity(internalIntent);
}
}