From db008e5785030babadc39080e7d0cb9ae208846c Mon Sep 17 00:00:00 2001
From: Alexander Egorov <lunohod@gmx.de>
Date: Mon, 3 Mar 2008 16:56:22 +0100
Subject: [PATCH] FBReader 0.8.14

---
 README.build                                       |   1 +
 build_packages.sh                                  |   5 +
 distributions/debian/desktop/changelog             |  12 +
 distributions/debian/maemo2/changelog              |  12 +
 distributions/debian/maemo4/changelog              |  12 +
 distributions/motopkg/moto/rules                   |  29 ++
 distributions/nsi/win32/control.nsi                |   2 +-
 distributions/tarball/desktop/rules                |   2 +-
 distributions/tarball/source/rules                 |   2 +-
 fbreader/VERSION                                   |   2 +-
 fbreader/data/default/config.moto.xml              |  16 +
 fbreader/data/default/external.moto.xml            |   8 +
 fbreader/data/default/keymap.moto.xml              |  13 +
 fbreader/data/default/keymap.pdaxrom.xml           |   1 +
 fbreader/data/default/keymap.pepperpad3.xml        |   1 +
 fbreader/data/default/keymap.zaurus.xml            |   1 +
 fbreader/data/default/menubar.xml                  |   1 +
 fbreader/data/default/styles.240x320.xml           |   2 +-
 fbreader/data/default/styles.640x480.xml           |   2 +-
 fbreader/data/default/styles.desktop.xml           |   2 +-
 fbreader/data/default/styles.gpe240x320.xml        |   2 +-
 fbreader/data/default/styles.gpe640x480.xml        |   2 +-
 fbreader/data/default/styles.maemo.xml             |   2 +-
 .../{styles.240x320.xml => styles.moto.xml}        |   4 +-
 fbreader/data/default/styles.pepperpad3.xml        |   2 +-
 fbreader/data/default/styles.win32.xml             |   2 +-
 fbreader/data/resources/en.xml                     |   1 +
 fbreader/data/resources/fi.xml                     |   1 +
 fbreader/data/resources/fr.xml                     |   1 +
 fbreader/data/resources/it.xml                     |   1 +
 fbreader/data/resources/ru.xml                     |   5 +-
 fbreader/data/resources/sv.xml                     |   1 +
 fbreader/data/resources/uk.xml                     |   1 +
 fbreader/icons/application/32x24.png               | Bin 0 -> 1230 bytes
 fbreader/icons/application/64x43.png               | Bin 0 -> 1534 bytes
 fbreader/icons/booktree/moto                       |   1 +
 fbreader/icons/filetree/moto                       |   1 +
 fbreader/icons/toolbar/14x15-png/findNext.png      | Bin 376 -> 371 bytes
 fbreader/icons/toolbar/14x15-png/findPrevious.png  | Bin 371 -> 376 bytes
 .../22x18-png/{findPrevious.png => findNext.png}   | Bin
 .../22x18-png/{findNext.png => findPrevious.png}   | Bin
 .../{findPrevious.ico => findNext.ico}             | Bin
 .../{findNext.ico => findPrevious.ico}             | Bin
 .../{findPrevious.png => findNext.png}             | Bin
 .../{findNext.png => findPrevious.png}             | Bin
 fbreader/icons/toolbar/moto/addBook.png            | Bin 0 -> 632 bytes
 fbreader/icons/toolbar/moto/bookInfo.png           | Bin 0 -> 659 bytes
 fbreader/icons/toolbar/moto/findNext.png           | Bin 0 -> 690 bytes
 fbreader/icons/toolbar/moto/findPrevious.png       | Bin 0 -> 676 bytes
 fbreader/icons/toolbar/moto/gotoHome.png           | Bin 0 -> 659 bytes
 fbreader/icons/toolbar/moto/preferences.png        | Bin 0 -> 834 bytes
 fbreader/icons/toolbar/moto/redo.png               | Bin 0 -> 592 bytes
 fbreader/icons/toolbar/moto/rotate.png             | Bin 0 -> 816 bytes
 fbreader/icons/toolbar/moto/search.png             | Bin 0 -> 670 bytes
 fbreader/icons/toolbar/moto/showHelp.png           | Bin 0 -> 638 bytes
 fbreader/icons/toolbar/moto/showLibrary.png        | Bin 0 -> 656 bytes
 fbreader/icons/toolbar/moto/showRecent.png         | Bin 0 -> 722 bytes
 fbreader/icons/toolbar/moto/toc.png                | Bin 0 -> 537 bytes
 fbreader/icons/toolbar/moto/undo.png               | Bin 0 -> 600 bytes
 fbreader/moto/FBReader.desktop                     |  13 +
 fbreader/moto/FBReader.sh                          |   8 +
 fbreader/moto/Makefile                             |  16 +
 fbreader/moto/util/Makefile                        |  11 +
 fbreader/moto/util/language_detector               | Bin 0 -> 6572 bytes
 fbreader/moto/util/language_detector.cpp           |  14 +
 fbreader/scripts/install_help.sh                   |   3 +
 fbreader/scripts/install_toolbar_and_menu.sh       |   2 +-
 fbreader/src/fbreader/FBReader.cpp                 |   2 +
 fbreader/src/fbreader/FBReaderActions.cpp          |   6 +-
 fbreader/src/formats/txt/PlainTextFormat.cpp       |   4 +-
 fbreader/src/formats/txt/TxtBookReader.cpp         |   5 +-
 fbreader/src/formats/txt/TxtReader.cpp             |   5 +-
 fbreader/src/migration/Migration.h                 |   9 +
 fbreader/src/migration/Migration_0_8_13.cpp        |  43 ++
 fbreader/src/migration/migrate.cpp                 |   1 +
 fbreader/src/optionsDialog/FormatOptionsPage.cpp   |   4 +-
 makefiles/arch/ebr.mk                              |  17 +
 makefiles/arch/moto.mk                             |  26 ++
 makefiles/packaging.mk                             |  13 +-
 makefiles/target.mk                                |   6 +
 zlibrary/VERSION                                   |   2 +-
 zlibrary/core/Makefile                             |  15 +-
 zlibrary/core/data/default/config.moto.xml         |   9 +
 zlibrary/core/src/application/ZLApplication.cpp    |  11 +
 zlibrary/core/src/application/ZLApplication.h      |   7 +
 zlibrary/core/src/options/ZLConfig.h               |   2 +
 zlibrary/core/src/options/ZLOptions.cpp            |   4 +
 zlibrary/core/src/options/ZLOptions.h              |   2 +
 zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp     |  12 +
 zlibrary/core/src/unix/xmlconfig/XMLConfig.h       |   1 +
 .../{ui => core}/src/win32/config/RegistryUtil.cpp |   0
 .../src/win32/config/StringEncoder.cpp             |   0
 .../{ui => core}/src/win32/config/StringEncoder.h  |   0
 .../src/win32/config/ZLWin32Config.cpp             |  11 +
 .../{ui => core}/src/win32/config/ZLWin32Config.h  |   1 +
 .../src/win32/config/ZLWin32ConfigIO.cpp           |   0
 .../src/win32/config/ZLWin32ConfigValue.h          |   0
 .../win32/encoding/ZLWin32EncodingConverter.cpp    |   0
 .../src/win32/encoding/ZLWin32EncodingConverter.h  |   0
 .../src/win32/filesystem/ZLWin32FSManager.cpp      |   0
 .../src/win32/filesystem/ZLWin32FSManager.h        |   0
 .../src/win32/filesystem/ZLWin32RootDir.cpp        |   0
 .../src/win32/filesystem/ZLWin32RootDir.h          |   0
 .../src/win32/filesystem2/ZLWin32FSDir.cpp         |   0
 .../src/win32/filesystem2/ZLWin32FSDir.h           |   0
 .../src/win32/filesystem2/ZLWin32FSManager.cpp     |   0
 .../src/win32/filesystem2/ZLWin32FSManager.h       |   0
 .../win32/filesystem2/ZLWin32FileInputStream.cpp   |   0
 .../src/win32/filesystem2/ZLWin32FileInputStream.h |   0
 .../win32/filesystem2/ZLWin32FileOutputStream.cpp  |   0
 .../win32/filesystem2/ZLWin32FileOutputStream.h    |   0
 .../src/win32/filesystem2/ZLWin32RootDir.cpp       |   0
 .../src/win32/filesystem2/ZLWin32RootDir.h         |   0
 .../src/win32/util}/W32WCHARUtil.h                 |   0
 zlibrary/text/src/view/ZLTextBaseStyle.cpp         |   3 +-
 zlibrary/text/src/view/ZLTextDecoratedStyle.cpp    |   3 +-
 zlibrary/text/src/view/ZLTextLineProcessor.cpp     |   2 +-
 zlibrary/text/src/view/ZLTextPaintInfo.cpp         |   7 +-
 zlibrary/text/src/view/ZLTextStyle.h               |  12 +-
 zlibrary/text/src/view/ZLTextStyleCollection.cpp   |  15 +-
 zlibrary/text/src/view/ZLTextStyleOptions.cpp      |  42 ++
 zlibrary/text/src/view/ZLTextStyleOptions.h        |  22 +
 zlibrary/text/src/view/ZLTextView.cpp              |  47 +-
 zlibrary/text/src/view/ZLTextView.h                |   1 +
 zlibrary/text/src/view/ZLTextViewStyle.cpp         |   4 +-
 zlibrary/ui/Makefile                               |  25 +-
 zlibrary/ui/data/keynames.moto-ezx.xml             |  19 +
 zlibrary/{core => ui}/data/messages.maemo.xml      |   0
 .../src/ezx/application/ZLQtApplicationWindow.cpp  | 464 +++++++++++++++++++
 .../ui/src/ezx/application/ZLQtApplicationWindow.h | 183 ++++++++
 .../application/ZLQtMenuAction.h}                  |  25 +-
 zlibrary/ui/src/ezx/application/moc.mk             |   1 +
 zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp |  76 +++
 .../dialogs/ZLFullScreenDialog.h}                  |  31 +-
 zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp         |  80 ++++
 .../ZLWin32RootDir.h => ezx/dialogs/ZLQtDialog.h}  |  29 +-
 zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp  |  98 ++++
 zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h    |  71 +++
 zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp  |  82 ++++
 zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h    |  54 +++
 zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp  | 121 +++++
 zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h    |  68 +++
 .../ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp     | 158 +++++++
 zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h  |  81 ++++
 .../dialogs/ZLQtUtil.cpp}                          |  26 +-
 .../StringEncoder.h => ezx/dialogs/ZLQtUtil.h}     |  16 +-
 zlibrary/ui/src/ezx/dialogs/moc.mk                 |   1 +
 zlibrary/ui/src/{opie => ezx}/library/ZLibrary.cpp |   8 +-
 zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp  | 508 +++++++++++++++++++++
 zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h    | 247 ++++++++++
 .../ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp |  52 +++
 .../optionView/ZLQtOptionViewHolder.h}             |  29 +-
 zlibrary/ui/src/ezx/optionView/moc.mk              |   1 +
 zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp      | 211 +++++++++
 zlibrary/ui/src/ezx/view/ZLQtPaintContext.h        |  76 +++
 zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp        | 170 +++++++
 zlibrary/ui/src/ezx/view/ZLQtViewWidget.h          |  74 +++
 zlibrary/ui/src/gpe/library/ZLibrary.cpp           |   2 +-
 zlibrary/ui/src/gtk/library/ZLibrary.cpp           |   2 +-
 zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp     |  11 +
 zlibrary/ui/src/opie/library/ZLibrary.cpp          |   2 +-
 zlibrary/ui/src/qt/library/ZLibrary.cpp            |   2 +-
 zlibrary/ui/src/qt4/library/ZLibrary.cpp           |   2 +-
 .../src/unix/message/ZLUnixMessage.cpp             |   0
 .../{core => ui}/src/unix/message/ZLUnixMessage.h  |   0
 .../win32/application/ZLWin32ApplicationWindow.cpp |   2 +-
 .../ui/src/win32/dialogs/ZLWin32DialogManager.cpp  |   2 +-
 zlibrary/ui/src/win32/library/ZLibrary.cpp         |   6 +-
 zlibrary/ui/src/win32/message/ZLWin32Message.cpp   |   2 +-
 zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp |   2 +-
 .../ui/src/win32/w32widgets/W32ColorComboBox.cpp   |   2 +-
 zlibrary/ui/src/win32/w32widgets/W32Control.cpp    |   2 +-
 .../ui/src/win32/w32widgets/W32DialogPanel.cpp     |   2 +-
 .../ui/src/win32/w32widgets/W32PropertySheet.cpp   |   2 +-
 zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp   |   2 +-
 175 files changed, 3585 insertions(+), 141 deletions(-)
 create mode 100644 distributions/motopkg/moto/rules
 create mode 100644 fbreader/data/default/config.moto.xml
 create mode 100644 fbreader/data/default/external.moto.xml
 create mode 100644 fbreader/data/default/keymap.moto.xml
 copy fbreader/data/default/{styles.240x320.xml => styles.moto.xml} (96%)
 create mode 100644 fbreader/icons/application/32x24.png
 create mode 100644 fbreader/icons/application/64x43.png
 create mode 120000 fbreader/icons/booktree/moto
 create mode 120000 fbreader/icons/filetree/moto
 rename fbreader/icons/toolbar/22x18-png/{findPrevious.png => findNext.png} (100%)
 rename fbreader/icons/toolbar/22x18-png/{findNext.png => findPrevious.png} (100%)
 rename fbreader/icons/toolbar/32x32-transparent-ico/{findPrevious.ico => findNext.ico} (100%)
 rename fbreader/icons/toolbar/32x32-transparent-ico/{findNext.ico => findPrevious.ico} (100%)
 rename fbreader/icons/toolbar/32x32-transparent-png/{findPrevious.png => findNext.png} (100%)
 rename fbreader/icons/toolbar/32x32-transparent-png/{findNext.png => findPrevious.png} (100%)
 create mode 100644 fbreader/icons/toolbar/moto/addBook.png
 create mode 100644 fbreader/icons/toolbar/moto/bookInfo.png
 create mode 100644 fbreader/icons/toolbar/moto/findNext.png
 create mode 100644 fbreader/icons/toolbar/moto/findPrevious.png
 create mode 100644 fbreader/icons/toolbar/moto/gotoHome.png
 create mode 100644 fbreader/icons/toolbar/moto/preferences.png
 create mode 100644 fbreader/icons/toolbar/moto/redo.png
 create mode 100644 fbreader/icons/toolbar/moto/rotate.png
 create mode 100644 fbreader/icons/toolbar/moto/search.png
 create mode 100644 fbreader/icons/toolbar/moto/showHelp.png
 create mode 100644 fbreader/icons/toolbar/moto/showLibrary.png
 create mode 100644 fbreader/icons/toolbar/moto/showRecent.png
 create mode 100644 fbreader/icons/toolbar/moto/toc.png
 create mode 100644 fbreader/icons/toolbar/moto/undo.png
 create mode 100644 fbreader/moto/FBReader.desktop
 create mode 100755 fbreader/moto/FBReader.sh
 create mode 100644 fbreader/moto/Makefile
 create mode 100644 fbreader/moto/util/Makefile
 create mode 100755 fbreader/moto/util/language_detector
 create mode 100644 fbreader/moto/util/language_detector.cpp
 create mode 100644 fbreader/src/migration/Migration_0_8_13.cpp
 create mode 100644 makefiles/arch/ebr.mk
 create mode 100644 makefiles/arch/moto.mk
 create mode 100644 zlibrary/core/data/default/config.moto.xml
 rename zlibrary/{ui => core}/src/win32/config/RegistryUtil.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/config/StringEncoder.cpp (100%)
 copy zlibrary/{ui => core}/src/win32/config/StringEncoder.h (100%)
 rename zlibrary/{ui => core}/src/win32/config/ZLWin32Config.cpp (92%)
 rename zlibrary/{ui => core}/src/win32/config/ZLWin32Config.h (97%)
 rename zlibrary/{ui => core}/src/win32/config/ZLWin32ConfigIO.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/config/ZLWin32ConfigValue.h (100%)
 rename zlibrary/{ui => core}/src/win32/encoding/ZLWin32EncodingConverter.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/encoding/ZLWin32EncodingConverter.h (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem/ZLWin32FSManager.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem/ZLWin32FSManager.h (100%)
 copy zlibrary/{ui => core}/src/win32/filesystem/ZLWin32RootDir.cpp (100%)
 copy zlibrary/{ui => core}/src/win32/filesystem/ZLWin32RootDir.h (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FSDir.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FSDir.h (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FSManager.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FSManager.h (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FileInputStream.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FileInputStream.h (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FileOutputStream.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32FileOutputStream.h (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32RootDir.cpp (100%)
 rename zlibrary/{ui => core}/src/win32/filesystem2/ZLWin32RootDir.h (100%)
 rename zlibrary/{ui/src/win32/w32widgets => core/src/win32/util}/W32WCHARUtil.h (100%)
 create mode 100644 zlibrary/ui/data/keynames.moto-ezx.xml
 rename zlibrary/{core => ui}/data/messages.maemo.xml (100%)
 create mode 100644 zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp
 create mode 100644 zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h
 copy zlibrary/ui/src/{win32/filesystem/ZLWin32RootDir.h => ezx/application/ZLQtMenuAction.h} (65%)
 create mode 100644 zlibrary/ui/src/ezx/application/moc.mk
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp
 copy zlibrary/ui/src/{win32/config/StringEncoder.h => ezx/dialogs/ZLFullScreenDialog.h} (59%)
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp
 rename zlibrary/ui/src/{win32/filesystem/ZLWin32RootDir.h => ezx/dialogs/ZLQtDialog.h} (60%)
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp
 create mode 100644 zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h
 rename zlibrary/ui/src/{win32/filesystem/ZLWin32RootDir.cpp => ezx/dialogs/ZLQtUtil.cpp} (63%)
 copy zlibrary/ui/src/{win32/config/StringEncoder.h => ezx/dialogs/ZLQtUtil.h} (77%)
 create mode 100644 zlibrary/ui/src/ezx/dialogs/moc.mk
 copy zlibrary/ui/src/{opie => ezx}/library/ZLibrary.cpp (93%)
 create mode 100644 zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp
 create mode 100644 zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h
 create mode 100644 zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp
 rename zlibrary/ui/src/{win32/config/StringEncoder.h => ezx/optionView/ZLQtOptionViewHolder.h} (53%)
 create mode 100644 zlibrary/ui/src/ezx/optionView/moc.mk
 create mode 100644 zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp
 create mode 100644 zlibrary/ui/src/ezx/view/ZLQtPaintContext.h
 create mode 100644 zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp
 create mode 100644 zlibrary/ui/src/ezx/view/ZLQtViewWidget.h
 rename zlibrary/{core => ui}/src/unix/message/ZLUnixMessage.cpp (100%)
 rename zlibrary/{core => ui}/src/unix/message/ZLUnixMessage.h (100%)

diff --git a/README.build b/README.build
index 841422a..fdc9d7e 100644
--- a/README.build
+++ b/README.build
@@ -46,6 +46,7 @@ Before building FBReader, you should check (and may be edit) 2 files:
         TARGET_ARCH = maemo                 UI_TYPE = maemo2
         TARGET_ARCH = maemo                 UI_TYPE = maemo4
         TARGET_ARCH = pma400                UI_TYPE = qtopia
+        TARGET_ARCH = moto                  UI_TYPE = ezx
         TARGET_ARCH = win32                 UI_TYPE = win32
 
   ** makefiles/arch/$(TARGET_ARCH).mk
diff --git a/build_packages.sh b/build_packages.sh
index 4024d2b..a9b9ac7 100755
--- a/build_packages.sh
+++ b/build_packages.sh
@@ -87,6 +87,11 @@ build_package() {
 			mkdirhier $pkgdir/$1
 			mv -f $tmpdir/*.ipk $pkgdir/$1
 			;;
+		motopkg)
+			$make_package ARCHITECTURE=$1 $2
+			mkdirhier $pkgdir/$1
+			mv -f $tmpdir/*.pkg $pkgdir/$1
+			;;
 		tarball)
 			$make_package ARCHITECTURE=$1 $2
 			mkdirhier $pkgdir/$1
diff --git a/distributions/debian/desktop/changelog b/distributions/debian/desktop/changelog
index 2f42835..5469c98 100644
--- a/distributions/debian/desktop/changelog
+++ b/distributions/debian/desktop/changelog
@@ -1,3 +1,15 @@
+fbreader (0.8.14-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 9 Feb 2008 22:48:00 +0300
+
+fbreader (0.8.13-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 24 Jan 2008 15:24:00 +0300
+
 fbreader (0.8.12-1) stable; urgency=low
 
   * new upstream version
diff --git a/distributions/debian/maemo2/changelog b/distributions/debian/maemo2/changelog
index 381c49b..22afd16 100644
--- a/distributions/debian/maemo2/changelog
+++ b/distributions/debian/maemo2/changelog
@@ -1,3 +1,15 @@
+fbreader (0.8.14-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 9 Feb 2008 22:48:00 +0300
+
+fbreader (0.8.13-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 24 Jan 2008 15:24:00 +0300
+
 fbreader (0.8.12-1) stable; urgency=low
 
   * new upstream version
diff --git a/distributions/debian/maemo4/changelog b/distributions/debian/maemo4/changelog
index 9903b6f..de27ceb 100644
--- a/distributions/debian/maemo4/changelog
+++ b/distributions/debian/maemo4/changelog
@@ -1,3 +1,15 @@
+fbreader (0.8.14-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 9 Feb 2008 22:48:00 +0300
+
+fbreader (0.8.13-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 24 Jan 2008 15:24:00 +0300
+
 fbreader (0.8.12-1) stable; urgency=low
 
   * new upstream version
diff --git a/distributions/motopkg/moto/rules b/distributions/motopkg/moto/rules
new file mode 100644
index 0000000..e7a6b4f
--- /dev/null
+++ b/distributions/motopkg/moto/rules
@@ -0,0 +1,29 @@
+PREFIX = /mmc/mmca1/.system/QTDownLoad
+
+LIBVERSION = $(shell cat zlibrary/VERSION)
+LIBSOVERSION = $(shell cat zlibrary/SOVERSION)
+APPVERSION = $(shell cat fbreader/VERSION)
+
+clean:
+	@make TARGET_ARCH=moto UI_TYPE=ezx clean
+
+build:
+	@make -C zlibrary/core TARGET_ARCH=moto UI_TYPE=ezx
+	@make -C zlibrary/text TARGET_ARCH=moto UI_TYPE=ezx
+	@make -C zlibrary/ui TARGET_ARCH=moto UI_TYPE=ezx
+	@make -C fbreader TARGET_ARCH=moto UI_TYPE=ezx
+
+install:
+	@make -C zlibrary/core TARGET_ARCH=moto UI_TYPE=ezx DESTDIR=$(DESTDIR) do_install
+	@make -C zlibrary/text TARGET_ARCH=moto UI_TYPE=ezx DESTDIR=$(DESTDIR) do_install
+	@make -C zlibrary/ui TARGET_ARCH=moto UI_TYPE=ezx DESTDIR=$(DESTDIR) do_install
+	@install ../libs/moto/libexpat.so.1.5.2 $(DESTDIR)$(PREFIX)/fbreader/lib/libexpat.so.1
+	@install ../libs/moto/libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/fbreader/lib/libbz2.so.1.0
+	@rm $(DESTDIR)$(PREFIX)/fbreader/lib/libzlcore.so.$(LIBSOVERSION)
+	@mv $(DESTDIR)$(PREFIX)/fbreader/lib/libzlcore.so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/fbreader/lib/libzlcore.so.$(LIBSOVERSION)
+	@rm $(DESTDIR)$(PREFIX)/fbreader/lib/libzltext.so.$(LIBSOVERSION)
+	@mv $(DESTDIR)$(PREFIX)/fbreader/lib/libzltext.so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/fbreader/lib/libzltext.so.$(LIBSOVERSION)
+	@make -C fbreader TARGET_ARCH=moto UI_TYPE=ezx DESTDIR=$(DESTDIR) do_install
+
+package:
+	@tar -czf FBReader-$(APPVERSION).pkg -C $(DESTDIR)$(PREFIX) .
diff --git a/distributions/nsi/win32/control.nsi b/distributions/nsi/win32/control.nsi
index a6186ca..6951b4e 100644
--- a/distributions/nsi/win32/control.nsi
+++ b/distributions/nsi/win32/control.nsi
@@ -20,7 +20,7 @@ Section "FBReader"
 	WriteRegStr HKCU "Software\FBReader" "" $INSTDIR
 
 	File /oname=FBReader.exe bin/FBReader
-	File ../../dlls/*.*
+	File ../../libs/win32/*.*
 	File /r share
   Delete "$INSTDIR\libiconv-2.dll"
   Delete "$INSTDIR\share\FBReader\help\MiniHelp.fb2"
diff --git a/distributions/tarball/desktop/rules b/distributions/tarball/desktop/rules
index dd98a06..fd8499b 100644
--- a/distributions/tarball/desktop/rules
+++ b/distributions/tarball/desktop/rules
@@ -22,5 +22,5 @@ install:
 	make -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 DESTDIR=$(DESTDIR) do_install
 	make -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DESTDIR) do_install
 
-tarball:
+package:
 	tar czf fbreader-`cat fbreader/VERSION`.tgz -C $(DESTDIR) .
diff --git a/distributions/tarball/source/rules b/distributions/tarball/source/rules
index b0e30a3..672d15a 100644
--- a/distributions/tarball/source/rules
+++ b/distributions/tarball/source/rules
@@ -9,5 +9,5 @@ install:
 	mkdir $(DESTDIR)/$(SRCDIR)
 	cp -r Makefile build_packages.sh zlibrary fbreader makefiles distributions README.build $(DESTDIR)/$(SRCDIR)
 
-tarball:
+package:
 	tar czf fbreader-sources-$(VERSION).tgz -C $(DESTDIR) $(SRCDIR)
diff --git a/fbreader/VERSION b/fbreader/VERSION
index 7eff8ab..832bad2 100644
--- a/fbreader/VERSION
+++ b/fbreader/VERSION
@@ -1 +1 @@
-0.8.12
+0.8.14
diff --git a/fbreader/data/default/config.moto.xml b/fbreader/data/default/config.moto.xml
new file mode 100644
index 0000000..18e9a1a
--- /dev/null
+++ b/fbreader/data/default/config.moto.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+	<group name="Options">
+		<option name="BookPath" value="/mmc/mmca1/books/fiction"/>
+		<option name="IsSelectionEnabled" value="false"/>
+		<option name="BottomMargin" value="3"/>
+		<option name="LeftMargin" value="3"/>
+		<option name="RightMargin" value="3"/>
+	</group>
+	<group name="Indicator">
+		<option name="Height" value="14"/>
+	</group>
+	<group name="TapScrolling">
+		<option name="Enabled" value="true"/>
+	</group>
+</config>
diff --git a/fbreader/data/default/external.moto.xml b/fbreader/data/default/external.moto.xml
new file mode 100644
index 0000000..773e4ab
--- /dev/null
+++ b/fbreader/data/default/external.moto.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ExternalPrograms>
+	<section name="Web Browser">
+		<program name="%browser" protocol="execute">
+			<action name="openLink" command="/usr/SYSqtapp/opera/brwdaemon -d %1 &amp;"/>
+		</program>
+	</section>
+</ExternalPrograms>
diff --git a/fbreader/data/default/keymap.moto.xml b/fbreader/data/default/keymap.moto.xml
new file mode 100644
index 0000000..58f32f8
--- /dev/null
+++ b/fbreader/data/default/keymap.moto.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keymap>
+	<binding key="&lt;Left&gt;" action="gotoSectionStart"/>
+	<binding key="&lt;Right&gt;" action="gotoSectionEnd"/>
+	<binding key="&lt;Down&gt;" action="largeScrollForward"/>
+	<binding key="&lt;Up&gt;" action="largeScrollBackward"/>
+	<binding key="&lt;Cancel&gt;" action="cancel"/>
+	<binding key="&lt;VolUp&gt;" action="increaseFont"/>
+	<binding key="&lt;VolDown&gt;" action="decreaseFont"/>
+	<binding key="&lt;Return&gt;" action="toggleFullscreen"/>
+	<binding key="&lt;Call&gt;" action="addBook"/>
+	<binding key="&lt;Photo&gt;" action="undo"/>
+</keymap>
diff --git a/fbreader/data/default/keymap.pdaxrom.xml b/fbreader/data/default/keymap.pdaxrom.xml
index 4039219..8dbc6fa 100644
--- a/fbreader/data/default/keymap.pdaxrom.xml
+++ b/fbreader/data/default/keymap.pdaxrom.xml
@@ -20,4 +20,5 @@
 	<binding key="&lt;I&gt;" action="bookInfo"/>
 	<binding key="&lt;Z&gt;" action="showRecent"/>
 	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="copyToClipboard"/>
+	<binding key="&lt;G&gt;" action="gotoPageNumber"/>
 </keymap>
diff --git a/fbreader/data/default/keymap.pepperpad3.xml b/fbreader/data/default/keymap.pepperpad3.xml
index 365e2b5..71dc89f 100644
--- a/fbreader/data/default/keymap.pepperpad3.xml
+++ b/fbreader/data/default/keymap.pepperpad3.xml
@@ -29,4 +29,5 @@
 	<binding key="&lt;Ctrl&gt;+&lt;DownArrow&gt;" action="nextTOCSection"/>
 	<binding key="&lt;Ctrl&gt;+&lt;UpArrow&gt;" action="previousTOCSection"/>
 	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="copyToClipboard"/>
+	<binding key="&lt;G&gt;" action="gotoPageNumber"/>
 </keymap>
diff --git a/fbreader/data/default/keymap.zaurus.xml b/fbreader/data/default/keymap.zaurus.xml
index 94bbfae..1b52364 100644
--- a/fbreader/data/default/keymap.zaurus.xml
+++ b/fbreader/data/default/keymap.zaurus.xml
@@ -21,4 +21,5 @@
 	<binding key="&lt;R&gt;" action="rotate"/>
 	<binding key="&lt;Z&gt;" action="showRecent"/>
 	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="copyToClipboard"/>
+	<binding key="&lt;G&gt;" action="gotoPageNumber"/>
 </keymap>
diff --git a/fbreader/data/default/menubar.xml b/fbreader/data/default/menubar.xml
index 09fdb2f..bbe89f5 100644
--- a/fbreader/data/default/menubar.xml
+++ b/fbreader/data/default/menubar.xml
@@ -11,6 +11,7 @@
 	</submenu>
 	<submenu id="navigate">
 		<item id="gotoHome"/>
+		<item id="gotoPageNumber"/>
 		<item id="gotoSectionStart"/>
 		<item id="gotoSectionEnd"/>
 		<item id="nextTOCSection"/>
diff --git a/fbreader/data/default/styles.240x320.xml b/fbreader/data/default/styles.240x320.xml
index 7263b4c..91620a3 100644
--- a/fbreader/data/default/styles.240x320.xml
+++ b/fbreader/data/default/styles.240x320.xml
@@ -16,7 +16,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="15" firstLineIndentDelta="-15" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.640x480.xml b/fbreader/data/default/styles.640x480.xml
index cb0c203..ee5ebf3 100644
--- a/fbreader/data/default/styles.640x480.xml
+++ b/fbreader/data/default/styles.640x480.xml
@@ -20,7 +20,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="30" firstLineIndentDelta="-30" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="30" firstLineIndentDelta="-30" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="30" firstLineIndentDelta="-30" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.desktop.xml b/fbreader/data/default/styles.desktop.xml
index b591577..f52c12d 100644
--- a/fbreader/data/default/styles.desktop.xml
+++ b/fbreader/data/default/styles.desktop.xml
@@ -20,7 +20,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="20" firstLineIndentDelta="-20" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.gpe240x320.xml b/fbreader/data/default/styles.gpe240x320.xml
index a71ae0e..8e9e10b 100644
--- a/fbreader/data/default/styles.gpe240x320.xml
+++ b/fbreader/data/default/styles.gpe240x320.xml
@@ -20,7 +20,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="15" firstLineIndentDelta="-15" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.gpe640x480.xml b/fbreader/data/default/styles.gpe640x480.xml
index 3ee9479..ac9fbfd 100644
--- a/fbreader/data/default/styles.gpe640x480.xml
+++ b/fbreader/data/default/styles.gpe640x480.xml
@@ -20,7 +20,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="22" firstLineIndentDelta="-22" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="22" firstLineIndentDelta="-22" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="22" firstLineIndentDelta="-22" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.maemo.xml b/fbreader/data/default/styles.maemo.xml
index bab6cd5..619801d 100644
--- a/fbreader/data/default/styles.maemo.xml
+++ b/fbreader/data/default/styles.maemo.xml
@@ -20,7 +20,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="22" firstLineIndentDelta="-22" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="22" firstLineIndentDelta="-22" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="22" firstLineIndentDelta="-22" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.240x320.xml b/fbreader/data/default/styles.moto.xml
similarity index 96%
copy from fbreader/data/default/styles.240x320.xml
copy to fbreader/data/default/styles.moto.xml
index 7263b4c..a162de1 100644
--- a/fbreader/data/default/styles.240x320.xml
+++ b/fbreader/data/default/styles.moto.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <DefaultStyles>
-	<base family="Georgia" fontSize="12"/>
+	<base family="SSong" fontSize="18"/>
 	<style id="0" name="Regular Paragraph" firstLineIndentDelta="15" allowHyphenations="true"/>
 	<style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
 	<style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/>
@@ -16,7 +16,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="15" firstLineIndentDelta="-15" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.pepperpad3.xml b/fbreader/data/default/styles.pepperpad3.xml
index b591577..f52c12d 100644
--- a/fbreader/data/default/styles.pepperpad3.xml
+++ b/fbreader/data/default/styles.pepperpad3.xml
@@ -20,7 +20,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="20" firstLineIndentDelta="-20" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/default/styles.win32.xml b/fbreader/data/default/styles.win32.xml
index b33f998..934873a 100644
--- a/fbreader/data/default/styles.win32.xml
+++ b/fbreader/data/default/styles.win32.xml
@@ -20,7 +20,7 @@
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="20" firstLineIndentDelta="-20" alignment="left"/>
 	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacing="1.2"/>
+	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacingPercent="120"/>
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
diff --git a/fbreader/data/resources/en.xml b/fbreader/data/resources/en.xml
index feed9c5..9252994 100644
--- a/fbreader/data/resources/en.xml
+++ b/fbreader/data/resources/en.xml
@@ -12,6 +12,7 @@
 		</node>
 		<node name="navigate" value="Navigate">
 			<node name="gotoHome" value="Go to Start of Document"/>
+			<node name="gotoPageNumber" value="Go to Page..."/>
 			<node name="gotoSectionStart" value="Go to Start of Text Section"/>
 			<node name="gotoSectionEnd" value="Go to End of Text Section"/>
 			<node name="nextTOCSection" value="Go to Next TOC Item"/>
diff --git a/fbreader/data/resources/fi.xml b/fbreader/data/resources/fi.xml
index c082208..5b7bd19 100644
--- a/fbreader/data/resources/fi.xml
+++ b/fbreader/data/resources/fi.xml
@@ -12,6 +12,7 @@
 		</node>
 		<node name="navigate" value="Navigoi">
 			<node name="gotoHome" value="Siirry dokumentin alkuun"/>
+			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
 			<node name="gotoSectionStart" value="Siirry tekstiosion alkuun"/>
 			<node name="gotoSectionEnd" value="Siirry tekstiosion loppuun"/>
 			<node name="nextTOCSection" value="Sisällysluettelon seuraavaan kohtaan"/>
diff --git a/fbreader/data/resources/fr.xml b/fbreader/data/resources/fr.xml
index e953ca7..2d48ab9 100644
--- a/fbreader/data/resources/fr.xml
+++ b/fbreader/data/resources/fr.xml
@@ -13,6 +13,7 @@
 		</node>
 		<node name="navigate" value="Navigation">
 			<node name="gotoHome" value="Aller au début du document"/>
+			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
 			<node name="gotoSectionStart" value="Aller au début de la section"/>
 			<node name="gotoSectionEnd" value="Aller à la fin de la section"/>
 			<node name="nextTOCSection" value="Aller à l'entrée suivante de la TDM"/>
diff --git a/fbreader/data/resources/it.xml b/fbreader/data/resources/it.xml
index 6c84314..0b40b4d 100644
--- a/fbreader/data/resources/it.xml
+++ b/fbreader/data/resources/it.xml
@@ -12,6 +12,7 @@
 		</node>
 		<node name="navigate" value="Navigazione">
 			<node name="gotoHome" value="Vai all'Inizio del Documento"/>
+			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
 			<node name="gotoSectionStart" value="Vai all'Inizio di Sezione"/>
 			<node name="gotoSectionEnd" value="Vai alla Fine di Sezione"/>
 			<node name="nextTOCSection" value="Vai al Successivo Elemento dell'Indice"/>
diff --git a/fbreader/data/resources/ru.xml b/fbreader/data/resources/ru.xml
index 84b190c..075c0db 100644
--- a/fbreader/data/resources/ru.xml
+++ b/fbreader/data/resources/ru.xml
@@ -12,6 +12,7 @@
 		</node>
 		<node name="navigate" value="Переход">
 			<node name="gotoHome" value="В начало книги"/>
+			<node name="gotoPageNumber" value="На страницу..."/>
 			<node name="gotoSectionStart" value="В начало раздела"/>
 			<node name="gotoSectionEnd" value="В конец раздела"/>
 			<node name="nextTOCSection" value="К следующей главе"/>
@@ -191,8 +192,8 @@
 						<node name="search" value="Показать диалог поиска"/>
 						<node name="findPrevious" value="Искать назад"/>
 						<node name="findNext" value="Искать вперед"/>
-						<node name="increaseFont" value="Увеличить размера шрифта"/>
-						<node name="decreaseFont" value="Уменьшить размера шрифта"/>
+						<node name="increaseFont" value="Увеличить размер шрифта"/>
+						<node name="decreaseFont" value="Уменьшить размер шрифта"/>
 						<node name="toggleIndicator" value="Показать/спрятать индикатор"/>
 						<node name="toggleFullscreen" value="Включить/выключить полноэкранный режим"/>
 						<node name="onFullscreen" value="Включить полноэкранный режим"/>
diff --git a/fbreader/data/resources/sv.xml b/fbreader/data/resources/sv.xml
index c8ae98d..a4e707d 100644
--- a/fbreader/data/resources/sv.xml
+++ b/fbreader/data/resources/sv.xml
@@ -12,6 +12,7 @@
 		</node>
 		<node name="navigate" value="Navigation">
 			<node name="gotoHome" value="Gå till början av dokumentet"/>
+			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
 			<node name="gotoSectionStart" value="Gå till början av textavsnitt"/>
 			<node name="gotoSectionEnd" value="Gå till slutet av textavsnitt"/>
 			<node name="nextTOCSection" value="Gå till nästa post i innehållsförteckning"/>
diff --git a/fbreader/data/resources/uk.xml b/fbreader/data/resources/uk.xml
index 406c2a5..c63adb7 100644
--- a/fbreader/data/resources/uk.xml
+++ b/fbreader/data/resources/uk.xml
@@ -12,6 +12,7 @@
 		</node>
 		<node name="navigate" value="Навігація">
 			<node name="gotoHome" value="На початок книги"/>
+			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
 			<node name="gotoSectionStart" value="На початок розділу"/>
 			<node name="gotoSectionEnd" value="В кінець розділу"/>
 			<node name="nextTOCSection" value="До наступної глави"/>
diff --git a/fbreader/icons/application/32x24.png b/fbreader/icons/application/32x24.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b353eeff2459c5cf6779b7910f6b3b9351c8f39
GIT binary patch
literal 1230
zcwPa{1Tp)GP)<h;3K|Lk000e1NJLTq001BW000;W1^@s6n^XTZ00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01Sr!01Sr#Q>d?400007bV*G`2iO4&
z4GSiGE^Uth00d4+L_t(Y$Gw$HXk1ks#=mp#IrlwxGLK}MNwl>!eW-O>t*8sPQcdeZ
zL9}#LMF<FjiVH<I(v65nL3c%@6u~08uoM(UMC*$dS}L{mk*20InaO14zUSV#kK>{(
zD9yA<6Z|jE>hk}7eCIpgC0NE(w@v0nfou`L&(EAZ+S$6}e&R?Q%_t1k&7J(@6ab9Y
zCKV9zF#_Hz)8<hQ!aa495(d3z0UT_cI1>DOCtbSuqa|I!OJyT{L}mQI9lLk^Fz1R?
z*UGO*q1T=RUaW4L)KrEi@@n#WPR@?Yv^4MZS&&fkX|p)G2ZS7MoWSw{s@o=qa|))$
zOVYkdQLUs&deH5~F4YT)xvs{oi>Kcotxam0gxw=~`s#RDonTa$@O%Beo~V(0X+r2n
zJ)5WTHM?&JP^~>WY^r2mwaA_uDX0}jMPv|3q>Pwyr3Sm(iF$TR(<JO1HpSP*O3G$c
zVTe;8q-Bu|Z$?Us;L)W;_tP7QmrRxH9UY=mBSXrV#6(0fu#grJ<+i}F9ngi7qLg%Y
z7$$vStgLR;R0(kkSg`?5nLtd7;2;Av1_F%MCWmq=_N*ze=SPa_T3MoqVvcTBMo-@e
z*YzRUXOLq7jSY5hr65CBB_t_eCpuht1Ny9t48nCC76ypxhJvRmL-d78L0PX{5w~~=
zzIr=cF9dVWA}_j#(+rh@3`3KVq#RbP!jaY^V#7BSALu~7R4J)6ohszQ4T{XrPdGY#
z9iDnC{2+$p{)REbLpM~xbQz5GkfcD{7vZo9psYcb3QKxjivrwLyGLS_j4LF>LTeUW
zF+ubpL{1FmoJUo6VQLh1BIDs*PvY#^GjP2CL{mW`1}-olO>Z8cR4yWK82q-i<9vFy
zMdrF88jS`d{~U%j2c{;15CQ^%O&cd5DklDJTBx@y`0Xx|Wt7{ZJ`n(v3drXS<cCUJ
zR&*|iA|xt6mP81IzzI?~i3~v?$Qe2`-Qa>KauBkda$R~88aWepKC~0_^$Vys>Y$}6
z@=1o3&XNHLA-JVFg1fg&V5VVVdd|kBnLok7R|FuejGthI`YQ$CEB>D1e;9&<XGwI9
zCsDe(00bPDW6uX$oPvkl(|)(PKXBUqDqaBrfb<H)^~6uPt(pCy+x?>c%g4zo0g$U#
zI<W2pl7dIpX@6n%t-zi?Hv98O;i`m?Tsf}hpD$v*NHXxy{x#@addIh#pI`j(u(x`z
z;BwOq{KX3-1N!#4pga4nZ#6%gIey4ll_CPb$u+9{8Ve%Nn)aN|fu6l^<id9!+Bek$
zjk#98-LV=$bU8DE0Qip8{C)aj$98-Cs(80mKXL5q@10&h;aQgPIP_=jcH=#-JAde}
zZ$Ge?k*5F7eUHCPWm(;xFBIR%7s?O1p7&F$*?7BWw^12eJEds3?afC0E6?e^Nd=5i
sraU7uiFMkoPYJ=7e|&Q=T&k`A02F%9--p$@H~;_u07*qoM6N<$f(-mOD*ylh

literal 0
HcwPel00001

diff --git a/fbreader/icons/application/64x43.png b/fbreader/icons/application/64x43.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c117e7ff03d5718248fbe1a865b199d9ce18368
GIT binary patch
literal 1534
zcwPbi1p)erP)<h;3K|Lk000e1NJLTq002M$001ip1^@s6$Xbp^00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iO4&
z4GkZ4aY6wA00n+YL_t(&-tAdUZyQw<J#RcS_I%im6TA6nKHN4GqNb^Y(x?<Fu|Y!K
z@COh=2(bXMXuF_hfyAa>ASz%})CC)U0Z3RZkU&L9MJ))m3N2MzrnG9@IF9YunVC0l
zW*&<qZQM9%L&lAha3#y~yKmmix$oR_?;8VcZ0Sr+PiJ!a8h$mM$;CEu52200cPfJQ
zvF=Zu9vh$NYT}Op_+at#pG|C6@Ty>*>XxTZNd9e9!m>LyK5>4@?~5^5l5~iGeB?6c
zblV0XoyolfV9Lm6Z?57$3}D{KXa8I_7F7i6!(H<9$)q#`NE!efx2ba+05~To@<Bv2
z9fT0n%d=?96i8=s$C6U%Ov?WCld<uM!BxP23gE?MV<DM1xgNQ2G9}GCm>Z93=uRfk
zolL-sk3#I7fTHPvJg3+q@JG6&(wQE)FwS-NaFNR4vGIxNCBG~8z*Us};5h2o*4Inp
z1pM>C$es5RV!7$McWFQB+6W@59@w*rEdW235G&{U<f(%Z!3LBtx>Jda=lcKv>W6U`
zqtIe;P}78CTT9oS9ae6<)ge}zu6u{}!_uBZI6&}$2Oyov4MjusZw4d(q-Ekf7>|VI
zg`MXj4Cf%U&H)Ia(DLifKBL@tGcH!;wZKb?9ynVA3&5Vt=`KaEF7H>a#{}Z9@cR%j
zX&*v#*8m71SVsHLhLxLAT&zk2yx|%Sf_u(xnA!+rRd0z_i9zkWB3PFXXp>Ew5{Jw9
zi;g1JJpf<<JokMFoMEr>x7v*M9uMKZ+lM)21QAthS)~$!$oXif{?mwhwJCVZS8$6R
zfZEmn06YLt%R+?SK{Qlr3ckR)F)I!uqO}hEh8d8~<c=i7%DKVFKj~()pZ8SU<NG0Y
z^f%=Ek}-7;DuN2ZDl{^Ns3`KGr_!Z~8vuW-ODdh|lcx?Y7rckyH54!mMEemE8*k&e
zE*P~iuxB^)=w3|UFM+upT-O70UHF_J!U5ND+BX0IUS(VwZ|0cyRNSEh@bwfFNoo{B
z&x2o|g2rY6>_$&-3bA+`rbS^|_TsmLxk~k^wA~wGS#oF;<w^`@wXt#Wr6`<mY{lZ7
z`*5mL=qJ};i%O%DY|go3Ljg#1#-R_rfLhH2r3^N8K&b<V`C#?>N@kP_*e6ax6-?Ov
zBLU!BFaQ9c>l#8K5%U&B$g)8~B7BRkm{%=MV?_D`VSzSZh-}dSJkB`xF<&aI4So}?
z1p(j<f=A2uuuq(PJorsYffgKxA9C5M*U*g{PzAHG{&NwQuWX+b;H&)V?COB$^`K}s
z-i8t#v*<(Tb`Zg}tbd>vvOI`VsS4)0V9W($9()jlnYS}Uu%~wyVjXdqmIKqYVcHa?
zNikQhZXXRGPr8+44WMKT2Y?5$l{<m~Prk@jX29067BB!iF9p`60c0Ddz`7#Ew|xpc
zrVIwO(+h8v>`MT?Z`)RQUAevvX84|m`D*2gV_WYV`Rs+Z?gWEYQqDPQvn7K$^mQYj
zz1;S#aL{5`E#9AV8GG5tXK!zbvp`TOz&T$4@49=9e73ZsIziv_FgH^)T*k(X?@pD1
z+z+8`Qh=|n_Vr5n3UladLD7D51F(+MpvxG{TJ@4+TkixRc$;4a`T7{ZsC^N@$&Hq}
zRx#k)!c_4>tyW*50j}eKQToG7arVbbd2Yq~0MBJ$)cU1duI5WKl@$!|To;aI{SM%S
zk<b3zwnZtO$vvM;b$$gx4tbsr&-1YOecm>$cL4~=ROgq3kfRIZKHP;lzuBhwHUPUT
znfO8wgjbgQi*v5orul}E&t7cvstlwvxn}`9`qy~L$Y*aY`u72i?>_-ljePd{qCX8F
k^@zW2<g-`tzqQ`}1vRI0YTV{$<p2Nx07*qoM6N<$f_ISC+yDRo

literal 0
HcwPel00001

diff --git a/fbreader/icons/booktree/moto b/fbreader/icons/booktree/moto
new file mode 120000
index 0000000..5524476
--- /dev/null
+++ b/fbreader/icons/booktree/moto
@@ -0,0 +1 @@
+22x22-transparent-png
\ No newline at end of file
diff --git a/fbreader/icons/filetree/moto b/fbreader/icons/filetree/moto
new file mode 120000
index 0000000..5524476
--- /dev/null
+++ b/fbreader/icons/filetree/moto
@@ -0,0 +1 @@
+22x22-transparent-png
\ No newline at end of file
diff --git a/fbreader/icons/toolbar/14x15-png/findNext.png b/fbreader/icons/toolbar/14x15-png/findNext.png
index a56aa4b9ed5418373f7925eadd88993626bfbcbe..022c23524dbda5f80577dc706d29eaa58f3ae44e 100644
GIT binary patch
delta 305
zcwPZ90nYyT0`mfpOMeqdL_t(I%f(c^&BP!Kbxxn4NkK=4=raTr4P};K4kjRN7GMF!
zU=E5<Au&L{ibF~iCApk*uQ3l}Y(IVgevQ8G`@UaSj4{S|T`S-EIp>`7z5g+!lv2vJ
zq1IY!-S{+3(=<I#*c~Ofig}*rdG5Nqaes9ngb+diIOm*m0DlM}gb+X}rIhkDLEm_J
z@4ffyYOS@_0xZk2EK5t6bIv)pfXb^K$8j9T`%1l1N+~6PVHk#C0HBmoO54VS5JE`f
zbzQ}$ioB(cF~%6r1Fo(+?RYzJB<&HuhW%0O5-X*YQUD=@5W?P8f3;uh*cfAssn26?
ztDiB(7<;UEl`7)y?L3M*=eHmJXN7HX|HJum0YAV$AAGw{MNCPI00000NkvXXu0mjf
DF5r!a

delta 310
zcwPZE0m=UJ0{8-uOMe(iL_t(I%hgmpu7)5GT+NF#7It)oo<mU4SaJ!@;R&$i0$zY)
za1IKnNH_qmLK2Pf=lhbEH_b9Ey91*D@Ym@3zVG{-5kd%|oD1LQ2_b}#WBy}s&N=6`
zp_EceS^2Uo%d&hf*qjO6h1ObY-84_@e#(F`#ux)w*L7W2fPb#*x~>CADW#OYX6T02
z7-NjdSt+HI0`T5@@2g;pF~(R63NKLzA%uADR2xDFAplTHDWw1yV~lZaJPgAy43(F4
z1#cbMtai>h=dKIxuDd+(e&Wp9Gky=pPjL{QrfHfc0Bfza_83dP#Akw)AB5+5p69t-
zk7F$PaU92Sye|^mU$eru4V1ytzw>V07hkw{8?0#GwE5Tg1(gB4P&j3TW&i*H07*qo
IM6N<$f{i(nDgXcg

diff --git a/fbreader/icons/toolbar/14x15-png/findPrevious.png b/fbreader/icons/toolbar/14x15-png/findPrevious.png
index 022c23524dbda5f80577dc706d29eaa58f3ae44e..a56aa4b9ed5418373f7925eadd88993626bfbcbe 100644
GIT binary patch
delta 310
zcwPZE0m=UJ0{8-uOMe(iL_t(I%hgmpu7)5GT+NF#7It)oo<mU4SaJ!@;R&$i0$zY)
za1IKnNH_qmLK2Pf=lhbEH_b9Ey91*D@Ym@3zVG{-5kd%|oD1LQ2_b}#WBy}s&N=6`
zp_EceS^2Uo%d&hf*qjO6h1ObY-84_@e#(F`#ux)w*L7W2fPb#*x~>CADW#OYX6T02
z7-NjdSt+HI0`T5@@2g;pF~(R63NKLzA%uADR2xDFAplTHDWw1yV~lZaJPgAy43(F4
z1#cbMtai>h=dKIxuDd+(e&Wp9Gky=pPjL{QrfHfc0Bfza_83dP#Akw)AB5+5p69t-
zk7F$PaU92Sye|^mU$eru4V1ytzw>V07hkw{8?0#GwE5Tg1(gB4P&j3TW&i*H07*qo
IM6N<$f{i(nDgXcg

delta 305
zcwPZ90nYyT0`mfpOMeqdL_t(I%f(c^&BP!Kbxxn4NkK=4=raTr4P};K4kjRN7GMF!
zU=E5<Au&L{ibF~iCApk*uQ3l}Y(IVgevQ8G`@UaSj4{S|T`S-EIp>`7z5g+!lv2vJ
zq1IY!-S{+3(=<I#*c~Ofig}*rdG5Nqaes9ngb+diIOm*m0DlM}gb+X}rIhkDLEm_J
z@4ffyYOS@_0xZk2EK5t6bIv)pfXb^K$8j9T`%1l1N+~6PVHk#C0HBmoO54VS5JE`f
zbzQ}$ioB(cF~%6r1Fo(+?RYzJB<&HuhW%0O5-X*YQUD=@5W?P8f3;uh*cfAssn26?
ztDiB(7<;UEl`7)y?L3M*=eHmJXN7HX|HJum0YAV$AAGw{MNCPI00000NkvXXu0mjf
DF5r!a

diff --git a/fbreader/icons/toolbar/22x18-png/findPrevious.png b/fbreader/icons/toolbar/22x18-png/findNext.png
similarity index 100%
rename from fbreader/icons/toolbar/22x18-png/findPrevious.png
rename to fbreader/icons/toolbar/22x18-png/findNext.png
diff --git a/fbreader/icons/toolbar/22x18-png/findNext.png b/fbreader/icons/toolbar/22x18-png/findPrevious.png
similarity index 100%
rename from fbreader/icons/toolbar/22x18-png/findNext.png
rename to fbreader/icons/toolbar/22x18-png/findPrevious.png
diff --git a/fbreader/icons/toolbar/32x32-transparent-ico/findPrevious.ico b/fbreader/icons/toolbar/32x32-transparent-ico/findNext.ico
similarity index 100%
rename from fbreader/icons/toolbar/32x32-transparent-ico/findPrevious.ico
rename to fbreader/icons/toolbar/32x32-transparent-ico/findNext.ico
diff --git a/fbreader/icons/toolbar/32x32-transparent-ico/findNext.ico b/fbreader/icons/toolbar/32x32-transparent-ico/findPrevious.ico
similarity index 100%
rename from fbreader/icons/toolbar/32x32-transparent-ico/findNext.ico
rename to fbreader/icons/toolbar/32x32-transparent-ico/findPrevious.ico
diff --git a/fbreader/icons/toolbar/32x32-transparent-png/findPrevious.png b/fbreader/icons/toolbar/32x32-transparent-png/findNext.png
similarity index 100%
rename from fbreader/icons/toolbar/32x32-transparent-png/findPrevious.png
rename to fbreader/icons/toolbar/32x32-transparent-png/findNext.png
diff --git a/fbreader/icons/toolbar/32x32-transparent-png/findNext.png b/fbreader/icons/toolbar/32x32-transparent-png/findPrevious.png
similarity index 100%
rename from fbreader/icons/toolbar/32x32-transparent-png/findNext.png
rename to fbreader/icons/toolbar/32x32-transparent-png/findPrevious.png
diff --git a/fbreader/icons/toolbar/moto/addBook.png b/fbreader/icons/toolbar/moto/addBook.png
new file mode 100644
index 0000000000000000000000000000000000000000..a262aa489993cffe0b0b1bd1934fab6a42dfe4f2
GIT binary patch
literal 632
zcwPZ`0*C#HP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01uY{01uY|DH0o200007bV*G`2iO4<
z7Z?ez+i)uY00H<(L_t(2&vlZ`YZE~j#-Ew}O0qGjlC)%tg}T~cTZ>XrL6G_f_=y+o
zMLk%-izs;Uq6d#&dJzN<f+sIU@oo=NJk}okh=!(hjm8k@N7mi!%+7eo2kEAHFEcRn
zn`hqlc?cqvJ9;jiQ28B0Vb556f0l7EQTp(5A$m`ZK(SmJPi-r8Jz(N$Sv`>DA(<}$
zJs@pwvQrn-j42=5mU&axb!F4YPm<K=P$(sKE82o+#^iGchZ7HChDItphkxc6WFM&W
zRntsPT3P-inb7r$pGG}30U;>}`hyezM#u80>6t6ZVBa)&dK`jk%~y>LoVomQ_WrvQ
z^XH%IdXJ*2s<3Sv>K;qhK7A$NtwWvT$kgC?;17`R<z=NuvC|4^FCnNBfKmn!0Rc{9
zMk0CbRVI1qMO^79MmrhFFX7bb3KWIHhz)>HnLl>;<X^AhqPYI;EZ{9ReT<NVP%y0y
zpER)P7a)X?ff_Itaw!NCeHES6Lnu3Yp=*WT$1j$1fhT^Jiq35*(U3x}bR}me8a4*O
zHq<r4dVg0+xga525z584w*qg+RJ(m900^&F-0JG=$jox#&wBiE81fp>o^=-}gn(?t
zL~wu0t2uL3=f~3L8?FT0N4o`}>5VzOEr@1sZP$mKwc@>B#V@a`D{uP82Ec#Ym(mgg
SMnY=<0000<MNUMnLSTYqR}lpO

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/bookInfo.png b/fbreader/icons/toolbar/moto/bookInfo.png
new file mode 100644
index 0000000000000000000000000000000000000000..acd85e65375ebe17f7d14fe758ea4e6f793975e5
GIT binary patch
literal 659
zcwPaM0&M+>P)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01uY{01uY|DH0o200007bV*G`2iO4<
z7Z))ALDYHx00I+9L_t(2&vlYLY!YD@$N%rW99McMARmgS)`C^i8iI}Kpia6N2fq@>
z4kq1<gHA3w8xtLLb}<gdq(g_=q=OE|#HF=hEg!akw1`O|$H#Hrad*5fLV(iW^geH%
zfBsLN=T9&|AbOpMyfMpDmI6nUrf}p=LoUDDO)RLreYW1hAH6|bBj(i!Nqi{^oLba;
zvU%{d){sBFA2i^43ny<*pFAwQ_PHD`jq?O8-}%Wl;W-SU`zgh)g~kH>+n{$eST_We
z9p_*XJNBb1^mz_EKk5@BN{eFGeijDjgbgO#c1yf69S+}}dq8@HwDY(<_vj&Y2BjJ&
zp~*xzXd9Pf$8m9H%6(>X>ei^h+m1<NU)EN?_AkflaU&3nG9{ixr6iNsxDOX*B5(?%
zO*oEll-}FP{agZ&=o^(W00bZeps?WbI6(=6rW-B6#-;5Ju@nx6B15;@!2(59uAr&v
zP!vUjUQ@hwL;Y1Kq=(+I>keRLtAUWT15H=|o;VarZ*Iip7tbEY_c*cvvCeoDw>NOg
zulqOC-)`oznfZMJzy|JQS^`VfC&oFUkpC!c=NJDBj~we2wV7JZzRId=$wfk+rjof2
z%gaAT{`Z@G!Zu?J3}B2wmkV#o`R`8_GOMgncYj`A-;yhpW)*<7Cjh)Zq8TQ;R4Nsh
ta;e1q-z)Pq!!TNzOr~6|R+WxZhkxGr){#0L*M9&2002ovPDHLkV1khp9WMX?

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/findNext.png b/fbreader/icons/toolbar/moto/findNext.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a41d96673f5c2af003ed474dbd1756497bf57e2
GIT binary patch
literal 690
zcwPar0!{siP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01t}*01t}+yK#i;00007bV*G`2iO4<
z7aAzhgaY>f00J^eL_t(2&xMjpXcJ)+h0i~k$)lO1t$pakJW2*NwbUdnRS{8eCt6&n
zsM{(<5m$mMK@_1ISArWAbgR&%SQMK|rHYt#6U9(tl14L4W1BQ-Go8uI{BCUNq>5*C
zFWirN&gBv`$P*cCb+FoH2dg}gt^O{9!jqnSI@UPHZf=CgphIZEeNk|qmsR6J!M59@
zY1+*+wu-D59s5qPf?K~E^7A)1jw4L7h@S9%*s(Iolk)JTq2Z;?pydz5v^%w{dwl#Y
zyUl7@<-9m@^ccE=B5JhB)5O;6eUa|T*!aW-$N+%T#rN*)aNTh_tehmf(dr9BW9;}<
zmXXYrGOG&RE6XyoC8M}2<mwBD_-sysVPo;VsG~bj#iwsoh@D)3QOh)+mpTE=n>Jcl
z7Gh9DFw{>ioDDS<cs0EM!Cr+@NW`Gm+oI9_(X;1H^Cl3q@l-%rCWw8h;pI&Eb$mL0
zlH-_p09KP#ihqb`AVjewoKKR8S)7@ArqTa`gj8@~;4^e4b%k=hC#0W+i$GrbyVVU*
zfUIG=PXck}dt{W38_?W`uCt5@qz$CQQN+Q4Bow*~g(*SjR^agpk31dzsClEwBA`^P
zIk~oQyJTcl(ozAx&8iwyd!8@mW=t7%-GD(U1pr-@muic1Lm#Hz#}2o(FE)F3jI0*f
zk@1Jw$EkO9YI-^96e=2J1IyKw)*qSKYx#8YMdnSMraqRx>MAoab}#p~kX+LN)YmWa
Y8-fqzo$+44`~Uy|07*qoM6N<$g68Z#?f?J)

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/findPrevious.png b/fbreader/icons/toolbar/moto/findPrevious.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9243845a68e0c06c4facbcad43e14dba551ef0e
GIT binary patch
literal 676
zcwPad0$crwP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01qYr01qYs1zJRZ00007bV*G`2iO4<
z7Z)5wo`??s00JaQL_t(2&wbEOXwz^M2k@7)Nt&ivSJx$N=c={q{s<0fMZwANAG;{i
z+YTZQVR{fxBH|wq6_lX|&mI-QgNJz#Pa->b>0$L>+u;y9wwA6oNz*iG(lq&bs`Ss?
zJ3Sun!~60u=qhe<7Wa_mJn2Ab%t5Z26h9{mrB{Exy{otHIlB<%b6e+QA?CT8!i|E#
z$yQ%fRx9P#-3K}#OIgzq-t}TvAI+-B!_G{f^m{$D$e!Y7whD=*+qdqa9vF_FIT+!o
zmz<9tkW2;+A3YAkk#WE<aOqX@DbK5)0HD$XInKX0&~Jq$oq#gEANGcaU{lheswj#J
zX~ZDX*>>n?HFH<*UT1^jLoyzOnn{9T7~rOyP^+8dWC(eF{mfJXLGE)VokaiucndOa
z8b$VvBAV$(7yzVl4M=4-pqyX(z4|rzEH)CmlSm{MdZHrK`85Opc^LyRY;8IH<;nb6
z^E-w?e%r5ZR}@pFN2b>4M-P_Xw9oOK5KW74;K=gWXdE7%dmM882X<z4IyHzNN`lj~
zg{gSyif_<+bLs}+=z$#!vtcZnsrUnmW>YHIE(IrOxE$Rxabm})cvBOzDe;2X*htx|
z0IZ(?0x^q%R7&<hL6XI$ZG&YsRH?9bE%!tDpx1SYXnGaG^wtc`l-}PjD*r;Ynu*g3
zf#B}QB~cVsiks^niz{#KV;6^g)ndbEs1_v@RH2-!ivZ9B0Qd_+(%chsqThi40000<
KMNUMnLSTXg_9&$Q

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/gotoHome.png b/fbreader/icons/toolbar/moto/gotoHome.png
new file mode 100644
index 0000000000000000000000000000000000000000..0149fd2da49b6fda0952d953696dad9fb10c89fb
GIT binary patch
literal 659
zcwPaM0&M+>P)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iO4<
z7aAFWS^~`g00I+9L_t(2&!v*jOH@%9K+nDJjpMJGbj%-9s4apd0+WG?QA!G3gwaBU
zRxRxhFj^G_uA*|$vQ3*-wMbkDEdoQZFh$xGVP%k+jL*_H^X9$#?!7IN6v|DV?Z@GK
ze0=bai2SIV0n&h9k%|k`w|0j4Q8zPtFZTW>%KiIVZVa6r`FODL(0D0C01OX9-}U-a
zjdj_Hy^6A`vX*Rf3+bAAw1Jb?5W%sQf!^GOC%KN^*1bd*Yf)NZts!BhXiguv)ZN*C
zzbc(*SX=Sd@>ku9fRWNcSg|#8r#ubdS}aPJG1iEtRQ5_wSO0C2Vaf~EXl*;(G}LtY
zsn!v(iCO;i`OOToUB5(Y2z7w5=6p}CZ_sD8N<{&}F)SD7iESiQ9HO<MGTFGZs<E1_
z@;cqQbD0m`0>yY8<Af+tBo+aN7=a`~HPs@sTQn4-@60dGt+cnbr+rbVjm##Aq{OKZ
zB&5Jvi`5E?*>#+49N|vSy;^v2B7gjDsb)D<mL45-rwLVvH5RKSUqVj;2|)c8twp|k
z@MALa7oG0@&avv|WW(3@{>IefnQ`e-bdm(p<=b{_M+B^nQF9MBr&M_{JTuTWCZ)sD
zbNwtX;R8j$2Q+|Njsl`BK@j=csi3HQ%)%poN=2_%vqx%gIxdA60-y|(0QJYOzMY5*
t-VzdU0O#nSQ~z#KZ)iolU9$WyKLJ;0_C8z!g(v_3002ovPDHLkV1i>ECIA2c

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/preferences.png b/fbreader/icons/toolbar/moto/preferences.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ed48bf9069bf7e796f143b0fbda318641ed482a
GIT binary patch
literal 834
zcwPZQ1HJr-P)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iO4<
z7a9qj?GmW~00P2EL_t(2&z+G;OcMbVhW}aGQHC<58x0_oB7stkL?LboaXY9n8c#+&
zm>>y6J+Qd+V7$11MuK3_V2pZl*MkSF8c`0C;6Y8JLJ`|0w9pnxg|;)(=}hYZYc$?`
zr?>s@<$VwMPb2;eE_Zb<=d}5avYdJsizS>VkDp3qYn|P<asZUdN_y<{@x~1K_ZXt2
z%wlb-t6le4uhSjMrY~K+!)bN-eZ{3ELra#bxA*t=g9d=ki{}ezTBS&7`E4NJe^za?
z@0*(PHv+f`0365lS}Q6JN>WM*heG857KLWB*}*VO)uey&UQto;GKOI&f+RHn(AjfK
z&*kN=mqecOPX=B}$<*z(mZn7^K@jemnl;C2Yu9eeWpkxSBto+}Y+2WpuHEJ$^8tzk
z=lS;ibRr?#b+k4l0DuC3`c3uUrKGr0qtTRw!yzguilkc2s3=CWhh=jtfk3F4=Y<=N
z)`sXmRC}&=(~6Q>7W|P>SWe$(x0dY6%VRM&8}<dKy<0?H@;V%j-yEr|<9z-iJx*=m
zql)gVwZgW4_;ZM`7w2F_Rk=1Lr#2+`_*3We7ecoG_dCjWUQp}vxf8ZZOY^5u9~p^B
zqJKItBr7titL(J}rh=P&*L&H&Hd=Re6dDb>b9JjL+vg)edSU*D9G(+;ZTe`tq9}C+
zz0qPanJQ*yXEd9)*1vHMyi`cb&W<I8X5+OTn^zxUz^kHjkxVq6xwEh!oM~@88T9!)
zhu!0&ACgIlG8)ZInKZEx07zkGOl8or1~DlTt}hdai?qw@8tm{4oKgVLZ7nAPgRfs7
zb-PEsq9~-|u~-HGNhPLT8i6(?c$wamCe_4*Yq&f7@qzc({RDvAk&*Y3Kj44m@p$e%
zdidlk&+`%ifT9@9Qsb(<B?PHr!yoSZ6e%GB5CAB@#94?L0BHc3pLZ87y^fwBCjbBd
M07*qoM6N<$g6GwEi~s-t

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/redo.png b/fbreader/icons/toolbar/moto/redo.png
new file mode 100644
index 0000000000000000000000000000000000000000..969d0626aacc4f5f43f4d0b1e0cc9b2ccefac03d
GIT binary patch
literal 592
zcwPZe0<ZmvP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iO4<
z7a2Eqp<KZL00GcRL_t(2&#jR^XcJ)=#(&>^m&-MO970r3q1d8T6kG8R7?dgsRdDOz
z>fk1VrEyW5I(862EEZe@5fNMkhiYvDT8Cn3iArKo)M}(jlU$O!FLxKGlq;p3`b_W3
zkB8^sePOGW8rBn=ak&vVak=yL{&TT>tiSSO>Fs*1ZDj1*cY4o-lY=kzn%!4YX?<OQ
z9;kK}LA<>y*NzxbcAPnS@zMLaH{120FAv|{^Sm|}?cw@(|7=g!p<YdB2%!-%W1>*Y
z0|LX}W`CTYx}X2^?e2$Br@1E4G&(3WasmOm)X`i)3m;q6anz!D_~4PWl%b@4D|<6D
z+O$@Up6_C*GD5b{giq6NV5w#5jz!b)_+Ffsz1^3t7K%U1P#j)0D$nL$`7<Ki#ORRd
zh5$nl5(24(*%j~e7P6n7S5_(`!K%`B8d}%x<H%48J**LpMOd^m2-hSLI-urea!)c(
zf88nO{A%zx^4K*w;3;;x4yLCt2L@BO!#zt$W4W_FGm(8TIsSXhUZDh7fF}a4F@Pu#
z0nGHX^Apj89-n$OJ2L&a@KRN&0yV%{b5%eA9$*8Z?AL|AwUTpVdaN|*I;a5ORN~Z-
eo(%qZ%k&>`2d&d<8V4Ex0000<MNUMnLSTY$xdVy-

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/rotate.png b/fbreader/icons/toolbar/moto/rotate.png
new file mode 100644
index 0000000000000000000000000000000000000000..233fb685519d958040c24fff1725b22d3def3df4
GIT binary patch
literal 816
zcwPZ81JC@4P)<h;3K|Lk000e1NJLTq000gE000jV1^@s6goGkD00006VoOIv|NsC0
z|NjYC_uK#g010qNS#tmY07w7;07w8v$!k6U00PiSL_t(I%dOP8kJLyM$MJ9ZYTJFd
zFR6_hB+zh(L(D(`0RcGyBIOT6A|xaxfRP9w7$Hcw1QJM=d+fH`WxL8IXqxF=G`q{f
ziyV~d^WOW}7W}QI(<@i*-fi2#!1LM`JkPeZ2E#B-%Yx-n>wX{JzkmAl!2==q#WFSz
zv)R?F_wKdrXw>VqE$r@|Iph0q@#3jdy&m-Y)9J~RFq`e{?Ct$3vjuKX)HHD6!hG&|
z(C_=cZ9|qB#&il=PbSx|gVsXW_HTfj)$Qzrq2s`K-0wRM#Bo{rJ|s!EySKN7T=)M&
zKfuW(2s{s_)8Wu{A&Rn02uPA%Z+92!S_t3&eP~nG&6~Gx-?;<J<#L%Mpwwa^C1`C~
z!y$lDZTsgyBMeWR2t&AZ>Dskhx4?A=gE0Jaz)utY+kvK0s;WTiswxU-8Yz<m=JOjj
z?%)6Kvny3qQvL&|bzK()7zVU07>4f$0a%vryDkg{VR-J`@xbN_6{4yZ3y7k3?_RzH
zYkl2ORaIH8Gt~O~60B}_yHll_29$!PIUclat&;>iFOK*3VK`Lk(<d-Cz2teG=Q&7O
zRqKoX3YlixO1VZ%^LWT{nkG$QJT8hCFJLz7_39eZw5mK0tSrm2)e7P`&$A3{+i^M_
z=ya6QdYxfeuG6e*=yn~)^ETVq&bq476ox}74-Q~5>2#!oI9@KB28yDtO%p6B%d)EA
z^5ygA&z^<RC<vkmq*O`>n9s-KP6sBF(I^Ohp6Ku}Ne&O;$&<&AA3lU2ID)DQ-n{wz
zxhNn_i$Vynlxi9wAj_m|8c34WN-3~y%Q6g*5<Cw+eE9k`O~JApXZw#6$5E7J;JQMT
z<q`Di)yI!T0eN1QrU_AWaPa7n5Z1G2`}@zI!+d`F^kM;0u2xC1P9q55_3O89zkJ!w
u66$*UZEhN^VX=rJA=V9SPqcwH=f45g0&|~K9_h&d0000<MNUMnLSTX?+KgEM

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/search.png b/fbreader/icons/toolbar/moto/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..a49814130cf91fbd10fc2633ae38e1570bacfeb0
GIT binary patch
literal 670
zcwPaX0%84$P)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01uh~01ui0AR>0f00007bV*G`2iO4<
z7Z@K~55;-_00JIKL_t(2&xMg)Xi{Mq$N%RmojUd8QJb@~=5RKf&IL(HH$l<Gh+PCl
zEJC89n<91<bXU=JFuGgRMIl1F>b9Fk)J4&%Rr|oDYi;Xj<or6vdE9xsn3|5Qe(+p8
zFZ|y3|GW={ChWms7&$e<(!|rw<e!y{fs^@cX6EPniFs^+ZEg%))!*&Z#T?dMmQ0Z!
z)!PR|x$yEhwxJ<*hK5AZ#>VzKjABXUP_`W$)EGknJ3s?~YhcJJ3e2OfJ*J>iWg&6>
zsIWZ#1q}ea)pXPCFdb7h8WQcrI_CrcFchJ9vyR(NqyQj#Ydqd=V9zXNWMpIx71D-)
zi{Oagu9@}Jw@OiZFh4gtcIWmzQgb$F0I--%2!;-k-5nkR03u&SB-8^P-$ku4E;GgZ
z?%D)l7=W=>n^6hbyoRd9@VncPE-~oov}!)lw)lBfOE@~*rva2|)w+&4gaDbGg2|6R
zs>-_ZLRPfH1**UR&{{rcD>KVwcmx_#i8N9xIbWpLGAI{v{tMCb-WHM6s?PT;gX!5M
zIn~cDp6Fw}+2osPyWlvmzqfDV(v^#W9isvo-hN$qqW$_b>ayu8iNpfB_j&Gz!{I2+
zQr7`oW*b8__Cuh_>E~;!i5uhbhrjFR=SI$6t8S=MilV%0yr?yaYBBvfyPUe3oct>R
zK<sI}1YoS*GXS6yeEG7f9hD?$ZsE&^k<_clOZX3e08=-_(0KZQ_y7O^07*qoM6N<$
Ef--nD#Q*>R

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/showHelp.png b/fbreader/icons/toolbar/moto/showHelp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff02ef9f4b041e9a11b74e00afe47df8be14dfdd
GIT binary patch
literal 638
zcwPa10)hRBP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ue}01ue~jhk1f00007bV*G`2iO4<
z7a12!&wL3000I6<L_t(2&wY|hXcJKshX1*9JCn{NGfk699x@Gin6$=Pu)b+gaa)R_
zi_&aF6hs$-3w7m6T<A(%R6$S>QBf*pCAd?%5~R3@i?*g(6I;_X(<H6Qyj;}OJZwL>
zaN(Yh^WVc^(1f>tSQ4myi6`2)E-D>W%@|03c>JQdjy6cUhix7Sx5GZ^Y*jZ$vozq=
zO!6=dw1}j3>FOJyF1vX>>=)1RJjbehB+keok744!kiQaf3HtenU%Y1H+nAra2dhF1
zre$F>C;*6}J?`()Z`uWp%a%oyoI7D!1PrjX7>GorJ^ek7x%mtXj)g@yV6%+%Q7L5+
z4uufv9k5ugedCd5fdhS!{TFXdoa#M!$JQd&zQWXn+tn@O^iU8ENj|Rl-On#4hTiQ<
z-0f_cYCTdriyhk~OwBCf#E}@Hii=EV)Wc^+_Fif1Sa$#*=#}v`qk?igKF<~4+a{s7
zW`MBl(Z&VXh`LTyGvKuIFc^xM;>4%f0(e^+C`(E$9qXCNt{~{^00FSPQpS?HiXNrY
z$mNSqo5X)X830<P^y~fP#~X3QkzOkNw!AV`7k+%ZcmGN9SwmFQFk!9RF!f4tEjNE5
z`R3K@<^0%#cr@V7F67E@lP@#**~v;xWB{Q1V8VH5aB!S(!m%%@)Yb3PsYi=b6I*V;
YAExN6oPs-n$^ZZW07*qoM6N<$f-%t}DF6Tf

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/showLibrary.png b/fbreader/icons/toolbar/moto/showLibrary.png
new file mode 100644
index 0000000000000000000000000000000000000000..508465db9e10dc21ccfb61cde6ded381d61c7202
GIT binary patch
literal 656
zcwPaJ0&o3^P)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01s;b01s;c^Gj@n00007bV*G`2iO4<
z7a0a7e_Z<j00Iz6L_t(2&xMgqZxT@yhTqE!a~UWU89pP8*a9L|G}X8;CdS02rpCk{
z;KrRB6ZbCMvi4);#)TWBCK?l0x@h8}v8^$UK_itG7@%W-=`fwSGuMSdfj0Hoo!s->
z_v9Rc5t65_3IQ*>9`u^;4cEUjAmNLqp}&zuc8-cpF(8=FdfuZq0K6qbDOOq}il5y)
zmi9jsJ@`>~(yl8fmzwJz%5w?nRXi-kRl`@+r%D-SX!B$!O;dKIFe5*Wgydk$j-VrC
zVf<Wrr%>ZiCK)`t!z4850xU<|b^EoP7%MFzMA?P8l<!d_BnLG+h;1<ov9pZ0Jh*%~
zHbqQFfGVAYErbC_2LOmu!H|*)nU50@n(8qhI#Lnh_GeI!jcCYE7#C3Iv#`7|fdAWv
zIDh(#JUbIR(r(l+umeD&g3PoIs^p=h3)oQma5Wp8V+;?a6!~n97ZxsYLGmLibwLOL
z^T;?}Ji(P@h7;n!B;sfx`vd&^wOeFmy$VVt001G_mpxy_V^JhhX<(m}1I7R24w${`
z93*lwF{g*yrrmGeYi?B3NpZB(9UskctZuE`_`dd_z4mhdL_!E3uU)X-)|1A!mHX}0
z7uKGwV&ue@_2+h+bC|#CueIjp9re?5bNDV$C2vFUrUtt#SKq9a)mBUE>pR{rtIKzL
qx*@8~`p2zm<+k3{G(-LRH{mySk<+NcRQf6a0000<MNUMnLSTY?qari_

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/showRecent.png b/fbreader/icons/toolbar/moto/showRecent.png
new file mode 100644
index 0000000000000000000000000000000000000000..963ef756266e2b62ad80b293c05605f340573b36
GIT binary patch
literal 722
zcwPb00xkWCP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01s~f01s~g47Tf+00007bV*G`2iO4<
z7Z@@g(3uYa00L4;L_t(2&vlZ^PZMDj#n1Qkn<*WpEmJI|ba=Ey9u){1C1GPEMp>8`
z6BcY;n7DDJ|9~4;xNzatpeDL@@5UGsH=3BBfdUPW0@F?@woKc3bv_qGMN)o?o1EmF
zn|qQ=a7uLQE|CRiKIFGHZKs(xe0{g}zP$U8n7$Ja2+jLJq4B~H(;3Hc!`mybKeE#h
zf}%S&ss`T69rB50b(KO=nsBT7IT4|+hGOzf!wfCzff3be)SmzVJq^vI<NoDnmlU>q
zifV@^r)&CFFcu~+Q*n8oGLcm~rzX)ES3J%E08A3x@xdN(xwl(VPaF|NA%o`88Wd7Y
z_9f&Lp$rFJ5~ef=aPLnuupUKPR-^v0ngtX)Cg7B}5%HBF$^pU{!+{+|J(vdP0Kq@l
z%-p^4UwR%5ON3p}kdibAatuRL*Ri#ufg1!~lj1ydU_iyh)j1vr$GJjF@QVx$&yV5M
zF#3`iPANk>7~ud2KnQSq;Q>~EZlZ&?%;fKA6Fe)FP!Rn?N#u49|1$}~5d^^iM-%K)
zHah#5k+yg6b2^>e!R1U2<@zCPgWveRisuv;LBKgUK<XgWM%_I|#V)|{8h!v#+Acvr
zyjD4mcs!4>Q4=Pqz+n|gUBb1I<dvuNf=hX81%+Nzq3JcJChS9s5OC@g>gLH3J=@3Q
zoD%}Lu1lI;>q{C{JNx6?(SqXZ*CK(0Vd(r({&0807ag6IY?n{#rP7<7?c7(>bb50e
zYtJ;Tm@6M2m-lknhlTz8r|wu~ty%T2u4mWZt}HqHH_!F*o_tEA=Kufz07*qoM6N<$
Ef=Y!ua{vGU

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/toc.png b/fbreader/icons/toolbar/moto/toc.png
new file mode 100644
index 0000000000000000000000000000000000000000..240855f12b658544ac72d93ac4822b7a72889195
GIT binary patch
literal 537
zcwPY+0_OdRP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iO4<
z7Z(XALu}*#00EgvL_t(2&wY|XYZE~f$A2?BE!o{{HBf~RR75Bqda(5<_yPJI1S#JA
zES~fxh<7jI2N1ziK~Ggnlm;~-)kK?aW@mTidC1l@3F#k(2lM8~`@c6&0c`I+){3YZ
zFj|5qR2J_n-sSkx63Q{&S+tZv`Et~K^DGzuC9-vYXY+L{OA<to;OkQn>L}jxdoawO
zJb!r?*fRjmRoR`*PI9@GAqZz>w5Ayw{^lj$`#+LLPhVsJ20(lTB7FUo<HIbNHVn<U
z$>EX303wsT0SMk9BD7oaLdBIx1F+Ff`P>`A3|KipIJPAr%y7i35o^f`KmS-x`=5ek
zfru~~R|{4{UE%$gAvaneau%!#kig9=Ys^cjN!+>J=3}=vna3&Us{%ym_D2g9lSag~
zODPBa5g>#b)BwR1hy>2l*wy*^U2S#J_(msN3f{VYf&GKQ^nU?-J)BS9j+a_}`{9U-
z(ez&bUx2y)n^$K&o!uw^$`b?UTfMp-vp)d5O#o#8JviKxdk-GIT5ZH?DJh}~o10<p
bT?&|gloaO8=b|(e00000NkvXXu0mjfH$338

literal 0
HcwPel00001

diff --git a/fbreader/icons/toolbar/moto/undo.png b/fbreader/icons/toolbar/moto/undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac5001bd80e6eb24f9cbd400ed5f781058870500
GIT binary patch
literal 600
zcwPZm0;m0nP)<h;3K|Lk000e1NJLTq000gE000jN1^@s6)D-@700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iO4<
z7ZxQ0fH6h@00G!ZL_t(2&$Uv|OH@%9J@?)F=8e75Aqz7}8LSK?D-prbMuG}z5pANq
zLW?$9BeX31v5aU@)S`bNS`>lHl!DqAv#21-q(mIYAJ2J@_v_v__r5kMV<bx8S$&-E
zJDiX2e86s?JI89b>al;37l%QN>cd$>-!l%(^zKNQ8D_NRVEWqGQ<ok(uI<0T%=V65
zcNjfd*LE{|=JJ@9l+~8KQq1Jo)rt}O{r&PJ0FZU2_f}F*Hys~2*KuV~vY;vu4pK%v
z9N$8u1f+^E`|HQY$2Z<~ZaDVjbn{qa>w}(-^Zkx2P{kuCQpSS+1-u*}-~ptJP?az@
zuext<%}7^!Uw^^-Mv10Cn1UOv!WK&ig$F4BJvL#gCb~)Jx~0*{>DPzS&5hR=qt8?_
zA2b1I8iAxSA|eqAABl230iXd;6aeNvD89B*dZX_bwarIPoRmq2YKBBhDhrd;A*DAU
zr8mH~+~xd4;TZtAan*&q3QKeI_r!o&?(AzF;^t3tan@a%c>ZpjG6-rQ)EJ6?#}NY%
z{wmz5Cxu6Xi(=+N`(3V)@as$Y3V;9*0Pz0QpcNU#03yl3=kxxj_<%L-c-HCfQ{Gbm
mZiOh`?o~<m?X7?HzwsN5kiv7NzV<T!0000<MNUMnLSTa9cnrY+

literal 0
HcwPel00001

diff --git a/fbreader/moto/FBReader.desktop b/fbreader/moto/FBReader.desktop
new file mode 100644
index 0000000..8efce3a
--- /dev/null
+++ b/fbreader/moto/FBReader.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Comment=E-book reader
+Exec=bin/FBReader.sh
+BigIcon=pics/FBReader-b.png
+Icon=pics/FBReader-s.png
+Version=0.8.11
+Type=Application
+Name=FBReader
+Category=Office
+Description=E-book reader
+Vendor=Geometer Plus
+Version=0.8.13
+Shared=2
diff --git a/fbreader/moto/FBReader.sh b/fbreader/moto/FBReader.sh
new file mode 100755
index 0000000..6ee3b7d
--- /dev/null
+++ b/fbreader/moto/FBReader.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+this=`basename $0`
+this=`echo $0 | sed -e 's/\/'$this'$//'`
+cd $this/..
+. /home/native/.profile
+export HOME=`pwd`
+export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
+exec bin/FBReader -lang `bin/language_detector`
diff --git a/fbreader/moto/Makefile b/fbreader/moto/Makefile
new file mode 100644
index 0000000..504d389
--- /dev/null
+++ b/fbreader/moto/Makefile
@@ -0,0 +1,16 @@
+ROOTDIR = $(CURDIR)/../..
+include $(ROOTDIR)/makefiles/config.mk
+
+install:
+	@install -m 0644 ../data/default/config.$(TARGET_ARCH).xml $(DESTDIR)$(SHAREDIR)/FBReader/default/config.xml
+	@install -m 0644 ../data/default/keymap.$(TARGET_ARCH).xml $(DESTDIR)$(SHAREDIR)/FBReader/default/keymap.xml
+	@install -m 0644 ../data/default/styles.$(TARGET_ARCH).xml $(DESTDIR)$(SHAREDIR)/FBReader/default/styles.xml
+	@install -d $(DESTDIR)$(INSTALLDIR)/pics
+	@install -d $(DESTDIR)$(INSTALLDIR)/.FBReader
+	@install -m 0644 ../icons/application/32x24.png $(DESTDIR)$(INSTALLDIR)/pics/FBReader-s.png
+	@install -m 0644 ../icons/application/64x43.png $(DESTDIR)$(INSTALLDIR)/pics/FBReader-b.png
+	@install -m 0644 FBReader.desktop $(DESTDIR)$(INSTALLDIR)/FBReader.desktop
+	@install FBReader.sh $(DESTDIR)$(BINDIR)
+	@install util/language_detector $(DESTDIR)$(BINDIR)
+
+clean:
diff --git a/fbreader/moto/util/Makefile b/fbreader/moto/util/Makefile
new file mode 100644
index 0000000..e65d888
--- /dev/null
+++ b/fbreader/moto/util/Makefile
@@ -0,0 +1,11 @@
+ROOTDIR = ../../..
+
+TARGET = language_detector
+
+include $(ROOTDIR)/makefiles/qsubdir.mk
+
+$(TARGET): language_detector.o
+	@$(LD) $(LDFLAGS) -o $@ $^ $(UILIBS)
+
+distclean: clean
+	@$(RM) $(TARGET)
diff --git a/fbreader/moto/util/language_detector b/fbreader/moto/util/language_detector
new file mode 100755
index 0000000000000000000000000000000000000000..4f3101a8881927b2c7fdb2c68950e953f93a1221
GIT binary patch
literal 6572
zcwW6&Z){uD6~E7ZPDAPzCw05D>%fI>ODS>fCN!n%G`ERK1EIKeKphIayx1>^TmQrF
zrAZNkw4^H9lJ(EJ300u@Lp5z;+W5dEKC~#4x(!Wi;sb+f;)7%JXrT-Rsp?>=@P6mr
z`|6jpOxuU;TF2+ybIv{I+`sSK`&_j50ZEcnCW?!-FbO#DW5(KnFRTQwj_3fZgKRZx
z2IjK%2@bQ2g9ji3+<>bD6C74B4kVKVSY?94>rEUyf=6=BlPq`}j7b->{E{3bd$Wl^
zvY-WWf;!=YpdR)5!yE#PgDu;XP7Q8KCtK60?C5w<&jmMgzE8x~z57usJQu6==bMc8
zIRpp;?grcgSOWMOAPCq9XalseT7hY{25^Uiw;J#*K%=PN%eb!%fc1d80P7t3&5ZkR
z0W<(MF&^u;*?(T@8Sl%#E4MpnFW@#N#@tbs3ryog^R<@UT)qKVCg?i>D;+Yoz<$6g
z#@9svfazpk2P|bb7wRjUX6yx_*Mq@2af<h69U`JJqjf-~k$qPE4xGH;m)Mk5U&W3>
zar;V1*!rxRfZPjvNjJCmDeN^<UD%I;zaI4w7q4$~@i@*gJ~uDQd~MqHXuf?X`8?f)
zkvk}J|F(QJ>@~xGvxw&!>f2#|tMK<O?C(N-pQuluY2P&OAJxAHxH!dQXu=AJ0*7Ev
z7WU?0ZvgsNC9bak(x~qe?I#!YzgaAVF2?)wETHA2z4pAU7xGE89}w+N5TL$R*gu1K
zPdmo{my5<@|DygM1NjoopJ=}g@?W6dF6!qNwLh^a-dBKMo96M6{_g<&r+6Qlu+n~m
z{?9`Gxsd-6@YXb6^Hgs^ycbaq2!Dx1@x2FJ@2{<&vy1%y9k}--w@2e6L-fHkUzcR>
z&x_*Ui28^apGJ(2d(n6wMLgHheq6*81b*=p-%B)}-<6#9Zf6g2(kcOfg#P+*K1YQA
zCl|>X&bOxwtu<rt!%ca7_d^|f;zl8r9c~{rhPFlzGNtSLyLUX?(@DZDdv+8G>Y<)Q
zv@1-aR5oQ0-)<8Q>mzDGODfsXbUI3sa9D`CR6`Ail3H3bw78ZYqUH+>hB&8VPq)Ro
zKRKFDrxL26MfW}wSDd1btTsmGsKF3IaLT$i6Suqfk)1nwl}8?UARg^g`gZK>jVcS>
zZAof|niyH=(~i$F9@`yP!XcITN|G4R?0c+cfhiVS(G9hLL3r?>vR4~U>4sM5Osl%C
z=};KX<g#2rQE05Sr^nTNeo)ml8t*VHCetx1g!>=wRkOpR>aeysJggb<Lok%FS)IA0
zhDdK1(31yvd(O$_wd`0bo6L>f;HL8V)=WxIbZglKy#4tF)dUPD9*jAS<uj-etsBY2
z#*HMpj{=PAThOc2a5fryD6yaAjgf+;CY1#K4b4(8!uO$PsRTL<W@d17s3!qtIDsXh
z7zH(D=oq$WxJ`*G7=y$CMNd7gMY-{gf|gIK2`##Rzh(a`42~@}IQA6=jjgGiuFy!g
z_h6BBhWSj#bx?4CC8b((c(ZDkP`w}1mmO6S<Ky8DWrvZ=AP_Z~R5GK6Hcl<$MtdSR
zYFO0fkfLBja$^cON^VFgVCpnDvZQJKRwH3W5Zwzw8}DY0_p=8pHl#%39SWix?1{H4
z@%xm%up&mP9qTL~4k-^SNevBhhoW|8FljV-!7W4$Copa|CN{zO>R^u6DmtYqn6`23
zUV9>~ZYiVLbS`mV5z}HRJ&#}>lBujRs%uHuAgf|+XVg@dA(ph3C1;{FxePHyqg?|1
zL0z}^N{z<0;599qv}haCzE=3=18X6}wnC@R0v!i~>vZ?_?CexFBMh4g2is~ir(!Xs
zEx6g{^O|)+O8B`fpr6~S)3?-P<zRG_)>*jD0w(0ls!LX#^jv~335`0z;h7xQ`q0h4
z5tK9fQmJKRqa<^lerM`7%Ah_L-v(+M7cx4-8!de|yLLnFVyj&u7eaCWU_*oTh4FA+
zVZ)kw^1a-{<p#cIE1@w?7>U(0gprI*5JsXpNw|%F2mLb7PyEYxUg5__#Si`}bf=jx
zhG8vXB)b8^@U)&VdeA}`N#VVOkwAtBBcOJ|Nba^0MzXh^FcQ89VI)FbgpmmEB8-Hw
zmoSp#7~yrue+VPV-bWZ8{(izpf(HmA@lFy(;x$4T$#<GC67xJ^Otdf3`q2}NT{#Ts
zmDm;E#QDo|snwKAGv@Nr@lyT#8>aUd2I>#T%k_VnDtrHN&a`RSL0`XCqpv#XPaO0I
z4*Gou{f>iv%Rygo(B~ZVYYzHX4*INve#t?fcF<D}deT8Z<Dd-(op#Vk2i@<W`#`Us
zoiW*~#ft2E`GaMF;+!177_wH=$7W1lXvUOhTg~^X)hibOuOmlF9>?4Pv#!>Unu{}L
zL-BaY4?TD2%q7O+mD@|jM)!QNkxibzTs(?(3DrF2sy7Bdp}(4z4z5g*2-Q!UEbtTX
z_EzfY>Vvu*dcMp;lP2uUx#o*=PMvGj>KZ9jtgz7U%{=D29cy_Oc@(V$n*U}-HcwbS
z?x=2(yok%D->6nUmhGHS=vTMH)@*UE8hF0!VteK!*6$|STC#(9NM{25w#Fg=p08N(
zMb2LyhpnyfeHDrGIryLNZvCj`?T5?tvFWmh73X{d)8%7m=kXQi>QH|Iw4c3fHW#PM
zfyi`O_MI>rXsjXYhirZ0j7fSv-?VuY^?K;CzzI|G?JP64r^0*_riZSX>kvc!l(~e(
z=Ga8h%_fd`ROknMFPq-kMicQ@ur<zjV~y6>x&{uHp;z&+=SwUwRI2kOO5~GGOq*lW
zE`WBWCey{9gbr&si+;wzf5`_wBEBT*GWszE+0?*{*-Gsqh>ty1@#eeAI075SAsa^<
znllM=Cdd4y9PnE@((KN%JS&@|7lU4(LyxgXD>(B0Ru4ZdZ%>!!kDb4~1at%ZMd0Ui
zjB^XxtP*{E6ZPULeum{w@v|*7&Cj-R;Cafqt$V|a85MI>^%g5t-$Yqr#mW)zyqHIt
zV-}b&@1eQH9FxsvpWtJxS)@33H}#w51oQ0@elh=Z%R$d$?e~hc|NfWNE6}e*#2(lV
z`>w#5OYYEMsZ;8k!@9o5HBg)j2)R2pSfc*RpZ)BT6qzhXq4Upbb=y4l%h@A1*WqRy
z5OVm~MQvfTOW1Hl5~Z#%#xT-ZruB_uyP<_-u``#r?VnzfLnQCA<X>Rl;HbV5f{zG%
zq-jrzeL(HxzzS1_Er}JZb>Ko<vg4+?47Foj=@rDdhQ{ji6}A0Fc!?N8`hL+|AeXSp
zjT8`<h;7@D_9R9$<RjvHS}Sy~rn@QKzvvD~_pSv+>{-bH8HwXx3p^|Ey8?eK@D~Cv
zb8);{;J>&zz9{gA0@L@I-bLsxPVXE2;*QsHn7@U*bCl-}r;qS=nl&E&o<ZMd`wfKN
zKj^MWS;8#i?;!LJL~lsVQ=Go|BYv-oF#bM5_s%b?)!aVttH5Mq9{AHAvj4iEeU+Vb
z(4yGyCsaO}`rpDWOLu4Iwm?hw?ngHS+JbG!YX7gCpgw}NXsClMn9Aa^muJCj&d`E8
zcJ{Oy>M#qAsQL&CCJ$xxLm7^Z0t@0Q5j?0B^i(dpprSxl(9)#GiG121%gD@w$i4Az
z-Ef12oRvlg`M)-z3>DOjX4zM9GhxAmkt^t^bF@D}K67Y}<Ql?UCZlDIuNcsq3#~;v
zL$%&!8DC#^u~z``mIyuT4OQYfsa-@$YQ0f<gdXhydV@_%HMuN+-YJ&~J=z<mK}6iV
zt;A|?uk^0z7J9Uo-tq7~WEVTW4#xKZ>Cqne6q{{?)%>~y(0j|5LXY;&zNP%h*(3be
z`f<kJI!TZA-o>SS?>YNHd$8Z3M|-u|%l9zJmpb$`R=Y>gS#i<J_qkncy8{kAYj1e@
zo0wCN;DAGq-sJ<xx3}9y9QK}a=+W8K-^9<W#d>3`whri>Y6N;QhhDwF&j~#mEB+RL
zYkNmo&E5s*U1(bP)@;*A4XxP79)G*%YsQ{pd;DHxHNW%tp3JYfwci<s-gW3*Ur~$Q
zsrPe-9_4tl|JL!n;?Scry57&%i&Kx_RmT009_1J>K<_n&o*lz)*}`ub={@VHOAc(m
Oi&Lq?$Ks7!==}?15&EA1

literal 0
HcwPel00001

diff --git a/fbreader/moto/util/language_detector.cpp b/fbreader/moto/util/language_detector.cpp
new file mode 100644
index 0000000..a683831
--- /dev/null
+++ b/fbreader/moto/util/language_detector.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <string>
+
+#include <zlanguage.h>
+
+int main() {
+	std::string language = (const char*)ZLanguage::getSystemLanguageCode().utf8();
+	language.erase(2);
+	if (language.length() != 2) {
+		language = "en";
+	}
+	std::cout << language;
+	return 0;
+}
diff --git a/fbreader/scripts/install_help.sh b/fbreader/scripts/install_help.sh
index 15a4e4e..467f935 100755
--- a/fbreader/scripts/install_help.sh
+++ b/fbreader/scripts/install_help.sh
@@ -9,6 +9,9 @@ case "$1" in
 	desktop|maemo|openzaurus_640x480|pdaxrom|pepperpad3|zaurus_640x480)
 		platform=desktop;
 		;;
+	moto)
+		platform=desktop;
+		;;
 	opensimpad-0.9.0|qvfb)
 		platform=640x480;
 		;;
diff --git a/fbreader/scripts/install_toolbar_and_menu.sh b/fbreader/scripts/install_toolbar_and_menu.sh
index f346c94..628114b 100755
--- a/fbreader/scripts/install_toolbar_and_menu.sh
+++ b/fbreader/scripts/install_toolbar_and_menu.sh
@@ -18,7 +18,7 @@ case "$1" in
 esac;
 
 case "$1" in
-	maemo|zaurus_640x480|zaurus_240x320|pma400)
+	moto|maemo|zaurus_640x480|zaurus_240x320|pma400)
 		menubar_file=data/default/menubar.xml
 		;;
 	*)
diff --git a/fbreader/src/fbreader/FBReader.cpp b/fbreader/src/fbreader/FBReader.cpp
index 050e47c..fdb2288 100644
--- a/fbreader/src/fbreader/FBReader.cpp
+++ b/fbreader/src/fbreader/FBReader.cpp
@@ -338,6 +338,8 @@ void FBReader::setMode(ViewMode mode) {
 	myPreviousMode = myMode;
 	myMode = mode;
 
+	setViewFinal(myMode == BOOK_TEXT_MODE);
+
 	switch (myMode) {
 		case BOOK_TEXT_MODE:
 			setView(myBookTextView);
diff --git a/fbreader/src/fbreader/FBReaderActions.cpp b/fbreader/src/fbreader/FBReaderActions.cpp
index 054c243..b65cda0 100644
--- a/fbreader/src/fbreader/FBReaderActions.cpp
+++ b/fbreader/src/fbreader/FBReaderActions.cpp
@@ -352,8 +352,7 @@ GotoPageNumber::GotoPageNumber(FBReader &fbreader) : ModeDependentAction(fbreade
 }
 
 bool GotoPageNumber::isEnabled() {
-	return false;
-	//return fbreader().bookTextView().pageNumber() > 1;
+	return ModeDependentAction::isEnabled() && (fbreader().bookTextView().pageNumber() > 1);
 }
 
 void GotoPageNumber::run() {
@@ -366,6 +365,9 @@ void GotoPageNumber::run() {
 	gotoPageDialog->addButton(ZLDialogManager::CANCEL_BUTTON, false);
 
 	if (gotoPageDialog->run()) {
+		gotoPageDialog->acceptValues();
+		fbreader().bookTextView().gotoPage(pageNumberOption.value());
+		fbreader().refreshWindow();
 	}
 }
 
diff --git a/fbreader/src/formats/txt/PlainTextFormat.cpp b/fbreader/src/formats/txt/PlainTextFormat.cpp
index 145cafb..03747d4 100644
--- a/fbreader/src/formats/txt/PlainTextFormat.cpp
+++ b/fbreader/src/formats/txt/PlainTextFormat.cpp
@@ -101,7 +101,7 @@ void PlainTextFormatDetector::detect(ZLInputStream &stream, PlainTextFormat &for
 		const char *end = buffer + length;
 		for (const char *ptr = buffer; ptr != end; ++ptr) {
 			++currentLineLength;
-			if ((*ptr == '\n') || ((*ptr == '\r') && (previous != '\n'))) {
+			if (*ptr == '\n') {
 				++lineCounter;
 				if (currentLineIsEmpty) {
 					++emptyLineCounter;
@@ -126,6 +126,8 @@ void PlainTextFormatDetector::detect(ZLInputStream &stream, PlainTextFormat &for
 				currentLineIsEmpty = true;
 				currentLineLength = 0;
 				currentLineIndent = 0;
+			} else if (*ptr == '\r') {
+				continue;
 			} else if (isspace((unsigned char)*ptr)) {
 				if (currentLineIsEmpty) {
 					++currentLineIndent;
diff --git a/fbreader/src/formats/txt/TxtBookReader.cpp b/fbreader/src/formats/txt/TxtBookReader.cpp
index 8eda772..1467a00 100644
--- a/fbreader/src/formats/txt/TxtBookReader.cpp
+++ b/fbreader/src/formats/txt/TxtBookReader.cpp
@@ -51,6 +51,9 @@ bool TxtBookReader::characterDataHandler(std::string &str) {
 			beginParagraph();
 		}
 		addData(str);
+		if (myInsideContentsParagraph) {
+			addContentsData(str);
+		}
 		myNewLine = false;
 	}
 	return true;
@@ -66,7 +69,7 @@ bool TxtBookReader::newLineHandler() {
 	mySpaceCounter = 0;
 	bool paragraphBreak =
 		(myFormat.breakType() & PlainTextFormat::BREAK_PARAGRAPH_AT_NEW_LINE) ||
-		((myFormat.breakType() & PlainTextFormat::BREAK_PARAGRAPH_AT_EMPTY_LINE) && (myLineFeedCounter > 1));
+		((myFormat.breakType() & PlainTextFormat::BREAK_PARAGRAPH_AT_EMPTY_LINE) && (myLineFeedCounter > 0));
 
 	if (myFormat.createContentsTable()) {
 		if (!myInsideContentsParagraph && (myLineFeedCounter == myFormat.emptyLinesBeforeNewSection() + 1)) {
diff --git a/fbreader/src/formats/txt/TxtReader.cpp b/fbreader/src/formats/txt/TxtReader.cpp
index 3ce3f65..d8be30d 100644
--- a/fbreader/src/formats/txt/TxtReader.cpp
+++ b/fbreader/src/formats/txt/TxtReader.cpp
@@ -40,7 +40,6 @@ void TxtReader::readDocument(ZLInputStream &stream) {
 	char *buffer = new char[BUFSIZE];
 	std::string str;
 	size_t length;
-	char previous = 0;
 	do {
 		length = stream.read(buffer, BUFSIZE);
 		char *start = buffer;
@@ -54,13 +53,11 @@ void TxtReader::readDocument(ZLInputStream &stream) {
 				}
 				start = ptr + 1;
 				newLineHandler();
-				previous = *ptr;
 			} else if (*ptr == '\r') {
+				continue;
 			} else if (isspace((unsigned char)*ptr)) {
-				previous = *ptr;
 				*ptr = ' ';
 			} else {
-				previous = *ptr;
 			}
 		}
 		if (start != end) {
diff --git a/fbreader/src/migration/Migration.h b/fbreader/src/migration/Migration.h
index 3606272..8357047 100644
--- a/fbreader/src/migration/Migration.h
+++ b/fbreader/src/migration/Migration.h
@@ -54,4 +54,13 @@ protected:
 	void doMigrationInternal();
 };
 
+class Migration_0_8_13 : public Migration {
+
+public:
+	Migration_0_8_13();
+
+protected:
+	void doMigrationInternal();
+};
+
 #endif /* __MIGRATION_H__ */
diff --git a/fbreader/src/migration/Migration_0_8_13.cpp b/fbreader/src/migration/Migration_0_8_13.cpp
new file mode 100644
index 0000000..3f77f7a
--- /dev/null
+++ b/fbreader/src/migration/Migration_0_8_13.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <vector>
+
+#include <ZLStringUtil.h>
+
+#include "Migration.h"
+
+Migration_0_8_13::Migration_0_8_13() : Migration("0.8.13") {
+}
+
+void Migration_0_8_13::doMigrationInternal() {
+	std::vector<std::string> optionNames;
+	ZLOption::listOptionNames("Style", optionNames);
+	for (std::vector<std::string>::const_iterator it = optionNames.begin(); it != optionNames.end(); ++it) {
+		if (ZLStringUtil::stringEndsWith(*it, ":lineSpacing") ||
+				ZLStringUtil::stringEndsWith(*it, ":lineSpace")) {
+			ZLDoubleOption doubleOption(ZLCategoryKey::LOOK_AND_FEEL, "Style", *it, 0.0);
+			ZLIntegerOption intOption(ZLCategoryKey::LOOK_AND_FEEL, "Style", *it + "Percent", -1);
+			const double doubleValue = doubleOption.value();
+			const int intValue = intOption.value();
+			doubleOption.setValue((intValue == -1) ? 0.0 : (intValue / 100.0));
+			intOption.setValue((int)(doubleValue * 100));
+		}
+	}
+}
diff --git a/fbreader/src/migration/migrate.cpp b/fbreader/src/migration/migrate.cpp
index 08b8d80..c3fdaf1 100644
--- a/fbreader/src/migration/migrate.cpp
+++ b/fbreader/src/migration/migrate.cpp
@@ -24,6 +24,7 @@
 
 void migrateFromOldVersions() {
 	Migration_0_8_11().doMigration();
+	Migration_0_8_13().doMigration();
 
 	ZLStringOption(FBCategoryKey::SYSTEM, "Version", "FBReaderVersion", "0").setValue(VERSION);
 }
diff --git a/fbreader/src/optionsDialog/FormatOptionsPage.cpp b/fbreader/src/optionsDialog/FormatOptionsPage.cpp
index e31adeb..5d16a06 100644
--- a/fbreader/src/optionsDialog/FormatOptionsPage.cpp
+++ b/fbreader/src/optionsDialog/FormatOptionsPage.cpp
@@ -62,7 +62,7 @@ FormatOptionsPage::FormatOptionsPage(ZLDialogContent &dialogTab) {
 		ZLTextBaseStyle &baseStyle = collection.baseStyle();
 
 		registerEntries(dialogTab,
-			KEY_LINESPACING, new ZLTextLineSpacingOptionEntry(baseStyle.LineSpaceOption, dialogTab.resource(KEY_LINESPACING), false),
+			KEY_LINESPACING, new ZLTextLineSpaceOptionEntry(baseStyle.LineSpacePercentOption, dialogTab.resource(KEY_LINESPACING), false),
 			KEY_DUMMY, 0,//new ZLSimpleSpinOptionEntry("First Line Indent", baseStyle.firstLineIndentDeltaOption(), -300, 300, 1),
 			name
 		);
@@ -93,7 +93,7 @@ FormatOptionsPage::FormatOptionsPage(ZLDialogContent &dialogTab) {
 			);
 			
 			registerEntries(dialogTab,
-				KEY_LINESPACING, new ZLTextLineSpacingOptionEntry(decoration->LineSpaceOption, dialogTab.resource(KEY_LINESPACING), true),
+				KEY_LINESPACING, new ZLTextLineSpaceOptionEntry(decoration->LineSpacePercentOption, dialogTab.resource(KEY_LINESPACING), true),
 				KEY_FIRSTLINEINDENT, new ZLSimpleSpinOptionEntry(decoration->FirstLineIndentDeltaOption, 1),
 				name
 			);
diff --git a/makefiles/arch/ebr.mk b/makefiles/arch/ebr.mk
new file mode 100644
index 0000000..9304e6d
--- /dev/null
+++ b/makefiles/arch/ebr.mk
@@ -0,0 +1,17 @@
+include $(ROOTDIR)/makefiles/arch/unix.mk
+
+SDK_DIR = /usr/local/arm/3.4.1
+SDK_BIN_DIR = $(SDK_DIR)/arm-linux/bin
+
+CC = $(SDK_BIN_DIR)/gcc
+AR = $(SDK_BIN_DIR)/ar rsu
+LD = $(SDK_BIN_DIR)/g++
+
+CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG -I $(ROOTDIR)/../ebr/ext/include
+LDFLAGS = -L $(ROOTDIR)/../ebr/ext/lib
+
+XML_LIB = -lexpat
+ARCHIVER_LIB = -lz -lbz2
+
+RM = rm -rvf
+RM_QUIET = rm -rf
diff --git a/makefiles/arch/moto.mk b/makefiles/arch/moto.mk
new file mode 100644
index 0000000..692f7c7
--- /dev/null
+++ b/makefiles/arch/moto.mk
@@ -0,0 +1,26 @@
+include $(ROOTDIR)/makefiles/arch/unix.mk
+
+INSTALLDIR = /mmc/mmca1/.system/QTDownLoad/fbreader
+IMAGEDIR = $(INSTALLDIR)/pics
+APPIMAGEDIR = $(IMAGEDIR)/%APPLICATION_NAME%
+
+ARM_PATH = /usr/local/a1200/gcc-arm-iwmmxt/gcc-3.3.6-glibc-2.3.2/arm-linux
+TOOLS_PATH = $(ARM_PATH)/arm-linux/bin
+QT_PATH = $(ARM_PATH)/qt
+
+CC = $(TOOLS_PATH)/gcc
+AR = $(TOOLS_PATH)/ar rsu
+LD = $(TOOLS_PATH)/g++
+MOC = $(QT_PATH)/bin/moc
+
+RM = rm -rvf
+RM_QUIET = rm -rf
+
+QTINCLUDE = -I $(QT_PATH)/include -I $(QT_PATH)/include/ezx
+UILIBS = -L$(QT_PATH)/lib -L$(QT_PATH)/lib/ezx -lqte-mt -lezxappbase -lezxappsdk -lezxopenwindow -lipp-miscGen -lipp-jp -lezxjpeg -lezxpm
+
+CFLAGS = -pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -mcpu=iwmmxt -mtune=iwmmxt -Wno-ctor-dtor-privacy -W -ftemplate-depth-30
+LDFLAGS = 
+
+XML_LIB = -lexpat
+ARCHIVER_LIB = -lz -lbz2
diff --git a/makefiles/packaging.mk b/makefiles/packaging.mk
index 56addd4..4fffd3a 100644
--- a/makefiles/packaging.mk
+++ b/makefiles/packaging.mk
@@ -2,12 +2,23 @@ VERSION = $(shell cat fbreader/VERSION)
 SOVERSION = $(shell cat zlibrary/SOVERSION)
 TMPDIR = $(CURDIR)/fbreader-$(VERSION)
 
+motopkg:
+	@echo -n "Building $(ARCHITECTURE) $@ package..."
+	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules build 1> $(ARCHITECTURE)-$@.log 2>&1
+	@mkdir $(TMPDIR)
+	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) install 1>> $(ARCHITECTURE)-$@.log 2>&1
+	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) package 1>> $(ARCHITECTURE)-$@.log 2>&1
+	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules clean 1> /dev/null 2>&1
+	@rm -rf $(TMPDIR)
+	@rm -f $(CURDIR)/$(ARCHITECTURE)-$@.log
+	@echo " OK"
+
 tarball:
 	@echo -n "Building $(ARCHITECTURE) $@ package..."
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules build 1> $(ARCHITECTURE)-$@.log 2>&1
 	@mkdir $(TMPDIR)
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) install 1>> $(ARCHITECTURE)-$@.log 2>&1
-	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) tarball 1>> $(ARCHITECTURE)-$@.log 2>&1
+	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) package 1>> $(ARCHITECTURE)-$@.log 2>&1
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules clean 1> /dev/null 2>&1
 	@rm -rf $(TMPDIR)
 	@rm -f $(CURDIR)/$(ARCHITECTURE)-$@.log
diff --git a/makefiles/target.mk b/makefiles/target.mk
index 6f79357..fd6593c 100644
--- a/makefiles/target.mk
+++ b/makefiles/target.mk
@@ -12,6 +12,9 @@
 #UI_TYPE = maemo2
 #UI_TYPE = maemo4
 
+#TARGET_ARCH = ebr
+#UI_TYPE = nanoX
+
 TARGET_ARCH = desktop
 UI_TYPE = gtk
 #UI_TYPE = qt
@@ -30,6 +33,9 @@ UI_TYPE = gtk
 #UI_TYPE = qtopia-240x320
 #UI_TYPE = qtopia-640x480
 
+#TARGET_ARCH = moto
+#UI_TYPE = ezx
+
 #TARGET_ARCH = pma400
 #UI_TYPE = qtopia
 
diff --git a/zlibrary/VERSION b/zlibrary/VERSION
index 7eff8ab..832bad2 100644
--- a/zlibrary/VERSION
+++ b/zlibrary/VERSION
@@ -1 +1 @@
-0.8.12
+0.8.14
diff --git a/zlibrary/core/Makefile b/zlibrary/core/Makefile
index 390e413..8d7672f 100644
--- a/zlibrary/core/Makefile
+++ b/zlibrary/core/Makefile
@@ -13,24 +13,20 @@ else
   TARGET = libzlcore.a
 endif
 
-SUBDIRS_ALL = src/library src/util src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/splittedView src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/desktop/application src/desktop/dialogs src/posix/filesystem src/unix/time src/unix/xmlconfig src/unix/filesystem src/unix/iconv src/unix/message src/unix/library
+SUBDIRS_ALL = src/library src/util src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/splittedView src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/desktop/application src/desktop/dialogs src/posix/filesystem src/unix/time src/unix/xmlconfig src/unix/filesystem src/unix/iconv src/unix/library src/win32/encoding src/win32/filesystem src/win32/config
 
 SUBDIRS = src/library src/util src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/splittedView src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/posix/filesystem src/unix/time
 
 ifeq "<$(TARGET_ARCH)>" "$(findstring <$(TARGET_ARCH)>, <desktop> <pepperpad3>)"
-  SUBDIRS += src/desktop/application src/desktop/dialogs src/unix/message
+  SUBDIRS += src/desktop/application src/desktop/dialogs
 endif
 
 ifeq "$(TARGET_ARCH)" "pdaxrom"
-  SUBDIRS += src/desktop/dialogs src/unix/message
-endif
-
-ifeq "<$(TARGET_ARCH)>" "$(findstring <$(TARGET_ARCH)>, <openzaurus> <opensimpad-0.9.0> <qvfb>)"
-  SUBDIRS += src/unix/message
+  SUBDIRS += src/desktop/dialogs
 endif
 
 ifeq "$(TARGET_ARCH)" "win32"
-  SUBDIRS += src/desktop/application src/desktop/dialogs
+  SUBDIRS += src/desktop/application src/desktop/dialogs src/win32/encoding src/win32/filesystem src/win32/config
 else
   SUBDIRS += src/unix/xmlconfig src/unix/filesystem src/unix/iconv src/unix/library
 endif
@@ -65,9 +61,6 @@ endif
 
 do_install:
 	@install -d $(SHARE_ZLIBRARY)
-	@if [ -f data/messages.$(TARGET_ARCH).xml ]; then \
-		install -m 0644 data/messages.$(TARGET_ARCH).xml $(SHARE_ZLIBRARY)/messages.xml; \
-	fi
 	@install -d $(SHARE_ZLIBRARY)/encodings
 	@install -m 0644 $(ENCODING_FILES) $(SHARE_ZLIBRARY)/encodings
 	@install -d $(SHARE_ZLIBRARY)/resources
diff --git a/zlibrary/core/data/default/config.moto.xml b/zlibrary/core/data/default/config.moto.xml
new file mode 100644
index 0000000..08c9fb0
--- /dev/null
+++ b/zlibrary/core/data/default/config.moto.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+  <group name="PlatformOptions">
+    <option name="FullKeyboardControlSupported" value="false"/>
+    <option name="TouchScreenPresented" value="true"/>
+    <option name="MousePresented" value="false"/>
+    <option name="KeyboardPresented" value="false"/>
+  </group>
+</config>
diff --git a/zlibrary/core/src/application/ZLApplication.cpp b/zlibrary/core/src/application/ZLApplication.cpp
index e40e09b..10d7002 100644
--- a/zlibrary/core/src/application/ZLApplication.cpp
+++ b/zlibrary/core/src/application/ZLApplication.cpp
@@ -38,6 +38,8 @@ static const std::string CONFIG = "Config";
 static const std::string AUTO_SAVE = "AutoSave";
 static const std::string TIMEOUT = "Timeout";
 
+bool ZLApplication::myIsViewFinal = true;
+
 ZLApplication::ZLApplication(const std::string &name) : ZLApplicationBase(name),
 	RotationAngleOption(ZLCategoryKey::CONFIG, ROTATION, ANGLE, ZLViewWidget::DEGREES90),
 	AngleStateOption(ZLCategoryKey::CONFIG, STATE, ANGLE, ZLViewWidget::DEGREES0),
@@ -47,6 +49,7 @@ ZLApplication::ZLApplication(const std::string &name) : ZLApplicationBase(name),
 	KeyDelayOption(ZLCategoryKey::CONFIG, "Options", "KeyDelay", 0, 5000, 250),
 	myViewWidget(0),
 	myWindow(0) {
+	myIsViewFinal = true;
 	myContext = ZLibrary::createContext();
 	if (ConfigAutoSavingOption.value()) {
 		ZLOption::startAutoSave(ConfigAutoSaveTimeoutOption.value());
@@ -348,3 +351,11 @@ void ZLApplicationWindow::onButtonPress(ZLApplication::Toolbar::ButtonItem &butt
 	}
 	application().doAction(button.actionId());
 }
+
+bool ZLApplication::isViewFinal() const {
+	return myIsViewFinal;
+}
+
+void ZLApplication::setViewFinal(bool final) {
+	myIsViewFinal = final;
+}
diff --git a/zlibrary/core/src/application/ZLApplication.h b/zlibrary/core/src/application/ZLApplication.h
index 73e01cb..3f3e010 100644
--- a/zlibrary/core/src/application/ZLApplication.h
+++ b/zlibrary/core/src/application/ZLApplication.h
@@ -356,6 +356,11 @@ public:
 	virtual bool closeView();
 	virtual void openFile(const std::string &fileName);
 
+	// TODO in 1.0: replace by virtual method
+	bool isViewFinal() const;
+	// TODO in 1.0: remove
+	void setViewFinal(bool final);
+
 	void refreshWindow();
 	void presentWindow();
 
@@ -384,6 +389,8 @@ private:
 	class ZLApplicationWindow *myWindow;
 	ZLTime myLastKeyActionTime;
 	shared_ptr<ZLMessageHandler> myPresentWindowHandler;
+	// TODO in 1.0: change to non-static
+	static bool myIsViewFinal;
 
 friend class ZLApplicationWindow;
 friend class MenuVisitor;
diff --git a/zlibrary/core/src/options/ZLConfig.h b/zlibrary/core/src/options/ZLConfig.h
index 44d1b8c..9c2c319 100644
--- a/zlibrary/core/src/options/ZLConfig.h
+++ b/zlibrary/core/src/options/ZLConfig.h
@@ -20,6 +20,7 @@
 #ifndef __ZLCONFIG_H__
 #define __ZLCONFIG_H__
 
+#include <vector>
 #include <string>
 
 class ZLConfig;
@@ -59,6 +60,7 @@ class ZLConfig {
 public:
 	virtual ~ZLConfig();
 
+	virtual void listOptionNames(const std::string &groupName, std::vector<std::string> &names) = 0;
 	virtual void removeGroup(const std::string &name) = 0;
 
 	virtual const std::string &getDefaultValue(const std::string &group, const std::string &name, const std::string &defaultValue) const = 0;
diff --git a/zlibrary/core/src/options/ZLOptions.cpp b/zlibrary/core/src/options/ZLOptions.cpp
index 3d69e1c..9b36be9 100644
--- a/zlibrary/core/src/options/ZLOptions.cpp
+++ b/zlibrary/core/src/options/ZLOptions.cpp
@@ -110,6 +110,10 @@ void ZLOption::clearGroup(const std::string &groupName) {
 	ourConfig->removeGroup(groupName);
 }
 
+void ZLOption::listOptionNames(const std::string &groupName, std::vector<std::string> &names) {
+	ourConfig->listOptionNames(groupName, names);
+}
+
 void ZLOption::startAutoSave(int seconds) {
 	ourConfig->startAutoSave(seconds);
 }
diff --git a/zlibrary/core/src/options/ZLOptions.h b/zlibrary/core/src/options/ZLOptions.h
index 0aaa8cd..b075218 100644
--- a/zlibrary/core/src/options/ZLOptions.h
+++ b/zlibrary/core/src/options/ZLOptions.h
@@ -20,6 +20,7 @@
 #ifndef __ZLOPTIONS_H__
 #define __ZLOPTIONS_H__
 
+#include <vector>
 #include <string>
 
 #include <ZLColor.h>
@@ -73,6 +74,7 @@ public:
 
 public:
 	static void clearGroup(const std::string &group);
+	static void listOptionNames(const std::string &group, std::vector<std::string> &names);
 	static bool isAutoSavingSupported();
 	static void startAutoSave(int seconds);
 	
diff --git a/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp b/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp
index 562fe1e..41bca50 100644
--- a/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp
+++ b/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp
@@ -134,6 +134,18 @@ XMLConfigGroup *XMLConfig::getDefaultGroup(const std::string &name) const {
 	return (it != myDefaultGroups.end()) ? it-> second : 0;
 }
 
+void XMLConfig::listOptionNames(const std::string &groupName, std::vector<std::string> &names) {
+	std::map<std::string,XMLConfigGroup*>::iterator it = myGroups.find(groupName);
+	if (it == myGroups.end()) {
+		return;
+	}
+
+	const std::map<std::string,XMLConfigValue> &values = it->second->myValues;
+	for (std::map<std::string,XMLConfigValue>::const_iterator jt = values.begin(); jt != values.end(); ++jt) {
+		names.push_back(jt->first);
+	}
+}
+
 void XMLConfig::removeGroup(const std::string &name) {
 	std::map<std::string,XMLConfigGroup*>::iterator it = myGroups.find(name);
 	if (it != myGroups.end()) {
diff --git a/zlibrary/core/src/unix/xmlconfig/XMLConfig.h b/zlibrary/core/src/unix/xmlconfig/XMLConfig.h
index 1948e7c..b8a34f4 100644
--- a/zlibrary/core/src/unix/xmlconfig/XMLConfig.h
+++ b/zlibrary/core/src/unix/xmlconfig/XMLConfig.h
@@ -68,6 +68,7 @@ public:
 	XMLConfig();
 	~XMLConfig();
 
+	void listOptionNames(const std::string &groupName, std::vector<std::string> &names);
 	void removeGroup(const std::string &name);
 
 	const std::string &getDefaultValue(const std::string &group, const std::string &name, const std::string &defaultValue) const;
diff --git a/zlibrary/ui/src/win32/config/RegistryUtil.cpp b/zlibrary/core/src/win32/config/RegistryUtil.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/config/RegistryUtil.cpp
rename to zlibrary/core/src/win32/config/RegistryUtil.cpp
diff --git a/zlibrary/ui/src/win32/config/StringEncoder.cpp b/zlibrary/core/src/win32/config/StringEncoder.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/config/StringEncoder.cpp
rename to zlibrary/core/src/win32/config/StringEncoder.cpp
diff --git a/zlibrary/ui/src/win32/config/StringEncoder.h b/zlibrary/core/src/win32/config/StringEncoder.h
similarity index 100%
copy from zlibrary/ui/src/win32/config/StringEncoder.h
copy to zlibrary/core/src/win32/config/StringEncoder.h
diff --git a/zlibrary/ui/src/win32/config/ZLWin32Config.cpp b/zlibrary/core/src/win32/config/ZLWin32Config.cpp
similarity index 92%
rename from zlibrary/ui/src/win32/config/ZLWin32Config.cpp
rename to zlibrary/core/src/win32/config/ZLWin32Config.cpp
index 13e8f2a..60412c8 100644
--- a/zlibrary/ui/src/win32/config/ZLWin32Config.cpp
+++ b/zlibrary/core/src/win32/config/ZLWin32Config.cpp
@@ -83,6 +83,17 @@ ZLWin32ConfigGroup *ZLWin32Config::getGroup(const std::string &name, bool create
 	return 0;
 }
 
+void ZLWin32Config::listOptionNames(const std::string &groupName, std::vector<std::string> &names) {
+	std::map<std::string,ZLWin32ConfigGroup*>::const_iterator it = myGroups.find(groupName);
+	if (it == myGroups.end()) {
+		return;
+	}
+	const std::map<std::string,ZLWin32ConfigValue> &values = it->second->myValues;
+	for (std::map<std::string,ZLWin32ConfigValue>::const_iterator jt = values.begin(); jt != values.end(); ++jt) {
+		names.push_back(jt->first);
+	}
+}
+
 void ZLWin32Config::removeGroup(const std::string &name) {
 	std::map<std::string,ZLWin32ConfigGroup*>::iterator it = myGroups.find(name);
 	if (it != myGroups.end()) {
diff --git a/zlibrary/ui/src/win32/config/ZLWin32Config.h b/zlibrary/core/src/win32/config/ZLWin32Config.h
similarity index 97%
rename from zlibrary/ui/src/win32/config/ZLWin32Config.h
rename to zlibrary/core/src/win32/config/ZLWin32Config.h
index 91452cb..d33d192 100644
--- a/zlibrary/ui/src/win32/config/ZLWin32Config.h
+++ b/zlibrary/core/src/win32/config/ZLWin32Config.h
@@ -69,6 +69,7 @@ public:
 	ZLWin32Config();
 	~ZLWin32Config();
 
+	void listOptionNames(const std::string &groupName, std::vector<std::string> &names);
 	void removeGroup(const std::string &name);
 
 	const std::string &getValue(const std::string &group, const std::string &name, const std::string &defaultValue) const;
diff --git a/zlibrary/ui/src/win32/config/ZLWin32ConfigIO.cpp b/zlibrary/core/src/win32/config/ZLWin32ConfigIO.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/config/ZLWin32ConfigIO.cpp
rename to zlibrary/core/src/win32/config/ZLWin32ConfigIO.cpp
diff --git a/zlibrary/ui/src/win32/config/ZLWin32ConfigValue.h b/zlibrary/core/src/win32/config/ZLWin32ConfigValue.h
similarity index 100%
rename from zlibrary/ui/src/win32/config/ZLWin32ConfigValue.h
rename to zlibrary/core/src/win32/config/ZLWin32ConfigValue.h
diff --git a/zlibrary/ui/src/win32/encoding/ZLWin32EncodingConverter.cpp b/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/encoding/ZLWin32EncodingConverter.cpp
rename to zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.cpp
diff --git a/zlibrary/ui/src/win32/encoding/ZLWin32EncodingConverter.h b/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.h
similarity index 100%
rename from zlibrary/ui/src/win32/encoding/ZLWin32EncodingConverter.h
rename to zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.h
diff --git a/zlibrary/ui/src/win32/filesystem/ZLWin32FSManager.cpp b/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem/ZLWin32FSManager.cpp
rename to zlibrary/core/src/win32/filesystem/ZLWin32FSManager.cpp
diff --git a/zlibrary/ui/src/win32/filesystem/ZLWin32FSManager.h b/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.h
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem/ZLWin32FSManager.h
rename to zlibrary/core/src/win32/filesystem/ZLWin32FSManager.h
diff --git a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.cpp b/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.cpp
similarity index 100%
copy from zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.cpp
copy to zlibrary/core/src/win32/filesystem/ZLWin32RootDir.cpp
diff --git a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h b/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.h
similarity index 100%
copy from zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h
copy to zlibrary/core/src/win32/filesystem/ZLWin32RootDir.h
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FSDir.cpp b/zlibrary/core/src/win32/filesystem2/ZLWin32FSDir.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FSDir.cpp
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FSDir.cpp
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FSDir.h b/zlibrary/core/src/win32/filesystem2/ZLWin32FSDir.h
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FSDir.h
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FSDir.h
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FSManager.cpp b/zlibrary/core/src/win32/filesystem2/ZLWin32FSManager.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FSManager.cpp
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FSManager.cpp
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FSManager.h b/zlibrary/core/src/win32/filesystem2/ZLWin32FSManager.h
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FSManager.h
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FSManager.h
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FileInputStream.cpp b/zlibrary/core/src/win32/filesystem2/ZLWin32FileInputStream.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FileInputStream.cpp
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FileInputStream.cpp
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FileInputStream.h b/zlibrary/core/src/win32/filesystem2/ZLWin32FileInputStream.h
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FileInputStream.h
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FileInputStream.h
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FileOutputStream.cpp b/zlibrary/core/src/win32/filesystem2/ZLWin32FileOutputStream.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FileOutputStream.cpp
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FileOutputStream.cpp
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32FileOutputStream.h b/zlibrary/core/src/win32/filesystem2/ZLWin32FileOutputStream.h
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32FileOutputStream.h
rename to zlibrary/core/src/win32/filesystem2/ZLWin32FileOutputStream.h
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32RootDir.cpp b/zlibrary/core/src/win32/filesystem2/ZLWin32RootDir.cpp
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32RootDir.cpp
rename to zlibrary/core/src/win32/filesystem2/ZLWin32RootDir.cpp
diff --git a/zlibrary/ui/src/win32/filesystem2/ZLWin32RootDir.h b/zlibrary/core/src/win32/filesystem2/ZLWin32RootDir.h
similarity index 100%
rename from zlibrary/ui/src/win32/filesystem2/ZLWin32RootDir.h
rename to zlibrary/core/src/win32/filesystem2/ZLWin32RootDir.h
diff --git a/zlibrary/ui/src/win32/w32widgets/W32WCHARUtil.h b/zlibrary/core/src/win32/util/W32WCHARUtil.h
similarity index 100%
rename from zlibrary/ui/src/win32/w32widgets/W32WCHARUtil.h
rename to zlibrary/core/src/win32/util/W32WCHARUtil.h
diff --git a/zlibrary/text/src/view/ZLTextBaseStyle.cpp b/zlibrary/text/src/view/ZLTextBaseStyle.cpp
index e7e765a..bb6ead0 100644
--- a/zlibrary/text/src/view/ZLTextBaseStyle.cpp
+++ b/zlibrary/text/src/view/ZLTextBaseStyle.cpp
@@ -38,7 +38,8 @@ ZLTextBaseStyle::ZLTextBaseStyle(const std::string &fontFamily, int fontSize) :
 	BoldOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:bold", false),
 	ItalicOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:italic", false),
 	AlignmentOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:alignment", ALIGN_JUSTIFY),
-	LineSpaceOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:lineSpacing", 1.2) {
+	LineSpaceOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:lineSpacing", 1.2),
+	LineSpacePercentOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:lineSpacingPercent", 120) {
 }
 
 ZLColor ZLTextBaseStyle::color() const {
diff --git a/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp b/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp
index ae1d774..706e40a 100644
--- a/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp
+++ b/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp
@@ -43,7 +43,8 @@ ZLTextFullStyleDecoration::ZLTextFullStyleDecoration(const std::string &name, in
 	RightIndentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":rightIndent", -300, 300, rightIndent),
 	FirstLineIndentDeltaOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":firstLineIndentDelta", -300, 300, firstLineIndentDelta),
 	AlignmentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":alignment", alignment),
-	LineSpaceOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":lineSpace", lineSpace) {
+	LineSpaceOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":lineSpace", lineSpace),
+	LineSpacePercentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":lineSpacePercent", (lineSpace == 0.0) ? -1 : (int)(lineSpace * 100)) {
 }
 
 ZLTextStylePtr ZLTextStyleDecoration::createDecoratedStyle(const ZLTextStylePtr base) const {
diff --git a/zlibrary/text/src/view/ZLTextLineProcessor.cpp b/zlibrary/text/src/view/ZLTextLineProcessor.cpp
index ea33e46..87ac444 100644
--- a/zlibrary/text/src/view/ZLTextLineProcessor.cpp
+++ b/zlibrary/text/src/view/ZLTextLineProcessor.cpp
@@ -239,7 +239,7 @@ ZLTextLineInfoPtr ZLTextView::processTextLine(const ZLTextWordCursor &start, con
 					}
 				}
 				if ((hyphenationPosition == startCharNumber) &&
-						newInfo.End.equalWordNumber(info.RealStart)) {
+						(info.End.wordNumber() <= info.RealStart.wordNumber())) {
 					hyphenationPosition = word.Length - 1;
 					subwordWidth = myStyle.elementWidth(element, startCharNumber);
 				}
diff --git a/zlibrary/text/src/view/ZLTextPaintInfo.cpp b/zlibrary/text/src/view/ZLTextPaintInfo.cpp
index 910393c..bbf2532 100644
--- a/zlibrary/text/src/view/ZLTextPaintInfo.cpp
+++ b/zlibrary/text/src/view/ZLTextPaintInfo.cpp
@@ -28,19 +28,20 @@ void ZLTextView::rebuildPaintInfo(bool strong) {
 	}
 
 	myLineInfos.clear();
+	if (strong) {
+		ZLTextParagraphCursorCache::clear();
+		myLineInfoCache.clear();
+	}
 	if (!myStartCursor.isNull()) {
 		if (strong) {
 			myStartCursor.rebuild();
-			myLineInfoCache.clear();
 		}
 		myEndCursor = 0;
 		myPaintState = START_IS_KNOWN;
 	} else if (!myEndCursor.isNull()) {
 		if (strong) {
 			myEndCursor.rebuild();
-			myLineInfoCache.clear();
 		}
-		myStartCursor = 0;
 		myPaintState = END_IS_KNOWN;
 	}
 }
diff --git a/zlibrary/text/src/view/ZLTextStyle.h b/zlibrary/text/src/view/ZLTextStyle.h
index 0d7c6b7..1a52409 100644
--- a/zlibrary/text/src/view/ZLTextStyle.h
+++ b/zlibrary/text/src/view/ZLTextStyle.h
@@ -58,6 +58,8 @@ public:
 	virtual double lineSpace() const = 0;
 
 	virtual bool allowHyphenations() const = 0;
+
+	int lineSpacePercent() const;
 };
 
 typedef shared_ptr<ZLTextStyle> ZLTextStylePtr;
@@ -107,6 +109,7 @@ public:
 	ZLBooleanOption ItalicOption;
 	ZLIntegerOption AlignmentOption;
 	ZLDoubleOption LineSpaceOption;
+	ZLIntegerOption LineSpacePercentOption;
 };
 
 class ZLTextStyleDecoration {
@@ -165,6 +168,7 @@ public:
 	ZLIntegerOption AlignmentOption;
 
 	ZLDoubleOption LineSpaceOption;
+	ZLIntegerOption LineSpacePercentOption;
 };
 
 class ZLTextDecoratedStyle : public ZLTextStyle {
@@ -323,6 +327,7 @@ friend class ZLTextStyleReader;
 
 inline ZLTextStyle::ZLTextStyle() {}
 inline ZLTextStyle::~ZLTextStyle() {}
+inline int ZLTextStyle::lineSpacePercent() const { return (int)(lineSpace() * 100); }
 
 inline bool ZLTextBaseStyle::isDecorated() const { return false; }
 inline const std::string &ZLTextBaseStyle::fontFamily() const { return FontFamilyOption.value(); }
@@ -336,7 +341,7 @@ inline int ZLTextBaseStyle::rightIndent() const { return 0; }
 inline int ZLTextBaseStyle::firstLineIndentDelta() const { return 0; }
 inline int ZLTextBaseStyle::verticalShift() const { return 0; }
 inline ZLTextAlignmentType ZLTextBaseStyle::alignment() const { return (ZLTextAlignmentType)AlignmentOption.value(); }
-inline double ZLTextBaseStyle::lineSpace() const { return LineSpaceOption.value(); }
+inline double ZLTextBaseStyle::lineSpace() const { return LineSpacePercentOption.value() / 100.0; }
 inline bool ZLTextBaseStyle::allowHyphenations() const { return true; }
 
 inline ZLTextStyleDecoration::~ZLTextStyleDecoration() {}
@@ -385,7 +390,10 @@ inline int ZLTextFullDecoratedStyle::spaceAfter() const { return myDecoration.Sp
 inline int ZLTextFullDecoratedStyle::leftIndent() const { return base()->leftIndent() + myDecoration.LeftIndentOption.value(); }
 inline int ZLTextFullDecoratedStyle::rightIndent() const { return base()->rightIndent() + myDecoration.RightIndentOption.value(); }
 inline int ZLTextFullDecoratedStyle::verticalShift() const { return base()->verticalShift() + myDecoration.VerticalShiftOption.value(); }
-inline double ZLTextFullDecoratedStyle::lineSpace() const { double space = myDecoration.LineSpaceOption.value(); return (space == 0) ? base()->lineSpace() : space; }
+inline double ZLTextFullDecoratedStyle::lineSpace() const {
+	const int spacing = myDecoration.LineSpacePercentOption.value();
+	return (spacing == -1) ? base()->lineSpace() : (spacing / 100.0);
+}
 
 inline ZLTextStylePtr ZLTextStyleCollection::baseStylePtr() const { return myBaseStyle; }
 inline ZLTextBaseStyle &ZLTextStyleCollection::baseStyle() const { return (ZLTextBaseStyle&)*myBaseStyle; }
diff --git a/zlibrary/text/src/view/ZLTextStyleCollection.cpp b/zlibrary/text/src/view/ZLTextStyleCollection.cpp
index e776170..fd192f2 100644
--- a/zlibrary/text/src/view/ZLTextStyleCollection.cpp
+++ b/zlibrary/text/src/view/ZLTextStyleCollection.cpp
@@ -49,8 +49,7 @@ public:
 	void startElementHandler(const char *tag, const char **attributes);
 
 private:
-	static int intValue(const char **attributes, const char *name);
-	static double doubleValue(const char **attributes, const char *name);
+	static int intValue(const char **attributes, const char *name, int defaultValue = 0);
 	static bool booleanValue(const char **attributes, const char *name);
 	static ZLBoolean3 b3Value(const char **attributes, const char *name);
 
@@ -60,14 +59,9 @@ private:
 
 static const std::string TRUE_STRING = "true";
 
-inline int ZLTextStyleReader::intValue(const char **attributes, const char *name) {
+inline int ZLTextStyleReader::intValue(const char **attributes, const char *name, int defaultValue) {
 	const char *stringValue = attributeValue(attributes, name);
-	return (stringValue == 0) ? 0 : atoi(stringValue);
-}
-
-inline double ZLTextStyleReader::doubleValue(const char **attributes, const char *name) {
-	const char *stringValue = attributeValue(attributes, name);
-	return (stringValue == 0) ? 0 : atof(stringValue);
+	return (stringValue == 0) ? defaultValue : atoi(stringValue);
 }
 
 inline bool ZLTextStyleReader::booleanValue(const char **attributes, const char *name) {
@@ -133,7 +127,8 @@ void ZLTextStyleReader::startElementHandler(const char *tag, const char **attrib
 						alignment = ALIGN_JUSTIFY;
 					}
 				}
-				double lineSpace = doubleValue(attributes, "lineSpace");
+				const int lineSpacingPercent = intValue(attributes, "lineSpacingPercent", -1);
+				const double lineSpace = (lineSpacingPercent == -1) ? 0.0 : (lineSpacingPercent / 100.0);
 
 				decoration = new ZLTextFullStyleDecoration(name, fontSizeDelta, bold, italic, spaceBefore, spaceAfter, leftIndent, rightIndent, firstLineIndentDelta, verticalShift, alignment, lineSpace, allowHyphenations);
 			}
diff --git a/zlibrary/text/src/view/ZLTextStyleOptions.cpp b/zlibrary/text/src/view/ZLTextStyleOptions.cpp
index 7e22507..c891430 100644
--- a/zlibrary/text/src/view/ZLTextStyleOptions.cpp
+++ b/zlibrary/text/src/view/ZLTextStyleOptions.cpp
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <algorithm>
+
 #include <ZLPaintContext.h>
 
 #include "ZLTextStyleOptions.h"
@@ -33,6 +35,9 @@ std::vector<std::string> ZLTextFontFamilyWithBaseOptionEntry::ourAllFamilies;
 std::vector<std::string> ZLTextLineSpacingOptionEntry::ourAllValues;
 std::vector<std::string> ZLTextLineSpacingOptionEntry::ourAllValuesPlusBase;
 
+std::vector<std::string> ZLTextLineSpaceOptionEntry::ourAllValues;
+std::vector<std::string> ZLTextLineSpaceOptionEntry::ourAllValuesPlusBase;
+
 ZLTextFontFamilyWithBaseOptionEntry::ZLTextFontFamilyWithBaseOptionEntry(ZLStringOption &option, const ZLResource &resource, const ZLPaintContext &context) : ZLFontFamilyOptionEntry(option, context), myResource(resource) {
 }
 
@@ -95,6 +100,43 @@ void ZLTextLineSpacingOptionEntry::onAccept(const std::string &value) {
 	}
 }
 
+ZLTextLineSpaceOptionEntry::ZLTextLineSpaceOptionEntry(ZLIntegerOption &option, const ZLResource &resource, bool allowBase) : myResource(resource), myOption(option), myAllowBase(allowBase) {
+	if (ourAllValuesPlusBase.empty()) {
+		for (int i = 5; i <= 20; ++i) {
+			ourAllValues.push_back(std::string() + (char)(i / 10 + '0') + '.' + (char)(i % 10 + '0'));
+		}
+		ourAllValuesPlusBase.push_back(myResource[KEY_UNCHANGED].value());
+		ourAllValuesPlusBase.insert(ourAllValuesPlusBase.end(), ourAllValues.begin(), ourAllValues.end());
+	}
+}
+
+ZLTextLineSpaceOptionEntry::~ZLTextLineSpaceOptionEntry() {
+}
+
+const std::vector<std::string> &ZLTextLineSpaceOptionEntry::values() const { return myAllowBase ? ourAllValuesPlusBase : ourAllValues; }
+
+const std::string &ZLTextLineSpaceOptionEntry::initialValue() const {
+	const int value = myOption.value();
+	if (value == -1) {
+		return ourAllValuesPlusBase[0];
+	}
+	const int index = std::max(0, std::min(15, (value + 5) / 10 - 5));
+	return ourAllValues[index];
+}
+
+void ZLTextLineSpaceOptionEntry::onAccept(const std::string &value) {
+	if (value == ourAllValuesPlusBase[0]) {
+		myOption.setValue(-1);
+	} else {
+		for (int i = 5; i <= 20; ++i) {
+			if (value == ourAllValues[i - 5]) {
+				myOption.setValue(10 * i);
+				break;
+			}
+		}
+	}
+}
+
 std::vector<std::string> ZLTextAlignmentOptionEntry::ourValues4;
 std::vector<std::string> ZLTextAlignmentOptionEntry::ourValues5;
 
diff --git a/zlibrary/text/src/view/ZLTextStyleOptions.h b/zlibrary/text/src/view/ZLTextStyleOptions.h
index 2a519ab..095545c 100644
--- a/zlibrary/text/src/view/ZLTextStyleOptions.h
+++ b/zlibrary/text/src/view/ZLTextStyleOptions.h
@@ -45,6 +45,7 @@ private:
 	const ZLResource &myResource;
 };
 
+// TODO: remove deprecated class
 class ZLTextLineSpacingOptionEntry : public ZLComboOptionEntry {
 
 private:
@@ -66,6 +67,27 @@ private:
 	bool myAllowBase;
 };
 
+class ZLTextLineSpaceOptionEntry : public ZLComboOptionEntry {
+
+private:
+	static std::vector<std::string> ourAllValues;
+	static std::vector<std::string> ourAllValuesPlusBase;
+
+public:
+	ZLTextLineSpaceOptionEntry(ZLIntegerOption &option, const ZLResource &resource, bool allowBase);
+	~ZLTextLineSpaceOptionEntry();
+
+	const std::vector<std::string> &values() const;
+	const std::string &initialValue() const;
+
+	void onAccept(const std::string &value);
+
+private:
+	const ZLResource &myResource;
+	ZLIntegerOption &myOption;
+	bool myAllowBase;
+};
+
 class ZLTextAlignmentOptionEntry : public ZLComboOptionEntry {
 
 private:
diff --git a/zlibrary/text/src/view/ZLTextView.cpp b/zlibrary/text/src/view/ZLTextView.cpp
index 9dbb794..868e472 100644
--- a/zlibrary/text/src/view/ZLTextView.cpp
+++ b/zlibrary/text/src/view/ZLTextView.cpp
@@ -89,7 +89,14 @@ void ZLTextView::scrollPage(bool forward, ScrollingMode mode, unsigned int value
 }
 
 std::vector<size_t>::const_iterator ZLTextView::nextBreakIterator() const {
-	return std::lower_bound(myTextBreaks.begin(), myTextBreaks.end(), endCursor().paragraphCursor().index());
+	ZLTextWordCursor cursor = endCursor();
+	if (cursor.isNull()) {
+		cursor = startCursor();
+	}
+	if (cursor.isNull()) {
+		return myTextBreaks.begin();
+	}
+	return std::lower_bound(myTextBreaks.begin(), myTextBreaks.end(), cursor.paragraphCursor().index());
 }
 
 void ZLTextView::scrollToStartOfText() {
@@ -444,13 +451,47 @@ int ZLTextView::textAreaHeight() const {
 		return viewHeight();
 	}
 }
+/*
+ *
+size_t ZLTextView::PositionIndicator::sizeOfTextBeforeParagraph(size_t paragraphNumber) const {
+	return myTextView.myTextSize[paragraphNumber] - myTextView.myTextSize[startTextIndex()];
+}
+
+size_t ZLTextView::PositionIndicator::sizeOfParagraph(size_t paragraphNumber) const {
+	return myTextView.myTextSize[paragraphNumber + 1] - myTextView.myTextSize[paragraphNumber];
+}
+*/
+
+
+void ZLTextView::gotoPage(size_t index) {
+	const size_t symbolIndex = index * 2048 - 128;
+	std::vector<size_t>::const_iterator it = std::lower_bound(myTextSize.begin(), myTextSize.end(), symbolIndex);
+	std::vector<size_t>::const_iterator i = nextBreakIterator();
+	const size_t startIndex = (i != myTextBreaks.begin()) ? *(i - 1) : 0;
+	const size_t endIndex = (i != myTextBreaks.end()) ? *i : myModel->paragraphsNumber();
+	size_t paragraphNumber = std::min((size_t)(it - myTextSize.begin()), endIndex) - 1;
+	gotoParagraph(paragraphNumber, true);
+	preparePaintInfo();
+	const ZLTextWordCursor &cursor = endCursor();
+	if (!cursor.isNull() && (paragraphNumber == cursor.paragraphCursor().index())) {
+		if (!cursor.paragraphCursor().isLast() || !cursor.isEndOfParagraph()) {
+			size_t paragraphLength = cursor.paragraphCursor().paragraphLength();
+			if (paragraphLength > 0) {
+				size_t wordNum =
+					(myTextSize[startIndex] + symbolIndex - myTextSize[paragraphNumber]) *
+					paragraphLength / (myTextSize[endIndex] - myTextSize[startIndex]);
+				moveEndCursor(cursor.paragraphCursor().index(), wordNum, 0);
+			}
+		}
+	}
+}
 
 size_t ZLTextView::pageNumber() const {
 	if (empty()) {
 		return 0;
 	}
 	std::vector<size_t>::const_iterator i = nextBreakIterator();
-	size_t startIndex = (i != myTextBreaks.begin()) ? *(i - 1) : 0;
-	size_t endIndex = (i != myTextBreaks.end()) ? *i : myModel->paragraphsNumber();
+	const size_t startIndex = (i != myTextBreaks.begin()) ? *(i - 1) : 0;
+	const size_t endIndex = (i != myTextBreaks.end()) ? *i : myModel->paragraphsNumber();
 	return (myTextSize[endIndex] - myTextSize[startIndex]) / 2048 + 1;
 }
diff --git a/zlibrary/text/src/view/ZLTextView.h b/zlibrary/text/src/view/ZLTextView.h
index 15b6e60..d86cb9a 100644
--- a/zlibrary/text/src/view/ZLTextView.h
+++ b/zlibrary/text/src/view/ZLTextView.h
@@ -128,6 +128,7 @@ protected:
 public:
 	void clearCaches();
 
+	void gotoPage(size_t index);
 	size_t pageNumber() const;
 
 	void scrollPage(bool forward, ScrollingMode mode, unsigned int value);
diff --git a/zlibrary/text/src/view/ZLTextViewStyle.cpp b/zlibrary/text/src/view/ZLTextViewStyle.cpp
index 860b423..199e04f 100644
--- a/zlibrary/text/src/view/ZLTextViewStyle.cpp
+++ b/zlibrary/text/src/view/ZLTextViewStyle.cpp
@@ -106,13 +106,13 @@ int ZLTextView::ViewStyle::elementHeight(const ZLTextElement &element) const {
 	switch (element.kind()) {
 		case ZLTextElement::WORD_ELEMENT:
 			if (myWordHeight == -1) {
-				myWordHeight = (int)(context().stringHeight() * textStyle()->lineSpace()) + textStyle()->verticalShift();
+				myWordHeight = context().stringHeight() * textStyle()->lineSpacePercent() / 100 + textStyle()->verticalShift();
 			}
 			return myWordHeight;
 		case ZLTextElement::IMAGE_ELEMENT:
 			return
 				context().imageHeight(((const ZLTextImageElement&)element).image()) +
-				std::max((int)(context().stringHeight() * (textStyle()->lineSpace() - 1)), 3);
+				std::max(context().stringHeight() * (textStyle()->lineSpacePercent() - 100) / 100, 3);
 		case ZLTextElement::BEFORE_PARAGRAPH_ELEMENT:
 			return - textStyle()->spaceAfter();
 		case ZLTextElement::AFTER_PARAGRAPH_ELEMENT:
diff --git a/zlibrary/ui/Makefile b/zlibrary/ui/Makefile
index d1a5ccb..c63b46e 100644
--- a/zlibrary/ui/Makefile
+++ b/zlibrary/ui/Makefile
@@ -10,42 +10,46 @@ else
   TARGET = libzlui-$(UI_TYPE).a
 endif
 
-SUBDIRS_ALL = src/win32/library src/win32/encoding src/win32/view src/win32/filesystem src/win32/time src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/config src/win32/message
-QTSUBDIRS_ALL = src/qt/time src/qtopia/message src/qtopia/application src/qtopia/dialogs src/qtopia/optionView src/qtopia/view src/qt/dialogs src/qt/view src/qt/image src/qt/util src/opie/view src/opie/dialogs src/opie/application src/qt/application-desktop src/qt/application-pdaxrom src/opie/library src/qt/library src/qtopia/library src/qt/filesystem src/qt4/time src/qt4/dialogs src/qt4/view src/qt4/image src/qt4/util src/qt4/application src/qt4/library src/qt4/filesystem
-GTKSUBDIRS_ALL = src/gtk/time src/gtk/dialogs src/gtk/optionView src/gtk/view src/gtk/image src/gtk/util src/maemo/dialogs src/maemo/optionView src/maemo/view src/gpe/dialogs src/gpe/view src/gtk/application-desktop src/gtk/application-pdaxrom src/maemo/application src/gpe/application src/maemo/library src/gtk/library src/gpe/library src/gtk/filesystem src/maemo/message src/maemo/message src/gtk/pixbuf
+SUBDIRS_ALL = src/win32/view src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/library src/win32/time src/unix/message src/win32/message
+QTSUBDIRS_ALL = src/qt/time src/qtopia/message src/qtopia/application src/qtopia/dialogs src/qtopia/optionView src/qtopia/view src/qt/dialogs src/qt/view src/qt/image src/qt/util src/opie/view src/opie/dialogs src/opie/application src/qt/application-desktop src/qt/application-pdaxrom src/opie/library src/qt/library src/qtopia/library src/qt/filesystem src/qt4/time src/qt4/dialogs src/qt4/view src/qt4/image src/qt4/util src/qt4/application src/qt4/library src/qt4/filesystem src/ezx/library src/ezx/application src/ezx/dialogs src/ezx/view src/ezx/optionView
+GTKSUBDIRS_ALL = src/gtk/time src/gtk/dialogs src/gtk/optionView src/gtk/view src/gtk/image src/gtk/util src/maemo/dialogs src/maemo/optionView src/maemo/view src/gpe/dialogs src/gpe/view src/gtk/application-desktop src/gtk/application-pdaxrom src/maemo/application src/gpe/application src/maemo/library src/gtk/library src/gpe/library src/gtk/filesystem src/maemo/message src/gtk/pixbuf
 
 SUBDIRS =
 
 ifeq "$(UI_TYPE)" "qt"
-  QTSUBDIRS = src/qt/time src/qt/dialogs src/qt/view src/qt/image src/qt/util src/qt/filesystem src/qt/library src/qt/application-$(TARGET_ARCH)
+  QTSUBDIRS = src/qt/time src/qt/dialogs src/qt/view src/qt/image src/qt/util src/qt/filesystem src/qt/library src/unix/message src/qt/application-$(TARGET_ARCH)
 endif
 
 ifeq "$(UI_TYPE)" "qt4"
-  QTSUBDIRS = src/qt4/time src/qt4/dialogs src/qt4/view src/qt4/image src/qt4/util src/qt4/filesystem src/qt4/library src/qt4/application
+  QTSUBDIRS = src/qt4/time src/qt4/dialogs src/qt4/view src/qt4/image src/qt4/util src/qt4/filesystem src/qt4/library src/unix/message src/qt4/application
 endif
 
 ifeq "$(UI_TYPE)" "gtk"
-  GTKSUBDIRS = src/gtk/time src/gtk/dialogs src/gtk/optionView src/gtk/image src/gtk/util src/gtk/filesystem src/gtk/library src/gtk/view src/gtk/application-$(TARGET_ARCH) src/gtk/pixbuf
+  GTKSUBDIRS = src/gtk/time src/gtk/dialogs src/gtk/optionView src/gtk/image src/gtk/util src/gtk/filesystem src/gtk/library src/gtk/view src/unix/message src/gtk/application-$(TARGET_ARCH) src/gtk/pixbuf
 endif
 
 ifeq "$(UI_TYPE)" "gpe"
-  GTKSUBDIRS = src/gpe/library src/gtk/time src/gpe/dialogs src/gpe/application src/gtk/image src/gtk/util src/gpe/view src/gtk/filesystem src/gtk/pixbuf
+  GTKSUBDIRS = src/gpe/library src/gtk/time src/gpe/dialogs src/gpe/application src/gtk/image src/gtk/util src/gpe/view src/gtk/filesystem src/unix/message src/gtk/pixbuf
 endif
 
 ifeq "$(UI_TYPE)" "opie"
-  QTSUBDIRS = src/opie/library src/qt/time src/opie/dialogs src/opie/application src/opie/view src/qt/image src/qt/util src/qt/filesystem
+  QTSUBDIRS = src/opie/library src/qt/time src/opie/dialogs src/opie/application src/opie/view src/qt/image src/qt/util src/unix/message src/qt/filesystem
 endif
 
 ifeq "<$(UI_TYPE)>" "$(findstring <$(UI_TYPE)>, <qtopia> <qtopia-240x320> <qtopia-640x480>)"
   QTSUBDIRS = src/qtopia/message src/qtopia/library src/qt/time src/qtopia/application src/qtopia/dialogs src/qtopia/optionView src/qtopia/view src/qt/util src/qt/image src/qt/filesystem
 endif
 
+ifeq "$(UI_TYPE)" "ezx"
+  QTSUBDIRS = src/unix/message src/ezx/library src/qt/time src/ezx/application src/ezx/dialogs src/ezx/optionView src/ezx/view src/qt/util src/qt/image src/qt/filesystem
+endif
+
 ifeq "<$(UI_TYPE)>" "$(findstring <$(UI_TYPE)>, <maemo2> <maemo4>)"
   GTKSUBDIRS = src/gtk/time src/maemo/dialogs src/maemo/optionView src/maemo/view src/gtk/image src/gtk/util src/maemo/application src/maemo/library src/gtk/filesystem src/maemo/message src/gtk/pixbuf
 endif
 
 ifeq "$(UI_TYPE)" "win32"
-  SUBDIRS += src/win32/library src/win32/view src/win32/filesystem src/win32/time src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/config src/win32/message src/win32/encoding
+  SUBDIRS += src/win32/view src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/library src/win32/time src/win32/message
 endif
 
 .objects:
@@ -92,6 +96,9 @@ endif
 
 do_install:
 	@install -d $(SHARE_ZLIBRARY)
+	@if [ -f data/messages.$(TARGET_ARCH).xml ]; then \
+		install -m 0644 data/messages.$(TARGET_ARCH).xml $(SHARE_ZLIBRARY)/messages.xml; \
+	fi
 	@install -m 0644 data/keynames.$(TARGET_ARCH)-$(UI_TYPE).xml $(SHARE_ZLIBRARY)/$(KEYNAMES)
 ifeq "$(ZLSHARED)" "yes"
 	@install -d $(LIB_ZLIBRARY)/ui
diff --git a/zlibrary/ui/data/keynames.moto-ezx.xml b/zlibrary/ui/data/keynames.moto-ezx.xml
new file mode 100644
index 0000000..1dd32ab
--- /dev/null
+++ b/zlibrary/ui/data/keynames.moto-ezx.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keynames>
+	<key code="0x1004" name="&lt;Return&gt;"/>
+	<key code="0x1005" name="&lt;Enter&gt;"/>
+	<key code="0x104d" name="&lt;Enter&gt;"/>
+	<key code="0x1013" name="&lt;Up&gt;"/>
+	<key code="0x1015" name="&lt;Down&gt;"/>
+	<key code="0x1012" name="&lt;Left&gt;"/>
+	<key code="0x1014" name="&lt;Right&gt;"/>
+	<key code="0x1016" name="&lt;VolUp&gt;"/>
+	<key code="0x1017" name="&lt;VolDown&gt;"/>
+	<key code="0x1034" name="&lt;Photo&gt;"/>
+	<key code="0x1030" name="&lt;Call&gt;"/>
+	<key code="0x1031" name="&lt;Cancel&gt;"/>
+	<key code="0x104b" name="&lt;Prev&gt;"/>
+	<key code="0x1049" name="&lt;Play&gt;"/>
+	<key code="0x104c" name="&lt;Next&gt;"/>
+	<key code="0x1033" name="&lt;Browser&gt;"/>
+</keynames>
diff --git a/zlibrary/core/data/messages.maemo.xml b/zlibrary/ui/data/messages.maemo.xml
similarity index 100%
rename from zlibrary/core/data/messages.maemo.xml
rename to zlibrary/ui/data/messages.maemo.xml
diff --git a/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp
new file mode 100644
index 0000000..1e63fa9
--- /dev/null
+++ b/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp
@@ -0,0 +1,464 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <zapplication.h>
+#include <qpixmap.h>
+#include <qpainter.h>
+#include <qmenubar.h>
+#include <qlayout.h>
+#include <qwallpaper.h>
+
+#include <ZLibrary.h>
+
+#include "ZLQtApplicationWindow.h"
+#include "ZLQtMenuAction.h"
+#include "../view/ZLQtViewWidget.h"
+#include "../../qt/util/ZLQtKeyUtil.h"
+#include "../dialogs/ZLQtUtil.h"
+#include "../optionView/ZLQtOptionViewHolder.h"
+#include "../../../../core/src/dialogs/ZLOptionView.h"
+
+class MyMenuBar : public QMenuBar, public ZLQtOptionViewHolder {
+
+public:
+	MyMenuBar(QWidget *parent, ZLQtApplicationWindow &window) : QMenuBar(parent), myWindow(window), myIndex(-1) {
+		QPalette pal(palette());
+		pal.setColor(QColorGroup::Button, QColor(77, 77, 77));
+		setPalette(pal);
+		setMinimumHeight(1);
+	}
+	~MyMenuBar();
+	void setItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
+
+private:
+	void attachWidget(ZLOptionView &view, QWidget *widget);
+	void attachWidgets(ZLOptionView &view, QWidget *widget0, int weight0, QWidget *widget1, int weight1);
+	QWidget *widget();
+	QWidget *parentWidget();
+	void keyPressEvent(QKeyEvent *event) {
+		if (event->key() == Key_Escape) {
+			QMenuBar::keyPressEvent(event);
+		}
+	}
+
+private:
+	std::map<std::string,ToolBarButton*> myButtons;
+	std::map<std::string,int> myActionIndices;
+	ZLQtApplicationWindow &myWindow;
+
+public:
+	int myIndex;
+};
+
+ToolBarButton::ToolBarButton(ZLQtApplicationWindow &window, ZLApplication::Toolbar::ButtonItem &button) : myWindow(window), myButton(button), myReleasedPixmap(0), myPressedPixmap(0), myIsPressed(button.isPressed()) {
+}
+
+ToolBarButton::~ToolBarButton() {
+	if (myReleasedPixmap != 0) {
+		delete myReleasedPixmap;
+	}
+	if (myPressedPixmap != 0) {
+		delete myPressedPixmap;
+	}
+}
+
+QPixmap &ToolBarButton::pixmap() {
+	if (myReleasedPixmap == 0) {
+		myReleasedPixmap = new QPixmap(
+								(ZLibrary::ApplicationImageDirectory()
+								+ ZLibrary::FileNameDelimiter
+								+ myButton.iconName() + ".png").c_str());
+	}
+	if (myButton.isPressed()) {
+		if (myPressedPixmap == 0) {
+			const int w = myReleasedPixmap->width();
+			const int h = myReleasedPixmap->height();
+			myPressedPixmap = new QPixmap(w, h);		
+			myPressedPixmap->fill(Qt::white);
+			QPainter painter(myPressedPixmap);
+			painter.drawPixmap(0, 0, *myReleasedPixmap);
+			painter.setPen(Qt::black);
+			painter.drawRect(0, 0, w, h);
+		}
+		return *myPressedPixmap;
+	} else {
+		return *myReleasedPixmap;
+	}
+}
+
+bool ToolBarButton::toggle() {
+	if (myIsPressed != myButton.isPressed()) {
+		myIsPressed = !myIsPressed;
+		return true;
+	}
+	return false;
+}
+
+ZLQtApplicationWindow::ZLQtApplicationWindow(ZLApplication *a) : ZLApplicationWindow(a) {
+	QWallpaper::setAppWallpaperMode(QWallpaper::Off);
+
+	myMainWindow = new MyMainWindow(this);
+
+	myFullScreen = false;
+	myTitleHeight = -1;
+
+	myVerticalDelta = -1;
+
+	myToolBar = new MyMenuBar(myMainWindow, *this);
+	myMenu = new QPopupMenu(myMainWindow);
+	QFont f(qApp->font());
+	f.setPointSize(15);
+	myMenu->setFont(f);
+	myCST = 0;
+
+	qApp->setMainWidget(myMainWindow);
+	myMainWindow->show();
+	myMainWindow->setWFlags(myMainWindow->getWFlags() | QObject::WStyle_Customize);
+}
+
+ZLQtApplicationWindow::~ZLQtApplicationWindow() {
+	delete myMainWindow;
+}
+
+MyMenuBar::~MyMenuBar() {
+	for (std::map<std::string,ToolBarButton*>::iterator it = myButtons.begin(); it != myButtons.end(); ++it) {
+		delete it->second;
+	}
+}
+
+void MyMenuBar::attachWidget(ZLOptionView&, QWidget *widget) {
+	insertItem(widget, 10001, myIndex++);
+}
+
+void MyMenuBar::attachWidgets(ZLOptionView&, QWidget *widget0, int, QWidget *widget1, int) {
+	insertItem(widget0, 10001, myIndex++);
+	insertItem(widget1, 10001, myIndex++);
+}
+
+QWidget *MyMenuBar::widget() {
+	return this;
+}
+
+QWidget *MyMenuBar::parentWidget() {
+	return 0;
+}
+
+void ZLQtApplicationWindow::setCaption(const std::string & /* caption */) {
+}
+
+void ZLQtApplicationWindow::grabAllKeys(bool /* grab */) {
+#if 0
+	if (grab) {
+		ZApplication::grabKeyboard();
+	} else {
+		ZApplication::ungrabKeyboard();
+	}
+#endif
+}
+
+void ZLQtApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr) {
+}
+
+void ZLQtApplicationWindow::initMenu() {
+}
+
+ZLQtApplicationWindow::MenuMaskCalculator::MenuMaskCalculator(ZLQtApplicationWindow &window) : myWindow(window), myFirstTime(myWindow.myMenuMask.empty()), myShouldBeUpdated(myFirstTime), myCounter(0) {
+}
+
+void ZLQtApplicationWindow::MenuMaskCalculator::processSubmenuBeforeItems(ZLApplication::Menubar::Submenu&) {
+}
+
+void ZLQtApplicationWindow::MenuMaskCalculator::processSubmenuAfterItems(ZLApplication::Menubar::Submenu&) {
+}
+
+void ZLQtApplicationWindow::MenuMaskCalculator::processSepartor(ZLApplication::Menubar::Separator&) {
+}
+
+void ZLQtApplicationWindow::MenuMaskCalculator::processItem(ZLApplication::Menubar::PlainItem &item) {
+	bool visible = myWindow.application().isActionVisible(item.actionId());
+	if (myFirstTime) {
+		myWindow.myMenuMask.push_back(visible);
+	} else {
+		if (myWindow.myMenuMask[myCounter] != visible) {
+			myWindow.myMenuMask[myCounter] = visible;
+			myShouldBeUpdated = true;
+		}
+		++myCounter;
+	}
+}
+
+ZLQtApplicationWindow::MenuUpdater::MenuUpdater(ZLQtApplicationWindow &window) : myWindow(window), myCounter(0) {
+	myMenuStack.push(myWindow.myMenu);
+}
+
+void ZLQtApplicationWindow::MenuUpdater::processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu) {
+	QPopupMenu *qmenu = new QPopupMenu(myMenuStack.top());
+	QFont f(qApp->font());
+	f.setPointSize(15);
+	qmenu->setFont(f);
+	myMenuStack.top()->insertItem(::qtString(submenu.menuName()), qmenu);
+	myMenuStack.push(qmenu);
+}
+
+void ZLQtApplicationWindow::MenuUpdater::processSubmenuAfterItems(ZLApplication::Menubar::Submenu&) {
+	myMenuStack.pop();
+}
+
+void ZLQtApplicationWindow::MenuUpdater::processItem(ZLApplication::Menubar::PlainItem &item) {
+	if (myWindow.myMenuMask[myCounter++]) {
+		const std::string &id = item.actionId();
+		ZLQtMenuAction *action = myWindow.myMenuMap[id];
+		if (action == 0) {
+			action = new ZLQtMenuAction(myWindow, item);
+			myWindow.myMenuMap[id] = action;
+		}
+		action->addTo(myMenuStack.top());
+		action->setEnabled(myWindow.application().isActionEnabled(id));
+	}
+}
+
+void ZLQtApplicationWindow::MenuUpdater::processSepartor(ZLApplication::Menubar::Separator&) {
+	myMenuStack.top()->insertSeparator();
+}
+
+void MyMenuBar::setItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
+	switch (item->type()) {
+		case ZLApplication::Toolbar::Item::BUTTON:
+			{
+				ZLApplication::Toolbar::ButtonItem &button = (ZLApplication::Toolbar::ButtonItem&)*item;
+				const std::string &id = button.actionId();
+				std::map<std::string,int> ::const_iterator iter = myActionIndices.find(id);
+				int actionIndex = (iter != myActionIndices.end()) ? iter->second : 0;
+				if (visible) {
+					if ((actionIndex == 0) || (idAt(myIndex) != actionIndex)) {
+						ToolBarButton *tbButton = myButtons[id];
+						if (actionIndex == 0) {
+							tbButton = new ToolBarButton(myWindow, button);
+							myButtons[id] = tbButton;
+							actionIndex = myActionIndices.size() + 1;
+							myActionIndices[id] = actionIndex;
+						}
+						insertItem(tbButton->pixmap(), tbButton, SLOT(doActionSlot()), 0, actionIndex, myIndex);
+					}
+					setItemEnabled(actionIndex, enabled);
+					++myIndex;
+				} else {
+					if ((actionIndex != 0) && (idAt(myIndex) == actionIndex)) {
+						removeItem(actionIndex);
+					}
+				}
+			}
+			break;
+		case ZLApplication::Toolbar::Item::OPTION_ENTRY:
+			if (idAt(myIndex) < 10001) {
+				shared_ptr<ZLOptionEntry> entry = ((ZLApplication::Toolbar::OptionEntryItem&)*item).entry();
+				if (entry->isVisible()) {
+					ZLOptionView *view = createViewByEntry("", "", entry);
+					view->setVisible(true);
+				}
+			} else {
+				++myIndex;
+			}
+			break;
+		case ZLApplication::Toolbar::Item::SEPARATOR:
+			break;
+	}
+}
+
+void ZLQtApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
+	((MyMenuBar*)myToolBar)->setItemState(item, visible, enabled);
+}
+
+static const QString CLOSE_BUTTON = "CST_Exit";
+static const QString BACK_BUTTON = "CST_Back";
+
+void ZLQtApplicationWindow::refresh() {
+	const QString &rightButtonResource =
+		application().isViewFinal() ? CLOSE_BUTTON : BACK_BUTTON;
+	if (myRightButtonResource != rightButtonResource) {
+		myRightButtonResource = rightButtonResource;
+		myCST->getRightBtn()->setResourceID(myRightButtonResource);
+	}
+
+	if (((MyMenuBar*)myToolBar)->myIndex == -1) {
+		((MyMenuBar*)myToolBar)->myIndex = 0;
+		ZLApplicationWindow::refresh();
+		((MyMenuBar*)myToolBar)->myIndex = -1;
+	}
+
+	MenuMaskCalculator calculator(*this);
+	calculator.processMenu(application());
+	if (calculator.shouldBeUpdated()) {
+		myMenu->clear();
+		MenuUpdater(*this).processMenu(application());
+	} else {
+		for (std::map<std::string,ZLQtMenuAction*>::iterator it = myMenuMap.begin(); it != myMenuMap.end(); ++it) {
+			it->second->setEnabled(application().isActionEnabled(it->first));
+		}
+	}
+}
+
+void ToolBarButton::doActionSlot() {
+	myWindow.onButtonPress(myButton);
+}
+
+void MyMainWindow::keyPressEvent(QKeyEvent *event) {
+	myApplicationWindow->application().doActionByKey(ZLQtKeyUtil::keyName(event));
+}
+
+void MyMainWindow::focusInEvent(QFocusEvent*) {
+	if (myApplicationWindow == 0) return;
+	if (myIsDeactivated) {
+		myApplicationWindow->myCST->hide();
+		myApplicationWindow->myCST->show();
+		myIsDeactivated = false;
+	}
+}
+
+void MyMainWindow::focusOutEvent(QFocusEvent *) {
+	if (myApplicationWindow == 0) return;
+	if (myApplicationWindow->isFullscreen()) {
+		myApplicationWindow->setFullscreen(false);
+		myIsDeactivated = true;
+	}
+}
+
+int ZLQtApplicationWindow::verticalAdjustment() {
+	if (myFullScreen || (myVerticalDelta == -1)) {
+		return 0;
+	}
+	return qApp->desktop()->height() - myVerticalDelta - myMainWindow->height();
+}
+
+void MyMainWindow::resizeEvent(QResizeEvent *event) {
+	if (event->size().width() != qApp->desktop()->width()) {
+		QSize oldSize = event->size();
+		QSize newSize = oldSize;
+		newSize.setWidth(qApp->desktop()->width());
+		QResizeEvent newEvent(newSize, oldSize);
+		QApplication::sendEvent(this, &newEvent);
+		return;
+	}
+	if ((myApplicationWindow->myVerticalDelta == -1) && !myApplicationWindow->myFullScreen) {
+		myApplicationWindow->myVerticalDelta = qApp->desktop()->height() - event->size().height();
+	}
+	if (myApplicationWindow->myFullScreen && (size() != qApp->desktop()->size())) {
+		int titleHeight = topData()->normalGeometry.top();
+		if (titleHeight > 0) {
+			myApplicationWindow->myTitleHeight = titleHeight;
+		}
+		topData()->normalGeometry = QRect(0, 0, -1, -1);
+		showNormal();
+		showFullScreen();
+	}
+}
+
+void ZLQtApplicationWindow::setFullscreen(bool fullscreen) {
+	if (fullscreen == myFullScreen) {
+		return;
+	}
+	myFullScreen = fullscreen;
+	if (myFullScreen) {
+		myToolBar->hide();
+		myCST->hide();
+		myMainWindow->showFullScreen();
+	} else {
+		myToolBar->show();
+		myCST->show();
+		myMainWindow->showNormal();
+	}
+}
+
+bool ZLQtApplicationWindow::isFullscreen() const {
+	return myFullScreen;
+}
+
+void MyMainWindow::closeEvent(QCloseEvent *event) {
+	if (myApplicationWindow != 0) {
+		if (myApplicationWindow->application().closeView()) {
+			myApplicationWindow = 0;
+			event->accept();
+		} else {
+			event->ignore();
+		}
+	}
+}
+
+void MyMainWindow::doActionQuit() {
+	myApplicationWindow->application().closeView();
+}
+
+void MyMainWindow::connectQuitButton(UTIL_CST *cst) {
+	connect(cst->getRightBtn(), SIGNAL(clicked()), this, SLOT(doActionQuit()));
+}
+
+void ZLQtApplicationWindow::close() {
+	myMainWindow->close();
+}
+
+void MyMainWindow::setDocument(const QString &fileName) {
+	if (!fileName.isEmpty()) {
+		myApplicationWindow->application().openFile((const char*)fileName.utf8());
+	}
+}
+
+ZLViewWidget *ZLQtApplicationWindow::createViewWidget() {
+	QWidget *main = new QWidget(myMainWindow);
+	ZLQtViewWidget *viewWidget = new ZLQtViewWidget(main, *this);
+
+	QVBoxLayout *layout = new QVBoxLayout(main);
+	layout->addWidget(viewWidget->widget(), 1);
+
+	myRightButtonResource = CLOSE_BUTTON;
+	myCST = new UTIL_CST(main, ZLibrary::ApplicationName().c_str(), "CST_Menu", myRightButtonResource);
+	myCST->setFixedSize(ZGlobal::getCstR().size());
+	layout->addWidget(myCST);
+	myCST->getMidBtn()->setEnabled(false);
+	myCST->getLeftBtn()->setPopup(myMenu);
+	myMainWindow->connectQuitButton(myCST);
+
+	myMainWindow->setCentralWidget(main);
+	return viewWidget;
+}
+
+ZLQtMenuAction::ZLQtMenuAction(ZLQtApplicationWindow &window, const ZLApplication::Menubar::PlainItem &item) : QAction(::qtString(item.name()), 0, 0, 0), myWindow(window), myActionId(item.actionId()) {
+	connect(this, SIGNAL(activated()), this, SLOT(doSlot()));
+}
+
+void ZLQtMenuAction::doSlot() {
+	myWindow.application().doAction(myActionId);
+	myWindow.myMainWindow->setFocus();
+}
+
+void MyMenuBar::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
+	const std::string &actionId = button.actionId();
+	ToolBarButton *tbButton = myButtons[actionId];
+	if ((tbButton != 0) && (tbButton->toggle())) {
+		changeItem(myActionIndices[actionId], tbButton->pixmap());
+	}
+}
+
+void ZLQtApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
+	((MyMenuBar*)myToolBar)->setToggleButtonState(button);
+}
+
+QMainWindow *ZLQtApplicationWindow::mainWindow() {
+	return myMainWindow;
+}
diff --git a/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h
new file mode 100644
index 0000000..8e8bd3d
--- /dev/null
+++ b/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTAPPLICATIONWINDOW_H__
+#define __ZLQTAPPLICATIONWINDOW_H__
+
+#include <vector>
+#include <map>
+#include <set>
+#include <stack>
+
+#include <qmainwindow.h>
+#include <zglobal.h>
+#include <ezxutilcst.h>
+
+#include "../../../../core/src/application/ZLApplicationWindow.h"
+
+class QMenuBar;
+class QPopupMenu;
+class ZLQtMenuAction;
+class QPixmap;
+
+class ZLQtApplicationWindow;
+
+class MyMainWindow : public QMainWindow {
+	Q_OBJECT
+
+public:
+	MyMainWindow(ZLQtApplicationWindow *applicationWindow): QMainWindow(),
+				myApplicationWindow(applicationWindow) {
+		setGeometry(ZGlobal::mapFromGlobalR(this, ZGlobal::getHomeR()));
+		myIsDeactivated = false;
+	}
+
+	WFlags getWFlags() { return QMainWindow::getWFlags(); }
+	void setWFlags(WFlags flags) { QMainWindow::setWFlags(flags); }
+
+	void focusInEvent(QFocusEvent *event);
+	void focusOutEvent(QFocusEvent *event);
+	void resizeEvent(QResizeEvent *event);
+	void closeEvent(QCloseEvent *event);
+	void keyPressEvent(QKeyEvent *event);
+	void connectQuitButton(UTIL_CST *cst);
+
+public slots:
+	void doActionQuit();
+
+private slots:
+	void setDocument(const QString &fileName);
+
+private:
+	ZLQtApplicationWindow *myApplicationWindow;
+	bool myIsDeactivated;
+};
+
+class ZLQtApplicationWindow : public ZLApplicationWindow {
+
+public:
+	ZLQtApplicationWindow(ZLApplication *application);
+	~ZLQtApplicationWindow();
+
+	int verticalAdjustment();
+
+	QMainWindow *mainWindow();
+
+private:
+	ZLViewWidget *createViewWidget();
+
+	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	void initMenu();
+	class MenuMaskCalculator : public ZLApplication::MenuVisitor {
+
+	public:
+		MenuMaskCalculator(ZLQtApplicationWindow &window);
+		bool shouldBeUpdated();
+
+	private:
+		void processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu);
+		void processSubmenuAfterItems(ZLApplication::Menubar::Submenu &submenu);
+		void processItem(ZLApplication::Menubar::PlainItem &item);
+		void processSepartor(ZLApplication::Menubar::Separator &separator);
+
+	private:
+		ZLQtApplicationWindow &myWindow;
+		bool myFirstTime;
+		bool myShouldBeUpdated;
+		int myCounter;
+	};
+	class MenuUpdater : public ZLApplication::MenuVisitor {
+
+	public:
+		MenuUpdater(ZLQtApplicationWindow &window);
+
+	private:
+		void processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu);
+		void processSubmenuAfterItems(ZLApplication::Menubar::Submenu &submenu);
+		void processItem(ZLApplication::Menubar::PlainItem &item);
+		void processSepartor(ZLApplication::Menubar::Separator &separator);
+
+	private:
+		ZLQtApplicationWindow &myWindow;
+		std::stack<QPopupMenu*> myMenuStack;
+		int myCounter;
+	};
+	void updateMenu();
+
+	void refresh();
+	void close();
+
+	void grabAllKeys(bool grab);
+
+	void setCaption(const std::string &caption);
+
+	bool isFullscreen() const;
+	void setFullscreen(bool fullscreen);
+
+	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
+	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+
+private:
+	std::vector<bool> myToolbarMask;
+	std::vector<bool> myMenuMask;
+	std::map<std::string,ZLQtMenuAction*> myMenuMap;
+
+	bool myFullScreen;
+	int myTitleHeight;
+
+	int myVerticalDelta;
+
+	class MyMainWindow *myMainWindow;
+	QMenuBar *myToolBar;
+	QPopupMenu *myMenu;
+  UTIL_CST *myCST;
+	QString myRightButtonResource;
+
+friend class MyMainWindow;
+friend class MenuMaskCalculator;
+friend class MenuUpdater;
+friend class ToolBarButton;
+friend class ZLQtMenuAction;
+};
+
+class ToolBarButton : public QObject {
+	Q_OBJECT
+
+public:	
+	ToolBarButton(ZLQtApplicationWindow &window, ZLApplication::Toolbar::ButtonItem &button);
+	~ToolBarButton();
+
+	QPixmap &pixmap();
+
+	bool toggle();
+
+public slots:
+	void doActionSlot();
+
+private:
+	ZLQtApplicationWindow &myWindow;
+	ZLApplication::Toolbar::ButtonItem &myButton;
+	QPixmap *myReleasedPixmap;
+	QPixmap *myPressedPixmap;
+	bool myIsPressed;
+};
+
+inline bool ZLQtApplicationWindow::MenuMaskCalculator::shouldBeUpdated() { return myShouldBeUpdated; }
+
+#endif /* __ZLQTAPPLICATIONWINDOW_H__ */
diff --git a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h b/zlibrary/ui/src/ezx/application/ZLQtMenuAction.h
similarity index 65%
copy from zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h
copy to zlibrary/ui/src/ezx/application/ZLQtMenuAction.h
index 5211a05..92f0778 100644
--- a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h
+++ b/zlibrary/ui/src/ezx/application/ZLQtMenuAction.h
@@ -17,18 +17,27 @@
  * 02110-1301, USA.
  */
 
