[Olena-patches] olena-2.0-135-ga6aaffe Merge branch Antoine Froger's work into unstable/scribo.

This is a merge commit message of the following branches: Merge: a9795b3 8c22f85 Conflicts: .gitignore GScribo/BUGS | 1 + GScribo/GScribo.pro | 83 +++++ GScribo/GScribo.pro.user | 405 +++++++++++++++++++++++++ GScribo/GScribo.pro.user.1.3 | 283 ++++++++++++++++++ GScribo/PagesWidget/pagesdelegate.cpp | 20 ++ GScribo/PagesWidget/pagesdelegate.h | 18 ++ GScribo/PagesWidget/pagesmodel.cpp | 55 ++++ GScribo/PagesWidget/pagesmodel.h | 43 +++ GScribo/PagesWidget/pageswidget.cpp | 49 +++ GScribo/PagesWidget/pageswidget.h | 55 ++++ GScribo/Preferences/generaloptions.cpp | 44 +++ GScribo/Preferences/generaloptions.h | 34 ++ GScribo/Preferences/generaloptions.ui | 100 ++++++ GScribo/Preferences/ocroptions.cpp | 53 ++++ GScribo/Preferences/ocroptions.h | 33 ++ GScribo/Preferences/ocroptions.ui | 62 ++++ GScribo/Preferences/optionwidget.h | 15 + GScribo/Preferences/preferencesdialog.cpp | 98 ++++++ GScribo/Preferences/preferencesdialog.h | 42 +++ GScribo/Preferences/preferencesdialog.ui | 121 ++++++++ GScribo/Preferences/preprocessingoptions.cpp | 45 +++ GScribo/Preferences/preprocessingoptions.h | 32 ++ GScribo/Preferences/preprocessingoptions.ui | 76 +++++ GScribo/Preferences/segmentationoptions.cpp | 33 ++ GScribo/Preferences/segmentationoptions.h | 31 ++ GScribo/Preferences/segmentationoptions.ui | 52 ++++ GScribo/Processing/preprocess.cpp | 11 + GScribo/Processing/preprocess.h | 26 ++ GScribo/Processing/process.cpp | 21 ++ GScribo/Processing/process.h | 29 ++ GScribo/Processing/progressdialog.cpp | 16 + GScribo/Processing/progressdialog.h | 22 ++ GScribo/Processing/runner.cpp | 183 +++++++++++ GScribo/Processing/runner.h | 58 ++++ GScribo/Rendering/abstractregionitem.h | 13 + GScribo/Rendering/backgroundtexture.h | 12 + GScribo/Rendering/graphicsview.cpp | 150 +++++++++ GScribo/Rendering/graphicsview.h | 43 +++ GScribo/Rendering/regionitem.cpp | 59 ++++ GScribo/Rendering/regionitem.h | 80 +++++ GScribo/Rendering/rootgraphicsitem.h | 30 ++ GScribo/Rendering/scene.cpp | 273 +++++++++++++++++ GScribo/Rendering/scene.h | 118 ++++++++ GScribo/Rendering/selection.cpp | 36 +++ GScribo/Rendering/selection.h | 20 ++ GScribo/TODO | 100 ++++++ GScribo/XmlWidget/attributesmodel.cpp | 69 +++++ GScribo/XmlWidget/attributesmodel.h | 48 +++ GScribo/XmlWidget/selectionproxy.h | 47 +++ GScribo/XmlWidget/xmlattributes.cpp | 23 ++ GScribo/XmlWidget/xmlattributes.h | 33 ++ GScribo/XmlWidget/xmldelegate.h | 30 ++ GScribo/XmlWidget/xmlitem.cpp | 43 +++ GScribo/XmlWidget/xmlitem.h | 90 ++++++ GScribo/XmlWidget/xmlmodel.cpp | 87 ++++++ GScribo/XmlWidget/xmlmodel.h | 44 +++ GScribo/XmlWidget/xmlview.cpp | 88 ++++++ GScribo/XmlWidget/xmlview.h | 79 +++++ GScribo/XmlWidget/xmlwidget.cpp | 34 ++ GScribo/XmlWidget/xmlwidget.h | 54 ++++ GScribo/aboutdialog.h | 25 ++ GScribo/aboutdialog.ui | 136 +++++++++ GScribo/configs.h | 134 +++++++++ GScribo/dir.h | 7 + GScribo/dockwidget.h | 22 ++ GScribo/main.cpp | 23 ++ GScribo/mainwindow.cpp | 415 ++++++++++++++++++++++++++ GScribo/mainwindow.h | 120 ++++++++ GScribo/mainwindow.ui | 35 +++ GScribo/region.h | 56 ++++ GScribo/regionwidget.cpp | 70 +++++ GScribo/regionwidget.h | 40 +++ GScribo/variantpointer.h | 19 ++ GScribo/xml.cpp | 206 +++++++++++++ GScribo/xml.h | 93 ++++++ 75 files changed, 5353 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform