Nikolay Pultsin
|
faa64fe9a1
|
Merge branch 'multidir' into rusnavu-master
Conflicts:
src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
src/org/geometerplus/fbreader/Paths.java
src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
|
2013-10-12 12:28:10 +01:00 |
|
Nikolay Pultsin
|
9b5718e104
|
string list as book path (only first element can be set from preferences)
|
2013-10-12 12:18:33 +01:00 |
|
Nikolay Pultsin
|
f9ec1cdd8f
|
rollback in FileTree
|
2013-10-12 10:45:34 +01:00 |
|
Nikolay Pultsin
|
e80f68d8d9
|
cleanup
|
2013-10-12 10:39:16 +01:00 |
|
Nikolay Pultsin
|
eadd144192
|
Merge branch 'master' of github.com:rusnavu/FBReaderJ into rusnavu-master
|
2013-10-12 09:41:32 +01:00 |
|
Nikolay Pultsin
|
56d7de4620
|
save book position
|
2013-10-12 08:32:58 +01:00 |
|
Nikolay Pultsin
|
65e9d4000e
|
set book progress from XMLSerializer
|
2013-10-11 22:46:51 +01:00 |
|
Nikolay Pultsin
|
03fb8843e4
|
Book.setProgress* methods
|
2013-10-11 22:45:21 +01:00 |
|
Nikolay Pultsin
|
e21e9deb95
|
fixed Book creation from XMLSerializer
|
2013-10-11 22:28:17 +01:00 |
|
Nikolay Pultsin
|
24269edf22
|
updated ChangeLog
|
2013-10-11 05:18:49 +01:00 |
|
Nikolay Pultsin
|
fc881e477d
|
fixed errorneus 'Empty catalog' message
|
2013-10-11 05:04:45 +01:00 |
|
navu
|
0382c50103
|
Multicatalog library
|
2013-10-10 19:36:42 +04:00 |
|
navu
|
b98e903f87
|
Initial import
|
2013-10-10 17:17:13 +04:00 |
|
Nikolay Pultsin
|
0c12d14922
|
more code around book progress
|
2013-10-10 03:28:27 +01:00 |
|
Nikolay Pultsin
|
f3bde8ade9
|
full-size cover in litres "my books" catalog
|
2013-10-08 03:42:34 +01:00 |
|
Nikolay Pultsin
|
469eb114e6
|
cleanup
|
2013-10-08 03:20:22 +01:00 |
|
Nikolay Pultsin
|
bb7f951387
|
code simplification
|
2013-10-08 02:28:08 +01:00 |
|
Nikolay Pultsin
|
e9fa03ed9b
|
added ZLTextView.getProgress() method
|
2013-10-08 00:07:51 +01:00 |
|
Nikolay Pultsin
|
02c0c0f54e
|
"progress" xml tag
|
2013-10-07 19:02:01 +01:00 |
|
Nikolay Pultsin
|
7313ac7367
|
imports reordering
|
2013-10-07 18:40:15 +01:00 |
|
Nikolay Pultsin
|
f513a9092b
|
myProgress field + imports cleanup in XMLSerializer
|
2013-10-07 18:38:28 +01:00 |
|
Nikolay Pultsin
|
4bdfb89889
|
progress field (in progress)
|
2013-10-07 15:48:45 +01:00 |
|
Nikolay Pultsin
|
6f0f6f658a
|
Book.myProgress field
|
2013-10-07 15:43:29 +01:00 |
|
Nikolay Pultsin
|
32b4564d0a
|
fixed mistyping
|
2013-10-07 15:41:51 +01:00 |
|
Nikolay Pultsin
|
7fa3ca92f0
|
better RationalNumber creation method
|
2013-10-07 15:40:04 +01:00 |
|
Nikolay Pultsin
|
0b97ef54f4
|
list views: scrolling speed optimization
|
2013-10-07 15:04:52 +01:00 |
|
Nikolay Pultsin
|
a0d75ce1c5
|
'icons' catalog has gone
|
2013-10-07 13:59:04 +01:00 |
|
Nikolay Pultsin
|
17d2850a89
|
cs-catalogs-reorder branch has gone
|
2013-10-07 13:56:47 +01:00 |
|
Nikolay Pultsin
|
cbe451a4e8
|
dragging items in catalog manager, keeping link orders in the network library, subTree => subtree
|
2013-10-07 13:55:40 +01:00 |
|
Nikolay Pultsin
|
c0fe515b82
|
code cleanup: same adapter for all actions
|
2013-10-06 18:18:56 +01:00 |
|
Nikolay Pultsin
|
70df5c58b8
|
drag list listeners
|
2013-10-06 18:07:16 +01:00 |
|
Nikolay Pultsin
|
4eec8e632b
|
do not reorder catalogs on saving
|
2013-10-06 17:36:20 +01:00 |
|
Nikolay Pultsin
|
1a1a8f5661
|
keep catalogs item + cleanup
|
2013-10-06 17:33:35 +01:00 |
|
Nikolay Pultsin
|
e41406ba88
|
fixed catalog manager item view
|
2013-10-06 17:09:00 +01:00 |
|
Nikolay Pultsin
|
21cf88adea
|
CatalogManager: item dragging (no position saving)
|
2013-10-06 16:47:56 +01:00 |
|
Nikolay Pultsin
|
8098729664
|
ics-catalogs branch has gone
|
2013-10-06 16:21:40 +01:00 |
|
Nikolay Pultsin
|
7b843764cf
|
DragList
|
2013-10-06 16:17:52 +01:00 |
|
Nikolay Pultsin
|
3e3b4447d8
|
drag list in CatalogManagerActivity (dragging is currently disabled)
|
2013-10-06 16:11:08 +01:00 |
|
Nikolay Pultsin
|
ac9dbb749b
|
resources for "recent catalogs" item (not implemented yet)
|
2013-10-06 15:58:54 +01:00 |
|
Nikolay Pultsin
|
6e51518dbd
|
unused resource strings
|
2013-10-06 15:52:21 +01:00 |
|
Nikolay Pultsin
|
9a2733dfa6
|
resources synchronization
|
2013-10-06 15:45:34 +01:00 |
|
Nikolay Pultsin
|
b7bb7f7499
|
new actions: disable single catalog & open root catalog
|
2013-10-06 15:37:04 +01:00 |
|
Nikolay Pultsin
|
777b00f59b
|
removed obsolete code
|
2013-10-06 12:51:04 +01:00 |
|
Nikolay Pultsin
|
f5b2a3b639
|
drag icon
|
2013-10-06 12:33:19 +01:00 |
|
Nikolay Pultsin
|
781a7a3176
|
cleanup
|
2013-10-06 12:04:55 +01:00 |
|
Nikolay Pultsin
|
d8a578b782
|
cleanup
|
2013-10-06 00:49:20 +01:00 |
|
Nikolay Pultsin
|
4a5cde76ea
|
formatting
|
2013-10-06 00:00:03 +01:00 |
|
Nikolay Pultsin
|
ada29a9eef
|
RSSNetworkLink is predefined link, not custom one
|
2013-10-05 23:54:05 +01:00 |
|
Nikolay Pultsin
|
3091436511
|
unused methods
|
2013-10-05 23:25:58 +01:00 |
|
Nikolay Pultsin
|
a7b740f5bd
|
match_parent => fill_parent (for compatibility)
|
2013-10-05 23:19:43 +01:00 |
|