Merge branch 'master' into master-catalogs
Nikolay Pultsin
|
|
@ -1,4 +1,5 @@
|
||||||
===== 1.9 (Aug ??, 2013) =====
|
===== 1.9 (Sep ??, 2013) =====
|
||||||
|
* Dictionary support: fixed ColorDict 3 integration
|
||||||
* mobi: added support for <div> & <mbp:pagebreak> tags
|
* mobi: added support for <div> & <mbp:pagebreak> tags
|
||||||
* ePub: fixed reading of files generated from LibreOffice
|
* ePub: fixed reading of files generated from LibreOffice
|
||||||
* ePub: no empty paragraphs before/after the cover
|
* ePub: no empty paragraphs before/after the cover
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
<dictionary
|
<dictionary
|
||||||
id="ColorDict"
|
id="ColorDict"
|
||||||
title="ColorDict 3"
|
title="ColorDict 3"
|
||||||
|
package="com.socialnmobile.colordict"
|
||||||
|
class=".activity.Main"
|
||||||
action="colordict.intent.action.SEARCH"
|
action="colordict.intent.action.SEARCH"
|
||||||
dataKey="EXTRA_QUERY"
|
dataKey="EXTRA_QUERY"
|
||||||
pattern="%s"
|
pattern="%s"
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 4.1 KiB |
BIN
icons/menu/ic_menu_filter.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 3 KiB |
|
Before Width: | Height: | Size: 681 B After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 4.7 KiB |
BIN
res/drawable-hdpi/ic_menu_filter.png
Normal file
|
After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 4 KiB |
|
|
@ -35,7 +35,7 @@ import org.geometerplus.fbreader.network.NetworkTree;
|
||||||
|
|
||||||
public class LanguageFilterAction extends RootAction {
|
public class LanguageFilterAction extends RootAction {
|
||||||
public LanguageFilterAction(Activity activity) {
|
public LanguageFilterAction(Activity activity) {
|
||||||
super(activity, ActionCode.LANGUAGE_FILTER, "languages", R.drawable.ic_menu_languages);
|
super(activity, ActionCode.LANGUAGE_FILTER, "languages", R.drawable.ic_menu_filter);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||