-#ifndef __ZLWIN32ROOTDIR_H__
-#define __ZLWIN32ROOTDIR_H__
+#ifndef __ZLQTMENUACTION_H__
+#define __ZLQTMENUACTION_H__
 
-#include "../../../../core/src/filesystem/ZLFSDir.h"
+#include <qaction.h>
 
-class ZLWin32RootDir : public ZLFSDir {
+#include <ZLApplication.h>
+
+class ZLQtApplicationWindow;
+
+class ZLQtMenuAction : public QAction {
+	Q_OBJECT
 
 public:
-	ZLWin32RootDir() : ZLFSDir(std::string()) {}
+	ZLQtMenuAction(ZLQtApplicationWindow &window, const ZLApplication::Menubar::PlainItem &item);
+
+private slots:
+	void doSlot();
 
-	void collectSubDirs(std::vector<std::string> &names, bool includeSymlinks);
-	void collectFiles(std::vector<std::string> &names, bool includeSymlinks);
+private:
+	const ZLQtApplicationWindow &myWindow;
+	const std::string &myActionId;
 };
 
-#endif /* __ZLWIN32ROOTDIR_H__ */
+#endif /* __ZLQTMENUACTION_H__ */
diff --git a/zlibrary/ui/src/ezx/application/moc.mk b/zlibrary/ui/src/ezx/application/moc.mk
new file mode 100644
index 0000000..ef0f680
--- /dev/null
+++ b/zlibrary/ui/src/ezx/application/moc.mk
@@ -0,0 +1 @@
+SRCMOC = ZLQtApplicationWindow.moc.cpp ZLQtMenuAction.moc.cpp
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp b/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp
new file mode 100644
index 0000000..6c5920a
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLFullScreenDialog.h"
+#include "ZLQtUtil.h"
+
+#include <zapplication.h>
+#include <zglobal.h>
+#include <ezxutilcst.h>
+#include <qwallpaper.h>
+
+ZLFullScreenDialog::ZLFullScreenDialog(const std::string &caption) :
+		ZMainWidget(::qtString(caption), false, qApp->mainWidget(), NULL,
+			WType_Modal | WType_TopLevel) {
+  QWallpaper::setAppWallpaperMode(QWallpaper::Off);
+  QFont f(qApp->font());
+  f.setPointSize(15);
+  setFont(f);
+  getTitleBarWidget()->setFont(f);
+	myInLoop = false;
+	UTIL_CST *cst = new UTIL_CST(this, "OK", "CST_Menu", "CST_Back");
+	setCSTWidget(cst);
+	connect(cst->getRightBtn(), SIGNAL(clicked()), this, SLOT(reject()));
+	connect(cst->getMidBtn(), SIGNAL(clicked()), this, SLOT(accept()));
+	cst->getLeftBtn()->setEnabled(false);
+}
+
+ZLFullScreenDialog::~ZLFullScreenDialog() {
+}
+
+void ZLFullScreenDialog::resizeEvent(QResizeEvent * /* event */) {
+}
+
+int ZLFullScreenDialog::exec() {
+	setResult(Rejected);
+	show();
+	myInLoop = true;
+	qApp->enter_loop();
+	return result();
+}
+
+void ZLFullScreenDialog::accept() {
+  hide();
+	if (myInLoop) {
+		qApp->exit_loop();
+	}
+	setResult(Accepted);
+  if (qApp->mainWidget() == this)
+    qApp->quit();
+}
+
+void ZLFullScreenDialog::reject() {
+  hide();
+	if (myInLoop) {
+		qApp->exit_loop();
+	}
+	setResult(Rejected);
+  if (qApp->mainWidget() == this)
+    qApp->quit();
+}
diff --git a/zlibrary/ui/src/win32/config/StringEncoder.h b/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.h
similarity index 59%
copy from zlibrary/ui/src/win32/config/StringEncoder.h
copy to zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.h
index 5655dd0..1c7d965 100644
--- a/zlibrary/ui/src/win32/config/StringEncoder.h
+++ b/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.h
@@ -17,16 +17,35 @@
  * 02110-1301, USA.
  */
 
-#ifndef __STRINGENCODER_H__
-#define __STRINGENCODER_H__
+#ifndef __ZLFULLSCREENDIALOG_H__
+#define __ZLFULLSCREENDIALOG_H__
 
 #include <string>
 
-class StringEncoder {
+#include <zmainwidget.h>
+
+class ZLFullScreenDialog : public ZMainWidget {
+	Q_OBJECT
+
+protected:
+	ZLFullScreenDialog(const std::string &caption);
+	virtual ~ZLFullScreenDialog();
+  enum DialogCode { Rejected, Accepted };
+  void setResult(int r) { rescode = r; }
+	
+	void resizeEvent(QResizeEvent *event);
 
 public:
-	static std::string encode(const std::string &source);
-	static std::string decode(const std::string &source);
+	int exec();
+  int result() const { return rescode; }
+
+protected slots:
+	virtual void accept();
+	virtual void reject();
+
+private:
+	bool myInLoop;
+  int rescode;
 };
 
-#endif /* __STRINGENCODER_H__ */
+#endif /* __ZLFULLSCREENDIALOG_H__ */
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp
new file mode 100644
index 0000000..e34316f
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <zbasedialog.h>
+#include <qvbox.h>
+#include <qbuttongroup.h>
+#include <qlayout.h>
+#include <qlabel.h>
+#include <qstring.h>
+#include <qscrollview.h>
+#include <zglobal.h>
+#include <ezxutilgraph.h>
+#include <ezxutilpushbutton.h>
+#include <zapplication.h>
+
+#include "ZLQtDialog.h"
+#include "ZLQtDialogContent.h"
+#include "ZLQtDialogManager.h"
+#include "ZLQtUtil.h"
+
+ZLQtDialog::ZLQtDialog(QWidget *parent, const ZLResource &resource) : ZBaseDialog(parent, 0, true), myButtonNumber(0) {
+  QFont f(qApp->font());
+  f.setPointSize(15);
+  setFont(f);
+
+	QVBoxLayout *layout = new QVBoxLayout(this);
+	QWidget *widget = new QVBox(this);
+	layout->add(widget);
+	
+	QFrame *frmTitle = new QFrame(widget);
+	frmTitle->setFixedHeight(25);
+	QHBoxLayout *hblTitle = new QHBoxLayout(frmTitle);
+	QLabel *lblTitle = new QLabel(::qtString("  " +
+    resource[ZLDialogManager::DIALOG_TITLE].value()), frmTitle);
+	hblTitle->addWidget(lblTitle);
+	UTIL_Graph::makeTitle(lblTitle, 1);
+	
+	myTab = new ZLQtDialogContent(widget, resource);
+
+	myButtonGroup = new QButtonGroup(this);
+	layout->add(myButtonGroup);
+
+	myButtonLayout = new QGridLayout(myButtonGroup, 1, 0, 4, 4);
+}
+
+ZLQtDialog::~ZLQtDialog() {
+}
+
+void ZLQtDialog::addButton(const QString &name, bool accept) {
+	UTIL_PushButton *button = new UTIL_PushButton(myButtonGroup, 0, -1, -1);
+	button->resize(ZGlobal::getDlgB2_1R().size());
+	button->setText(name);
+	myButtonLayout->addWidget(button, 0, myButtonNumber++);
+	connect(button, SIGNAL(clicked()), this, accept ? SLOT(accept()) : SLOT(reject()));
+}
+
+void ZLQtDialog::addButton(const ZLResourceKey &key, bool accept) {
+	addButton(::qtButtonName(key), accept);
+}
+
+bool ZLQtDialog::run() {
+	((ZLQtDialogContent*)myTab)->close();
+	return exec();
+}
diff --git a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h b/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.h
similarity index 60%
rename from zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h
rename to zlibrary/ui/src/ezx/dialogs/ZLQtDialog.h
index 5211a05..cf7d7ce 100644
--- a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.h
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.h
@@ -17,18 +17,31 @@
  * 02110-1301, USA.
  */
 
-#ifndef __ZLWIN32ROOTDIR_H__
-#define __ZLWIN32ROOTDIR_H__
+#ifndef __ZLQTDIALOG_H__
+#define __ZLQTDIALOG_H__
 
-#include "../../../../core/src/filesystem/ZLFSDir.h"
+#include <zbasedialog.h>
 
-class ZLWin32RootDir : public ZLFSDir {
+#include <ZLDialog.h>
+
+class QGridLayout;
+class QButtonGroup;
+class QString;
+
+class ZLQtDialog : public ZBaseDialog, public ZLDialog {
 
 public:
-	ZLWin32RootDir() : ZLFSDir(std::string()) {}
+	ZLQtDialog(QWidget *parent, const ZLResource &resource);
+	~ZLQtDialog();
+
+	void addButton(const ZLResourceKey &key, bool accept);
+	void addButton(const QString &name, bool accept);
+	bool run();
 
-	void collectSubDirs(std::vector<std::string> &names, bool includeSymlinks);
-	void collectFiles(std::vector<std::string> &names, bool includeSymlinks);
+private:
+	QGridLayout *myButtonLayout;
+	QButtonGroup *myButtonGroup;
+	int myButtonNumber;
 };
 
-#endif /* __ZLWIN32ROOTDIR_H__ */
+#endif /* __ZLQTDIALOG_H__ */
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp
new file mode 100644
index 0000000..2707393
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <zapplication.h>
+#include <qlayout.h>
+
+#include <ZLOptionEntry.h>
+
+#include "ZLQtDialogContent.h"
+#include "../../../../core/src/dialogs/ZLOptionView.h"
+
+void ZLQtDialogContent::close() {
+	myLayout->setRowStretch(myRowCounter, 10);
+}
+
+ZLQtDialogContent::ZLQtDialogContent(QWidget *parent, const ZLResource &resource) : ZLDialogContent(resource), myParentWidget(parent) {
+	myWidget = new QWidget(myParentWidget);
+	const long displaySize = qApp->desktop()->height() * (long)qApp->desktop()->width();
+	const int space = (displaySize < 640 * 480) ? 3 : 10;
+	myLayout = new QGridLayout(myWidget, -1, 13, space, space);
+	myRowCounter = 0;
+}
+
+ZLQtDialogContent::~ZLQtDialogContent() {
+}
+
+void ZLQtDialogContent::addOption(const std::string &name, const std::string &tooltip, ZLOptionEntry *option) {
+	createViewByEntry(name, tooltip, option, 0, 12);
+	++myRowCounter;
+}
+
+void ZLQtDialogContent::addOptions(const std::string &name0, const std::string &tooltip0, ZLOptionEntry *option0, const std::string &name1, const std::string &tooltip1, ZLOptionEntry *option1) {
+	createViewByEntry(name0, tooltip0, option0, 0, 5);
+	createViewByEntry(name1, tooltip1, option1, 7, 12);
+	++myRowCounter;
+}
+
+void ZLQtDialogContent::attachWidget(QWidget *widget, int row, int fromColumn, int toColumn) {
+	myLayout->addMultiCellWidget(widget, row, row, fromColumn, toColumn);
+}
+
+void ZLQtDialogContent::attachWidget(ZLOptionView &view, QWidget *widget) {
+	std::map<ZLOptionView*,Position>::const_iterator it = myOptionPositions.find(&view);
+	if (it != myOptionPositions.end()) {
+		Position position = it->second;
+		attachWidget(widget, position.Row, position.FromColumn, position.ToColumn);
+	}
+}	
+
+void ZLQtDialogContent::attachWidgets(ZLOptionView &view, QWidget *widget0, int weight0, QWidget *widget1, int weight1) {
+	std::map<ZLOptionView*,Position>::const_iterator it = myOptionPositions.find(&view);
+	if (it != myOptionPositions.end()) {
+		Position position = it->second;
+		int secondStart = position.FromColumn + (position.ToColumn - position.FromColumn + 1) * weight0 / (weight0 + weight1);
+		attachWidget(widget0, position.Row, position.FromColumn, secondStart - 1);
+		attachWidget(widget1, position.Row, secondStart, position.ToColumn);
+	}
+}	
+
+void ZLQtDialogContent::createViewByEntry(const std::string &name, const std::string &tooltip, ZLOptionEntry *option, int fromColumn, int toColumn) {
+	if (option == 0) {
+		return;
+	}
+
+	ZLOptionView *view = ZLQtOptionViewHolder::createViewByEntry(name, tooltip, option);
+
+	if (view != 0) {
+		myOptionPositions.insert(
+			std::pair<ZLOptionView*,Position>(view, Position(myRowCounter, fromColumn, toColumn))
+		);
+		addView(view);
+		view->setVisible(option->isVisible());
+	}
+}
+
+QWidget *ZLQtDialogContent::widget() {
+	return myWidget;
+}
+
+QWidget *ZLQtDialogContent::parentWidget() {
+	return myParentWidget;
+}
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h
new file mode 100644
index 0000000..8e64448
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTDIALOGCONTENT_H__
+#define __ZLQTDIALOGCONTENT_H__
+
+#include <map>
+
+#include <ZLDialogContent.h>
+
+#include "../optionView/ZLQtOptionViewHolder.h"
+
+class QWidget;
+class QGridLayout;
+
+class ZLQtDialogContent : public ZLDialogContent, public ZLQtOptionViewHolder {
+
+public:
+	ZLQtDialogContent(QWidget *parent, const ZLResource &resource);
+	~ZLQtDialogContent();
+
+	void addOption(const std::string &name, const std::string &tooltip, ZLOptionEntry *option);
+	void addOptions(const std::string &name0, const std::string &tooltip0, ZLOptionEntry *option0,
+									const std::string &name1, const std::string &tooltip1, ZLOptionEntry *option1);
+
+	void close();
+
+	QWidget *widget();
+	QWidget *parentWidget();
+
+private:
+	void attachWidget(QWidget *widget, int row, int fromColumn, int toColumn);
+	void attachWidget(ZLOptionView &view, QWidget *widget);
+	void attachWidgets(ZLOptionView &view, QWidget *widget0, int weight0, QWidget *widget1, int weight1);
+
+	void createViewByEntry(const std::string &name, const std::string &tooltip, ZLOptionEntry *option, int fromColumn, int toColumn);
+
+private:
+	QWidget *myWidget;
+	QGridLayout *myLayout;
+	int myRowCounter;
+	QWidget *myParentWidget;
+
+	struct Position {
+		Position(int row, int fromColumn, int toColumn);
+		int Row;
+		int FromColumn;
+		int ToColumn;
+	};
+	std::map<ZLOptionView*,Position> myOptionPositions;
+};
+
+inline ZLQtDialogContent::Position::Position(int row, int fromColumn, int toColumn) : Row(row), FromColumn(fromColumn), ToColumn(toColumn) {}
+
+#endif /* __ZLQTDIALOGCONTENT_H__ */
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp
new file mode 100644
index 0000000..fb5db44
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <qclipboard.h>
+
+#include <zapplication.h>
+#include <zmessagebox.h>
+#include <ezxres.h>
+
+#include "ZLQtDialogManager.h"
+#include "ZLQtDialog.h"
+#include "ZLQtOptionsDialog.h"
+#include "ZLQtSelectionDialog.h"
+#include "ZLQtUtil.h"
+
+#include "../application/ZLQtApplicationWindow.h"
+
+void ZLQtDialogManager::createApplicationWindow(ZLApplication *application) const {
+	myApplicationWindow = new ZLQtApplicationWindow(application);
+}
+
+shared_ptr<ZLOptionsDialog> ZLQtDialogManager::createOptionsDialog(const ZLResourceKey &key, shared_ptr<ZLRunnable> applyAction, bool) const {
+  return new ZLQtOptionsDialog(resource()[key], applyAction);
+}
+
+shared_ptr<ZLDialog> ZLQtDialogManager::createDialog(const ZLResourceKey &key) const {
+	return new ZLQtDialog(myApplicationWindow->mainWindow(), resource()[key]);
+}
+
+void ZLQtDialogManager::informationBox(const ZLResourceKey&, const std::string &message) const {
+	RES_ICON_Reader reader;
+	ZMessageBox::information(myApplicationWindow->mainWindow(), reader.getIcon("Dialog_Complete.gif", true), ::qtString(message), ::qtButtonName(OK_BUTTON));
+}
+
+void ZLQtDialogManager::errorBox(const ZLResourceKey&, const std::string &message) const {
+	RES_ICON_Reader reader;
+	ZMessageBox::information(myApplicationWindow->mainWindow(), reader.getIcon("Dialog_Error.gif", true), ::qtString(message), ::qtButtonName(OK_BUTTON));
+}
+
+int ZLQtDialogManager::questionBox(const ZLResourceKey&, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const {
+	RES_ICON_Reader reader;
+	return ZMessageBox::information(myApplicationWindow->mainWindow(), reader.getIcon("Dialog_Question_Mark.gif", true), ::qtString(message), ::qtButtonName(button0), ::qtButtonName(button1), ::qtButtonName(button2));
+}
+
+bool ZLQtDialogManager::selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const {
+	return ZLQtSelectionDialog(dialogTitle(key), handler).run();
+}
+
+void ZLQtDialogManager::wait(const ZLResourceKey &key, ZLRunnable &runnable) const {
+	RES_ICON_Reader reader;
+	ZMessageBox waitMessage(0, reader.getIcon("Dialog_Waiting.gif", true), ::qtString(waitMessageText(key)), 0, 1);
+	waitMessage.adjustSize();
+	waitMessage.exec();
+	runnable.run();
+	waitMessage.hide();
+}
+
+bool ZLQtDialogManager::isClipboardSupported(ClipboardType type) const {
+	return type == CLIPBOARD_MAIN;
+}
+
+void ZLQtDialogManager::setClipboardText(const std::string &text, ClipboardType type) const {
+	if ((type == CLIPBOARD_MAIN) && !text.empty()) {
+		qApp->clipboard()->setText(::qtString(text));
+	}
+}
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h
new file mode 100644
index 0000000..539c32f
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTDIALOGMANAGER_H__
+#define __ZLQTDIALOGMANAGER_H__
+
+#include <ZLDialogManager.h>
+
+class ZLApplication;
+class ZLQtApplicationWindow;
+
+class ZLQtDialogManager : public ZLDialogManager {
+
+public:
+	static void createInstance() { ourInstance = new ZLQtDialogManager(); }
+
+private:
+	ZLQtDialogManager() : myApplicationWindow(0) {}
+
+public:
+	void createApplicationWindow(ZLApplication *application) const;
+
+	shared_ptr<ZLDialog> createDialog(const ZLResourceKey &key) const;
+	shared_ptr<ZLOptionsDialog> createOptionsDialog(const ZLResourceKey &id, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const;
+	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	void errorBox(const ZLResourceKey &key, const std::string &message) const;
+	int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const;
+	bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const;
+	void wait(const ZLResourceKey &key, ZLRunnable &runnable) const;
+
+	bool isClipboardSupported(ClipboardType type) const;
+	void setClipboardText(const std::string &text, ClipboardType type) const;
+
+private:
+	mutable ZLQtApplicationWindow *myApplicationWindow;
+};
+
+#endif /* __ZLQTDIALOGMANAGER_H__ */
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp
new file mode 100644
index 0000000..b529e09
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <algorithm>
+#include <qscrollview.h>
+#include <qfont.h>
+#include <qcstring.h>
+#include <zapplication.h>
+#include <ezxutilcst.h>
+
+#include "ZLQtOptionsDialog.h"
+#include "ZLQtDialogManager.h"
+#include "ZLQtDialogContent.h"
+#include "ZLQtUtil.h"
+
+MyQTabWidget::MyQTabWidget(QWidget *parent) : QWidgetStack(parent) {
+}
+
+int MyQTabWidget::currentPageIndex() const {
+  return id(visibleWidget());
+}
+
+ZLQtOptionsDialog::ZLQtOptionsDialog(const ZLResource &resource, shared_ptr<ZLRunnable> applyAction) : ZLFullScreenDialog(std::string("X3")), ZLOptionsDialog(resource, applyAction) {
+  QWidget *title = getTitleBarWidget();
+  if(title->isA("QLabel")) {
+    ((QLabel *)title)->setText(::qtString(ZLOptionsDialog::caption()));
+  }
+  
+  myTabWidget = new MyQTabWidget(this);
+  setContentWidget(myTabWidget);
+
+	UTIL_CST *cst = (UTIL_CST *)getCSTWidget();
+	myMenu = new QPopupMenu(cst);
+	QFont f(qApp->font());
+	f.setPointSize(15);
+	myMenu->setFont(f);
+	connect(myMenu, SIGNAL(activated(int)), this, SLOT(selectTab(int)));
+	cst->getLeftBtn()->setEnabled(true);
+	cst->getLeftBtn()->setPopup(myMenu);
+	cst->getMidBtn()->setText("OK");
+  
+  tabsCount = 0;
+}
+
+ZLQtOptionsDialog::~ZLQtOptionsDialog() {
+}
+
+ZLDialogContent &ZLQtOptionsDialog::createTab(const ZLResourceKey &key) {
+	QScrollView *sv = new QScrollView(myTabWidget);
+	sv->setResizePolicy(QScrollView::AutoOneFit);
+	sv->setFrameStyle(QFrame::NoFrame);
+	
+	ZLQtDialogContent *tab = new ZLQtDialogContent(sv->viewport(), tabResource(key));
+	sv->addChild(tab->widget());
+	myMenu->insertItem(::qtString(tab->displayName()), -1, tabsCount);
+  myTabWidget->addWidget(sv, tabsCount);
+	myTabs.push_back(tab);
+  if(!tabsCount) {
+    raiseTab(0);
+  }
+
+  tabsCount++;
+	return *tab;
+}
+
+const std::string &ZLQtOptionsDialog::selectedTabKey() const {
+	return myTabs[myTabWidget->currentPageIndex()]->key();
+}
+
+void ZLQtOptionsDialog::raiseTab(int i) {
+	myTabWidget->raiseWidget(i);
+  QWidget *title = getTitleBarWidget();
+  if(title->isA("QLabel")) {
+    ((QLabel *)title)->setText(::qtString(ZLOptionsDialog::caption()) +
+      " (" + ::qtString((*myTabs[i]).displayName()) + ")");
+  }
+}
+
+void ZLQtOptionsDialog::selectTab(const ZLResourceKey &key) {
+	for (std::vector<shared_ptr<ZLDialogContent> >::const_iterator it = myTabs.begin(); it != myTabs.end(); ++it) {
+		if ((*it)->key() == key.Name) {
+      raiseTab(it - myTabs.begin());
+			break;
+		}
+	}
+}
+
+void ZLQtOptionsDialog::selectTab(int i) {
+  raiseTab(myMenu->indexOf(i));
+}
+
+bool ZLQtOptionsDialog::runInternal() {
+	for (std::vector<shared_ptr<ZLDialogContent> >::iterator it = myTabs.begin(); it != myTabs.end(); ++it) {
+		((ZLQtDialogContent&)**it).close();
+	}
+	return exec();
+}
+
+void ZLQtOptionsDialog::keyPressEvent(QKeyEvent *event) {
+	if (event->key() == Key_Return) {
+		ZLFullScreenDialog::accept();
+	} else {
+		ZLFullScreenDialog::keyPressEvent(event);
+	}
+}
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h
new file mode 100644
index 0000000..181b26b
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTOPTIONSDIALOG_H__
+#define __ZLQTOPTIONSDIALOG_H__
+
+#include <vector>
+
+#include <qwidget.h>
+#include <qwidgetstack.h>
+
+#include <ZLOptionsDialog.h>
+
+#include "ZLFullScreenDialog.h"
+
+class MyQTabWidget;
+
+class ZLQtOptionsDialog : public ZLFullScreenDialog, public ZLOptionsDialog {
+	Q_OBJECT
+
+public:
+	ZLQtOptionsDialog(const ZLResource &resource, shared_ptr<ZLRunnable> applyAction);
+  ~ZLQtOptionsDialog();
+	ZLDialogContent &createTab(const ZLResourceKey &key);
+
+protected:
+	const std::string &selectedTabKey() const;
+	void selectTab(const ZLResourceKey &key);
+
+	bool runInternal();
+
+	void keyPressEvent(QKeyEvent *event);
+
+private slots:
+	void selectTab(int i);
+	void raiseTab(int i);
+
+private:
+	MyQTabWidget *myTabWidget;
+	QPopupMenu *myMenu;
+  unsigned tabsCount;
+};
+
+class MyQTabWidget : public QWidgetStack {
+	Q_OBJECT
+
+public:
+	MyQTabWidget(QWidget *parent);
+  int currentPageIndex() const;
+};
+
+#endif /* __ZLQTOPTIONSDIALOG_H__ */
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp b/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp
new file mode 100644
index 0000000..0d3c0b2
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <stdio.h>
+#include <qvbox.h>
+#include <qlineedit.h>
+#include <qheader.h>
+#include <zapplication.h>
+
+#include <ZLibrary.h>
+
+#include "ZLQtSelectionDialog.h"
+#include "ZLQtUtil.h"
+
+ZLQtSelectionDialogItem::ZLQtSelectionDialogItem(QListView *listView, QListViewItem *previous, const ZLTreeNodePtr node) : QListViewItem(listView, previous, ::qtString(node->displayName())), myNode(node) {
+}
+
+ZLQtSelectionDialogListView::ZLQtSelectionDialogListView(QWidget *parent) : QListView(parent) {
+}
+
+void ZLQtSelectionDialogListView::keyPressEvent(QKeyEvent *e) {
+  if(e->key() == Key_Down || e->key() == Key_Up)
+    return QListView::keyPressEvent(e);
+  if((e->key() == Key_Enter || e->key() == 0x1004) && e->type() == QEvent::KeyPress)
+    emit returnPressed(currentItem());
+}
+
+ZLQtSelectionDialog::ZLQtSelectionDialog(const std::string &caption, ZLTreeHandler &handler) : ZLFullScreenDialog(caption), ZLSelectionDialog(handler) {
+	myMainBox = new QVBox(this);
+  setContentWidget(myMainBox);
+ 
+	myStateLine = new QLineEdit(myMainBox);
+	myStateLine->setEnabled(!this->handler().isOpenHandler());
+  myStateLine->setFrame(false);
+  QFrame *f = new QFrame(myMainBox);
+  f->setFrameStyle(QFrame::HLine | QFrame::Plain);
+	myListView = new ZLQtSelectionDialogListView(myMainBox);
+	myListView->addColumn("");
+  myListView->setFrameStyle(QFrame::NoFrame);
+	myListView->setColumnWidth(0, ZApplication::desktop()->width() -
+		ZApplication::style().scrollBarExtent().width());
+	myListView->header()->hide();
+	myListView->setSorting(-1, true);
+
+ 	connect(myListView, SIGNAL(clicked(QListViewItem*)), this, SLOT(runNodeSlot()));
+ 	connect(myListView, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(accept()));
+
+	ZLSelectionDialog::update();
+}
+
+ZLQtSelectionDialog::~ZLQtSelectionDialog() {
+	for (std::map<std::string,QPixmap*>::const_iterator it = myPixmaps.begin(); it != myPixmaps.end(); ++it) {
+		delete it->second;
+	}
+}
+
+QPixmap &ZLQtSelectionDialog::getPixmap(const ZLTreeNodePtr node) {
+	const std::string &pixmapName = node->pixmapName();
+	std::map<std::string,QPixmap*>::const_iterator it = myPixmaps.find(pixmapName);
+	if (it == myPixmaps.end()) {
+		QPixmap *pixmap = new QPixmap(
+									(ZLibrary::ApplicationImageDirectory()
+									+ ZLibrary::FileNameDelimiter
+									+ pixmapName + ".png").c_str());
+		myPixmaps[pixmapName] = pixmap;
+		return *pixmap;
+	} else {
+		return *it->second;
+	}
+}
+
+void ZLQtSelectionDialog::keyPressEvent(QKeyEvent *event) {
+	if ((event == 0)) return;
+  if (event->key() == Key_Escape) {
+		reject();
+	}
+  else if (event->key() == Key_Enter) {
+    accept();
+  }
+  else {
+    event->ignore();
+  }
+}
+
+void ZLQtSelectionDialog::updateStateLine() {
+	myStateLine->setText(::qtString(handler().stateDisplayName()));
+}
+
+void ZLQtSelectionDialog::updateList() {
+	myListView->clear();
+
+	const std::vector<ZLTreeNodePtr> &subnodes = handler().subnodes();
+
+	if (subnodes.size() > 0) {
+		QListViewItem *item = 0;
+
+		for (std::vector<ZLTreeNodePtr>::const_iterator it = subnodes.begin(); it != subnodes.end(); ++it) {
+		 	item = new ZLQtSelectionDialogItem(myListView, item, *it);
+			item->setPixmap(0, getPixmap(*it));
+		}
+	}
+}
+
+void ZLQtSelectionDialog::selectItem(int index) {
+	QListViewItem *item = myListView->firstChild();
+	if (item == 0) {
+		return;
+	}
+	for (; index > 0; --index) {
+		item = item->nextSibling();
+		if (item == 0) {
+			return;
+		}
+	}
+	myListView->setSelected(item, true);
+	if (item != myListView->firstChild()) {
+		myListView->ensureItemVisible(item);
+	}
+}
+
+void ZLQtSelectionDialog::exitDialog() {
+	ZLFullScreenDialog::accept();
+}
+
+void ZLQtSelectionDialog::runNodeSlot() {
+	QListViewItem *item = myListView->currentItem();
+	if (item != 0) {
+		runNode(((ZLQtSelectionDialogItem*)item)->node());
+	}
+}
+
+void ZLQtSelectionDialog::accept() {
+	if (handler().isOpenHandler()) {
+		runNodeSlot();
+	} else {
+		runState((const char*)myStateLine->text().utf8());
+	}
+}
+
+bool ZLQtSelectionDialog::run() {
+	return exec() == Accepted;
+}
diff --git a/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h b/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h
new file mode 100644
index 0000000..25af51f
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTSELECTIONDIALOG_H__
+#define __ZLQTSELECTIONDIALOG_H__
+
+#include <string>
+#include <map>
+
+#include <qlistview.h>
+#include <zapplication.h>
+
+#include "ZLFullScreenDialog.h"
+#include <ZLSelectionDialog.h>
+
+class QVBox;
+class QLineEdit;
+
+class ZLQtSelectionDialogItem : public QListViewItem {
+
+public:
+	ZLQtSelectionDialogItem(QListView *listView, QListViewItem *previous, const ZLTreeNodePtr node);
+	ZLTreeNodePtr node() const { return myNode; }
+
+private:
+	ZLTreeNodePtr myNode;
+};
+
+class ZLQtSelectionDialogListView : public QListView {
+public:
+  ZLQtSelectionDialogListView(QWidget *parent);
+  void keyPressEvent(QKeyEvent *);
+};
+
+class ZLQtSelectionDialog : public ZLFullScreenDialog, public ZLSelectionDialog {
+	Q_OBJECT
+
+public:
+	ZLQtSelectionDialog(const std::string &caption, ZLTreeHandler &handler); 
+	~ZLQtSelectionDialog();
+	bool run();
+
+private:
+	QPixmap &getPixmap(const ZLTreeNodePtr node);
+
+protected:
+	void keyPressEvent(QKeyEvent *event);
+
+	void exitDialog();
+	void updateStateLine();
+	void updateList();
+	void selectItem(int index);
+
+private slots:
+	void runNodeSlot();
+	void accept();
+
+private:
+	QLineEdit *myStateLine;
+	ZLQtSelectionDialogListView *myListView;
+	QVBox *myMainBox;
+	std::map<std::string,QPixmap*> myPixmaps;
+};
+
+#endif /* __ZLQTSELECTIONDIALOG_H__ */
diff --git a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.cpp b/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.cpp
similarity index 63%
rename from zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.cpp
rename to zlibrary/ui/src/ezx/dialogs/ZLQtUtil.cpp
index 5d7a6d3..a762467 100644
--- a/zlibrary/ui/src/win32/filesystem/ZLWin32RootDir.cpp
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.cpp
@@ -17,20 +17,22 @@
  * 02110-1301, USA.
  */
 
-#include <windows.h>
+#include <qregexp.h>
+#include <ZLDialogManager.h>
 
-#include "ZLWin32RootDir.h"
+#include "ZLQtUtil.h"
 
-void ZLWin32RootDir::collectSubDirs(std::vector<std::string> &names, bool) {
-	char *buffer = new char[26 * 4];
-	DWORD length = GetLogicalDriveStringsA(26 * 4, buffer);
-	for (char *ptr = buffer; ptr < buffer + length; ) {
-		std::string drive = ptr;
-		names.push_back(drive);
-		ptr += drive.length() + 1;
-	}
-	delete[] buffer;
+static inline QString qtButtonString(const std::string &text) {
+	return QString::fromUtf8(text.c_str()).replace(QRegExp("[\\n\\r?/<>&\\\\:\"*]"), "");
+}
+
+QString qtString(const std::string &text) {
+	return QString::fromUtf8(text.c_str());
 }
 
-void ZLWin32RootDir::collectFiles(std::vector<std::string>&, bool) {
+QString qtButtonName(const ZLResourceKey &key) {
+	if (key.Name.empty()) {
+		return QString::null;
+	}
+	return ::qtButtonString(ZLDialogManager::buttonName(key));
 }
diff --git a/zlibrary/ui/src/win32/config/StringEncoder.h b/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.h
similarity index 77%
copy from zlibrary/ui/src/win32/config/StringEncoder.h
copy to zlibrary/ui/src/ezx/dialogs/ZLQtUtil.h
index 5655dd0..4ac6807 100644
--- a/zlibrary/ui/src/win32/config/StringEncoder.h
+++ b/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.h
@@ -17,16 +17,16 @@
  * 02110-1301, USA.
  */
 
-#ifndef __STRINGENCODER_H__
-#define __STRINGENCODER_H__
+#ifndef __ZLQTUTIL_H__
+#define __ZLQTUTIL_H__
 
 #include <string>
 
-class StringEncoder {
+#include <qstring.h>
 
-public:
-	static std::string encode(const std::string &source);
-	static std::string decode(const std::string &source);
-};
+#include <ZLResource.h>
 
-#endif /* __STRINGENCODER_H__ */
+QString qtButtonName(const ZLResourceKey &key);
+QString qtString(const std::string &text);
+
+#endif /* __ZLQTUTIL_H__ */
diff --git a/zlibrary/ui/src/ezx/dialogs/moc.mk b/zlibrary/ui/src/ezx/dialogs/moc.mk
new file mode 100644
index 0000000..f39f889
--- /dev/null
+++ b/zlibrary/ui/src/ezx/dialogs/moc.mk
@@ -0,0 +1 @@
+SRCMOC = ZLFullScreenDialog.moc.cpp ZLQtOptionsDialog.moc.cpp ZLQtSelectionDialog.moc.cpp
diff --git a/zlibrary/ui/src/opie/library/ZLibrary.cpp b/zlibrary/ui/src/ezx/library/ZLibrary.cpp
similarity index 93%
copy from zlibrary/ui/src/opie/library/ZLibrary.cpp
copy to zlibrary/ui/src/ezx/library/ZLibrary.cpp
index fbc12f9..f558213 100644
--- a/zlibrary/ui/src/opie/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/ezx/library/ZLibrary.cpp
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-#include <qpe/qpeapplication.h>
+#include <zapplication.h>
 
 #include <ZLApplication.h>
 #include <ZLibrary.h>
@@ -29,7 +29,7 @@
 #include "../dialogs/ZLQtDialogManager.h"
 #include "../../qt/image/ZLQtImageManager.h"
 #include "../view/ZLQtPaintContext.h"
-#include "../../../../core/src/unix/message/ZLUnixMessage.h"
+#include "../../unix/message/ZLUnixMessage.h"
 #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
 #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
 
@@ -46,7 +46,7 @@ void initLibrary() {
 }
 
 void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
-	new QPEApplication(argc, argv);
+	new ZApplication(argc, argv);
 
 	ZLibrary::parseArguments(argc, argv);
 
@@ -67,5 +67,5 @@ void ZLQtLibraryImplementation::run(ZLApplication *application) {
 	ZLDialogManager::instance().createApplicationWindow(application);
 	application->initWindow();
 	qApp->exec();
-	delete application;
+  delete application;
 }
diff --git a/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp b/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp
new file mode 100644
index 0000000..e38f503
--- /dev/null
+++ b/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp
@@ -0,0 +1,508 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <string.h>
+#include <cctype>
+
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qlabel.h>
+#include <qbuttongroup.h>
+#include <qradiobutton.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
+#include <qmultilineedit.h>
+#include <qlineedit.h>
+#include <qslider.h>
+#include <qlayout.h>
+#include <zglobal.h>
+
+#include <ZLStringUtil.h>
+#include <ZLDialogManager.h>
+#include "../../qt/util/ZLQtKeyUtil.h"
+
+#include "ZLQtOptionView.h"
+#include "../dialogs/ZLQtDialogContent.h"
+#include "../dialogs/ZLQtUtil.h"
+
+void BooleanOptionView::_createItem() {
+	myCheckBox = new QCheckBox(::qtString(ZLOptionView::name()), myHolder.widget());
+	myCheckBox->setChecked(((ZLBooleanOptionEntry&)*myOption).initialState());
+	myHolder.attachWidget(*this, myCheckBox);
+	connect(myCheckBox, SIGNAL(toggled(bool)), this, SLOT(onStateChanged(bool)));
+}
+
+void BooleanOptionView::_show() {
+	myCheckBox->show();
+}
+
+void BooleanOptionView::_hide() {
+	myCheckBox->hide();
+}
+
+void BooleanOptionView::_onAccept() const {
+	((ZLBooleanOptionEntry&)*myOption).onAccept(myCheckBox->isChecked());
+}
+
+void BooleanOptionView::onStateChanged(bool state) const {
+	((ZLBooleanOptionEntry&)*myOption).onStateChanged(state);
+}
+
+void Boolean3OptionView::_createItem() {
+	myCheckBox = new QCheckBox(::qtString(ZLOptionView::name()), myHolder.widget());
+	myCheckBox->setTristate(true);
+	switch (((ZLBoolean3OptionEntry&)*myOption).initialState()) {
+		case B3_FALSE:
+			myCheckBox->setChecked(false);
+			break;
+		case B3_TRUE:
+			myCheckBox->setChecked(true);
+			break;
+		case B3_UNDEFINED:
+			myCheckBox->setNoChange();
+			break;
+	}
+	myHolder.attachWidget(*this, myCheckBox);
+	connect(myCheckBox, SIGNAL(stateChanged(int)), this, SLOT(onStateChanged(int)));
+}
+
+void Boolean3OptionView::_show() {
+	myCheckBox->show();
+}
+
+void Boolean3OptionView::_hide() {
+	myCheckBox->hide();
+}
+
+void Boolean3OptionView::_onAccept() const {
+	ZLBoolean3 value = B3_UNDEFINED;
+	switch (myCheckBox->state()) {
+		case QCheckBox::On:
+			value = B3_TRUE;
+			break;
+		case QCheckBox::Off:
+			value = B3_FALSE;
+			break;
+		case QCheckBox::NoChange:
+			value = B3_UNDEFINED;
+			break;
+	}
+	((ZLBoolean3OptionEntry&)*myOption).onAccept(value);
+}
+
+void Boolean3OptionView::onStateChanged(int state) const {
+	ZLBoolean3 value = B3_UNDEFINED;
+	switch (state) {
+		case QCheckBox::On:
+			value = B3_TRUE;
+			break;
+		case QCheckBox::Off:
+			value = B3_FALSE;
+			break;
+		case QCheckBox::NoChange:
+			value = B3_UNDEFINED;
+			break;
+	}
+	((ZLBoolean3OptionEntry&)*myOption).onStateChanged(value);
+}
+
+void ChoiceOptionView::_createItem() {
+	myGroup = new QButtonGroup(::qtString(ZLOptionView::name()), myHolder.widget());
+	QVBoxLayout *layout = new QVBoxLayout(myGroup, 12);
+	layout->addSpacing(myGroup->fontMetrics().height());
+	myButtons = new QRadioButton*[((ZLChoiceOptionEntry&)*myOption).choiceNumber()];
+	for (int i = 0; i < ((ZLChoiceOptionEntry&)*myOption).choiceNumber(); ++i) {
+		myButtons[i] = new QRadioButton((QButtonGroup*)layout->parent());
+		myButtons[i]->setText(::qtString(((ZLChoiceOptionEntry&)*myOption).text(i)));
+		layout->addWidget(myButtons[i]);
+	}
+	myButtons[((ZLChoiceOptionEntry&)*myOption).initialCheckedIndex()]->setChecked(true);
+	myHolder.attachWidget(*this, myGroup);
+}
+
+void ChoiceOptionView::_show() {
+	myGroup->show();
+}
+
+void ChoiceOptionView::_hide() {
+	myGroup->hide();
+}
+
+void ChoiceOptionView::_onAccept() const {
+	for (int i = 0; i < ((ZLChoiceOptionEntry&)*myOption).choiceNumber(); ++i) {
+		if (myButtons[i]->isChecked()) {
+			((ZLChoiceOptionEntry&)*myOption).onAccept(i);
+			return;
+		}
+	}
+}
+
+void ComboOptionView::_createItem() {
+	const ZLComboOptionEntry &comboOption = (ZLComboOptionEntry&)*myOption;
+	myLabel = new QLabel(::qtString(ZLOptionView::name()), myHolder.widget());
+	myComboBox = new QComboBox(myHolder.widget());
+	myComboBox->setEditable(comboOption.isEditable());
+
+	if (myHolder.parentWidget() != 0) {
+		connect(myHolder.parentWidget(), SIGNAL(resized(const QSize&)), this, SLOT(onTabResized(const QSize&)));
+	}
+	connect(myComboBox, SIGNAL(activated(int)), this, SLOT(onValueSelected(int)));
+	connect(myComboBox, SIGNAL(textChanged(const QString&)), this, SLOT(onValueEdited(const QString&)));
+
+	myHolder.attachWidgets(*this, myLabel, 1, myComboBox, 1);
+
+	reset();
+}
+
+void ComboOptionView::reset() {
+	if (myComboBox == 0) {
+		return;
+	}
+
+	myComboBox->clear();
+
+	const ZLComboOptionEntry &comboOption = (ZLComboOptionEntry&)*myOption;
+	const std::vector<std::string> &values = comboOption.values();
+	const std::string &initial = comboOption.initialValue();
+	int selectedIndex = -1;
+	int index = 0;
+	for (std::vector<std::string>::const_iterator it = values.begin(); it != values.end(); ++it, ++index) {
+		myComboBox->insertItem(::qtString(*it));
+		if (*it == initial) {
+			selectedIndex = index;
+		}
+	}
+	if (selectedIndex >= 0) {
+		myComboBox->setCurrentItem(selectedIndex);
+	}
+}
+
+void ComboOptionView::onTabResized(const QSize &size) {
+	myComboBox->setMaximumWidth(size.width() / 2 - 30);
+}
+
+void ComboOptionView::_show() {
+	myLabel->show();
+	myComboBox->show();
+}
+
+void ComboOptionView::_hide() {
+	myLabel->hide();
+	myComboBox->hide();
+}
+
+void ComboOptionView::_setActive(bool active) {
+	myComboBox->setEnabled(active);
+}
+
+void ComboOptionView::_onAccept() const {
+	((ZLComboOptionEntry&)*myOption).onAccept((const char*)myComboBox->currentText().utf8());
+}
+
+void ComboOptionView::onValueSelected(int index) {
+	ZLComboOptionEntry &o = (ZLComboOptionEntry&)*myOption;
+	if ((index >= 0) && (index < (int)o.values().size())) {
+		o.onValueSelected(index);
+	}
+}
+
+void ComboOptionView::onValueEdited(const QString &value) {
+	ZLComboOptionEntry &o = (ZLComboOptionEntry&)*myOption;
+	if (o.useOnValueEdited()) {
+		o.onValueEdited((const char*)value.utf8());
+	}
+}
+
+void SpinOptionView::_createItem() {
+	myLabel = new QLabel(::qtString(ZLOptionView::name()), myHolder.widget());
+	mySpinBox = new QSpinBox(
+		((ZLSpinOptionEntry&)*myOption).minValue(),
+		((ZLSpinOptionEntry&)*myOption).maxValue(),
+		((ZLSpinOptionEntry&)*myOption).step(), myHolder.widget()
+	);
+	QPalette palette(mySpinBox->palette());
+	palette.setColor(QColorGroup::Button, QColor(177, 177, 177));
+	mySpinBox->setPalette(palette);
+	mySpinBox->setButtonSymbols(QSpinBox::PlusMinus);
+	mySpinBox->setValue(((ZLSpinOptionEntry&)*myOption).initialValue());
+	myHolder.attachWidgets(*this, myLabel, 2, mySpinBox, 1);
+}
+
+void SpinOptionView::_show() {
+	myLabel->show();
+	mySpinBox->show();
+}
+
+void SpinOptionView::_hide() {
+	myLabel->hide();
+	mySpinBox->hide();
+}
+
+void SpinOptionView::_onAccept() const {
+	((ZLSpinOptionEntry&)*myOption).onAccept(mySpinBox->value());
+}
+
+void StringOptionView::_createItem() {
+	myLineEdit = new QLineEdit(myHolder.widget());
+	connect(myLineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(onValueEdited(const QString&)));
+	if (!ZLOptionView::name().empty()) {
+		myLabel = new QLabel(::qtString(ZLOptionView::name()), myHolder.widget());
+		myHolder.attachWidgets(*this, myLabel, 1, myLineEdit, 3);
+	} else {
+		myLabel = 0;
+		myHolder.attachWidget(*this, myLineEdit);
+	}
+	reset();
+}
+
+void StringOptionView::_show() {
+	if (myLabel != 0) {
+		myLabel->show();
+	}
+	myLineEdit->show();
+}
+
+void StringOptionView::_hide() {
+	if (myLabel != 0) {
+		myLabel->hide();
+	}
+	myLineEdit->hide();
+}
+
+void StringOptionView::_setActive(bool active) {
+	myLineEdit->setReadOnly(!active);
+}
+
+void StringOptionView::_onAccept() const {
+	((ZLStringOptionEntry&)*myOption).onAccept((const char*)myLineEdit->text().utf8());
+}
+
+void StringOptionView::reset() {
+	if (myLineEdit == 0) {
+		return;
+	}
+
+	myLineEdit->setText(::qtString(((ZLStringOptionEntry&)*myOption).initialValue()));
+	myLineEdit->cursorLeft(false, myLineEdit->text().length());
+}
+
+void StringOptionView::onValueEdited(const QString &value) {
+	ZLStringOptionEntry &o = (ZLStringOptionEntry&)*myOption;
+	if (o.useOnValueEdited()) {
+		o.onValueEdited((const char*)value.utf8());
+	}
+}
+
+void MultilineOptionView::_createItem() {
+	myMultiLineEdit = new QMultiLineEdit(myHolder.widget());
+	myMultiLineEdit->setWordWrap(QMultiLineEdit::WidgetWidth);
+	myMultiLineEdit->setWrapPolicy(QMultiLineEdit::AtWhiteSpace);
+	connect(myMultiLineEdit, SIGNAL(textChanged()), this, SLOT(onValueEdited()));
+	myHolder.attachWidget(*this, myMultiLineEdit);
+	reset();
+}
+
+void MultilineOptionView::_show() {
+	myMultiLineEdit->show();
+}
+
+void MultilineOptionView::_hide() {
+	myMultiLineEdit->hide();
+}
+
+void MultilineOptionView::_setActive(bool active) {
+	myMultiLineEdit->setReadOnly(!active);
+}
+
+void MultilineOptionView::_onAccept() const {
+	((ZLMultilineOptionEntry&)*myOption).onAccept((const char*)myMultiLineEdit->text().utf8());
+}
+
+void MultilineOptionView::reset() {
+	if (myMultiLineEdit == 0) {
+		return;
+	}
+
+	myMultiLineEdit->setText(::qtString(((ZLStringOptionEntry&)*myOption).initialValue()));
+	//myMultiLineEdit->home();
+}
+
+void MultilineOptionView::onValueEdited() {
+	ZLMultilineOptionEntry &o = (ZLMultilineOptionEntry&)*myOption;
+	if (o.useOnValueEdited()) {
+		o.onValueEdited((const char*)myMultiLineEdit->text().utf8());
+	}
+}
+
+class KeyLineEdit : public QLineEdit {
+
+public:
+	KeyLineEdit(KeyOptionView &keyView);
+
+protected:
+	void focusInEvent(QFocusEvent*);
+	void focusOutEvent(QFocusEvent*);
+	void keyPressEvent(QKeyEvent *keyEvent);
+
+private:
+	KeyOptionView &myKeyView;
+};
+
+KeyLineEdit::KeyLineEdit(KeyOptionView &keyView) : QLineEdit(keyView.myWidget), myKeyView(keyView) {
+	focusOutEvent(0);
+}
+
+void KeyLineEdit::focusInEvent(QFocusEvent*) {
+	grabKeyboard();
+}
+
+void KeyLineEdit::focusOutEvent(QFocusEvent*) {
+	releaseKeyboard();
+}
+
+void KeyLineEdit::keyPressEvent(QKeyEvent *keyEvent) {
+	std::string keyText = ZLQtKeyUtil::keyName(keyEvent);
+	setText(keyText.c_str());
+	if (!keyText.empty()) {
+		myKeyView.myCurrentKey = keyText;
+		myKeyView.myComboBox->setCurrentItem(((ZLKeyOptionEntry&)*myKeyView.myOption).actionIndex(keyText));
+		myKeyView.myComboBox->show();
+	}
+	((ZLKeyOptionEntry&)*myKeyView.myOption).onKeySelected(keyText);
+}
+
+void KeyOptionView::_createItem() {
+	myWidget = new QWidget(myHolder.widget());
+  QRect rect = ZGlobal::getHomeR();
+	QGridLayout *layout = new QGridLayout(myWidget, 2, 2, 0, 10);
+
+	myLabel = new QLabel(myWidget);
+	myLabel->setText(::qtString(ZLResource::resource("keyOptionView")["actionFor"].value()));
+	layout->addWidget(myLabel, 0, 0);
+
+	myKeyEditor = new KeyLineEdit(*this);
+  myKeyEditor->setMaximumWidth(rect.width() - 20);
+  myKeyEditor->setMinimumWidth(rect.width() - 20);
+	layout->addWidget(myKeyEditor, 0, 1, Qt::AlignRight);
+
+	myComboBox = new QComboBox(myWidget);
+  myComboBox->setMaximumWidth(rect.width() - 20);
+  myComboBox->setMinimumWidth(rect.width() - 20);
+	const std::vector<std::string> &actions = ((ZLKeyOptionEntry&)*myOption).actionNames();
+	for (std::vector<std::string>::const_iterator it = actions.begin(); it != actions.end(); ++it) {
+    myComboBox->insertItem(::qtString(*it));
+	}
+	connect(myComboBox, SIGNAL(activated(int)), this, SLOT(onValueChanged(int)));
+  layout->addWidget(myComboBox, 1, 1, Qt::AlignRight);
+	myHolder.attachWidget(*this, myWidget);
+}
+
+void KeyOptionView::reset() {
+	if (myWidget == 0) {
+		return;
+	}
+	myCurrentKey.erase();
+	myKeyEditor->setText("");
+	((ZLKeyOptionEntry&)*myOption).onKeySelected(myCurrentKey);
+	myComboBox->hide();
+}
+
+void KeyOptionView::_show() {
+	myWidget->show();
+	myLabel->show();
+	myKeyEditor->show();
+	if (!myCurrentKey.empty()) {
+		myComboBox->show();
+	} else {
+		myComboBox->hide();
+	}
+}
+
+void KeyOptionView::_hide() {
+	myKeyEditor->hide();
+	myWidget->hide();
+	myLabel->hide();
+	myComboBox->hide();
+	myCurrentKey.erase();
+	myKeyEditor->setText("");
+	((ZLKeyOptionEntry&)*myOption).onKeySelected(myCurrentKey);
+}
+
+void KeyOptionView::_onAccept() const {
+	((ZLKeyOptionEntry&)*myOption).onAccept();
+}
+
+void KeyOptionView::onValueChanged(int index) {
+	if (!myCurrentKey.empty()) {
+		((ZLKeyOptionEntry&)*myOption).onValueChanged(myCurrentKey, index);
+	}
+}
+
+void ColorOptionView::_createItem() {
+	myWidget = new QWidget(myHolder.widget());
+	QGridLayout *layout = new QGridLayout(myWidget, 3, 3, 0, 10);
+	const ZLResource &resource = ZLResource::resource(ZLDialogManager::COLOR_KEY);
+	layout->addWidget(new QLabel(::qtString(resource["red"].value()), myWidget), 0, 0);
+	layout->addWidget(new QLabel(::qtString(resource["green"].value()), myWidget), 1, 0);
+	layout->addWidget(new QLabel(::qtString(resource["blue"].value()), myWidget), 2, 0);
+	const ZLColor &color = ((ZLColorOptionEntry&)*myOption).color();
+	myRSlider = new QSlider(0, 255, 1, color.Red, QSlider::Horizontal, myWidget);
+	myGSlider = new QSlider(0, 255, 1, color.Green, QSlider::Horizontal, myWidget);
+	myBSlider = new QSlider(0, 255, 1, color.Blue, QSlider::Horizontal, myWidget);
+	connect(myRSlider, SIGNAL(sliderMoved(int)), this, SLOT(onSliderMove(int)));
+	connect(myGSlider, SIGNAL(sliderMoved(int)), this, SLOT(onSliderMove(int)));
+	connect(myBSlider, SIGNAL(sliderMoved(int)), this, SLOT(onSliderMove(int)));
+	layout->addWidget(myRSlider, 0, 1);
+	layout->addWidget(myGSlider, 1, 1);
+	layout->addWidget(myBSlider, 2, 1);
+	myColorBar = new QLabel("                  ", myWidget);
+	myColorBar->setBackgroundColor(QColor(color.Red, color.Green, color.Blue));
+	myColorBar->setFrameStyle(QFrame::Panel | QFrame::Plain);
+	layout->addMultiCellWidget(myColorBar, 0, 2, 2, 2);
+	myHolder.attachWidget(*this, myWidget);
+}
+
+void ColorOptionView::reset() {
+	if (myWidget == 0) {
+		return;
+	}
+	ZLColorOptionEntry &colorEntry = (ZLColorOptionEntry&)*myOption;
+	colorEntry.onReset(ZLColor(myRSlider->value(), myGSlider->value(), myBSlider->value()));
+	const ZLColor &color = colorEntry.color();
+	myRSlider->setValue(color.Red);
+	myGSlider->setValue(color.Green);
+	myBSlider->setValue(color.Blue);
+	myColorBar->setBackgroundColor(QColor(color.Red, color.Green, color.Blue));
+}
+
+void ColorOptionView::_show() {
+	myWidget->show();
+}
+
+void ColorOptionView::_hide() {
+	myWidget->hide();
+}
+
+void ColorOptionView::onSliderMove(int) {
+	myColorBar->setBackgroundColor(QColor(myRSlider->value(), myGSlider->value(), myBSlider->value()));
+}
+
+void ColorOptionView::_onAccept() const {
+	((ZLColorOptionEntry&)*myOption).onAccept(ZLColor(myRSlider->value(), myGSlider->value(), myBSlider->value()));
+}
diff --git a/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h b/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h
new file mode 100644
index 0000000..8fa51d0
--- /dev/null
+++ b/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTOPTIONVIEW_H__
+#define __ZLQTOPTIONVIEW_H__
+
+#include <qobject.h>
+
+#include <ZLOptionsDialog.h>
+#include <ZLOptionEntry.h>
+#include "../../../../core/src/dialogs/ZLOptionView.h"
+
+class ZLQtOptionViewHolder;
+
+class QButtonGroup;
+class QLabel;
+class QSpinBox;
+class QCheckBox;
+class QLineEdit;
+class QMultiLineEdit;
+class QPushButton;
+class QRadioButton;
+class QComboBox;
+class QSlider;
+class QWidget;
+
+class ZLQtOptionView : public ZLOptionView {
+
+protected:
+	ZLQtOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLOptionView(name, tooltip, option), myHolder(holder) {}
+
+protected:
+	ZLQtOptionViewHolder &myHolder;
+};
+
+class ChoiceOptionView : public ZLQtOptionView {
+
+public:
+	ChoiceOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {
+		myButtons = 0;
+	}
+	~ChoiceOptionView() { if (myButtons != 0) delete[] myButtons; }
+
+protected:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _onAccept() const;
+
+private:
+	QButtonGroup *myGroup;
+	QRadioButton **myButtons;
+};
+
+class BooleanOptionView : public QObject, public ZLQtOptionView {
+
+Q_OBJECT
+
+public:
+	BooleanOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+protected:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _onAccept() const;
+
+private slots:
+	void onStateChanged(bool) const;
+
+private:
+	QCheckBox *myCheckBox;
+};
+
+class Boolean3OptionView : public QObject, public ZLQtOptionView {
+
+Q_OBJECT
+
+public:
+	Boolean3OptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+protected:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _onAccept() const;
+
+private slots:
+	void onStateChanged(int) const;
+
+private:
+	QCheckBox *myCheckBox;
+};
+
+class StringOptionView : public QObject, public ZLQtOptionView {
+
+Q_OBJECT
+
+public:
+	StringOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+private:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _setActive(bool active);
+	void _onAccept() const;
+	void reset();
+
+private slots:
+	void onValueEdited(const QString &value);
+
+private:
+	QLabel *myLabel;
+	QLineEdit *myLineEdit;
+};
+
+class MultilineOptionView : public QObject, public ZLQtOptionView {
+
+Q_OBJECT
+
+public:
+	MultilineOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+private:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _setActive(bool active);
+	void _onAccept() const;
+	void reset();
+
+private slots:
+	void onValueEdited();
+
+private:
+	QMultiLineEdit *myMultiLineEdit;
+};
+
+class SpinOptionView : public ZLQtOptionView {
+
+public:
+	SpinOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+protected:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _onAccept() const;
+
+private:
+	QLabel *myLabel;
+	QSpinBox *mySpinBox;
+};
+
+class ComboOptionView : public QObject, public ZLQtOptionView {
+
+Q_OBJECT
+
+public:
+	ComboOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+private:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _setActive(bool active);
+	void _onAccept() const;
+	void reset();
+
+private slots:
+	void onValueSelected(int index);
+	void onValueEdited(const QString &value);
+	void onTabResized(const QSize &size);
+	
+private:
+	QLabel *myLabel;
+	QComboBox *myComboBox;
+};
+
+class KeyOptionView : public QObject, public ZLQtOptionView {
+
+Q_OBJECT
+
+public:
+	KeyOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+private:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _onAccept() const;
+	void reset();
+
+private slots:
+	void onValueChanged(int);
+
+private:
+	QWidget *myWidget;
+	QLineEdit *myKeyEditor;
+	QLabel *myLabel;
+	QComboBox *myComboBox;
+	std::string myCurrentKey;
+
+friend class KeyLineEdit;
+};
+
+class ColorOptionView : public QObject, public ZLQtOptionView {
+
+Q_OBJECT
+
+public:
+	ColorOptionView(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option, ZLQtOptionViewHolder &holder) : ZLQtOptionView(name, tooltip, option, holder) {}
+
+private:
+	void _createItem();
+	void _show();
+	void _hide();
+	void _onAccept() const;
+	void reset();
+
+private slots:
+	void onSliderMove(int);
+
+private:
+	QWidget *myWidget;
+	QSlider *myRSlider, *myGSlider, *myBSlider;
+	QLabel *myColorBar;
+};
+
+#endif /* __ZLQTOPTIONVIEW_H__ */
diff --git a/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp b/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp
new file mode 100644
index 0000000..b697410
--- /dev/null
+++ b/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLQtOptionViewHolder.h"
+#include "ZLQtOptionView.h"
+
+ZLOptionView *ZLQtOptionViewHolder::createViewByEntry(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option) {
+	if (option == 0) {
+		return 0;
+	}
+
+	switch (option->kind()) {
+		case ZLOptionEntry::BOOLEAN:
+			return new BooleanOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::BOOLEAN3:
+			return new Boolean3OptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::STRING:
+			return new StringOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::MULTILINE:
+			return new MultilineOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::CHOICE:
+			return new ChoiceOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::SPIN:
+			return new SpinOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::COMBO:
+			return new ComboOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::COLOR:
+			return new ColorOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::KEY:
+			return new KeyOptionView(name, tooltip, option, *this);
+		case ZLOptionEntry::ORDER:
+			// TODO: implement
+			return 0;
+	}
+  return 0;
+}
diff --git a/zlibrary/ui/src/win32/config/StringEncoder.h b/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.h
similarity index 53%
rename from zlibrary/ui/src/win32/config/StringEncoder.h
rename to zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.h
index 5655dd0..8dca007 100644
--- a/zlibrary/ui/src/win32/config/StringEncoder.h
+++ b/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.h
@@ -17,16 +17,33 @@
  * 02110-1301, USA.
  */
 
-#ifndef __STRINGENCODER_H__
-#define __STRINGENCODER_H__
+#ifndef __ZLQTOPTIONVIEWHOLDER_H__
+#define __ZLQTOPTIONVIEWHOLDER_H__
 
 #include <string>
 
-class StringEncoder {
+#include <qwidget.h>
+
+#include <shared_ptr.h>
+
+class ZLOptionView;
+class ZLOptionEntry;
+class ZLQtOptionView;
+
+class ZLQtOptionViewHolder {
 
 public:
-	static std::string encode(const std::string &source);
-	static std::string decode(const std::string &source);
+	virtual ~ZLQtOptionViewHolder();
+
+	virtual void attachWidget(ZLOptionView &view, QWidget *widget) = 0;
+	virtual void attachWidgets(ZLOptionView &view, QWidget *widget0, int weight0, QWidget *widget1, int weight1) = 0;
+	virtual QWidget *widget() = 0;
+	virtual QWidget *parentWidget() = 0;
+
+protected:
+	ZLOptionView *createViewByEntry(const std::string &name, const std::string &tooltip, shared_ptr<ZLOptionEntry> option);
 };
 
-#endif /* __STRINGENCODER_H__ */
+inline ZLQtOptionViewHolder::~ZLQtOptionViewHolder() {}
+
+#endif /* __ZLQTOPTIONVIEWHOLDER_H__ */
diff --git a/zlibrary/ui/src/ezx/optionView/moc.mk b/zlibrary/ui/src/ezx/optionView/moc.mk
new file mode 100644
index 0000000..114506a
--- /dev/null
+++ b/zlibrary/ui/src/ezx/optionView/moc.mk
@@ -0,0 +1 @@
+SRCMOC = ZLQtOptionView.moc.cpp
diff --git a/zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp b/zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp
new file mode 100644
index 0000000..c0dcc86
--- /dev/null
+++ b/zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qfontmetrics.h>
+#include <qfontdatabase.h>
+#include <qimage.h>
+
+#include <ZLUnicodeUtil.h>
+#include <ZLImage.h>
+
+#include "ZLQtPaintContext.h"
+#include "../../qt/image/ZLQtImageManager.h"
+
+ZLQtPaintContext::ZLQtPaintContext() {
+	myPainter = new QPainter();
+	myPixmap = 0;
+	mySpaceWidth = -1;
+	myDescent = 0;
+	myFontIsStored = false;
+}
+
+ZLQtPaintContext::~ZLQtPaintContext() {
+	if (myPixmap != 0) {
+		myPainter->end();
+		delete myPixmap;
+	}
+	delete myPainter;
+}
+
+void ZLQtPaintContext::setSize(int w, int h) {
+	if (myPixmap != 0) {
+		if ((myPixmap->width() != w) || (myPixmap->height() != h)) {
+			myPainter->end();
+			delete myPixmap;
+			myPixmap = 0;
+		}
+	}
+	if ((myPixmap == 0) && (w > 0) && (h > 0)) {
+		myPixmap = new QPixmap(w, h);
+		myPainter->begin(myPixmap);
+		if (myFontIsStored) {
+			myFontIsStored = false;
+			setFont(myStoredFamily, myStoredSize, myStoredBold, myStoredItalic);
+		}
+	}
+}
+
+void ZLQtPaintContext::fillFamiliesList(std::vector<std::string> &families) const {
+	QFontDatabase db;
+	QStringList qFamilies = db.families();
+	for (QStringList::Iterator it = qFamilies.begin(); it != qFamilies.end(); ++it) {
+		std::string family = (*it).ascii();
+		families.push_back(family);
+	}
+}
+
+const std::string ZLQtPaintContext::realFontFamilyName(std::string &fontFamily) const {
+	QString fullName = QFontInfo(QFont(fontFamily.c_str())).family();
+	if (fullName.isNull() || fullName.isEmpty()) {
+		fullName = QFontInfo(QFont::defaultFont()).family();
+		if (fullName.isNull() || fullName.isEmpty()) {
+			return "SSong";
+		}
+	}
+	return fullName.left(fullName.find(" [")).ascii();
+}
+
+void ZLQtPaintContext::setFont(const std::string &family, int size, bool bold, bool italic) {
+	if (myPainter->device() == 0) {
+		myFontIsStored = true;
+		myStoredFamily = family;
+		myStoredSize = size;
+		myStoredBold = bold;
+		myStoredItalic= italic;
+	} else {
+		QFont font = myPainter->font();
+		bool fontChanged = false;
+
+		if (font.family() != family.c_str()) {
+			font.setFamily(family.c_str());
+			fontChanged = true;
+		}
+
+		if (font.pointSize() != size) {
+			font.setPointSize(size);
+			fontChanged = true;
+		}
+
+		if ((font.weight() != (bold ? QFont::Bold : QFont::Normal))) {
+			font.setWeight(bold ? QFont::Bold : QFont::Normal);
+			fontChanged = true;
+		}
+
+		if (font.italic() != italic) {
+			font.setItalic(italic);
+			fontChanged = true;
+		}
+
+		if (fontChanged) {
+			myPainter->setFont(font);
+			mySpaceWidth = -1;
+			myDescent = myPainter->fontMetrics().descent();
+		}
+	}
+}
+
+void ZLQtPaintContext::setColor(ZLColor color, LineStyle style) {
+	myPainter->setPen(QPen(
+		QColor(color.Red, color.Green, color.Blue),
+		1,
+		(style == SOLID_LINE) ? QPainter::SolidLine : QPainter::DashLine
+	));
+}
+
+void ZLQtPaintContext::setFillColor(ZLColor color, FillStyle style) {
+	myPainter->setBrush(QBrush(
+		QColor(color.Red, color.Green, color.Blue),
+		(style == SOLID_FILL) ? QPainter::SolidPattern : QPainter::NoBrush
+	));
+}
+
+int ZLQtPaintContext::stringWidth(const char *str, int len) const {
+	return myPainter->fontMetrics().width(QString::fromUtf8(str, len));
+}
+
+int ZLQtPaintContext::spaceWidth() const {
+	if (mySpaceWidth == -1) {
+		mySpaceWidth = myPainter->fontMetrics().width(" ");
+	}
+	return mySpaceWidth;
+}
+
+int ZLQtPaintContext::descent() const {
+	return myDescent;
+}
+
+int ZLQtPaintContext::stringHeight() const {
+	return myPainter->font().pointSize() + 2;
+}
+
+void ZLQtPaintContext::drawString(int x, int y, const char *str, int len) {
+	QString qStr = QString::fromUtf8(str, len);
+	myPainter->drawText(x, y, qStr);
+}
+
+void ZLQtPaintContext::drawImage(int x, int y, const ZLImageData &image) {
+	const QImage &qImage = (ZLQtImageData&)image;
+	myPainter->drawImage(x, y - qImage.height(), qImage);
+}
+
+void ZLQtPaintContext::drawLine(int x0, int y0, int x1, int y1) {
+	myPainter->drawLine(x0, y0, x1, y1);
+}
+
+void ZLQtPaintContext::fillRectangle(int x0, int y0, int x1, int y1) {
+	if (x1 < x0) {
+		int tmp = x1;
+		x1 = x0;
+		x0 = tmp;
+	}
+	if (y1 < y0) {
+		int tmp = y1;
+		y1 = y0;
+		y0 = tmp;
+	}
+	myPainter->fillRect(x0, y0,
+											x1 - x0 + 1, y1 - y0 + 1,
+											myPainter->brush());
+}
+
+void ZLQtPaintContext::drawFilledCircle(int x, int y, int r) {
+	myPainter->drawEllipse(x - r, y - r, 2 * r + 1, 2 * r + 1);
+}
+
+void ZLQtPaintContext::clear(ZLColor color) {
+	if (myPixmap != 0) {
+		myPixmap->fill(QColor(color.Red, color.Green, color.Blue));
+	}
+}
+
+int ZLQtPaintContext::width() const {
+	if (myPixmap == 0) {
+		return 0;
+	}
+	return myPixmap->width();
+}
+
+int ZLQtPaintContext::height() const {
+	if (myPixmap == 0) {
+		return 0;
+	}
+	return myPixmap->height();
+}
diff --git a/zlibrary/ui/src/ezx/view/ZLQtPaintContext.h b/zlibrary/ui/src/ezx/view/ZLQtPaintContext.h
new file mode 100644
index 0000000..67b0035
--- /dev/null
+++ b/zlibrary/ui/src/ezx/view/ZLQtPaintContext.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTPAINTCONTEXT_H__
+#define __ZLQTPAINTCONTEXT_H__
+
+#include <ZLPaintContext.h>
+
+class QPainter;
+class QPixmap;
+class QImage;
+
+class ZLQtPaintContext : public ZLPaintContext {
+
+public:
+	ZLQtPaintContext();
+	~ZLQtPaintContext();
+
+	const QPixmap &pixmap() const { return *myPixmap; }
+
+	void setSize(int w, int h);
+
+	int width() const;
+	int height() const;
+
+	void clear(ZLColor color);
+
+	void fillFamiliesList(std::vector<std::string> &families) const;
+	const std::string realFontFamilyName(std::string &fontFamily) const;
+
+	void setFont(const std::string &family, int size, bool bold, bool italic);
+	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
+	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
+
+	int stringWidth(const char *str, int len) const;
+	int spaceWidth() const;
+	int stringHeight() const;
+	int descent() const;
+	void drawString(int x, int y, const char *str, int len);
+
+	void drawImage(int x, int y, const ZLImageData &image);
+
+	void drawLine(int x0, int y0, int x1, int y1);
+	void fillRectangle(int x0, int y0, int x1, int y1);
+	void drawFilledCircle(int x, int y, int r);
+
+private:
+	QPainter *myPainter;
+	QPixmap *myPixmap;
+	mutable int mySpaceWidth;
+	mutable int myDescent;
+
+	bool myFontIsStored;
+	std::string myStoredFamily;
+	int myStoredSize;
+	bool myStoredBold;
+	bool myStoredItalic;	
+};
+
+#endif /* __ZLQTPAINTCONTEXT_H__ */
diff --git a/zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp
new file mode 100644
index 0000000..a17413e
--- /dev/null
+++ b/zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <algorithm>
+
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qframe.h>
+#include <qimage.h>
+#include <zapplication.h>
+
+#include "ZLQtViewWidget.h"
+#include "ZLQtPaintContext.h"
+#include "../application/ZLQtApplicationWindow.h"
+#include "../dialogs/ZLQtDialogManager.h"
+
+ZLQtViewWidget::ZLQtViewWidgetInternal::ZLQtViewWidgetInternal(QWidget *parent, ZLQtViewWidget &holder) : QWidget(parent), myHolder(holder), myTimerId(0), myWasLeaved(false) {
+	setBackgroundMode(NoBackground);
+}
+
+ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLQtApplicationWindow &applicationWindow) : ZLViewWidget((ZLViewWidget::Angle)applicationWindow.application().AngleStateOption.value()), myApplicationWindow(applicationWindow) {
+	myQWidget = new ZLQtViewWidgetInternal(parent, *this);
+}
+
+void ZLQtViewWidget::trackStylus(bool track) {
+	myQWidget->setMouseTracking(track);
+}
+
+void ZLQtViewWidget::ZLQtViewWidgetInternal::paintEvent(QPaintEvent*) {
+	const int w = width();
+	const int h = height() + myHolder.myApplicationWindow.verticalAdjustment();
+	switch (myHolder.rotation()) {
+		default:
+			((ZLQtPaintContext&)myHolder.view()->context()).setSize(w, h);
+			break;
+		case DEGREES90:
+		case DEGREES270:
+			((ZLQtPaintContext&)myHolder.view()->context()).setSize(h, w);
+			break;
+	}
+	myHolder.view()->paint();
+
+	int angle = 0;
+	switch (myHolder.rotation()) {
+		default:
+			break;
+		case DEGREES90:
+			angle = 270;
+			break;
+		case DEGREES180:
+			angle = 180;
+			break;
+		case DEGREES270:
+			angle = 90;
+			break;
+	}
+	const QPixmap &pixmap = ((ZLQtPaintContext&)myHolder.view()->context()).pixmap();
+	QPainter painter(this);
+	if (angle == 0) {
+		painter.drawPixmap(0, 0, pixmap);
+	} else {
+		QWMatrix matrix;
+		matrix.rotate(angle);
+		painter.drawPixmap(0, 0, pixmap.xForm(matrix));
+	}
+}
+
+void ZLQtViewWidget::ZLQtViewWidgetInternal::mousePressEvent(QMouseEvent *event) {
+	myWasLeaved = false;
+	if (myTimerId > 0) {
+		killTimer(myTimerId);
+		myTimerId = 0;
+	}
+
+	myCurrentX = x(event);
+	myCurrentY = y(event);
+
+	myHolder.view()->onStylusMove(myCurrentX, myCurrentY);
+	myHolder.view()->onStylusPress(myCurrentX, myCurrentY);
+
+	if (!myWasLeaved) {
+		myTimerId = startTimer(50);
+	}
+}
+
+void ZLQtViewWidget::ZLQtViewWidgetInternal::timerEvent(QTimerEvent*) {
+	myHolder.view()->onStylusPress(myCurrentX, myCurrentY);
+}
+
+void ZLQtViewWidget::ZLQtViewWidgetInternal::leaveEvent(QEvent*) {
+	if (myTimerId > 0) {
+		killTimer(myTimerId);
+		myTimerId = 0;
+	}
+	myWasLeaved = true;
+}
+
+void ZLQtViewWidget::ZLQtViewWidgetInternal::mouseReleaseEvent(QMouseEvent *event) {
+	if (myTimerId > 0) {
+		killTimer(myTimerId);
+		myTimerId = 0;
+	}
+	myHolder.view()->onStylusRelease(x(event), y(event));
+}
+
+void ZLQtViewWidget::ZLQtViewWidgetInternal::mouseMoveEvent(QMouseEvent *event) {
+	switch (event->state() & MouseButtonMask) {
+		case LeftButton:
+			myHolder.view()->onStylusMovePressed(x(event), y(event));
+			break;
+		case NoButton:
+			myHolder.view()->onStylusMove(x(event), y(event));
+			break;
+		default:
+			break;
+	}
+
+	myCurrentX = x(event);
+	myCurrentY = y(event);
+}
+
+int ZLQtViewWidget::ZLQtViewWidgetInternal::x(const QMouseEvent *event) const {
+	const int maxX = width() - 1;
+	const int maxY = height() + myHolder.myApplicationWindow.verticalAdjustment() - 1;
+	switch (myHolder.rotation()) {
+		default:
+			return std::min(std::max(event->x(), 0), maxX);
+		case DEGREES90:
+			return maxY - std::min(std::max(event->y(), 0), maxY);
+		case DEGREES180:
+			return maxX - std::min(std::max(event->x(), 0), maxX);
+		case DEGREES270:
+			return std::min(std::max(event->y(), 0), maxY);
+	}
+}
+
+int ZLQtViewWidget::ZLQtViewWidgetInternal::y(const QMouseEvent *event) const {
+	const int maxX = width() - 1;
+	const int maxY = height() + myHolder.myApplicationWindow.verticalAdjustment() - 1;
+	switch (myHolder.rotation()) {
+		default:
+			return std::min(std::max(event->y(), 0), maxY);
+		case DEGREES90:
+			return std::min(std::max(event->x(), 0), maxX);
+		case DEGREES180:
+			return maxY - std::min(std::max(event->y(), 0), maxY);
+		case DEGREES270:
+			return maxX - std::min(std::max(event->x(), 0), maxX);
+	}
+}
+
+void ZLQtViewWidget::repaint()	{
+	myQWidget->repaint(false);
+}
diff --git a/zlibrary/ui/src/ezx/view/ZLQtViewWidget.h b/zlibrary/ui/src/ezx/view/ZLQtViewWidget.h
new file mode 100644
index 0000000..dc8ea7f
--- /dev/null
+++ b/zlibrary/ui/src/ezx/view/ZLQtViewWidget.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTVIEWWIDGET_H__
+#define __ZLQTVIEWWIDGET_H__
+
+#include <qwidget.h>
+
+#include <ZLView.h>
+#include <ZLApplication.h>
+
+class ZLQtApplicationWindow;
+
+class ZLQtViewWidget : public ZLViewWidget {
+
+private:
+	class ZLQtViewWidgetInternal : public QWidget {
+
+	public:
+		ZLQtViewWidgetInternal(QWidget *parent, ZLQtViewWidget &holder);
+
+	private:
+		void paintEvent(QPaintEvent *event);
+		void mousePressEvent(QMouseEvent *event);
+		void mouseReleaseEvent(QMouseEvent *event);
+		void mouseMoveEvent(QMouseEvent *event);
+    void timerEvent(QTimerEvent *event);
+    void leaveEvent(QEvent *event);
+
+		int x(const QMouseEvent *event) const;
+		int y(const QMouseEvent *event) const;
+
+	private:
+		ZLQtViewWidget &myHolder;
+    int myCurrentX;
+    int myCurrentY;
+    int myTimerId;
+		bool myWasLeaved;
+	};
+	
+public:
+	ZLQtViewWidget(QWidget *parent, ZLQtApplicationWindow &applicationWindow);
+	QWidget *widget();
+
+private:
+	void repaint();
+	void trackStylus(bool track);
+
+private:
+	ZLQtViewWidgetInternal *myQWidget;
+	ZLQtApplicationWindow &myApplicationWindow;
+
+friend class ZLQtViewWidgetInternal;
+};
+
+inline QWidget *ZLQtViewWidget::widget() { return myQWidget; }
+
+#endif /* __ZLQTVIEWWIDGET_H__ */
diff --git a/zlibrary/ui/src/gpe/library/ZLibrary.cpp b/zlibrary/ui/src/gpe/library/ZLibrary.cpp
index db13c04..f32d4a1 100644
--- a/zlibrary/ui/src/gpe/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/gpe/library/ZLibrary.cpp
@@ -30,7 +30,7 @@
 #include "../dialogs/ZLGtkDialogManager.h"
 #include "../../gtk/image/ZLGtkImageManager.h"
 #include "../view/ZLGtkPaintContext.h"
-#include "../../../../core/src/unix/message/ZLUnixMessage.h"
+#include "../../unix/message/ZLUnixMessage.h"
 #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
 #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
 
diff --git a/zlibrary/ui/src/gtk/library/ZLibrary.cpp b/zlibrary/ui/src/gtk/library/ZLibrary.cpp
index 66f12e8..3ed65b2 100644
--- a/zlibrary/ui/src/gtk/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/gtk/library/ZLibrary.cpp
@@ -29,7 +29,7 @@
 #include "../dialogs/ZLGtkDialogManager.h"
 #include "../image/ZLGtkImageManager.h"
 #include "../view/ZLGtkPaintContext.h"
-#include "../../../../core/src/unix/message/ZLUnixMessage.h"
+#include "../../unix/message/ZLUnixMessage.h"
 #include "../../../../core/src/util/ZLKeyUtil.h"
 #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
 #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
diff --git a/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp b/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp
index 29791ca..17185c4 100644
--- a/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp
+++ b/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp
@@ -19,6 +19,8 @@
 
 #include <algorithm>
 
+#include <gdk/gdkscreen.h>
+
 #include <ZLUnicodeUtil.h>
 #include <ZLImage.h>
 
@@ -251,7 +253,16 @@ int ZLGtkPaintContext::stringHeight() const {
 		return 0;
 	}
 	if (myStringHeight == -1) {
+#if GTK_CHECK_VERSION(2,10,0)
+		if (pango_font_description_get_size_is_absolute(myFontDescription)) {
+			myStringHeight = pango_font_description_get_size(myFontDescription) / PANGO_SCALE + 2;
+		} else {
+			static const int resolution = gdk_screen_get_resolution(gdk_screen_get_default());
+			myStringHeight = pango_font_description_get_size(myFontDescription) * resolution / 72 / PANGO_SCALE + 2;
+		}
+#else // GTK_CHECK_VERSION(2,10,0)
 		myStringHeight = pango_font_description_get_size(myFontDescription) / PANGO_SCALE + 2;
+#endif // GTK_CHECK_VERSION(2,10,0)
 	}
 	return myStringHeight;
 }
diff --git a/zlibrary/ui/src/opie/library/ZLibrary.cpp b/zlibrary/ui/src/opie/library/ZLibrary.cpp
index fbc12f9..78af1a4 100644
--- a/zlibrary/ui/src/opie/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/opie/library/ZLibrary.cpp
@@ -29,7 +29,7 @@
 #include "../dialogs/ZLQtDialogManager.h"
 #include "../../qt/image/ZLQtImageManager.h"
 #include "../view/ZLQtPaintContext.h"
-#include "../../../../core/src/unix/message/ZLUnixMessage.h"
+#include "../../unix/message/ZLUnixMessage.h"
 #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
 #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
 
diff --git a/zlibrary/ui/src/qt/library/ZLibrary.cpp b/zlibrary/ui/src/qt/library/ZLibrary.cpp
index a525403..9c4559f 100644
--- a/zlibrary/ui/src/qt/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/qt/library/ZLibrary.cpp
@@ -29,7 +29,7 @@
 #include "../dialogs/ZLQtDialogManager.h"
 #include "../image/ZLQtImageManager.h"
 #include "../view/ZLQtPaintContext.h"
-#include "../../../../core/src/unix/message/ZLUnixMessage.h"
+#include "../../unix/message/ZLUnixMessage.h"
 #include "../../../../core/src/util/ZLKeyUtil.h"
 #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
 #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
index 1a4784e..7e50f85 100644
--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
@@ -29,7 +29,7 @@
 #include "../dialogs/ZLQtDialogManager.h"
 #include "../image/ZLQtImageManager.h"
 #include "../view/ZLQtPaintContext.h"
-#include "../../../../core/src/unix/message/ZLUnixMessage.h"
+#include "../../unix/message/ZLUnixMessage.h"
 #include "../../../../core/src/util/ZLKeyUtil.h"
 #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
 #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
diff --git a/zlibrary/core/src/unix/message/ZLUnixMessage.cpp b/zlibrary/ui/src/unix/message/ZLUnixMessage.cpp
similarity index 100%
rename from zlibrary/core/src/unix/message/ZLUnixMessage.cpp
rename to zlibrary/ui/src/unix/message/ZLUnixMessage.cpp
diff --git a/zlibrary/core/src/unix/message/ZLUnixMessage.h b/zlibrary/ui/src/unix/message/ZLUnixMessage.h
similarity index 100%
rename from zlibrary/core/src/unix/message/ZLUnixMessage.h
rename to zlibrary/ui/src/unix/message/ZLUnixMessage.h
diff --git a/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp b/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp
index 5f0f8d7..d37560c 100644
--- a/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp
+++ b/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp
@@ -29,7 +29,7 @@
 #include "ZLWin32ApplicationWindow.h"
 #include "../dialogs/ZLWin32DialogManager.h"
 #include "../view/ZLWin32ViewWidget.h"
-#include "../w32widgets/W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 #include "../time/ZLWin32Time.h"
 
 const int ICON_SIZE = 32;
diff --git a/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp b/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp
index 6b7f410..98c8aae 100644
--- a/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp
+++ b/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-#include "../w32widgets/W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 #include "ZLWin32DialogManager.h"
 #include "ZLWin32Dialog.h"
 #include "../application/ZLWin32ApplicationWindow.h"
diff --git a/zlibrary/ui/src/win32/library/ZLibrary.cpp b/zlibrary/ui/src/win32/library/ZLibrary.cpp
index 3ad4c52..faa6828 100644
--- a/zlibrary/ui/src/win32/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/win32/library/ZLibrary.cpp
@@ -22,14 +22,14 @@
 #include <ZLApplication.h>
 #include <ZLibrary.h>
 
-#include "../filesystem/ZLWin32FSManager.h"
+#include "../../../../core/src/win32/filesystem/ZLWin32FSManager.h"
 #include "../time/ZLWin32Time.h"
 #include "../dialogs/ZLWin32DialogManager.h"
 #include "../image/ZLWin32ImageManager.h"
 #include "../view/ZLWin32PaintContext.h"
 #include "../message/ZLWin32Message.h"
-#include "../config/ZLWin32Config.h"
-#include "../encoding/ZLWin32EncodingConverter.h"
+#include "../../../../core/src/win32/config/ZLWin32Config.h"
+#include "../../../../core/src/win32/encoding/ZLWin32EncodingConverter.h"
 
 const std::string ZLibrary::FileNameDelimiter("\\");
 const std::string ZLibrary::PathDelimiter(";");
diff --git a/zlibrary/ui/src/win32/message/ZLWin32Message.cpp b/zlibrary/ui/src/win32/message/ZLWin32Message.cpp
index 74ce248..1306a0e 100644
--- a/zlibrary/ui/src/win32/message/ZLWin32Message.cpp
+++ b/zlibrary/ui/src/win32/message/ZLWin32Message.cpp
@@ -22,7 +22,7 @@
 #include <ZLFile.h>
 
 #include "ZLWin32Message.h"
-#include "../w32widgets/W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 ZLWin32CommunicationManager::ZLWin32CommunicationManager() {
 }
diff --git a/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp b/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp
index d0067a4..e8b2bbb 100644
--- a/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp
+++ b/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp
@@ -23,7 +23,7 @@
 #include "ZLWin32PaintContext.h"
 #include "../application/ZLWin32ApplicationWindow.h"
 #include "../image/ZLWin32ImageManager.h"
-#include "../w32widgets/W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 ZLWin32PaintContext::ZLWin32PaintContext() : myDisplayContext(0), myBufferBitmap(0), myWidth(0), myHeight(0), myBackgroundBrush(0), myFillBrush(0), mySpaceWidth(-1) {
 }
diff --git a/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp b/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp
index cf68277..0b2e34b 100644
--- a/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp
+++ b/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp
@@ -24,7 +24,7 @@
 #include <ZLDialogManager.h>
 
 #include "W32ColorComboBox.h"
-#include "W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 static const WORD CLASS_COMBOBOX = 0x0085;
 
diff --git a/zlibrary/ui/src/win32/w32widgets/W32Control.cpp b/zlibrary/ui/src/win32/w32widgets/W32Control.cpp
index 53a098a..ac409cb 100644
--- a/zlibrary/ui/src/win32/w32widgets/W32Control.cpp
+++ b/zlibrary/ui/src/win32/w32widgets/W32Control.cpp
@@ -24,7 +24,7 @@
 
 #include "W32Control.h"
 #include "W32ControlCollection.h"
-#include "W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 static const WORD CLASS_BUTTON = 0x0080;
 static const WORD CLASS_EDIT = 0x0081;
diff --git a/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp b/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp
index da7445b..6fb8cb1 100644
--- a/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp
+++ b/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp
@@ -21,7 +21,7 @@
 
 #include "W32DialogPanel.h"
 #include "W32Control.h"
-#include "W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 static const int FirstControlId = 2001;
 
diff --git a/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp b/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp
index ca93d84..99f3579 100644
--- a/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp
+++ b/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp
@@ -24,7 +24,7 @@
 
 #include "W32DialogPanel.h"
 
-#include "W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 bool W32PropertySheet::ourPropertySheetStarted = false;
 
diff --git a/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp b/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp
index 2142454..8b8f53d 100644
--- a/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp
+++ b/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp
@@ -24,7 +24,7 @@
 #include <ZLFile.h>
 
 #include "W32TreeView.h"
-#include "W32WCHARUtil.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 const std::string W32TreeView::ITEM_SELECTED_EVENT = "Tree View: Item Selected";
 const std::string W32TreeView::ITEM_DOUBLE_CLICKED_EVENT = "Tree View: Item Double-Clicked";
-- 
2.11.4.GIT